This commit was manufactured by cvs2svn to create tag 'v201006040347'.
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 c351329..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +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.306.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
-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.1.0,1.2.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,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.apache.axis;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.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 7a4927e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse.org
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_AXIS_EMITTER=Axis Emitter
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index 79917a4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisClientConfigWidgetFactory"/>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="ClientProjectName"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="ClientProject"
- transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
- <map
- key="CustomizeClientMappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="CustomizeClientMappings"
- transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_AXIS_EMITTER"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage">
- </page>
-
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
deleted file mode 100644
index e8aa870..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216 126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
-# 20060424 120137 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service Package to Namespace Mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client Namespace to Package Mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-
-
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-# Messages for Axis Emitter Preference Page
-TOOLTIP_PPAE_PAGE=Set preferences that control Axis Emitter.
-TOOLTIP_PPAE_CHECKBOX_ALL_WANTED=By default, code is generated only for referenced elements. \nCall bGenerateAll(true) and WSDL2Java will generate code \nfor all elements in the scope regardless of whether they are referenced. \nScope means: by default, all WSDL files; if generateImports(false),\nthen only the immediate WSDL file.
-TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED=Emits separate Helper classes for meta data.
-TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS=Prefers building beans to straight arrays for wrapped XML array types.
-TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS=If this option is selected, the Java2WSDL parser will look into extended classes to determine the list of methods to export into the WSDL file.
-TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC=If selected, the tools will examine the Java service class and its value types to determine if it satisfies important requirements of the JAX-RPC specification.
-TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE=Add scope to deploy.wsdd.
-TOOLTIP_PPAE_FIELD_TIME_OUT=Timeout in seconds (default is 45, specify -1 to disable).
-TOOLTIP_PPAE_GROUP_WSDL2JAVA=Set preferences for wsdl2java.
-TOOLTIP_PPAE_GROUP_JAVA2WSDL=Set preferences for java2wsdl.
-BUTTON_ALL_WANTED=&Generate code for all elements, even unreferenced ones
-BUTTON_HELPER_WANTED=Emits separate &helper classes for meta data
-BUTTON_WRAP_ARRAYS=Prefers building beans to straight arrays for &wrapped XML array types
-BUTTON_USE_INHERITED_METHODS=Look for allowed &methods in inherited class
-BUTTON_VALIDATE_AGAINST_JAXRPC=Analyze the service class for compliance to JAX-RPC before generating code
-LABEL_DEPLOY_SCOPE=Add &scope to deploy.wsdd:
-LABEL_TIME_OUT=&Timeout in seconds:
-GROUP_WSDL2JAVA_NAME=Wsdl2Java
-GROUP_JAVA2WSDL_NAME=Java2Wsdl
-DEPLOY_SCOPE_APPLICATION=Application
-DEPLOY_SCOPE_REQUEST=Request
-DEPLOY_SCOPE_SESSION=Session
-MSG_ERROR_INVALID_TIME_OUT=Invalid timeout! Timeout should be positive integer or -1 to disable.
-MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT=Using timeout value (in milliseconds) from JVM arguments AxisWsdl2JavaTimeout
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
deleted file mode 100644
index 6f4038e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUI";//$NON-NLS-1$
-
- private AxisConsumptionUIMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_DEFAULT_BEAN;
- public static String MSG_ERROR_WSDL_NO_DEFINITION;
- public static String MSG_ERROR_WSDL_NO_PORT;
- public static String MSG_ERROR_WRITE_WSDL;
- public static String MSG_ERROR_IMPORT_WSDL;
- public static String MSG_ERROR_WSDL_LOCATION_NOT_SET;
- public static String MSG_WARN_NO_JAVA_NATURE;
- public static String MSG_ERROR_BAD_BUILDPATH;
- public static String PROGRESS_INFO_COPY_AXIS_CFG;
- public static String MSG_ERROR_FILECOPY;
- public static String MSG_ERROR_REFRESH_PROJECT;
- public static String TOOLTIP_PWJB_PAGE;
- public static String TOOLTIP_PWJB_TEXT_FOLDER;
- public static String TOOLTIP_PWJB_CHECKBOX_GENPROXY;
- public static String PAGE_TITLE_WS_AXIS_PROXY;
- public static String PAGE_DESC_WS_AXIS_PROXY;
- public static String CHECKBOX_GENPROXY;
- public static String LABEL_FOLDER_NAME;
- public static String PAGE_TITLE_WS_BEAN2XML;
- public static String PAGE_TITLE_WS_XML2PROXY;
- public static String PAGE_DESC_P2N_MAPPINGS;
- public static String LABEL_MAPPING_PAIRS;
- public static String TABLE_COLUMN_LABEL_PACKAGE;
- public static String TABLE_COLUMN_LABEL_NAMESPACE;
- public static String LABEL_EXPLORE_MAPPINGS_XML2BEAN;
- public static String TOOLTIP_N2P_SHOW_MAPPINGS;
- public static String TOOLTIP_PPAE_PAGE;
- public static String TOOLTIP_PPAE_CHECKBOX_ALL_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS;
- public static String TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS;
- public static String TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC;
- public static String TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE;
- public static String TOOLTIP_PPAE_FIELD_TIME_OUT;
- public static String TOOLTIP_PPAE_GROUP_WSDL2JAVA;
- public static String TOOLTIP_PPAE_GROUP_JAVA2WSDL;
- public static String BUTTON_ALL_WANTED;
- public static String BUTTON_HELPER_WANTED;
- public static String BUTTON_WRAP_ARRAYS;
- public static String BUTTON_USE_INHERITED_METHODS;
- public static String BUTTON_VALIDATE_AGAINST_JAXRPC;
- public static String LABEL_DEPLOY_SCOPE;
- public static String LABEL_TIME_OUT;
- public static String GROUP_WSDL2JAVA_NAME;
- public static String GROUP_JAVA2WSDL_NAME;
- public static String DEPLOY_SCOPE_APPLICATION;
- public static String DEPLOY_SCOPE_REQUEST;
- public static String DEPLOY_SCOPE_SESSION;
- public static String MSG_ERROR_INVALID_TIME_OUT;
- public static String MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT;
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index dd21b83..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * AxisClientDefaultingCommand
- *
- */
-public class AxisClientDefaultingCommand extends AbstractDataModelOperation
-{
- private boolean isClientScenario_ = true;
- private boolean customizeMappings_ = false;
- private boolean generateProxy_ = true;
- private String clientRuntimeId_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_ = null;
- private IProject clientProjectEAR_ = null;
- private String wsdlURL_;
- private boolean testProxySelected_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private boolean clientIsExistingServer_;
- private String proxyProjectFolder_;
- private WebServicesParser webServicesParser_;
- public AxisClientDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- clientExistingServer_ = getServerFromServerLabel();
-// if (clientExistingServer_ != null) {
-// //TODO The following line should no longer be necessary.
-// clientExistingServer_.getServerType().getId();
-// } else {
-// //TODO get the factory id for the type.
-// }
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- // proxyProjectFolber_
-
- webServicesParser_ = WSDLParserFactory.getWSDLParser();
- return status;
- }
-
- public void setClientRuntimeID(String clientRuntimeId) {
- clientRuntimeId_ = clientRuntimeId;
- }
-
- public String getClientRuntimeID() {
- return this.clientRuntimeId_;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public IProject getClientProject() {
- return proxyProject_;
- }
-
- /**
- * @param clientProject
- * The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.proxyProject_ = clientProject;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public IProject getClientProjectEAR() {
- return clientProjectEAR_;
- }
-
- /**
- * @param clientProjectEAR
- * The clientProjectEAR to set.
- */
- public void setClientProjectEAR(IProject clientProjectEAR) {
- this.clientProjectEAR_ = clientProjectEAR;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getTestProxySelected() {
- return testProxySelected_;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestProxySelected(boolean testProxySelected) {
- this.testProxySelected_ = testProxySelected;
- }
-
- /**
- * @return Returns the wsdlURL.
- */
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- /**
- * @param wsdlURL
- * The wsdlURL to set.
- */
- public void setWsdlURL(String wsdlURL) {
- this.wsdlURL_ = wsdlURL;
- }
-
- /**
- * @return Returns the clientServer.
- */
- public IServer getClientExistingServer() {
- return clientExistingServer_;
- }
-
- /**
- * @param clientServer
- * The clientServer to set.
- */
- public void setClientServer(String clientServer) {
- this.clientServer_ = clientServer;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer() {
- return clientIsExistingServer_;
- }
-
- /**
- * @param clientIsExistingServer
- * The clientIsExistingServer to set.
- */
- public void setClientIsExistingServer(boolean clientIsExistingServer) {
- this.clientIsExistingServer_ = clientIsExistingServer;
- }
-
- public boolean getCustomizeClientMappings() {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings(boolean value) {
- customizeMappings_ = value;
- }
-
- private IServer getServerFromServerLabel() {
- if (true)
- // rsk revisit if (clientIsExistingServer_)
- {
- // Maybe this should be in WebServiceServerRuntimeTypeRegistry
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- if ((server.getName()).equals(clientServer_))
- return server;
- }
- }
- }
- //
- } else {
- //TODO create the server
- }
- return null;
- }
- /**
- * @return Returns the proxyProjectFolder.
- */
- public String getProxyProjectFolder() {
- if (proxyProject_!=null) {
- proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_ ).toString();
- }
- return proxyProjectFolder_;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser_ = webServicesParser;
- }
- /**
- * @return Returns the generateProxy.
- */
- public boolean getGenerateProxy() {
- return generateProxy_;
- }
- /**
- * @param generateProxy The generateProxy to set.
- */
- public void setGenerateProxy(boolean generateProxy) {
- this.generateProxy_ = generateProxy;
- }
-
- /**
- * @return Returns the isClientScenario_.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /**
- * @param isClientScenario_ The isClientScenario_ to set.
- */
- public void setIsClientScenario(boolean isClientScenario)
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index 7c9edf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
-
- private String clientProject_ = null;
- private String wsdlURL_;
- private String clientServer_;
- private WebServicesParser webServicesParser_;
-
- /**
- * Default CTOR
- */
- public AxisClientInputCommand() {
- }
-
- public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project) {
- wsc_ = wsc;
- clientProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
- clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-
- return Status.OK_STATUS;
- }
-
- public String getClientServer() {
- return clientServer_;
- }
-
- public String getClientProject() {
- return clientProject_;
- }
-
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
-
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index 9f729fc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
- private String proxyBean_;
- private String proxyEndpoint_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
- wsc_ = wsc;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- wsc_.getWebServiceClientInfo().setProxyEndpoint(proxyEndpoint_);
- return Status.OK_STATUS;
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint_ = proxyEndpoint;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index 02fa4e7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
-
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
- if(def==null)
- {
- status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[]{wsdlURL_}));
- env.getStatusHandler().reportError(status);
- return status;
- }
- IPath clientWSDLPath = new Path(clientWSDLPathName_);
- IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
- status = resolveWSDL(workspaceRoot, def, clientWSDLPath, env, monitor);
- return status;
- }
-
- private IStatus resolveWSDL(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor) {
- try {
- writeWSDLFile(workspace, wsdlDef, wsdlPath, env, monitor);
- Map importDefs = wsdlDef.getImports();
- Set keysSet = importDefs.keySet();
- for (Iterator e = keysSet.iterator(); e.hasNext();) {
- Object keyName = e.next();
- Vector vector = (Vector) importDefs.get(keyName);
- for (int i = 0; i < vector.size(); i++) {
- Import importDef = (Import) vector.get(i);
- Definition def = importDef.getDefinition();
- String newPathString =
- wsdlPath.toString().substring(
- 0,
- wsdlPath.toString().lastIndexOf("/") + 1); //$NON-NLS-1$
- if (isInvalidImportWSDL(importDef.getLocationURI())) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_IMPORT_WSDL,new String[]{importDef.getLocationURI()}));
- }
- IPath newPath =
- new Path(newPathString + importDef.getLocationURI());
- IStatus status = resolveWSDL(workspace, def, newPath, env, monitor);
- if (status != null
- && status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
- }
- } catch (Exception e) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL,new String[] { wsdlPath.toString() }), e);
- }
- return Status.OK_STATUS;
- }
-
- private boolean isInvalidImportWSDL(String wsdlPath) {
-
- // relative url
- if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
- if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
- if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
- return true;
- }
- }
-
- }
- return false;
- }
-
- private void writeWSDLFile(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor)
- throws Exception {
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- //WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- //WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
- wsdlWriter.writeWSDL(wsdlDef, baos);
- byte[] b = baos.toByteArray();
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
- ResourceContext context = ((BaseEclipseEnvironment)env).getResourceContext();
-
- FileResourceUtils.createFile(
- context,
- wsdlPath.makeAbsolute(),
- bais,
- monitor,
- env.getStatusHandler());
-
- baos.close();
- bais.close();
-
- }
-
- /**
- * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
- */
- public void setClientWSDLPathName(String clientWSDLPathName)
- {
- this.clientWSDLPathName_ = clientWSDLPathName;
- }
- /**
- * @param wsdlURL_ The wsdlURL_ to set.
- */
- public void setWsdlURL(String wsdlURL)
- {
- this.wsdlURL_ = wsdlURL;
- }
- /**
- * @param wsParser_ The wsParser_ to set.
- */
- public void setWsParser(WebServicesParser wsParser)
- {
- this.wsParser_ = wsParser;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index 12c5ec3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122 215866 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
-{
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_;
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private String outputFolder_;
-
- public DefaultsForClientJavaWSDLCommand()
- {
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
-
- if( outputFolder_ == null )
- {
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(proxyProject_);
- outputFolder_ = paths[0].toString();
- }
-
- if (javaWSDLParam_ == null)
- {
- status = StatusUtils
- .errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- javaWSDLParam_.setMetaInfOnly(false);
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
- if (mn != null)
- {
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
- // String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
- // String output =
- // ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
- IPath javaOutput = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(javaOutput.toString());
-
-
- IPath webModulePath = ResourceUtils.getWebComponentServerRootPath(proxyProject_);
- // output = PlatformUtils.getPlatformURL(webModulePath);
- IResource res = ResourceUtils.findResource(webModulePath);
- if (res != null) {
- output = res.getLocation().toString();
- }
- javaWSDLParam_.setOutput(output);
- }
- else
- {
- // Check if it's a plain old Java project
- if (ResourceUtils.isJavaProject(proxyProject_))
- {
- IPath output = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(output.toString());
- javaWSDLParam_.setOutput(output.toString());
- }
- else
- {
- // Not familiar with this kind of project
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- if (WSDLServicePathname_ == null)
- {
- if (WSDLServiceURL_ == null)
- {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- else
- {
- WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
- }
- javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- *
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- *
- * @param javaWSDLParam
- * The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * @param proxyProject_
- * The proxyProject_ to set.
- */
- public void setProxyProject(IProject proxyProject)
- {
- this.proxyProject_ = proxyProject;
- }
-
- /**
- * @param serviceURL_
- * The wSDLServiceURL_ to set.
- */
- public void setWSDLServiceURL(String serviceURL)
- {
- WSDLServiceURL_ = serviceURL;
- }
-
- /**
- * @param servicePathname_
- * The wSDLServicePathname_ to set.
- */
- public void setWSDLServicePathname(String servicePathname)
- {
- WSDLServicePathname_ = servicePathname;
- }
-
- public String getOutputFolder()
- {
- return outputFolder_;
- }
-
- public void setOutputFolder(String outputFolder)
- {
- outputFolder_ = outputFolder;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 1330bdd..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID =
- "org.eclipse.jst.ws.axis.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisConsumptionUIPlugin instance_;
- private ILog log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisConsumptionUIPlugin() {
- super();
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
- * @return The WebServiceWasConsumptionPlugin singleton.
- */
- static public WebServiceAxisConsumptionUIPlugin getInstance() {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext bundle ) throws CoreException {
- log_.log(ILog.INFO, 5066, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.start( bundle );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "start", exc );
- }
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException {
- log_.log(ILog.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "stop", exc );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
deleted file mode 100644
index c66cc60..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20080428 224726 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.preferences;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-
-
-public class AxisEmitterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPAE0001 for the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_PAGE = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0001";
- //
- private Button allWanted;
- /*CONTEXT_ID PPAE0002 for the all wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_ALL_WANTED = "PPAE0002";
- //
- private Button helperWanted;
- /*CONTEXT_ID PPAE0003 for helper wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_HELPER_WANTED = "PPAE0003";
- //
- private Button wrapArrays;
- /*CONTEXT_ID PPAE0004 for the wrap arrays check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS = "PPAE0004";
-
- private Combo deployScopeTypes;
- //*CONTEXT_ID PPAE0005 for the deploy scope type combo box on the Axis Emitter page*/
- private String INFOPOP_PPAE_COMBO_DEPLOY_SCOPE = "PPAE0005";
-
- private StackLayout timeOutSubCompositeStackLayout;
-
- private Text timeOutField;
- int timeOut;
- String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
-
- private Text timeOutMsgText;
- /*CONTEXT_ID PPAE0006 for the time out field on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_FIELD_TIME_OUT = "PPAE0006";
-
- private Button useInheritedMethods;
- /*CONTEXT_ID PPAE0007 for the use inherited methods check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS = "PPAE0007";
-
- private Button validateAgainstJAXRPC;
- /*CONTEXT_ID PPAE0010 for the "validate against JAXRPC..." check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC = "PPAE0010";
-
- /*CONTEXT_ID PPAE0008 for the wsdl2java group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_WSDL2JAVA = "PPAE0008";
- /*CONTEXT_ID PPAE0009 for the java2wsdl group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_JAVA2WSDL = "PPAE0009";
-/**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- UIUtils utils = new UIUtils( WebServiceAxisConsumptionUIPlugin.ID );
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_PAGE);
- helpSystem.setHelp(parent, INFOPOP_PPAE_PAGE);
- Group wsdl2JavaGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_WSDL2JAVA_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_WSDL2JAVA, INFOPOP_PPAE_GROUP_WSDL2JAVA, 2, 10,10);
- allWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_ALL_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_ALL_WANTED,INFOPOP_PPAE_CHECKBOX_ALL_WANTED);
-
- helperWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_HELPER_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED,INFOPOP_PPAE_CHECKBOX_HELPER_WANTED);
-
- wrapArrays = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_WRAP_ARRAYS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS,INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS);
-
- deployScopeTypes = utils.createCombo(wsdl2JavaGroup, AxisConsumptionUIMessages.LABEL_DEPLOY_SCOPE, AxisConsumptionUIMessages.TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE, INFOPOP_PPAE_COMBO_DEPLOY_SCOPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- /*
- * Ensure the order is the same as it in the fields for class
- * org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext
- */
- deployScopeTypes.setItems(new String []{AxisConsumptionUIMessages.DEPLOY_SCOPE_APPLICATION, AxisConsumptionUIMessages.DEPLOY_SCOPE_REQUEST,AxisConsumptionUIMessages.DEPLOY_SCOPE_SESSION});
-
- Label timeoutLabel = new Label(wsdl2JavaGroup, SWT.WRAP);
- timeoutLabel.setText(AxisConsumptionUIMessages.LABEL_TIME_OUT);
- timeoutLabel.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT);
-
- Composite timeOutSubComposite = utils.createComposite(wsdl2JavaGroup, 1);
- timeOutSubCompositeStackLayout = new StackLayout();
- timeOutSubComposite.setLayout(timeOutSubCompositeStackLayout);
-
- // only one of this is displayed at one time, they share infopop and tooltip text
- timeOutField = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
- timeOutMsgText = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
-
- timeOutMsgText.setEditable(false);
-
- Group java2WsdlGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_JAVA2WSDL_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_JAVA2WSDL, INFOPOP_PPAE_GROUP_JAVA2WSDL, 2, 10,10);
- useInheritedMethods = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_USE_INHERITED_METHODS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS,INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS);
- validateAgainstJAXRPC = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_VALIDATE_AGAINST_JAXRPC,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC,INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- /**
- * Creates checkbox with horizontalSpan = 2 in its grid data in order to
- * match the grid layout for combo
- */
- private Button createCheckBox( Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText(labelName);
- button.setToolTipText( tooltip );
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
- GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd.horizontalSpan= 2;
- button.setLayoutData(gd);
- return button;
- }
-
- private Text createTextField(Composite parent,String labelName, String tooltip, String infopop)
- { tooltip = tooltip == null ? labelName : tooltip;
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
- Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- text.setLayoutData(data);
- text.setToolTipText(tooltip);
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
-
- text.addModifyListener( new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- numberFieldChanged((Text) e.widget);
- }
- }
- );
- return text;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- if(validateNumber(timeOutField.getText()).isOK())
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- allWanted.setSelection( AxisEmitterDefaults.getAllWantedDefault());
- helperWanted.setSelection( AxisEmitterDefaults.getHelperWantedDefault());
- wrapArrays.setSelection( AxisEmitterDefaults.getWrapArraysDefault());
- deployScopeTypes.select(AxisEmitterDefaults.getDeployScopeDefault());
- if (wsdl2JavaTimeoutProperty != null) timeOutField.setText(""+ getTimeOutValueWithProperty());
- else timeOutField.setText("" + AxisEmitterDefaults.getTimeOutDefault());
- useInheritedMethods.setSelection(AxisEmitterDefaults.getUseInheritedMethodsDefault());
- validateAgainstJAXRPC.setSelection(AxisEmitterDefaults.getValidateAgainstJAXRPC());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- allWanted.setSelection( context.isAllWantedEnabled());
- helperWanted.setSelection( context.isHelperWantedEnabled());
- wrapArrays.setSelection( context.isWrapArraysEnabled());
- deployScopeTypes.select(context.getDeployScopeType());
- useInheritedMethods.setSelection( context.isUseInheritedMethodsEnabled());
- validateAgainstJAXRPC.setSelection( context.isValidateAgainstJAXRPCEnabled() );
- if (wsdl2JavaTimeoutProperty != null)
- { timeOut=getTimeOutValueWithProperty();
- //timeOutField.setEnabled(false);
- timeOutSubCompositeStackLayout.topControl = timeOutMsgText;
- timeOutMsgText.setText(AxisConsumptionUIMessages.MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT);
- }
- else
- {
- timeOut = context.getTimeOut();
- timeOutSubCompositeStackLayout.topControl = timeOutField;
- }
- timeOutField.setText(""+ timeOut);
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- context.setAllWantedEnabled( allWanted.getSelection() );
- context.setHelperWantedEnabled( helperWanted.getSelection() );
- context.setWrapArraysEnabled( wrapArrays.getSelection() );
- context.selectDeployScopeType(deployScopeTypes.getSelectionIndex());
- timeOut = Integer.parseInt(timeOutField.getText().trim());
- context.setTimeOut(timeOut);
- context.setUseInheritedMethodsEnabled( useInheritedMethods.getSelection() );
- context.setValidateAgainstJAXRPCEnabled( validateAgainstJAXRPC.getSelection() );
- }
-
- private void numberFieldChanged(Text textControl) {
- IStatus status = validateNumber(textControl.getText());
- setValid(!status.matches(IStatus.ERROR));
- applyToStatusLine(this,status);
- }
-
- private int getTimeOutValueWithProperty()
- {
- if (wsdl2JavaTimeoutProperty != null)
- { try {
- long timeOutProperty = Long.parseLong(wsdl2JavaTimeoutProperty);
- if (timeOutProperty < 0) return -1; // timeout = -1 equals never time out; treating all negative number as -1
- else return (int)Math.ceil(timeOutProperty/1000.0);
- } catch (NumberFormatException e){
- System.err.print("AxisWSDL2JavaTimeout is not a valid number");
- return AxisEmitterDefaults.getTimeOutDefault();
- }
- }
- else return AxisEmitterDefaults.getTimeOutDefault();
- }
-
- private IStatus validateNumber(String numberString)
- {
- IStatus status;
- try
- {
- int number = Integer.parseInt(numberString);
- if (number <= 0 && number != -1)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- else
- { timeOut = number;
- status = Status.OK_STATUS;
- //we set param:message="" here, Later in
- //applyToStatusLine(), we do page.setMessage(null,type)
- status = new Status(IStatus.OK, WebServiceAxisConsumptionUIPlugin.ID, IStatus.OK, "",null);
- }
- }
- catch
- (NumberFormatException e)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- return status;
- }
-
- private void applyToStatusLine(DialogPage page, IStatus status) {
- String message= status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(null, IMessageProvider.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, IMessageProvider.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, IMessageProvider.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message= null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
deleted file mode 100644
index f8dcdf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20080603 235367 makandre@ca.ibm.com - Andrew Mak, "IWAB0014E Unexpected exception occurred" from ant task for web service client generation
- * 20080626 229867 makandre@ca.ibm.com - Andrew Mak, Missing method in generated proxy class
- * 20080709 240225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ClientCodeGenOperation extends AbstractDataModelOperation {
-
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- private WSDL2JavaCommand wsdl2JavaCommand = null;
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
-
- private IProject project;
-
- private Stub2BeanCommand stub2BeanCommand = null;
- private WebServicesParser webServicesParser;
- private String outputFolder;
- private String proxyBean;
- private String proxyEndpoint;
-
- private RefreshProjectCommand refreshProjectCommand = null;
-
- public ClientCodeGenOperation(){
- copyAxisJarCommand = new CopyAxisJarCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- stub2BeanCommand = new Stub2BeanCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment env = getEnvironment();
- ClientWSModifyOperation buOperation = new ClientWSModifyOperation(info, env);
- try {
- buOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
-
- private class ClientWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
-
- protected ClientWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException{
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(project);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // WSDL2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- wsdl2JavaCommand.setWsdlURI(wsdlURI);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // Stub2BeanCommand
- stub2BeanCommand.setEnvironment(env);
- stub2BeanCommand.setWebServicesParser(webServicesParser);
- stub2BeanCommand.setOutputFolder(outputFolder);
- stub2BeanCommand.setJavaWSDLParam(javaWSDLParam);
- stub2BeanCommand.setClientProject(project);
- status = stub2BeanCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- proxyBean = stub2BeanCommand.getProxyBean();
- proxyEndpoint = stub2BeanCommand.getProxyEndpoint();
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(project);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- }
-
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setOutputFolder(String outputFolder) {
- this.outputFolder = outputFolder;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public String getProxyBean() {
- return proxyBean;
- }
-
- public String getProxyEndpoint() {
- return proxyEndpoint;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index f01af18..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,454 +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
- *******************************************************************************/
-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 = 1588063L;
- private static long COMMON_DISCOVERY_JAR_SIZE = 71451L;
- private static long JAVAX_XML_RPC_JAR_SIZE = 32361L;
- private static long JAVAX_XML_SOAP_JAR_SIZE = 19582L;
- private static long JAVAX_WSDL_JAR_SIZE = 134085L;
- private static long COMMON_LOGGING_JAR_SIZE = 39353L;
-
-// 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.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 32f3eca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,78 +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.8.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
-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.1.0,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,1.2.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,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.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,1.2.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.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,1.2.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)",
- com.ibm.icu;bundle-version="[3.4.4,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 e880705..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,125 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# -------- -------- -----------------------------------------------------------
-# 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-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_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=Web Service Sample 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 fb4161d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,763 +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"/>
-
-<!-- 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>
-</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/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/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 deff7ec..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
+++ /dev/null
@@ -1,657 +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 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
-###############################################################################
-
-#
-# 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:
-LABEL_SERVERS_INSTANCES=Server instance:
-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_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 does not support the service project {1}.
-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 does not support the service project type {1}.
-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 does not support the client project {1}.
-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 does not support the client project type {1}.
-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}, cannot be associated with the EAR, {1}. Choose an EAR with a J2EE level of {2} or higher.
-MSG_SERVICE_CANNOT_ASSOCIATE=The service project, {0}, cannot be associated with the EAR, {1}. Choose an EAR with a J2EE level of {2} or higher.
-
-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.
-
-
-# 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 projects
-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 6c91e82..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
+++ /dev/null
@@ -1,409 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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;
-
-
- 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 283f011..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
+++ /dev/null
@@ -1,210 +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.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
- {
- istatus[0] = server.publish(kind, shellMonitor);
- }
- };
-
- 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/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 42c9ade..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,1067 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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.model.internal.validation.EARValidationMessageResourceHandler;
-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, 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, 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)) {
-
- return StatusUtils.errorStatus(NLS.bind(
- ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { runtimeLabel, 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, templateLabel }));
- }
-
- } else {
- // Check if the runtime supports it.
- if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportTemplate(
- typeId, runtimeId, templateId)) {
- return StatusUtils
- .errorStatus(NLS
- .bind(
- ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
- new String[] { runtimeLabel, 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) {
- return StatusUtils.warningStatus(NLS.bind(
- EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_,
- 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 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 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 4cf8809..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,151 +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
- * 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
- *
- *******************************************************************************/
-
-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());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- 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/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 0163260..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,119 +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
- * 20090714 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 b9fb927..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.internal.webservice.helper.WebServicesManager;
-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.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 648f6b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,538 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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.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.swt.widgets.Text;
-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;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor implements Runnable
-{
- private WebServiceClientTypeWidget clientWidget_;
- private Button overwriteButton_;
- private Button monitorService_;
-
- private Text 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.createText(typeComposite, ConsumptionUIMessages.LABEL_WEBSERVICEDEF,
- ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL,
- INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL, SWT.LEFT | SWT.BORDER );
-
- 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);
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- wsdlDialog_ = new WSDLSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidgetWrapper();
- }
- }));
- 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 internalize() {
-
- if (webServiceURI_ == null || webServiceURI_.length() == 0)
- return;
-
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(webServiceURI_);
- 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) {
-
- 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
- }
- }
- }
-}
-
-
-
-
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 beeab2f..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.internal.webservice.helper.WebServicesManager;
-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.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 1bc2523..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,630 +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
- * -------- -------- -----------------------------------------------------------
- * 20060505 139918 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-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();
- }
- 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();
- }
- }
- );
-
- 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 325adb6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,490 +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
- * 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
- *******************************************************************************/
-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;
- }
-
-
- 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);
- 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 0e78537..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
- * 20090714 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 e9fe9d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1615 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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);
- }
- else
- {
- matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId);
- }
-
- 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, serviceProjectName, 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 0053910..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,614 +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 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
- *******************************************************************************/
-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();
- 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());
- }
- else
- {
- templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId());
- }
-
- 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)
- {
- return StatusUtils.warningStatus( NLS.bind(EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_, 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 0098457..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,696 +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
- * 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)
- *******************************************************************************/
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.common.ValidationUtils;
-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.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 Text sampleFolderText_;
- /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
- //
- 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.createText( comboGroup_, ConsumptionUIMessages.LABEL_FOLDER_NAME,
- ConsumptionUIMessages.TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER,
- INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
- SWT.SINGLE | SWT.BORDER );
-
-
-
- sampleFolderText_.addModifyListener( new ModifyListener()
- {
- public void modifyText( ModifyEvent evt )
- {
- handleFolderText();
- }
- });
-
-
- 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_);
-
- if ( webModuleSegments < webContentPath_.segmentCount() )
- {
- sampleFolderText_.setText("");
- handleFolderText();
- }
- else
- {
- sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
- handleFolderText();
- }
- }
- }
-
- 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].getRuntime().getId())){
- serverInstances_.add(servers[j].getId(), servers[j].getName());
- serverInstanceTypeCombo_.add(servers[j].getName());
- }
- }
- serverInstanceTypeCombo_.select(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;
- }
-
-
- 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();
- IServerType[] serverTypes = ServerCore.getServerTypes();
-
-
-
- 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(runtimes[i].getId(), runtimes[i].getName());
- runtimesCombo.add( runtimes[i].getName() );
- }
- }
- else{
- runtimes_.add(runtimes[i].getId(), 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].getRuntime() != null){
- if(id.equals(servers[k].getRuntime().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_.setText( folder );
- }
-
- 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;
- }
-}
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 a246e7c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,135 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-/*
- * 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();
- // test facilities
- 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 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 e7d91d9..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,172 +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.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.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;
- return status;
- }
-
- 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 e364e68..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,194 +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
- * 20090929 250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.io.InputStream;
-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());
-
- InputStream resultStream = null;
- InputStream methodStream = null;
- InputStream inputStream = null;
- InputStream clientStream = null;
-
- for( int retries = 0; retries < 10; retries++ )
- {
- try
- {
- // Test the URLs
-
- resultStream = new URL(newPath + "/" + RESULT).openStream();
- methodStream = new URL(newPath + "/" + METHOD).openStream();
- inputStream = new URL(newPath + "/" + INPUT).openStream();
- clientStream = new URL(newPath + "/" + TEST_CLIENT).openStream();
-
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- finally
- {
- try
- {
- if( resultStream != null ) resultStream.close();
- if( methodStream != null ) methodStream.close();
- if( inputStream != null ) inputStream.close();
- if( clientStream != null ) clientStream.close();
- }
- catch( IOException exc )
- {
- }
- }
- }
-
- 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;
- }
- }
-}
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 cd96e45..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,736 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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.jface.dialogs.Dialog;
-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.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-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.ui.help.IWorkbenchHelpSystem;
-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 Dialog {
-
- private Shell thisShell;
- private Text 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);
- 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 void setShellStyle(int newShellStyle)
- {
- super.setShellStyle( newShellStyle | SWT.RESIZE );
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- Composite composite = (Composite) super.createDialogArea(parent);
-
- UIUtils uiUtils = new UIUtils(WebServiceConsumptionUIPlugin.ID);
- // Window title
- if (selectionMode_ == MODE_SERVICE)
- thisShell.setText(ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION);
- else
- thisShell.setText(ConsumptionUIMessages.PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION);
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
- helpSystem.setHelp(thisShell, WebServiceConsumptionUIPlugin.ID + "." + INFOPOP_PWRS_DIALOG);
-
- // Dialog description banner
- messageBanner_ = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
- messageBanner_.setText(ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION + "\n" + " "); // reserves a second line for message display
- messageBanner_.setToolTipText(ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION);
-
- // -----------------------------------------------------------------------//
- 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;
- enableOKButton();
- 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;
- enableOKButton();
- 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;
- enableOKButton();
- 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;
- enableOKButton();
- 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;
- enableOKButton();
- 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;
- }
-
-
- private void validateServerRuntimeSelection() {
-
- if (selectionMode_ == MODE_SERVICE) {
- if (selectedServerFactoryID_ != null && selectedRuntime_ != null)
- {
-
- if (WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_.getId(),
- typeId_))
- {
- setOKStatusMessage();
- } else
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
- String runtimeLabel = selectedRuntime_.getLabel();
- setERRORStatusMessage(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- // Found an error - so return.
- return;
- }
- }
- }
- else {
-
- if (selectedServerFactoryID_ != null && selectedRuntime_ != null)
- {
- String clientId = typeId_;
- if (WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_
- .getId(), clientId))
- {
- setOKStatusMessage();
- } else
- {
- String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
- String runtimeLabel = selectedRuntime_.getLabel();
- setERRORStatusMessage(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
- runtimeLabel }));
- // Found an error - so return.
- return;
- }
- }
- }
- // Disable OK button if the runtime selection is invalid
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
- disableOKButton();
- }
- // 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) {
- disableOKButton();
- }
- if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
- disableOKButton();
- setOKStatusMessage();
- }
- // Disable OK button if category is selected rather than a server
- if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
- disableOKButton();
- }
- else {
- enableOKButton();
- }
-
- }
-
- private void setOKStatusMessage() {
- messageBanner_.setText(ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION);
- messageBanner_.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
- enableOKButton();
- }
-
- private void setERRORStatusMessage(String message) {
- messageBanner_.setText(message);
- messageBanner_.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- disableOKButton();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- protected void okPressed() {
- if (labelProvider_!=null)
- labelProvider_.dispose();
- if (existingServersIcon!=null)
- existingServersIcon.dispose();
- if (serverTypesIcon!=null)
- serverTypesIcon.dispose();
- setReturnCode(OK);
- close();
- }
-
- protected void cancelPressed() {
- if (labelProvider_!=null)
- labelProvider_.dispose();
- if (existingServersIcon!=null)
- existingServersIcon.dispose();
- if (serverTypesIcon!=null)
- serverTypesIcon.dispose();
- setReturnCode(CANCEL);
- close();
- }
-
- 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);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- runtimesGroup_.moveAbove(serversGroup_);
- 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 4ab0915..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
+++ /dev/null
@@ -1,183 +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
- * -------- -------- -----------------------------------------------------------
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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;
-
- 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 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 3243101..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
+++ /dev/null
@@ -1,496 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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 = getTemplates(desc.getRequiredFacetVersions());
- 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 = getTemplates(desc.getRequiredFacetVersions());
- templatesByServiceRuntimeId_.put(serviceRuntimeId, validTemplates);
- return validTemplates;
- }
- }
-
-
- /**
- * Returns the set of templates that supported the given required facet versions.
- * @param requiredFacetVersions
- * @return Set containing elemets of type {@link IFacetedProjectTemplate}.
- */
- private Set getTemplates(RequiredFacetVersion[] requiredFacetVersions)
- {
- Set templates = new HashSet();
-
- for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
- {
- final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
- String templateId = template.getId();
- 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 092e7cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
+++ /dev/null
@@ -1,215 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-
-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;
-
- 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 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 ab2df35..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
+++ /dev/null
@@ -1,225 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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);
-
- }
- }
- }
-
- /**
- * 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 d634ef5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
+++ /dev/null
@@ -1,2216 +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
- * 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-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;
-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());
- }
- }
- }
-
- return (String[])finalTemplateIdList.toArray(new String[]{});
- }
-
- /**
- * 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());
- }
- }
- }
-
- 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)
- {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return null;
- }
-
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < srIds.length; i++)
- {
- 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}
- * @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[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < srIds.length; i++)
- {
- 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 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.
- *
- * @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)
- {
- String[] crIds = getClientRuntimesByType(clientImplId);
- if (crIds == null)
- {
- return null;
- }
-
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < crIds.length; i++)
- {
- 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 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)
- {
- String[] crIds = getClientRuntimesByType(clientImplId);
- if (crIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < crIds.length; i++)
- {
- 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 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 ad09d9c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
-webserviceutilssrc.zip
-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 86d8caa..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.310.qualifier
-Bundle-ClassPath: wsc.jar,
- 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
-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.jface;bundle-version="[3.2.0,4.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.1.0,1.2.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,1.2.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,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.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)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.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 5bb9bda..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,27 +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.wsc.jar = src/
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = wsc.jar,\
- webserviceutils.jar
-bin.includes = plugin.properties,\
- plugin.xml,\
- wsc.jar,\
- 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
-
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 f2c1bac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption
-PLUGIN_PROVIDER=Eclipse.org
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
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 f6640aa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,52 +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"/>
-
-
- <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/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 07311fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.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.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 );
- IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
- if (status.getSeverity() != IStatus.OK)
- throw new CoreException(status);
- 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 900cf8a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,142 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- * 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)
- * 20090929 250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-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 project;
- private String module;
-
- 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 iproject = ProjectUtilities.getProject(project);
- if (!J2EEUtils.isJavaComponent(iproject))
- {
- // Get the IModule as specified by the module name
- IModule imodule = ServerUtils.getModule(iproject, module);
-
- // TODO: This workaround for 156768 should be removed once the defect is fixed
- if (imodule == null) {
- // calling incremental build on the project before trying again
- iproject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);
-
- imodule = ServerUtils.getModule(iproject);
- if (imodule == 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, imodule, null))
- {
- IModule[] imodules = new IModule[]{imodule};
- 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.project = project;
- }
-
- 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 fb19f00..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,86 +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
- * -------- -------- -----------------------------------------------------------
- * 20090929 250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-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.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
- {
- 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());
- }
- catch (Exception e)
- {
- }
-
-
- return Status.OK_STATUS;
- }
- /**
- * @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 9834948..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,362 +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.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);
- }
- }
- }
- }
-
- 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 e688e63..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,436 +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
- * 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
- *******************************************************************************/
-
-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.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.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.internal.util.IModuleConstants;
-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.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;
-
-
- 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
- {
- status = FacetUtils.createNewFacetedProject(projectName);
- if (status.getSeverity() == IStatus.ERROR)
- {
- return status;
- }
-
- IProject createdProject = ProjectUtilities.getProject(projectName);
- IFacetedProject fproject = ProjectFacetsManager.create(createdProject);
-
- //Get the facet versions to install.
- Set facetsToAdd = getFacetsToAdd();
-
- //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.
- }
- // end of adding default facets
- }
- } catch (CoreException ce)
- {
- 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/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 db7e772..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,1530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * -------- -------- -----------------------------------------------------------
- * 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
- * 20090818 286859 zina@ca.ibm.com - Zina Mostafia
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.lang.reflect.InvocationTargetException;
-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.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.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.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-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 org.osgi.framework.Bundle;
-
-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
-{
-
- /**
- * 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);
-
- // 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];
- }
-
- protected static 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 (int i = 0; i < originalSet.length ; i++) {
- if (originalSet[i].equals(ejbModulePath))
- foundEJBModulEntry = true;
- }
- if (!foundEJBModulEntry) {
- IClasspathEntry[] newSet = new IClasspathEntry[originalSet.length + 1];
- for (int i = 0; i < originalSet.length ; i++) {
- newSet[i] = originalSet[i];
- }
- newSet[originalSet.length] = JavaCore.newSourceEntry(ejbModulePath);
- javaProject.setRawClasspath(newSet,null);
- }
- }
- catch (Exception e) {
- // TODO: handle exception
- }
-
- }
-
-/**
- * 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())
- {
- // 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];
- }
-
- /**
- * 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;
-
- //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];
- }
-
- /**
- * 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;
-
- //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); //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(IModuleConstants.JST_JAVA);
- 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.getVersion("5.0");
- }
- else if (jdkComplianceLevel.equals("1.6"))
- {
- javaFacetVersion = javaFacet.getVersion("6.0");
- }
- 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 of "jst.java"
- * @param pf facet
- * @return <code>true</code> if facet has an id of "jst.java", <code>false</code> otherwise.
- */
- public static boolean isJavaFacet(IProjectFacet pf)
- {
- if (pf != null && pf.getId().equals("jst.java"))
- 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;
- }
-
- // 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;
-
- }
- }
-}
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/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 c0406ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +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 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
- + "org.w3c.dom.Element " + 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 289e009..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +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 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
- + "javax.xml.soap.SOAPElement " + 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 6d47bb0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +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.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=\"<%=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=\"<%=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(Generator.TAB + "return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + 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 c46105f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +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.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=\"<%=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 0427721..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,143 +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
- * -------- -------- -----------------------------------------------------------
- * 20060523 142296 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.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: <%= e %>" + 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 04714bb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.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.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=\"<%=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 7576991..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.310.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.1.0,1.2.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,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,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.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 d6e85f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,62 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-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
-
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create 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 e2d7657..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,194 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-
-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_)) {
- 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 dabde40..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,410 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-
-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_)){
- 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 d75896d..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,146 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-
-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());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- 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 55d89a8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,1698 +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
- * 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
- *******************************************************************************/
-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.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.Text;
-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.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 Text 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_);
- }
- }
- 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 Text(typeComposite, SWT.LEFT | SWT.BORDER );
- 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_);
-
- browseButton_ = utils_.createPushButton(typeComposite,
- ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- browseDialog_ = new ServiceImplSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ObjectSelectionWidget();
- }
- }));
- 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 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();
- }
-
- if (displayable == null || displayable.length() == 0)
- return;
-
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(displayable);
- 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);
- 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_.setEditable( 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;
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_);
- launchable.setInitialSelection(getObjectSelection());
- IWorkbench workbench = PlatformUI.getWorkbench();
- result = launchable.launch(workbench.getActiveWorkbenchWindow().getShell());
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(launchable.getObjectSelectionDisplayableString());
- serviceImpl_.addModifyListener(objectModifyListener_);
- objectSelection = launchable.getObjectSelection();
- project = launchable.getProject();
- componentName= launchable.getComponentName();
- }
- }
- else
- {
- 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();
- }
- }
-
- // 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 cc92849..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,652 +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
- * 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
- *******************************************************************************/
-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);
-
- // 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, "GenerateProxy", 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 5b6d555..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,667 +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
- * -------- -------- -----------------------------------------------------------
- * 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
- *******************************************************************************/
-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());
-
- //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/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws/.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/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index 5e01b0f..0000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index 6414517..0000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws</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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4165159..0000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Wed Oct 01 07:20:02 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2bcc8c9..0000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:42 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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index eeb12b7..0000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 1.0.308.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal;x-internal:=true,
- org.eclipse.jst.ws.internal.command;x-internal:=true,
- org.eclipse.jst.ws.internal.common;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance.rules;x-internal:=true,
- org.eclipse.jst.ws.internal.context;x-internal:=true,
- org.eclipse.jst.ws.internal.data;x-internal:=true,
- org.eclipse.jst.ws.internal.dialog;x-internal:=true,
- org.eclipse.jst.ws.internal.ext;x-internal:=true,
- org.eclipse.jst.ws.internal.ext.test;x-internal:=true,
- org.eclipse.jst.ws.internal.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.wsrt
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.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.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.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.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.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.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.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.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.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)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws/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/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index 2d5936b..0000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-src.includes = component.xml
-bin.includes = .,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.. = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index a90bf17..0000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.ws">
- <component-depends unrestricted="true">
- </component-depends>
- <plugin id="org.eclipse.jst.ws" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.core" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ejb.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.uddiregistry" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.jst.ws/plugin.properties b/bundles/org.eclipse.jst.ws/plugin.properties
deleted file mode 100644
index 505a8be..0000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
deleted file mode 100644
index 4aaa75e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
+++ /dev/null
@@ -1,31 +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
-###############################################################################
-
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-
-ANY_FILTER_NAME=All files
-ANY_FILTER_DESC=This is a kind of Filter that accepts all objects.
-
-ERROR_SELECTION_TRANSFORM=Specified selection does not match a resource.
-
-MSG_JAXRPC11_NOT_COMPLIANT=The service class "{0}" does not comply to one or more requirements of the JAX-RPC 1.1 specification, and may not deploy or function correctly.
-MSG_JAXRPC11_UNRESOLVED_CLASS=The class "{0}" cannot be loaded via project "{1}". Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project.
-MSG_JAXRPC11_UNRESOLVED_TYPE=A data type, "{0}", could not be resolved while analyzing the service class. Check your project classpath.
-MSG_JAXRPC11_RULE_0001=The service class "{0}" does not have a public default constructor. Chapter 10.1 of the JAX-RPC 1.1 specification requires a service class to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the service class to handle an incoming request message.
-MSG_JAXRPC11_RULE_0002=The value type "{0}" used via the service class "{1}" does not have a public default constructor. Chapter 5.4 of the JAX-RPC 1.1 specification requires a value type to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the value type during deserialization.
-MSG_JAXRPC11_RULE_0003=The method "{0}" on the service class "{1}" is overloaded. Overloaded methods are allowed by chapter 5.5.5 of the JAX-RPC 1.1 specification, however, some JAX-RPC 1.1 compliant tools may not allow overloaded methods or may generate WSDL with overloaded operations as contrary to rule R2304 of the WS-I Basic Profile.
-MSG_JAXRPC11_RULE_0004=The service specific exception class "{0}" does not have a public constructor with parameters corresponding in number and type to the getter methods on the class. Chapter 5.5.5 of the JAX-RPC 1.1 specification requires a service specific exception to have a public constructor with the same number of parameters as there are getter methods, and of matching data types, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the exception during deserialization of a fault message.
-MSG_JAXRPC11_RULE_0005=The method "{0}" on the service class "{1}" uses a data type, "{2}", that is not supported by the JAX-RPC specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0006=The field or property "{0}" on the value type "{1}" used via the service class "{2}" has a data type, "{3}", that is not supported by the JAX-RPC 1.1 specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0007=The primitive type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported primitive types are "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0008=The wrapper type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported wrapper types are those corresponding to "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0009=The Java type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.3 of the specification, the supported standard types are "java.lang.String", "java.util.Date", "java.util.Calendar", "java.math.BigInteger", "java.math.BigDecimal", "javax.xml.namespace.QName" and "java.net.URI".
-MSG_JAXRPC11_RULE_0010=Support for collection and map classes such as "{0}" is not required by JAX-RPC 1.1. Due to their non-type safe nature, a JAX-RPC 1.1 compliant Web service engine may not handle collections, or may represent them in WSDL documents and SOAP messages in a manner that impairs interoperability. The use of arrays instead of collections is strongly recommended.
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
deleted file mode 100644
index b295793..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060607 145604 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WSPluginMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.WSPlugin";//$NON-NLS-1$
-
- private WSPluginMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_SERVER;
- public static String ANY_FILTER_NAME;
- public static String ANY_FILTER_DESC;
- public static String ERROR_SELECTION_TRANSFORM;
- public static String MSG_JAXRPC11_NOT_COMPLIANT;
- public static String MSG_JAXRPC11_UNRESOLVED_CLASS;
- public static String MSG_JAXRPC11_UNRESOLVED_TYPE;
- public static String MSG_JAXRPC11_RULE_0001;
- public static String MSG_JAXRPC11_RULE_0002;
- public static String MSG_JAXRPC11_RULE_0003;
- public static String MSG_JAXRPC11_RULE_0004;
- public static String MSG_JAXRPC11_RULE_0005;
- public static String MSG_JAXRPC11_RULE_0006;
- public static String MSG_JAXRPC11_RULE_0007;
- public static String MSG_JAXRPC11_RULE_0008;
- public static String MSG_JAXRPC11_RULE_0009;
- public static String MSG_JAXRPC11_RULE_0010;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WSPluginMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
deleted file mode 100644
index 45ab7d8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,61 +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.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A NullStatusRenderer throws away IStatus information.
-*/
-public class NullStatusMonitor implements StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- protected boolean result;
-
- /**
- * Default constructor.
- */
- public NullStatusMonitor () {}
- /**
- * Does nothing.
- */
- public int reportStatus(IStatus status, Vector options) { return 0; }
- public boolean reportStatus(IStatus status)
- {
- switch (status.getSeverity())
- {
- case IStatus.ERROR:
- case IStatus.WARNING:
- result = false;
- break;
- case IStatus.INFO:
- default: //IStatus.OK
- result = true;
- break;
- }
- return result;
- }
- public void dumpSavedStatus() { }
- public boolean canContinue()
- {
- return result;
- }
-
- public void reset () {
- result = true;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
deleted file mode 100644
index c4ac802..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,37 +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.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * reports the contents of the given status object.
- * Subclasses must implement this method to report
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public int reportStatus(IStatus status, Vector options);
- public boolean reportStatus(IStatus status);
- public void dumpSavedStatus();
- public boolean canContinue();
- public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +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.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Renders the contents of the given status object.
- * Subclasses must implement this method to render
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index 95a8f16..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,82 +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.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-
-/**
-* This is a kind of {@link Filter} that accepts all objects,
-* and is a suitable base class for new <code>Filters</code>.
-*/
-public class AnyFilter implements Filter
-{
-
- /**
- * Constructs a new <code>AnyFilter</code>.
- */
- public AnyFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WSPluginMessages.ANY_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WSPluginMessages.ANY_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * The default implementation of <code>AnyFilter</code>
- * returns a status with severity <code>IStatus.OK</code>.
- * Subclasses may override.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}.
- */
- public IStatus statusOf ( Object object )
- {
- return new Status(IStatus.OK,WebServicePlugin.ID,0,"",null);
- }
-
- /**
- * Returns true if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- * Subclasses may override to provide a higher-performance
- * implementation.
- * @param object The object to filter.
- * @return True if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- */
- public boolean accepts ( Object object )
- {
- return !statusOf(object).matches(IStatus.ERROR);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 86876fa..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.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.common;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface Filter
-{
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ();
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ();
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * The severity of the
- * returned <code>IStatus</code> is as follows:
- * <ul>
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#OK}
- * if the <code>Filter</code> accepts the <code>object</code>
- * with no further information for the caller (meaning the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods
- * are ignored).
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#INFO}
- * if the <code>Filter</code> accepts the <code>object</code>
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#WARNING}
- * if the <code>Filter</code> accepts the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#ERROR}
- * if the <code>Filter</code> does not accept the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * </ul>
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- */
- public IStatus statusOf ( Object object );
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts ( Object object );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
deleted file mode 100644
index 10061e5..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /dev/null
@@ -1,28 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-
-/**
- * Transfroms a org.eclipse.core.runtime.IProject to java.lang.String
- */
-public class IProjectToStringTransformer implements Transformer {
-
- public Object transform(Object value)
- {
- IProject project = (IProject)value;
- return project.getName();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
deleted file mode 100644
index f7da25f..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,159 +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
- * -------- -------- -----------------------------------------------------------
- * 20060222 125574 zina@ca.ibm.com - Zina Mostafia
- * 20060222 225574 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090310 242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-/*
- * Created on May 8, 2004
- */
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-
-/**
- * @author gilberta
- */
-public class J2EEActionAdapterFactory {
-
- private static String getConvertedURIFromIFile(IFile file,String defaultURI)
- {
- String convertedLocation = null;
- boolean allowBaseConversionOnFailure = true;
- if (file != null && file.exists())
- {
- IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
- if (converter != null)
- {
- convertedLocation = converter.convert(file);
- allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
- }
- }
- if (convertedLocation == null && allowBaseConversionOnFailure)
- return defaultURI;
- return convertedLocation;
- }
-
- private static String getConvertedURIFromURI(String originalURI)
- {
- IFile file = null;
- if (originalURI != null)
- {
- String platformResource = "platform:/resource";
- if (originalURI.startsWith(platformResource))
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(originalURI.substring(platformResource.length())));
- else if (originalURI.startsWith("file:"))
- {
- String filePath = convertToRelative(originalURI);
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- }
- }
- return getConvertedURIFromIFile(file,originalURI);
- }
-
- public static String getWSDLURI(ServiceImpl serviceImpl)
- {
- Definition definition = serviceImpl.getEnclosingDefinition();
- String location = definition.getLocation();
- return getConvertedURIFromURI(location);
- }
-
- //has to be under the webcontent
- public static final String EJB_MODULE = "ejbModule";
- public static final String APPCLIENT_MODULE = "appClientModule";
- public static final String WEB_MODULE = "WebContent";
-
- public static String getWSDLURI(ServiceRef serviceImpl)
- {
- String moduleRoot = null;
- IProject project = ProjectUtilities.getProject(serviceImpl);
- if(J2EEUtils.isWebComponent(project))
- {
- moduleRoot = WEB_MODULE;
- }
- else if (J2EEUtils.isEJBComponent(project))
- {
- moduleRoot = EJB_MODULE;
- }
- else if (J2EEUtils.isAppClientComponent(project))
- {
- moduleRoot = APPCLIENT_MODULE;
- }
-
- if (moduleRoot != null)
- {
- IPath path = project.getLocation().addTrailingSeparator();
- path = path.append(moduleRoot).addTrailingSeparator();
- path = path.append(serviceImpl.getWsdlFile());
- File file = new File(path.toString());
- try {
- URL url = file.toURL();
- return getConvertedURIFromURI(url.toString());
- }
- catch(MalformedURLException e) {
- }
- }
- return null;
- }
-
- public static String getWSDLURI(WSDLResourceImpl wsdlRI)
- {
- Definition definition = wsdlRI.getDefinition();
- String location = definition.getLocation();
- return getConvertedURIFromURI(location);
- }
-
- public static String getWSILPath(WSDLResourceImpl wsdlRI)
- {
- return convertToRelative(getWSDLURI(wsdlRI));
- }
-
- public static String getWSILPath(ServiceRef serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String getWSILPath(ServiceImpl serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String FILE="file:/";
- public static String FILEL="file:";
- public static String convertToRelative(String uri)
- {
- //remove file:
- String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- root = FILE + root;
- String rootL = FILEL + root;
- if(uri.startsWith(root) || uri.startsWith(rootL)){
- return uri.substring(root.length());
- }
- return uri;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
deleted file mode 100644
index b5dbfcd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1713 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008, 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 124143 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524 131132 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070723 194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071221 213726 kathy@ca.ibm.com - Kathy Chan
- * 20070123 216345 gilberta@ca.ibm.com - Gilbert Andrews
- * 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
- * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090114 261087 ericdp@ca.ibm.com - Eric D. Peters, No way to get meta-inf path for a project
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-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.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.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-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.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-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.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-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.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * This class contains some useful J2EE utilities for Web services internal use.
- */
-public final class J2EEUtils {
-
- public final static int WEB = 1;
- public final static int EJB = 2;
- public final static int APPCLIENT = 4;
- public final static int EAR = 8;
-
- /**
- * Returns an IVirtualComponent
- * @param project
- * @return
- */
- public static IVirtualComponent getVirtualComponent(IProject project){
- return ComponentCore.createComponent(project);
- }
-
- /**
- *
- * @param projectName
- * @return
- */
- public static IVirtualComponent getVirtualComponent(String projectName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 )
- project = ProjectUtilities.getProject(projectName);
-
- return ComponentCore.createComponent(project);
- }
-
-
- /**
- * Returns the J2EE version
- * @param p project
- * @return int
- */
- public static int getJ2EEVersion(IProject p){
-
- String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
- return J2EEVersionUtil.convertVersionStringToInt(ver);
-
- /*
- int j2eeVer = -1;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(p);
- if (vc!=null){
- j2eeVer = getJ2EEVersion(vc);
- }
- }
- catch (Exception e){
- //handle exception
- }
- return j2eeVer;
- */
- }
-
- public static int getJ2EEVersion(IVirtualComponent ch){
- int j2eeVer = -1;
- //check type
- if (ch!=null){
- IProject project = ch.getProject();
- j2eeVer = getJ2EEVersion(project);
- }
-
- /* Use new API provided by J2EE
- if (ch!=null) {
- if (isWebComponent(ch))
- j2eeVer = getWebComponentJ2EEVersion(ch);
- else if (isAppClientComponent(ch))
- j2eeVer = getAppClientComponentJ2EEVersion(ch);
- else if (isEJBComponent(ch))
- j2eeVer = getEJBComponentJ2EEVersion(ch);
- else if (isEARComponent(ch))
- j2eeVer = getEARComponentJ2EEVersion(ch);
- }
- */
-
- return j2eeVer;
- }
-
-
- /**
- * Returns the J2EEVersion
- * @param p IProject
- * @return String
- */
- public static String getJ2EEVersionAsString(IProject p){
-
- String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
- return ver != null ? ver : null;
-
- /*
- int j2eeVer = getJ2EEVersion(p);
- if (j2eeVer!=-1){
- return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
- }
- else
- return null;
-
- */
- }
-
- public static IVirtualComponent[] getAllComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IVirtualComponent vc = ComponentCore.createComponent(projects[i]);
- if(vc != null)
- v.add(vc);
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all the EAR components in the workspace
- * @return IVirtualComponent[]; empty if none
- */
- public static IVirtualComponent[] getAllEARComponents() {
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getEARComponentsFromProject(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static IVirtualComponent[] getAllWebComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getWebComponents(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static IVirtualComponent[] getAllEJBComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getEJBComponents(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns the EAR components in a given IProject
- * @param project
- * @return empty if no EAR components; must not return null
- */
- public static IVirtualComponent[] getEARComponentsFromProject(IProject project){
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null && isEARComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns Web components in a project
- * @param project
- * @return empty array if no web components; must not return null
- */
- public static IVirtualComponent[] getWebComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- if (component != null && isWebComponent(component)){
- v.add(component);
- }
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getWebComponentNames(IProject project){
- IVirtualComponent[] vcs = getWebComponents(project);
- return toComponentNamesArray(vcs);
- }
-
- public static String[] getEARComponentNames(IProject project){
- IVirtualComponent[] vcs = getEARComponentsFromProject(project);
- return toComponentNamesArray(vcs);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentType i.e. J2EEUtils.WEB
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, int componentType){
-
- List v = new ArrayList();
- if ( (WEB & componentType)==WEB ){
- IVirtualComponent[] webVC = getWebComponents(project);
- addToArrayListHelper(webVC, v);
- }
- if ( (EJB & componentType)==EJB ){
- IVirtualComponent[] ejbVC = getEJBComponents(project);
- addToArrayListHelper(ejbVC, v);
- }
- if ( (APPCLIENT & componentType)==APPCLIENT ) {
- IVirtualComponent[] appClientVC = getAppClientComponents(project);
- addToArrayListHelper(appClientVC, v);
- }
- if ( (EAR & componentType)==EAR ) {
- IVirtualComponent[] earVC = getEARComponentsFromProject(project);
- addToArrayListHelper(earVC, v);
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentTypeId as defined in IModuleConstants.
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, String componentTypeId){
-
- //get all components in the project of type componentTypeId
- List v = new ArrayList();
- try {
-
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if ( vc != null && J2EEProjectUtilities.isProjectOfType(project,componentTypeId))
- {
- v.add(vc);
- }
- //if (isWebComponent(project, components[i].getName())){
- //v.add(components[i]);
- //}
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getProjectsContainingComponentOfType(String componentTypeId)
- {
- Vector v = new Vector();
- IVirtualComponent[] comps = getAllComponents();
- for (int i = 0; i < comps.length; i++) {
- if (J2EEProjectUtilities.isProjectOfType(comps[i].getProject(),componentTypeId))
- {
- //Add the project name to the vector if it has not been added already
- String name = comps[i].getProject().getName();
- if (!v.contains(name))
- {
- v.add(name);
- }
- }
-
- }
-
- return (String[])v.toArray(new String[0]);
- }
-
- /**
- * Helper method for getComponentsByType
- * @param vcs
- * @param vect
- */
- private static void addToArrayListHelper(IVirtualComponent[] vcs, List al){
- for (int i=0;i<vcs.length;i++){
- al.add(vcs[i]);
- }
- }
-
-
- /**
- * Essentially, returns all projects in the workspace
- * @return
- */
- public static IProject[] getAllFlexibleProjects(){
-
- List v = new ArrayList();
- try {
- IProject[] projects = ProjectUtilities.getAllProjects();
- for(int i=0; i<projects.length;i++) {
- if (ModuleCoreNature.getModuleCoreNature(projects[i])!=null){
- v.add(projects[i]);
- }
- }
- }
- catch(Exception e){
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param projectName
- * @param componentName
- * @return
- */
- public static boolean exists(String projectName, String componentName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 ) {
- project = ProjectUtilities.getProject(projectName);
- }
- else
- return false;
-
- return exists(project);
- }
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param project
- * @return
- */
- public static boolean exists(IProject project){
- if (project!=null) {
- if (!project.exists())
- return false;
-
- IVirtualComponent vc = ComponentCore.createComponent(project);
- return vc.exists();
- }
- else
- return false;
-
- }
-
- /**
- * Returns an array of EAR components which are referenced by the component
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEARComponents(IProject project){
- List ears = new ArrayList();
- try{
- IVirtualComponent targetVC = ComponentCore.createComponent(project);
-
- IVirtualComponent[] earVC = getAllEARComponents();
- for (int i=0; i<earVC.length;i++) {
- IVirtualReference[] refs = earVC[i].getReferences();
- for (int k=0;k<refs.length;k++) {
- if (targetVC.equals(refs[k].getReferencedComponent())){
- ears.add(refs[k].getEnclosingComponent());
- }
- }
- }
-
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ears.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * Returns the EJB Components referenced by the ear
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0;i<refs.length;i++){
- if (isEJBComponent(refs[i].getReferencedComponent())){
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- *
- * @param jar
- * @return Vector of bean String names.
- * @deprecated use getBeanNames(IProject project)
- */
- public static Vector getBeanNames(EJBJar jar) {
- // We currently only support Stateless session beans.
- // List cmpBeans = jar.getBeanManagedBeans();
- // List bmpBeans = jar.getContainerManagedBeans();
- List sessionBeans = jar.getSessionBeans();
-
- Vector names = new Vector();
-
- // getBeanNames( names, cmpBeans );
- // getBeanNames( names, bmpBeans );
- getBeanNames(names, sessionBeans);
-
- return names;
- }
-
-
- /**
- *
- * @param project- the project to find stateless session beans in
- * @return Vector of bean String names.
- */
- public static Vector getBeanNames(IProject project) {
- // We currently only support Stateless session beans.
- Vector names = new Vector();
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object modelObject = provider.getModelObject();
-
- List sessionBeans = 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)
- sessionBeans = eBeans.getSessionBeans();
- } else {
- sessionBeans = ((EJBJar)modelObject).getSessionBeans();
- }
-
- Iterator iterator = sessionBeans.iterator();
-
- while (iterator.hasNext()) {
- Object next = (iterator.next());
- if (next instanceof EnterpriseBean) {
- EnterpriseBean bean = (EnterpriseBean) next;
-
- if (bean.isSession()) {
- Session sessionBean = (Session) bean;
-
- if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getName());
- }
- }
- } else {
- SessionBean bean = (SessionBean) next;
- if (bean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getEjbName());
- }
- }
- }
- return names;
- }
-
- /**
- * @param names
- * specifies that vector of strings that will be used to add bean
- * names to.
- * @param beans
- * specifies a list of beans.
- */
- private static void getBeanNames(Vector names, List beans) {
- Iterator iterator = beans.iterator();
-
- while (iterator.hasNext()) {
- EnterpriseBean bean = (EnterpriseBean) (iterator.next());
-
- if (bean.isSession()) {
- Session sessionBean = (Session) bean;
-
- if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getName());
- }
- }
- }
- }
- /**
- * Uses jem ProjectUtilities to get the project
- * @param ejb eObject
- * @return IProject
- */
- public static IProject getProjectFromEJB(EnterpriseBean ejb) {
- return ProjectUtilities.getProject(ejb);
- }
-
- /**
- * Returns a default J2EE 1.3 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault13EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- * Returns a default J2EE 1.4 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault14EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- * Returns the first EAR component of the J2EE version
- * @param versionId
- * @return
- */
- public static IVirtualComponent getEARComponentofJ2EEVersion(int versionId){
- IVirtualComponent[] components = getAllEARComponents();
- for (int i=0; i<components.length; i++){
- if (getJ2EEVersion(components[i]) == versionId)
- return components[i];
- }
- return null;
- }
-
-
- /**
- *
- * @param j2eeVersionInt
- * @return
- */
- public static String getLabelFromJ2EEVersion(String j2eeVersionInt) {
- if (j2eeVersionInt == null || j2eeVersionInt.length() == 0)
- return "";
-
- int j2eeVersion = Integer.parseInt(j2eeVersionInt);
- switch (j2eeVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return J2EEVersionConstants.VERSION_1_2_TEXT;
- case J2EEVersionConstants.J2EE_1_3_ID :
- return J2EEVersionConstants.VERSION_1_3_TEXT;
- case J2EEVersionConstants.J2EE_1_4_ID :
- return J2EEVersionConstants.VERSION_1_4_TEXT;
- default :
- return "";
- }
- }
-
- public static String getJ2EEVersionFromLabel(String j2eeLabel) {
- String j2ee12String = String.valueOf(J2EEVersionConstants.J2EE_1_2_ID);
- String j2ee13String = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- String j2ee14String = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return j2ee12String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return j2ee13String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return j2ee14String;
-
- return "";
-
- }
-
- /**
- * Returns String representations of J2EE versions
- * @param aVersion
- * @return
- */
- public static String getJ2EEIntVersionAsString(String aVersion) {
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_2_ID).toString();
- // default
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- }
-
- // ----------------------------------------------------------------------
-
-
-
- /**
- *
- * @return
- *
- * @deprecated // use getALLEARComponents
- */
- public static IProject[] getEARProjects() {
- Vector v = new Vector();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
-// if (projects[i].hasNature(IEARNatureConstants.NATURE_ID)) {
- if (ResourceUtils.isEARProject(projects[i])) {
- v.add(projects[i]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * Returns the first EAR project associated with the project and server
- * @param serviceProject
- * @param server
- * @return
- *
- * @deprecated // to be simplified
- */
- public static IProject getDefaultEARProject(IProject serviceProject, IServer server) {
-
- IProject[] earProjects = null;
- IProject ear = null;
-
- if (serviceProject != null && serviceProject.exists()) {
- try {
-
- boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
- || ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
- || ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
- if (!isWebEJBOrAppClient) {
- return null;
- }
-
- IProject[] ears = getEARProjects();
-
- // separate EARs which are already deployed to the existing
- // server
- if (ears != null && ears.length >= 1) {
- ArrayList preferredEARList = new ArrayList();
- ArrayList secondaryEARList = new ArrayList();
- for (int i = 0; i < ears.length; i++) {
- ear = ears[i];
- IModule module = ResourceUtils.getModule(ear);
- if (module != null) {
- if (server != null
- || ServerUtil.containsModule(server,
- module, new NullProgressMonitor())) {
- preferredEARList.add(ear);
- } else {
- secondaryEARList.add(ear);
- }
- }
- }
- // add secondaryEARList items to end of primary list
- for (int j = 0; j < secondaryEARList.size(); j++) {
- preferredEARList.add(secondaryEARList.get(j));
- }
- // toArray
- if (preferredEARList != null) {
- earProjects = (IProject[]) preferredEARList.toArray(new IProject[0]);
- }
- }
- } catch (Exception ce) {
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
- }
- }
- return earProjects[0];
- }
-
- /**
- * Gets the EJB Components in the project
- * @param project
- * @return
- */
- public static IVirtualComponent[] getEJBComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- IVirtualComponent component = ComponentCore.createComponent(project);
- try {
- if (component != null && isEJBComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Gets the Application Client components in a project.
- * @param project
- * @return
- */
- public static IVirtualComponent[] getAppClientComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- if (component != null && isAppClientComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isEJB20Component(refs[i].getReferencedComponent()))
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * Utility method to combine two IProject[]
- * @param projectArray1
- * @param projectArray2
- * @return
- */
- public static IProject[] combineProjectArrays(IProject[] projectArray1,
- IProject[] projectArray2) {
-
- // check if either or both arrays are null.
- if (projectArray1 == null && projectArray2 == null)
- return null;
- else if (projectArray1 != null && projectArray2 == null)
- return projectArray1;
- else if (projectArray1 == null && projectArray2 != null)
- return projectArray2;
-
- IProject[] combinedProjects = new IProject[projectArray1.length
- + projectArray2.length];
-
- System.arraycopy(projectArray1, 0, combinedProjects, 0,
- projectArray1.length);
- if (projectArray2.length > 0) {
- System.arraycopy(projectArray2, 0, combinedProjects,
- projectArray1.length, projectArray2.length);
- }
-
- return combinedProjects;
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project){
- List webComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isWebComponent(refs[i].getReferencedComponent()))
- webComps.add(refs[i].getReferencedComponent());
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])webComps.toArray(new IVirtualComponent[0]);
- }
-
-
-
- /**
- *
- * @param ejbComponent
- * @return
- */
- public static boolean isEJB20Component(IVirtualComponent ejbComponent){
- return isEJB20Component(ejbComponent.getProject());
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static boolean isEJB20Component(IProject project){
- boolean isEJB = false;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (EJBArtifactEdit.isValidEJBModule(vc)) {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vc);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getModuleVersionID()== J2EEVersionConstants.EJB_2_0_ID) {
- return true;
- }
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
-
- return isEJB;
- }
-
-
- /**
- * Checks if the component at compName is referenced by the ear at earCompName
- * @param earProject
- * @param project
- * @return
- */
- public static boolean isComponentAssociated(IProject earProject, IProject project) {
- IVirtualComponent vc1 = ComponentCore.createComponent(earProject);
- IVirtualComponent vc2 = ComponentCore.createComponent(project);
- return isComponentAssociated(vc1, vc2);
- }
-
- /**
- * Checks if the component is referenced by the ear
- * @param ear
- * @param component
- * @return
- */
- private static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
- boolean isAssociated = false;
-
- // Note: not implemented by J2EE yet.. to be used later.
- IVirtualReference[] compRefs = ear.getReferences();
- if (compRefs!= null) {
- for (int i=0;i<compRefs.length;i++){
- IVirtualReference vref = compRefs[i];
- if (component.equals(vref.getReferencedComponent()))
- isAssociated = true;
- }
- }
- return isAssociated;
- }
-
- /**
- *
- * @param project
- * @param earProject
- */
- public static void associateComponentToEAR(IProject project, IProject earProject) {
-
- IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) addComponentToEARDataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- IVirtualComponent targetComp = ComponentCore.createComponent(project);
- modList.add(targetComp);
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-
- try {
- addComponentToEARDataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
-
- }
- /**
- * Determines whether project can be associated with earProject safely.
- * @returns true if the project is a Web project, EJB project, or AppClient
- * project that can safely be associated with the EAR project.
- * Returns false if the project is a Web project,
- * EJB project, or AppClient project that cannot be associated safely with the EAR project, and
- * true if project is not recognized as a Web, EJB, or
- * AppClient project, and ture if earProject is not recognized as an EAR project.
- */
- public static boolean canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject) {
- boolean toReturn = true;
- boolean isWeb = isWebComponent(project);
- boolean isEJB = isEJBComponent(project);
- boolean isAppClient = isAppClientComponent(project);
- boolean isEAR = isEARComponent(earProject);
- if ((isWeb || isEJB || isAppClient) && isEAR)
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- String compareVersion;
- List<IProjectFacetVersion> supportedFacetVersionList = new ArrayList<IProjectFacetVersion>();
- if (isWeb)
- {
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, webPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = webPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
- else if (isEJB)
- {
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, ejbPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = ejbPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
- else if (isAppClient)
- {
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
- supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, acPf);
- toReturn = false;
- for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
- IProjectFacetVersion next = supportedFacetVersion;
- compareVersion = acPfv.getVersionString();
- if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) {
- toReturn = true;
- break;
- }
- }
-
- }
-
- } catch (Exception e)
- {
- //not much we can do here, return what we've calculated thus far
- }
- }
-
-
- return toReturn;
-
- }
- /**
- * Determines whether project can be associated with earProject.
- * @returns IStatus of OK if the project is a Web project, EJB project, or AppClient
- * project that can be associated with the EAR project.
- * Returns IStatus with an ERROR severity if the project is a Web project,
- * EJB project, or AppClient project that cannot be associated with the EAR project.
- * When an IStatus of severity ERROR is returned, the IStatus' message will contain the
- * lowest J2EE level that this project requires on an EAR.
- * Returns an IStatus with severity OK if project is not recognized as a Web, EJB, or
- * AppClient project or if earProject is not recognized as an EAR project.
- * @deprecated use canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject)
- */
- public static IStatus canAssociateProjectToEAR(IProject project, IProject earProject)
- {
- //If project contains the web, ejb, or appclient facet, and earProject contains the
- //ear facet, return whether or not the facet versions are such that the project
- //can be added to the ear.
-
- IStatus status = Status.OK_STATUS;
- boolean isWeb = isWebComponent(project);
- boolean isEJB = isEJBComponent(project);
- boolean isAppClient = isAppClientComponent(project);
- boolean isEAR = isEARComponent(earProject);
- if ((isWeb || isEJB || isAppClient) && isEAR)
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- String earVersion = earPfv.getVersionString();
-
- String webVersion = null;
- String ejbVersion = null;
- String acVersion = null;
-
- if (isWeb)
- {
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
- webVersion = webPfv.getVersionString();
- }
- else if (isEJB)
- {
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
- ejbVersion = ejbPfv.getVersionString();
- }
- else if (isAppClient)
- {
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
- acVersion = acPfv.getVersionString();
- }
-
- if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_2_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_1_1_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_2_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_2_TEXT);
- }
- }
- else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_3_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_0_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_3_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_3_TEXT);
- }
- }
- else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_4_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_1_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_4_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_4_TEXT);
- }
- }
- } catch (CoreException ce)
- {
- //If facet API throws a CoreException when trying to create an IFacetedProject from
- //an IProject, an OK Status will be returned and clients of this utility method
- //won't raise a validation error.
- }
- }
-
- return status;
- }
-
-
- /*
- * @param versionA version number of the form 1.2.3
- * @param versionA version number of the form 1.2.3
- * @return boolean returns whether versionA is greater than or equal to versionB
- */
- private static boolean greaterThanOrEqualTo(String versionA, String versionB)
- {
- if (versionA.equals(versionB))
- {
- return true;
- }
- else
- {
- 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;
- }
- }
-
- /**
- * @param project
- * @return
- */
- public static IPath getWebInfPath(IProject project){
-
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- //should WEB-INF location be pulled in from the .component file rather than hardcoded here?
- IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
- IPath modulePath = webInfDir.getWorkspaceRelativePath();
-
- if (!webInfDir.exists())
- {
- try
- {
- webInfDir.create(0,null);
- }
- catch (CoreException e)
- {}
- }
- return modulePath;
- }
-
- /**
- * @param project
- * @return
- */
- public static IPath getMetaInfPath(IProject project){
-
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- //should META-INF location be pulled in from the .component file rather than hardcoded here?
- IVirtualFolder metaInfDir = component.getRootFolder().getFolder(new Path("/META-INF"));
- IPath modulePath = metaInfDir.getWorkspaceRelativePath();
-
- if (!metaInfDir.exists())
- {
- try
- {
- metaInfDir.create(0,null);
- }
- catch (CoreException e)
- {}
- }
- return modulePath;
- }
-
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IPath getFirstWebContentPath(IProject project){
-
- IPath modulePath = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (ModuleCoreNature.isFlexibleProject(project)) {
- modulePath = vc.getRootFolder().getWorkspaceRelativePath();
- }
- }
- catch(Exception ex){}
-
- return modulePath;
- }
-
- /**
- * @param project
- * @return
- */
- public static IPath getWebContentPath(IProject project){
- IVirtualComponent component = ComponentCore.createComponent(project);
- IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
- return modulePath;
- }
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IContainer getFirstWebContentContainer(IProject project){
- IContainer container = null;
- IPath modulePath = getFirstWebContentPath(project);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res!=null){
- container = res.getParent();
- }
-
- return container;
- }
-
- /**
- * @param project
- * @return
- */
- public static IContainer getWebContentContainer(IProject project){
- IContainer container = null;
- IPath modulePath = getWebContentPath(project);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res instanceof IContainer){
- container = (IContainer)res;
- }
- return container;
- }
-
-
- /**
- * Returns the first Module name
- * @param project
- * @return
- *
- */
- public static String getFirstWebModuleName(IProject project){
- String moduleName = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- moduleName = vc.getName();
- }
- catch(Exception ex){}
-
- return moduleName;
- }
-
-
- public static boolean isWebComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isDynamicWebProject(comp.getProject());
- }
-
- public static boolean isEARComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isEARProject(comp.getProject());
- }
-
- /**
- * True if the component is a valid EJB component
- * @param project
- * @return
- */
- public static boolean isEJBComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isEJBComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- public static boolean isEJBComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isEJBProject(comp.getProject());
- }
-
- public static boolean isAppClientComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isApplicationClientProject(comp.getProject());
- }
-
- public static boolean isJavaComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isUtilityProject(comp.getProject());
- }
-
- public static String getComponentTypeId(IProject project) {
- return J2EEProjectUtilities.getJ2EEProjectType(project);
- }
-
- public static String[] toComponentNamesArray(IVirtualComponent[] components){
- String[] ecNames = new String[components.length];
- for(int i=0; i<components.length; i++){
- ecNames[i] = components[i].getName();
- }
- return ecNames;
- }
-
- public static IProject[] toProjectArray(IVirtualComponent[] components){
- IProject[] projects = new IProject[components.length];
- for (int i=0; i<components.length; i++){
- projects[i] = components[i].getProject();
- }
- return projects;
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported servlet level
- * @param j2eeLevel
- * @return web app version
- */
- public static Integer getServletVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-
- default:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
- }
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported EJB version
- * @param j2eeLevel
- * @return ejb spec version
- */
- public static Integer getEJBVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.EJB_1_1_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
-
- default:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
- }
- }
-
- /**
- * True if the component is a valid Java component
- * @param project
- * @return
- */
- public static boolean isJavaComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isJavaComponent(vc);
- }
- else
- {
- //check if it's a faceted project with only the Java facet.
- try
- {
- if (project.exists())
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- Set facets = fProject.getProjectFacets();
- if (facets.size()==1)
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
- if (pfv.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA))
- {
- return true;
- }
- }
- }
- else
- {
- //This is not a faceted project. Check if this is a simple Java project.
- if (ResourceUtils.isJavaProject(project))
- {
- return true;
- }
- }
- }
- } catch (CoreException ce)
- {
-
- }
- }
-
- return false;
- }
-
- /**
- * True if the component is a valid Web component
- * @param project
- * @return
- */
- public static boolean isWebComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isWebComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * True if the component is a true Application client component
- * @param project
- * @return
- */
- public static boolean isAppClientComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isAppClientComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * True is the component is a valid EAR component
- * @param project
- * @return
- */
- public static boolean isEARComponent(IProject project){
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isEARComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- public static IFolder getOutputContainerRoot (IVirtualComponent component) {
- return (IFolder)J2EEProjectUtilities.getOutputContainers(component.getProject())[0];
- }
-
- // 194434 - Check for non-existing EAR with contents that's not deleted previously
- public static IStatus canCreateEAR(IProject earProject)
- {
- IStatus status = Status.OK_STATUS;
- if( !earProject.exists() ){
- IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- path = path.append(earProject.getName());
- status = ProjectCreationDataModelProviderNew.validateExisting(earProject.getName(), path.toOSString());
- }
- return status;
- }
-
-
- public static void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
- {
- if (J2EEUtils.isWebComponent(project))
- {
- ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
- manifest.mergeClassPath(new String[]{uri});
- J2EEProjectUtilities.writeManifest(project, manifest);
- forceClasspathUpdate(project);
- }
- }
-
- public static void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
- {
- try {
- IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
- migrationdm.getDefaultOperation().execute(monitor, null);
-
-
- IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
- IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
- IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
- targetCompList.add(targetcomponent);
-
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib");
- refdm.getDefaultOperation().execute(monitor, null);
-
- }catch (Exception e) {
-
- }
- }
-
- //Forcing classpath update
- public static void forceClasspathUpdate (IProject project) {
- J2EEComponentClasspathUpdater classpathUpdater = J2EEComponentClasspathUpdater.getInstance();
- Collection projCollection = Collections.singleton(project);
- classpathUpdater.forceUpdate(projCollection, true);
- IJobManager jm = Job.getJobManager();
- try{
- jm.join(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME, null);
- }catch(Exception exc){}
- }
- /**
- * Determines the IJ2EEModuleConstants.JST_WEB_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_WEB_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getWebJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, webPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
- /**
- * Determines the IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getAppClientJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, acPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
- /**
- * Determines the IJ2EEModuleConstants.JST_EJB_MODULE facet version that
- * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
- * @returns the version String for IJ2EEModuleConstants.JST_EJB_MODULE facet, if there is problem
- * trying to determine the version, either the default version or the latest supported version
- * will be returned
- */
- public static String getEJBJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
- String returnVersion = EarUtilities.EJB_FACET.getDefaultVersion().getVersionString();
- try {
- returnVersion = EarUtilities.EJB_FACET.getLatestVersion().getVersionString();
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- returnVersion= EarUtilities.getSupportedFacets(earPfv, ejbPf).get(0).getVersionString();
- } catch (Exception e) {
- //nothing we can do here, return what we have calculated thus far
- }
- return returnVersion;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
deleted file mode 100644
index 5455fdc..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,248 +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.common;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-
-/**
-* This class contains some useful utilities for dealing with the JavaMOF
-*/
-
-public final class JavaMOFUtils
-{
- /**
- * Determine whether this class of the given name is loadable in the given
- * project.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable and no exceptions are thrown.
- */
- public static boolean isClassLoadable(String className, IProject project) throws CoreException
- {
- return isClassLoadable(getJavaClass(className,project));
- }
-
- public static boolean isClassLoadable(JavaClass javaClass)
- {
- return javaClass.isExistingType();
- }
-
- /**
- * Determine whether the specified class has a public constructor
- * with an empty parameter list.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and the
- * class has a public constructor with an empty parameter list
- */
- public static boolean hasPublicDefaultCtor(String className, IProject project) throws CoreException
- {
- return hasPublicDefaultCtor(getJavaClass(className, project));
- }
-
-
- public static boolean hasPublicDefaultCtor(JavaClass javaClass)
- {
-
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return true;
-
- Iterator iMethods = methodList.iterator();
- boolean userDefinedCtor = false;
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
-
- if (thisMethod.isConstructor())
- {
- userDefinedCtor = true;
-
- //Since the user has defined a ctor, the default ctor is no longer available.
- //We must ensure that the user has provided a public ctor with no parameters.
-
- //check if public
- if (thisMethod.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- {
- //see if parameter list is empty
- List paramList = thisMethod.getParameters();
- if (paramList.isEmpty() )
- {
- return true;
- }
- }
- }
-
- }
-
- if (userDefinedCtor)
- {
- return false; //if the user defined a ctor and we still haven't
- //returned true, none of them were public with no parameters.
- }
- else
- {
- return true;
- }
-
- }
- /**
- * Determine whether the specified class implements the specified interface.
- * @param className The fully qualified name of the class
- * @param interfaceName The fully qualified name of the interface
- * @param project The project
- * @return True if the class and interface are loadable from the project and
- * the class implements the interface.
- */
- public static boolean implementsInterface(String className, String interfaceName, IProject project)
- throws CoreException
- {
- return implementsInterface(getJavaClass(className, project), getJavaClass(interfaceName, project));
- }
-
-public static boolean implementsInterface(JavaClass javaClass, JavaClass interfaceClass)
- {
-
- if (!javaClass.isExistingType()) return false;
-
- if (!interfaceClass.isExistingType()) return false;
-
- return javaClass.implementsInterface(interfaceClass);
- }
-
- /**
- * Determine whether the specified class extends the specified superclass
- * @param className The fully qualified name of the class
- * @param superClassName The fully qualified name of the superclass
- * @param project The project
- * @return True if the class and superClass are loadable from the project and
- * the class extends the superClass
- */
- public static boolean extendsClass(String className, String superClassName, IProject project)
- throws CoreException
- {
- return extendsClass(getJavaClass(className,project), getJavaClass(superClassName, project));
- }
-
- public static boolean extendsClass(JavaClass javaClass, JavaClass superClass)
- {
- return superClass.isAssignableFrom(javaClass);
- }
-
- /**
- * Determine whether the specified class is actually an interface
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and is
- * actually an interface
- */
- public static boolean isInterface(String className, IProject project) throws CoreException
- {
- return isInterface(getJavaClass(className, project));
- }
-
- public static boolean isInterface(JavaClass javaClass)
- {
- return javaClass.isInterface();
- }
- public static boolean hasAbstractMethods (String className, IProject project) throws CoreException
- {
- return hasAbstractMethods(getJavaClass(className, project));
- }
-
- public static boolean hasAbstractMethods (JavaClass javaClass)
- {
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return false;
-
- Iterator iMethods = methodList.iterator();
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
- if ( thisMethod.isAbstract()) return true;
- }
- return false;
- }
-
- /*
- *
- */
- /**
- * @param classQName Fully qualified classname (packageName + typeName)
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String classQName , IProject project) throws CoreException
- {
- EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
- return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(classQName,jMOF.getResourceSet());
- }
-
- /**
- * @param packageName
- * @param typeName
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String packageName, String typeName , IProject project) throws CoreException
- {
- EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
- return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(packageName, typeName, jMOF.getResourceSet());
- }
-
- public static boolean isValidSEIFile(JavaClass beanClass, JavaClass seiClass)
- {
- if (!seiClass.isInterface())
- return false;
-
- Vector beanMethodsList = new Vector();
- List beanMethods = beanClass.getMethods();
- Iterator beanMethodsIterator = beanMethods.iterator();
- while (beanMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)beanMethodsIterator.next();
- beanMethodsList.add(thisMethod.getMethodElementSignature());
- }
-
- List seiMethods = seiClass.getMethods();
- if (beanMethods == null ) {
- if ( seiMethods == null) return true;
- else return false;
- }
- if (seiMethods == null) return false;
-
- Iterator seiMethodsIterator = seiMethods.iterator();
- while (seiMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)seiMethodsIterator.next();
- if ( !beanMethodsList.contains(thisMethod.getMethodElementSignature())) {
- return false;
- }
- }
- return true;
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
deleted file mode 100644
index d36a486..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1919 +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
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122 215866 trungha@ca.ibm.com - Trung Ha
- * 20080303 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20080626 236645 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Eclipse resources.
- */
-public final class ResourceUtils {
-
- // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
- private static IWorkspaceRoot root_ = null;
-
- // Keeps the IWorkspace hanging around. See getWorkspace().
-
- private static IWorkspace workspace_ = null;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has no Java or Web nature.
- */
- public static byte PROJECT_TYPE_NONE = 0;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Java project nature.
- */
- public static byte PROJECT_TYPE_JAVA = 1;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Web project nature.
- */
- public static byte PROJECT_TYPE_WEB = 2;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an EJB project nature.
- */
- public static byte PROJECT_TYPE_EJB = 4;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an Application client project nature.
- */
- public static byte PROJECT_TYPE_APPCLIENT = 8;
-
- /**
- * The SOAP rpcrouter servlet extension to be added to web project URL
- */
- public static String SERVLET_EXT = "/servlet/rpcrouter";
-
- private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client";
- private static final String DEFAULT_CLIENT_EJB_PROJECT_EXT = "EJBClient";
- private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
- private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB";
- private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
- private static final String DEFAULT_WEB_COMPONENT_NAME = "WebServiceProject";
- private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
- private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceProjectEAR";
- private static final String DEFAULT_SERVICE_EAR_COMPONENT_NAME = "WebServiceProjectEAR";
- private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceProjectClientEAR";
- private static final String DEFAULT_CLIENT_EAR_COMPONENT_NAME = "WebServiceProjectClientEAR";
-
- private static final String DEFAULT_EAR_EXT = "EAR";
-
- /**
- * Returns the IWorkspaceRoot object.
- * @return The IWorkspaceRoot object.
- */
- public static IWorkspaceRoot getWorkspaceRoot() {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- return root_;
- }
-
- /**
- * Returns the IWorkspace object.
- * @return The IWorkspace object.
- */
- public static IWorkspace getWorkspace() {
- if (workspace_ == null) {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- workspace_ = root_.getWorkspace();
- }
- return workspace_;
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute pathname or null if no such resource exists.
- *
- * @param absolutePathname
- * The absolute path of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(String absolutePathname) {
- if (absolutePathname == null) {
- return null;
- }
- return findResource(new Path(absolutePathname));
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute path or null if no such resource exists.
- *
- * @param absolutePath
- * The absolute <code>IPath</code> of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(IPath absolutePath) {
- if (absolutePath == null) {
- return null;
- }
- return ResourceUtils.getWorkspaceRoot().findMember(absolutePath);
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given file system relative pathname and project or null if no such resource exists.
- *
- * @param filePath File system relative pathname
- * @param project Project
- * @return The <code>IResource</code>.
- */
- public static IResource findResourceAtLocation(String filePath, IProject project) {
-
- return findResource(findPathAtLocation( new Path(filePath), project));
- }
-
- /**
- * This method attempts to convert a path that is relative to a file system
- * to a path that is relative to the workspace. Instead of comparing the
- * filePath with the install location of the workspace (i.e.
- * Platform.getLocation()), the filePath is compared with the location of the project
- * since the project could be in a location other than the the default location relative to the
- * workspace.
- *
- * @param filePath File path relative to a file system
- * @param project The project the file is in
- * @return Path relative to the workspace
- */
- public static IPath findPathAtLocation(IPath filePath, IProject project) {
- IPath result = null;
-
- IPath projectLocation = project.getLocation();
-
- if (projectLocation.matchingFirstSegments(filePath) == projectLocation
- .segmentCount()) {
- filePath = filePath.removeFirstSegments(projectLocation
- .segmentCount() - 1);
- result = filePath.setDevice(null);
- }
-
- return result;
- }
- /**
- * Validates the given string as a name for a resource of the given type(s).
- * This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validateName IWorkspace.validateName()}.
- *
- * @param segment
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- *
- * @deprecated not used
- */
- public static IStatus validateName(String segment, int typeMask) {
- return getWorkspace().validateName(segment, typeMask);
- }
-
- /**
- * Validates the given string as the path of a resource of the given
- * type(s). This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validatePath IWorkspace.validatePath()}.
- *
- * @param path
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- * @deprecated not used
- */
- public static IStatus validatePath(String path, int typeMask) {
- return getWorkspace().validatePath(path, typeMask);
- }
-
- /**
- * Validates the given Java type name.
- *
- * @param typeName
- * The Java type name.
- * @return The status with a value of <code>IStatus.OK</code> if the name
- * is valid, or with appropriate severity and message information if
- * name is not valid. The primitive types (boolean, char, byte,
- * short, int, long, float, double) are valid. Arrays of valid types
- * are themselves valid.
- * @deprecated use JavaConventions in the jdt core
- */
- public static IStatus validateJavaTypeName(String typeName) {
- //
- // Strip off the trailing array bits, if any.
- //
- int a = typeName.indexOf('[');
- if (a > 0) {
- typeName = typeName.substring(0, a);
- }
- //
- // Allow primitives.
- //
- if (isPrimitiveJavaType(typeName)) {
- return new Status(IStatus.OK, WebServicePlugin.ID, 0, "", null);
- }
- //
- // Defer to JavaConventions.
- //
- return JavaConventions.validateJavaTypeName(typeName);
- }
-
- /**
- * Returns true if the given <code>typeName</code> is a Java primitive
- * (boolean, char, byte, short, int, long, float, double).
- *
- * @return True if the type name is a Java primitive.
- *
- * @deprecated
- */
- public static boolean isPrimitiveJavaType(String typeName) {
- return (typeName.equals("boolean") || typeName.equals("char")
- || typeName.equals("byte") || typeName.equals("short")
- || typeName.equals("int") || typeName.equals("long")
- || typeName.equals("float") || typeName.equals("double"));
- }
-
- /**
- * Returns the handle of the IProject at the beginning of the given
- * <code>absolutePath</code>. Neither the given path nor the project need
- * exist in the workspace. The path must be absolute, and must consist of at
- * least one segment.
- *
- * @return An IProject handle for the project at the beginning of the given
- * <code>absolutePath</code>, or null if the path does not
- * specify a project.
- */
- public static IProject getProjectOf(IPath absolutePath) {
- if (absolutePath.isAbsolute()) {
- String projectName = absolutePath.segment(0);
- if (projectName != null) {
- return getWorkspaceRoot().getProject(projectName);
- }
- }
- return null;
- }
-
- /**
- *
- * @param absolutePath
- * @return
- */
- public static IVirtualComponent getComponentOf(IPath absolutePath){
- if (absolutePath.isAbsolute()) {
- String projectName = absolutePath.segment(0);
- IProject project = getWorkspaceRoot().getProject(projectName);
- if (projectName != null) {
- return ComponentCore.createComponent(project);
- }
- }
- return null;
- }
-
- public static IVirtualComponent getComponentOf(IResource res)
- {
- IVirtualResource[] vresources = ComponentCore.createResources(res);
- IVirtualComponent vcomp = null;
- if (vresources != null && vresources.length>0)
- {
- IVirtualResource vres = vresources[0];
- vcomp = vres.getComponent();
- }
- return vcomp;
- }
-
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isJavaProject(IProject project) {
- try
- {
- return project.hasNature(JavaCore.NATURE_ID);
- }
- catch (CoreException ce)
- {
- //Return false if CoreException occurs while checking nature.
- return false;
- }
- }
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isTrueJavaProject(IProject project) {
- return (!isWebProject(project) && !isAppClientProject(project) && !isEARProject(project)
- && !isEJBProject(project) && isJavaProject(project));
- /*
- * try { String[] natures = project.getDescription().getNatureIds();
- * return (natures.length == 1 &&
- * natures[0].equals(JavaCore.NATURE_ID)); } catch (CoreException e) { }
- * return false;
- */
- }
-
- /**
- * Returns true if the given <code>project</code> is a Web Project.
- * Note: For components; use J2EEUtils.isWebComponent()
- * @param project
- * The project.
- * @return True if the project is a Web Project.
- *
- * @deprecated
- */
- public static boolean isWebProject(IProject project) {
- boolean isWeb = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- //isWeb = WebArtifactEdit.isValidWebModule(wbcs[0]);
- }
- }
- catch(Exception ex){
- // handle exception
- }
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isWeb;
- }
-
- /**
- * Note: for components; use J2EEUtils.isEARComponent()
- * @param project
- * @return
- *
- * @deprecated
- */
- public static boolean isEARProject(IProject project){
- boolean isEAR = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EARArtifactEdit earEdit = null;
- try {
- //earEdit = EARArtifactEdit.getEARArtifactEditForRead(wbcs[0]);
- if (earEdit!=null){
- isEAR = true;
- }
- }
- finally{
- if (earEdit!=null)
- earEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEAR;
- }
- /**
- * Returns true if the given <code>project</code> is an EJB 1.1 or EJB 2.0
- * Project.
- * Note: for components, use J2EEUtils.isEJBComponent
- * @param project
- * The project.
- * @return True if the project is an EJB 1.1 or an EJB 2.0 Project.
- *
- * @deprecated
- *
- */
- public static boolean isEJBProject(IProject project) {
- boolean isEJB = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EJBArtifactEdit ejbEdit = null;
- try {
- //ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(wbcs[0]);
- if (ejbEdit!=null){
- isEJB = true;
- }
- }
- finally{
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEJB;
- }
-
- /**
- * Returns true if the given <code>project</code> is an Application Client
- * Project.
- * Note: for components, use J2EEUtils.isAppClientComponent()
- * @param project
- * The project.
- * @return True if the project is an Application Client Project
- *
- * @deprecated
- */
- public static boolean isAppClientProject(IProject project) {
- boolean isAppClient = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- AppClientArtifactEdit appClientEdit = null;
- try {
- //appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbcs[0]);
- if (appClientEdit!=null){
- isAppClient = true;
- }
- }
- finally{
- if (appClientEdit!=null)
- appClientEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isAppClient;
- }
-
- /**
- * Returns the type of the given <code>project</code> as a bitmask.
- * Relevant bitmask values are:
- * <ol>
- * <li>{@link #PROJECT_TYPE_JAVA PROJECT_TYPE_JAVA}
- * <li>{@link #PROJECT_TYPE_WEB PROJECT_TYPE_WEB}
- * <li>{@link #PROJECT_TYPE_EJB PROJECT_TYPE_EJB}
- * <li>{@link #PROJECT_TYPE_NONE PROJECT_TYPE_NONE}
- * </ol>
- *
- * @param project
- * The project.
- * @return The type bitmask of the project.
- *
- * @deprecated use getComponentType
- */
- public static byte getProjectType(IProject project) {
- byte projectType = PROJECT_TYPE_NONE;
- if (ResourceUtils.isJavaProject(project)) {
- projectType |= PROJECT_TYPE_JAVA;
- }
- if (ResourceUtils.isWebProject(project)) {
- projectType |= PROJECT_TYPE_WEB;
- }
- if (ResourceUtils.isEJBProject(project)) {
- projectType |= PROJECT_TYPE_EJB;
- }
- return projectType;
- }
-
- /**
- * Returns the component type id as defined in IModuleConstants
- * i.e. IModuleConstants.JST_WEB_MODULE = "jst.web"
- * @param project
- * @return
- */
- public static String getComponentType(IProject project){
- return J2EEProjectUtilities.getJ2EEProjectType(project);
- }
-
- /**
- * Returns the component type
- * @param component
- * @return
- */
- public static String getComponentType(IVirtualComponent component){
- return getComponentType(component.getProject());
- }
-
- /**
- * Returns WebModule Deployable of the <code>project</code> as an
- * <code>IDeployable</code>, or null if the project has no Web nature.
- *
- * @param project
- * The project.
- * @return WebModule Deployable of the <code>project</code> or null if the
- * project has no Web nature.
- */
- public static IModule getModule(IProject project) {
- return ServerUtil.getModule(project);
-}
-
-// Workaround for 113621
-//public static IModule getModule(IProject project) {
-// IModule[] modules = ServerUtil.getModules(project);
-// if (modules!=null && modules.length!=0) {
-// return modules[0];
-// }
-// return null;
-//}
-
- /**
- * Returns the build output location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project has no Java nature.
- * i.e. WP\.deployables\webModule\WEB-INF\classes
- * @param project
- * The project.
- * @return The build output location of the <code>project</code> or null
- * if the project has no Java nature.
- */
- public static IPath getJavaOutputLocation(IProject project) {
- IPath outputLocation = null;
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- outputLocation = javaProject.getOutputLocation();
- }
- } catch (JavaModelException e) {
- }
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
- "project=" + project + ",outputLocation=" + outputLocation);
-
- return outputLocation;
- }
-
- /**
- * Returns a build source location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project either has no Java nature
- * or if the project's build classpath contains no folders local to the
- * project. If the project has more than one of its own folders on the build
- * classpath, then one of them is chosen arbitrarily as the build source
- * location. To work with all entries on the build classpath, use
- * {@link #getJavaPackageFragmentRoots getJavaPackageFragmentRoots()}or
- * {@link #getJavaClasspath getJavaClasspath()}.
- *
- * @param project
- * The project.
- * @return A build source location of the <code>project</code> or null if
- * the project has no Java nature or if the project's build
- * classpath contains no folders local to the project.
- */
-
- public static IPath getJavaSourceLocation(IProject project) {
- IPath sourceLocation = null;
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
- for (int i = 0; i < fragmentRoots.length && sourceLocation == null; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i]
- .getCorrespondingResource();
- if (fragmentRoot != null
- && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- sourceLocation = fragmentRoot.getFullPath();
- }
- } catch (JavaModelException e) {
- }
- }
-
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
- "project=" + project + ",sourceLocation=" + sourceLocation);
-
- return sourceLocation;
- }
-
-
- /**
- * Returns the "JavaSource" folder
- * @param project
- * @return
- */
- /*
- public static IPath getJavaSourceLocation(IProject project){
- IVirtualComponent component = ComponentCore.createComponent(project);
- return getJavaSourceLocation(component);
- }
- */
- /**
- * Returns the JavaSource location folder
- * @param comp
- * @return
- */
- public static IPath getJavaSourceLocation(IVirtualComponent comp){
- if (comp!=null){
- IVirtualFolder folder = comp.getRootFolder().getFolder(new Path("/WEB-INF/classes"));
- return folder.getWorkspaceRelativePath();
- }
- return null;
- }
-
- /**
- * Returns the JavaSource locations in each project
- * @param project
- * @return
- */
- public static IPath[] getAllJavaSourceLocations(IProject project) {
- Vector pathVector = new Vector();
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-
- for (int i = 0; i < fragmentRoots.length; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i].getCorrespondingResource();
- if (fragmentRoot != null && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- pathVector.add(fragmentRoot.getFullPath());
- }
- } catch (JavaModelException e) {
- }
- }
- return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
- }
-
- public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-
- if (components!=null){
- List javaSourcePaths = new ArrayList();
- for (int i=0;i<components.length;i++){
- IPath path = getJavaSourceLocation(components[i]);
- javaSourcePaths.add(path);
- }
- return (IPath[])javaSourcePaths.toArray(new IPath[0]);
- }
- return null;
- }
-
- /**
- * Returns a build source package fragment root of the <code>project</code>
- * as an <code>IPackageFragmentRoot</code>, or null if the project either
- * has no Java nature or if the project's build classpath contains no
- * folders local to the project. If the project has more than one of its own
- * folders on the build classpath, then one of them is chosen arbitrarily as
- * the build source location.
- *
- * @param project
- * The project.
- * @return A build source package fragment root of the <code>project</code>
- * or null if the project has no Java nature or if the project's
- * build classpath contains no folders local to the project.
- *
- * @deprecated not used
- */
- public static IPackageFragmentRoot getJavaSourcePackageFragmentRoot(IProject project) {
- IPackageFragmentRoot packageFragmentRoot = null;
- IPath javaSourceLocation = getJavaSourceLocation(project);
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- packageFragmentRoot = javaProject.findPackageFragmentRoot(javaSourceLocation);
- }
- } catch (JavaModelException e) {
- }
- return packageFragmentRoot;
- }
-
- /**
- * Returns the package fragment roots of the <code>project</code> as an
- * array of <code>IPackageFragmentRoot</code> objects. If the project has
- * no Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The package fragment roots of the <code>project</code>.
- */
- public static IPackageFragmentRoot[] getJavaPackageFragmentRoots(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] packageFragmentRoots = javaProject
- .getPackageFragmentRoots();
- return packageFragmentRoots;
- }
- } catch (JavaModelException e) {
- }
- return new IPackageFragmentRoot[0];
- }
-
- /**
- * Returns the build classpath entries of the <code>project</code> as an
- * array of <code>IClasspathEntry</code> objects. If the project has no
- * Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The classpath entries of the <code>project</code>.
- *
- * @deprecated not used
- */
- public static IClasspathEntry[] getJavaClasspath(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
- return classpathEntries;
- }
- } catch (JavaModelException e) {
- }
- return new IClasspathEntry[0];
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IFolder getWebComponentServerRoot(IProject project){
-
- IFolder webModuleServerRoot = null;
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc.exists())
- webModuleServerRoot = J2EEUtils.getOutputContainerRoot(vc);
-
- return webModuleServerRoot;
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IPath getWebComponentServerRootPath(IProject project){
-
- IContainer webModuleServerRoot = null;
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null && vc.exists()){
- IContainer[] containers = J2EEProjectUtilities.getOutputContainers(project.getProject());
- if (containers.length > 0)
- webModuleServerRoot = containers[0];
- }
-
- if (webModuleServerRoot != null)
- return webModuleServerRoot.getFullPath();
- return null;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated use getWebComponentURL(..) which belongs in ServerUtils
- */
- public static String getWebProjectURL(IProject project,
- String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module,
- serverFactoryId, server, true, new NullProgressMonitor());
- if (serverInstance != null) {
-// URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
-
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- * Returns the forged URL string corresponding to the web server module root
- * of the project in a server instance or null if the project has no Web
- * nature or has no association to a server instance.
- *
- * @param project
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated not used
- */
-// public static String getForgedWebProjectURL(IProject project, String serverFactoryId, IServer server){
-//
-// String webProjectURL = null;
-// IModule module = getModule(project);
-// if (module != null)
-// {
-// //IServer serverInstance = ServerUtils.getServerForModule(module,
-// // serverFactoryId, server, true, new NullProgressMonitor());
-// if (server != null)
-// {
-// String hostname = server.getHost();
-//
-// // get ServerPort
-// int portNumber = 0;
-//
-// 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;
-// portNumber = p.getPort();
-// break;
-// }
-// }
-//
-//
-//
-// URL url = null;
-// try {
-// url = new URL("http", hostname, portNumber, "");
-// }
-// catch(Exception e){
-// e.printStackTrace();
-// }
-//
-//
-// //URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-//
-// if (url != null)
-// {
-// String s = url.toString();
-// webProjectURL = s + "/"+project.getName();
-// //webProjectURL = (s.endsWith("/") ? s.substring(0,s.length()-1) : s);
-// }
-// }
-// }
-// ILog log = new EclipseLog();
-// log.log(ILog.INFO, 5036, ResourceUtils.class, "getWebProjectURL", "project="+project+",webProjectURL="+webProjectURL);
-// return webProjectURL;
-// }
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated belongs in ServerUtils
- *
- */
- public static String getWebProjectURL(IProject project) {
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module);
- if (serverInstance != null) {
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated should be in ServerUtils
- */
- public static String getEncodedWebProjectURL(IProject project) {
- String url = getWebProjectURL(project);
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource or null if the resource is not properly
- * located in a project or folder on the build classpath or that is the
- * build output path.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource.
- */
- public static String getJavaResourcePackageName(IPath absolutePath) {
- try {
- IPath javaFolderPath = absolutePath.removeLastSegments(1);
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragment fragment = javaProject
- .findPackageFragment(javaFolderPath);
- if (fragment != null) {
- return fragment.getElementName();
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(javaFolderPath)) {
- IPath javaPackagePath = javaFolderPath
- .removeFirstSegments(outputPath.segmentCount());
- return javaPackagePath.isEmpty() ? null : javaPackagePath
- .toString().replace(IPath.SEPARATOR, '.');
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource as a relative pathname or null if the
- * resource is not properly located in a project or folder on the build
- * classpath.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource as a relative path.
- */
- public static IPath getJavaResourcePackagePath(IPath absolutePath) {
- String packageName = ResourceUtils
- .getJavaResourcePackageName(absolutePath);
- return (packageName == null ? null : new Path(packageName.replace('.',
- IPath.SEPARATOR)));
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * absolute path of the project or folder that is on the build classpath or
- * is the build output path and that contains the fully qualified Java
- * resource, or null if no such project or folder exists.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return The absolute path of the project or folder containing the fully
- * qualified Java resource.
- * @deprecated not used
- */
- public static IPath getJavaResourceRootPath(IPath absolutePath) {
- try {
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] pfrs = javaProject
- .getPackageFragmentRoots();
- for (int i = 0; i < pfrs.length; i++) {
- IResource fragmentRoot = pfrs[i].getCorrespondingResource();
- if (fragmentRoot != null) {
- IPath fragmentPath = fragmentRoot.getFullPath();
- if (fragmentPath.isPrefixOf(absolutePath)) {
- return fragmentPath;
- }
- }
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(absolutePath)) {
- return outputPath;
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Determines an URL (HTTP or FILE) to an Eclipse resource, returning the
- * URL string if successful and false otherwise. A value of null will
- * definitely be returned if any of the following conditions are not met:
- * <ol>
- * <li>The absolute path begins with a Web Project.
- * <li>The leading portion of the absolute path matches the path of the
- * container returned by {#link #getWebModuleServerRoot
- * getWebModuleServerRoot} for the project.
- * <li>The path does not lead to the WEB-INF folder or any descendent
- * thereof.
- * <li>The Web Project is associated with an explicit or default server
- * instance.
- * </ol>
- *
- * @param absolutePath
- * The absolute path of the resource.
- * @return The URL of the file, or null if no URL can be determined.
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath,
-// String serverFactoryId, IServer server) {
-// return getURLFromPath(absolutePath, getWebProjectURL(
-// getProjectOf(absolutePath), serverFactoryId, server));
-// }
-
- /**
- *
- * @param absolutePath
- * @param webProjectURL
- * @return
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath, String webProjectURL) {
-// StringBuffer url = new StringBuffer();
-// IProject project = getProjectOf(absolutePath);
-// IContainer webModuleServerRoot = getWebModuleServerRoot(project);
-// if (webModuleServerRoot != null) {
-// IPath webModuleServerRootPath = webModuleServerRoot.getFullPath();
-// if (webModuleServerRootPath.isPrefixOf(absolutePath)) {
-// int numSegment = webModuleServerRootPath.segmentCount();
-// int numSegmentFromPath = absolutePath.segmentCount();
-// if (numSegmentFromPath > numSegment) {
-// String nextSegment = absolutePath.segment(numSegment);
-// // check if the segment after the WebModuleServerRoot is
-// // WEB-INF (ignoring case)
-// if (nextSegment != null && !nextSegment.equalsIgnoreCase("WEB-INF")) {
-// IPath relativePath = absolutePath.removeFirstSegments(numSegment);
-// if (webProjectURL != null)
-// url.append(webProjectURL).append(IPath.SEPARATOR).append(relativePath.toString());
-// }
-// } else if (numSegmentFromPath == numSegment)
-// url.append(webProjectURL);
-// }
-// }
-// if (url.length() < 1) {
-// IWorkspaceRoot workspace = getWorkspaceRoot();
-// url.append(getResourceURI(workspace.getFile(absolutePath)));
-// }
-// ILog log = new EclipseLog();
-// log.log(ILog.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-// "absolutePath=" + absolutePath + ",url=" + url);
-//
-// return url.toString();
-// }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an index file located relative to the
- * plugin's installation location.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param indexPathname
- * A file containing a whitespace-delimitted list of pathnames of
- * the files to copy. The pathnames are relative to the
- * <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>indexPathname</code> file are preserved. Must not
- * be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyIndexedFilesToOS(Plugin plugin, IPath sourcePath,
- IPath indexPathname, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- InputStream input = plugin.openStream(indexPathname);
- Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- copyEnumeratedFilesToOS(plugin, sourcePath, filenames, targetPath,
- progressMonitor);
- }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an enumeration.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathnames
- * An enumeration of pathnames of the files to copy. The
- * pathnames are relative to the <code>plugin sourcePath</code>.
- * Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>pathnames</code> enumeration are preserved. Must
- * not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyEnumeratedFilesToOS(Plugin plugin, IPath sourcePath,
- Enumeration pathnames, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- while (pathnames.hasMoreElements()) {
- String filename = (String) pathnames.nextElement();
- copyFileToOS(plugin, sourcePath, new Path(filename), targetPath,
- progressMonitor);
- }
- }
-
- /**
- * Copies a file from a plugin's installation location to a native
- * directory.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathname
- * The pathname of the file to copy. The pathname is relative to
- * the <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the file
- * will be copied. The relative pathname of the file is
- * preserved. Must not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyFileToOS(Plugin plugin, IPath sourcePath,
- IPath pathname, IPath targetPath, IProgressMonitor progressMonitor)
- throws IOException {
- IPath target = targetPath.append(pathname);
- IPath source = sourcePath == null ? pathname : sourcePath
- .append(pathname);
- InputStream input = plugin.openStream(source);
- OutputStream output = new FileOutputStream(target.toOSString());
- copyStream(input, output);
- input.close();
- output.close();
- }
-
- /**
- * Copies data from one stream to another.
- *
- * @param input
- * The input stream.
- * @param output
- * The output stream.
- * @return The number of bytes copied.
- * @throws IOException
- * An exception if an error occurs while processing either of
- * the streams.
- */
- static public int copyStream(InputStream input, OutputStream output)
- throws IOException {
- int t = 0;
- byte[] buffer = new byte[1024];
- int n = input.read(buffer);
- while (n >= 0) {
- output.write(buffer, 0, n);
- t += n;
- n = input.read(buffer);
- }
- return t;
- }
-
- /**
- * Creates a native directory path equal to the parent portion of the given
- * <code>pathname</code>. If the directory already exists, then no action
- * is taken.
- *
- * @param pathname
- * The pathname to the file whose parent directory should be
- * created.
- * @throws IOException
- * An exception if an IO error occurs.
- */
- static public void createParentDirectoryFor(String pathname)
- throws IOException {
- File file = new File(pathname);
- File parent = file.getParentFile();
- if (parent != null) {
- parent.mkdirs();
- }
- }
-
- /**
- * Returns the IResource represented by the given selection.
- *
- * @param object
- * The selection
- * @return IResource if the selection represents an IResource. Returns null
- * otherwise.
- * @throws CoreException
- */
- static public IResource getResourceFromSelection(Object obj)
- throws CoreException {
- IResource res = null;
- if (obj != null) {
- if (obj instanceof IResource) {
- res = (IResource) obj;
- } else if (obj instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) obj;
- res = javaElement.getCorrespondingResource();
- } else if (obj instanceof EnterpriseBean) {
- EnterpriseBean ejbBean = (EnterpriseBean) obj;
- IProject ejbProject = ProjectUtilities.getProject(ejbBean);
- if (ejbProject != null)
- res = ejbProject;
- } else if (obj instanceof SessionBean) {
- SessionBean JEE5Bean = (SessionBean) obj;
- IProject ejbProject = ProjectUtilities.getProject(JEE5Bean);
- if (ejbProject != null)
- res = ejbProject;
- }
-
- }
-
- return res;
- }
-
- //----------------------------------------------------------------------
- // Naughty bits...
- //----------------------------------------------------------------------
-
- //
- // Creates a path of folders.
- // Do not call with an absolutePath of less than one segment.
- //
- // private static IContainer makeFolderPath (
- // ResourceContext resourceContext,
- // IPath absolutePath,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (absolutePath.segmentCount() <= 1)
- // {
- // return getWorkspaceRoot().getProject(absolutePath.segment(0));
- // }
- // else
- // {
- // IContainer parent = makeFolderPath(resourceContext,
- // absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
- // String folderName = absolutePath.lastSegment();
- // return makeFolder(resourceContext, parent,folderName, progressMonitor ,
- // statusMonitor);
- // }
- // }
- //
- // Creates a folder under a container.
- // The container must already exist.
- //
- // private static IFolder makeFolder (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String folderName,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(folderName);
- // if (child == null)
- // {
- // if (!resourceContext.isCreateFoldersEnabled()) {
- // int result = statusMonitor.reportStatus(new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FOLDER_CREATION_DISABLED",
- // new Object[] {parent.getFullPath().toString(),folderName}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCreateFoldersEnabled(true);
- //
- // }
- // IFolder folder = parent.getFolder(new Path(folderName));
- // folder.create(true,true,progressMonitor);
- // return folder;
- // }
- // else if (child.getType() == IResource.FOLDER)
- // {
- // return (IFolder)child;
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FOLDER",new
- // Object[] {parent.getFullPath().append(folderName).toString()}),null));
- // }
- // }
-
- //
- // Creates a file under a container.
- // The container must already exist.
- //
- // private static IFile makeFile (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String fileName,
- // InputStream inputStream,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(fileName);
- // if (child != null)
- // {
- // if (child.getType() == IResource.FILE)
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (child.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- //
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- // }
- //
- // IFile[] files = new IFile[1];
- // files[0] = (IFile)child;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return null;
- // }
- //
- // //Change the contents of the existing file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.setContents(inputStream,true,true,progressMonitor);
- // return file;
- //
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FILE",new
- // Object[] {parent.getFullPath().append(fileName)}),null));
- // }
- // }
- // else
- // {
- // //Create a new file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.create(inputStream,true,progressMonitor);
- // return file;
- // }
- // }
-
- /**
- * Deletes a file under a container. The container must already exist.
- *
- * @param file -
- * the IFile to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the file does not exist or if it exists and is
- * successfully deleted. False otherwise.
- */
- // public static boolean deleteFile (
- // ResourceContext resourceContext,
- // IFile file,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor )
- // throws CoreException
- // {
- // if (file.exists())
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (file.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- //
- // }
- // IFile[] files = new IFile[1];
- // files[0] = file;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return false;
- // }
- // file.delete(true,progressMonitor);
- // }
- // //At this point, either the file did not exist or we successfully deleted
- // it. Return success.
- // return true;
- // }
- /**
- * Deletes a folder under a container.
- *
- * @param folder -
- * the IFolder to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the folder does not exist or if it exists and is
- * successfully deleted along with its members. False otherwise.
- */
- // public static boolean deleteFolder (
- // ResourceContext resourceContext,
- // IFolder folder,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (!folder.exists()) return true;
- //
- // boolean deleted = true;
- // IResource[] resources = folder.members();
- // for (int i=0; i<resources.length; i++)
- // {
- // IResource resource = resources[i];
- // if (resource instanceof IFile)
- // {
- // deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor,
- // statusMonitor);
- // }
- // if (resource instanceof IFolder)
- // {
- // deleted = deleteFolder( resourceContext, (IFolder)resource,
- // progressMonitor, statusMonitor);
- // }
- //
- // if (!deleted) break;
- // }
- // if (deleted) {
- // folder.delete(true, true, progressMonitor);
- // return true;
- // }
- // else
- // return false;
- //
- // }
- /**
- * Deletes a set of files that are named in an index file located relative
- * to the plugin's installation location.
- *
- * @param plugin
- * The plugin containing the indexed file Must not be null.
- * @param sourcePath -
- * relative path of the indexed file passing a null in has the
- * same effect as passing a "." in
- * @param indexFilePath -
- * the indexed filename Must not be null
- * @param targetPath -
- * path containing the files named in the indexed file Must not
- * be null, this path must end with a trailing separator
- * @param progressMonitor
- */
- // public static void deleteIndexFilesFromOS (
- // Plugin plugin,
- // IPath indexFilePath,
- // IPath targetPath
- // )
- // throws IOException {
- // InputStream input = plugin.openStream(indexFilePath);
- // Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- // while (filenames.hasMoreElements()) {
- // File targetFile =
- // targetPath.append((String)filenames.nextElement()).toFile();
- // if (targetFile.exists())
- // targetFile.delete();
- // }
- // }
- /**
- * Returns a URI reference to the given Eclipse resource, or null if no such
- * reference can be determined (for example, if the resource does not exist
- * in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getLocation();
- if (location != null) {
- uri = "file:" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns a URI reference to the given Eclipse resource using the
- * "platform:" protocol, or null if no such reference can be determined (for
- * example, if the resource does not exist in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getPlatformResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getFullPath();
- if (location != null) {
- uri = "platform:/resource" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns the default binding namespace string given a Java bean name
- * (using the convention used by CTC in GM). e.g. Java bean MyClass result
- * in binding namespace of
- * "http://www.myclass.com/definitions/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The binding namespace as a string.
- */
- public static String getBindingNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/definitions/"
- + beanName + "RemoteInterface";
- }
-
- /**
- * Returns the default schema namespace string given a Java bean name (using
- * the convention used by CTC in GM). e.g. Java bean MyClass result in
- * schema namespace of
- * "http://www.myclass.com/schemas/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The schemas namespace as a string.
- */
- public static String getSchemaNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/schemas/"
- + beanName + "RemoteInterface";
- }
-
- // public static Vector getThreeStateFileOptions() {
- // Vector options = new Vector();
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_ID,IStatusDialogConstants.YES_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_TO_ALL_ID,IStatusDialogConstants.YES_TO_ALL_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.CANCEL_ID,IStatusDialogConstants.CANCEL_LABEL,"",""));
- // return options;
- // }
-
- //----------------------------------------------------------------------
-
- /**
- * Gets the SOAP rpcrouter servlet URL for the service project
- *
- * @param project
- * The project.
- * @param serverFactoryId
- * The server factory id
- * @param server
- * The server
- * @return The URL, possibly null.
- */
-
- public static String getServletURL(IProject project,
- String serverFactoryId, IServer server) {
- return getServletURL(getWebProjectURL(project, serverFactoryId, server));
- }
-
- public static String getServletURL(String webProjectURL) {
- if (webProjectURL == null)
- return null;
- else
- return webProjectURL + SERVLET_EXT;
- }
-
- /**
- * Gets the client Web project name
- *
- * @param projectName
- * The project name to base on.
- * @param typeId the webservice type id.
- * @return The client Web project name.
- *
- * @deprecated
- */
- public static String getClientWebProjectName(String projectName, String typeId)
- {
- String baseClientWebProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- IPath projectPath;
- IProject project;
- boolean foundWebProject = false;
- int i = 1;
-
- if( isSkeletonEJBType( typeId ) )
- {
- // For the skeleton EJB scenario we need to create a slightly different
- // base name. When the EJB project is created another project
- // is created with "Client" tacked onto the end. We will
- // add "WS" to our client so we don't collide with the other
- // client project.
- baseClientWebProjectName = projectName + "WS" + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- String clientWebProjectName = baseClientWebProjectName;
-
- while (!foundWebProject)
- {
- projectPath = new Path(clientWebProjectName).makeAbsolute();
- project = ResourceUtils.getProjectOf(projectPath);
-
- if (project.exists() && !ResourceUtils.isWebProject(project))
- {
- clientWebProjectName = baseClientWebProjectName + i;
- i++;
- }
- else
- {
- foundWebProject = true;
- }
- }
-
- return clientWebProjectName;
- }
-
- public static String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB)
- {
- String clientProjectName = null;
- String clientComponentName = null;
- if (isEJB)
- {
- clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- }
- else
- {
- clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseName = clientProjectName;
- clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseCompName = clientComponentName;
- }
-
- //TODO we may want to remove this if statement once defect 103366 is resolved.
- //TODO: Defect 107997 - Revisit prject and module creation logic
-// if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-// {
-// clientComponentName = clientProjectName;
-// }
-
-// boolean foundWebProject = false;
-// int i = 1;
-//
-// while (!foundWebProject)
-// {
-// IPath projectPath = new Path(clientProjectName).makeAbsolute();
-// IProject project = ResourceUtils.getProjectOf(projectPath);
-//
-// if (project.exists())
-// {
-// clientProjectName = baseName + i;
-// clientComponentName = baseCompName + i;
-// i++;
-// }
-// else
-// {
-// foundWebProject = true;
-// }
-// }
-
- return new String[]{clientProjectName, clientComponentName};
- }
-
- /**
- *
- * @param typeID
- * @return
- *
- * @deprecated
- */
- public static boolean isSkeletonEJBType( String typeID )
- {
- return typeID.equals( "org.eclipse.jst.ws.type.wsdl.ejb" );
- }
-
- public static String getDefaultEJBProjectName() {
- return DEFAULT_EJB_PROJECT_NAME;
- }
-
- public static String getDefaultEJBComponentName() {
- return DEFAULT_EJB_COMPONENT_NAME;
- }
-
- public static String getDefaultWebProjectName() {
- return DEFAULT_WEB_PROJECT_NAME;
- }
-
- public static String getDefaultWebComponentName() {
- return DEFAULT_WEB_COMPONENT_NAME;
- }
-
- public static String getDefaultClientExtension() {
- return DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- */
- public static String getRouterProjectName(String projectName) {
- return projectName + DEFAULT_ROUTER_PROJECT_EXT;
- }
-
- public static String getDefaultServiceEARProjectName() {
- return DEFAULT_SERVICE_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultServiceEARComponentName() {
- return DEFAULT_SERVICE_EAR_COMPONENT_NAME;
- }
-
- public static String getDefaultClientEARProjectName() {
- return DEFAULT_CLIENT_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultClientEARComponentName() {
- return DEFAULT_CLIENT_EAR_COMPONENT_NAME;
- }
-
- public static String getDefaultEARExtension() {
- return DEFAULT_EAR_EXT;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
deleted file mode 100644
index 57e4120..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,69 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionToResource implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value)
- {
- IStructuredSelection selection = (IStructuredSelection)value;
- IResource resource = null;
-
- if( selection != null )
- {
- Object object = selection.getFirstElement();
-
- if( object != null )
- {
- if( object instanceof IResource)
- {
- resource = (IResource)object;
- }
- else if( object instanceof ICompilationUnit )
- {
- ICompilationUnit compUnit = (ICompilationUnit)object;
-
- try
- {
- resource = compUnit.getCorrespondingResource();
- }
- catch( JavaModelException exc)
- {
- }
- }
- else if( object instanceof EnterpriseBean )
- {
- EnterpriseBean ejbBean = (EnterpriseBean)object;
- IProject ejbProject = ProjectUtilities.getProject( ejbBean );
-
- if( ejbProject != null )
- {
- resource = ejbProject;
- }
- }
- }
- }
-
- return resource;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
deleted file mode 100644
index d13a8a2..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,832 +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
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 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
- * 20070119 159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 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)
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-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.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IModule;
-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.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
- private Hashtable serverIdToLabel_;
-
- private Hashtable serverLabelToId_;
-
- private static ServerUtils instance_;
-
- public static ServerUtils getInstance() {
- if (instance_ == null) {
- instance_ = new ServerUtils();
- }
- return instance_;
-
- }
-
- public ServerUtils() {
- }
-
- // Gets the Server labels given the server factory id
- public void getServerLabelsAndIds() {
- serverIdToLabel_ = new Hashtable();
- serverLabelToId_ = new Hashtable();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int idx = 0; idx < serverTypes.length; idx++) {
-
- IServerType serverType = (IServerType) serverTypes[idx];
-
- String id = serverType.getId();
- String serverLabel = serverType.getName();
- if (!(id == null) && !(serverLabel == null)) {
- serverIdToLabel_.put(id, serverLabel);
- serverLabelToId_.put(serverLabel, id);
- }
- }
- }
-
- public String getServerLabelForId(String factoryId) {
- if (serverIdToLabel_ == null)
- this.getServerLabelsAndIds();
- return (String) serverIdToLabel_.get(factoryId);
- }
-
- public String getServerIdForLabel(String factoryLabel) {
- if (serverLabelToId_ == null)
- this.getServerLabelsAndIds();
- return (String) serverLabelToId_.get(factoryLabel);
- }
-
- public IStatus modifyModules(IEnvironment env, IServer server,
- IModule module, boolean add, IProgressMonitor monitor) {
-
- IServerWorkingCopy wc = null;
- IStatus status = Status.OK_STATUS;
-
- try {
-
- if (module == null || !module.getProject().exists()) {
- return status;
- }
-
- // check if module is a true Java project
- if (module instanceof IModule) {
- IModule pm = (IModule) module;
- if (pm != null) {
- IProject project = pm.getProject();
- if (project == null
- || ResourceUtils.isTrueJavaProject(project)) {
- return status;
- }
- }
- }
-
- wc = server.createWorkingCopy();
- if (wc != null) {
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- List list = Arrays.asList(server.getModules());
- if (add) {
- if (!list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[] { module },
- new IModule[0], monitor);
- }
- } else { // removes module
- if (list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[0],
- new IModule[] { module }, monitor);
- }
- }
- } else {
- // handle case of Null WC; non-issue for now
- }
- }
- catch (CoreException exc )
- {
- status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
- env.getStatusHandler().reportError(status);
- return status;
- } finally {
- if (wc != null) {
- // Always saveAll and release the serverWorkingCopy
- try
- {
- wc.saveAll(true, monitor);
- }
- catch (CoreException exc )
- {
- status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return status;
- }
-
- public static IServer getServerForModule(IModule module, String serverTypeId,
- IServer server, boolean create, IProgressMonitor monitor) {
- if (server != null)
- return server;
- else
- return getServerForModule(module, serverTypeId, create, monitor);
- }
-
- public static IServer getServerForModule(IModule module,
- String serverTypeId, boolean create, IProgressMonitor monitor) {
- try {
-
- IServer[] servers = ServerUtil.getServersByModule(module, monitor);
-
- if (servers != null && servers.length > 0) {
- if (serverTypeId == null || serverTypeId.length() == 0)
- return servers[0]; // WSAD v4 behavior
-
- for (int i = 0; i < servers.length; i++) {
- if (servers[i].getServerType().getId().equalsIgnoreCase(
- serverTypeId))
- return servers[i];
- }
- }
-
- return createServer(module, serverTypeId, monitor);
-
- } catch (Exception e) {
- return null;
- }
- }
-
- public static IServer getServerForModule(IModule module) {
- try {
- IServer[] servers = ServerUtil.getServersByModule(module, null);
- return ((servers != null && servers.length > 0) ? servers[0] : null);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- *
- * @param env
- * @param module
- * @param serverTypeId
- * @param monitor
- * @return
- *
- * @deprecated
- */
- public IServer createServer(IEnvironment env, IModule module,
- String serverTypeId, IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce)
- {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- if (module != null && module.getProject().exists()) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- }
- catch (Exception e)
- {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, e);
- env.getStatusHandler().reportError(status);
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
- }
- }
-
- /**
- * createServer This creates a server but does not report errors. @param
- * module
- * @param serverTypeId
- * @param monitor progress monitor
- * @return IServer returns null if unsuccessful
- *
- * @deprecated
- */
- public static IServer createServer(IModule module, String serverTypeId,
- IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
-
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
- if (module != null) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- } catch (Exception e) {
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- // handler core exception
- }
- }
- }
-
- public static String[] getServerTypeIdsByModule(IVirtualComponent component) {
- IProject project = component.getProject();
- String[] serverIds = null;
-
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(getModule(project), null);
- if (servers != null) {
- serverIds = new String[servers.length];
-
- for (int index = 0; index < servers.length; index++) {
- serverIds[index] = servers[index].getId();
-
- }
- }
- }
-
- if (serverIds == null) {
- serverIds = new String[0];
- }
-
- return serverIds;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getServerTypeIdsByModule( IVirtualComponent )
- */
- public static String[] getServerTypeIdsByModule(IProject project) {
- Vector serverIds = new Vector();
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(ResourceUtils
- .getModule(project), null);
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++) {
- serverIds.add(servers[i].getId());
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- public static IModule getModule(IProject project) {
- return ServerUtil.getModule(project);
-}
- /**
- * Find the specific module with module name in a project
- * @param project - the project
- * @param module - name of desired module
- * @return IModule
- */
- public static IModule getModule(IProject project, String module) {
- // If module is null, then just return the first one
- if (module == null)
- return getModule(project);
-
- IModule[] modules = ServerUtil.getModules(project);
- int length = modules.length;
- for (int i = 0; i < length; i++)
- {
- IModule aModule = modules[i];
- if (module.equals(aModule.getName()))
- return aModule;
- }
- return null;
- }
-
-// Workaround for 113621
-//public static IModule getModule(IProject project) {
-// IModule[] modules = ServerUtil.getModules(project);
-// if (modules!=null && modules.length!=0) {
-// return modules[0];
-// }
-// return null;
-//}
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * component based on a server factory ID or null if the project has no Web nature
- * or the module root cannot be determined (e.g. For some types of
- * servers, we would not be able to get module root URL if the server has not been started).
- * Note that we are not relying on which server the module is currently associated with to determine
- * the correct module server root because the project might be associated with a server but we need the
- * module root based on another server factory ID.
- *
- * @param project
- * The project.
- * @param serverFactoryId server factory ID
- * @return The web server module root URL or null
- */
- public static String getWebComponentURL(IProject project, String serverFactoryId) {
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null)
- {
- try {
- //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];
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- //Found an appropriate IRuntime that is not a stub
- nonStubRuntime = runtime;
- break;
- }
- }
- }
-
- if (nonStubRuntime != null)
- {
- IServerWorkingCopy serverWC = serverType.createServer(null, null, nonStubRuntime, null);
- IURLProvider urlProvider = (IURLProvider) serverWC.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- }
-
- } catch(CoreException ce){
- Logger.getLogger().log(ce);
- }
-
- }
- }
- return webProjectURL;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * component based on a server factory ID and server. Returns null if the project has no Web nature
- * or the module root cannot be determined (e.g. For some types of
- * servers, we would not be able to get module root URL if the server has not been started).
- * Note that we are not relying on which server the module is currently associated with to determine
- * the correct module server root because the project might be associated with a server but we need the
- * module root based on another server / server factory ID.
- *
- * @param project
- * The project.
- * @param serverFactoryId server factory ID
- * @param server Server id
- * @return The web server module root URL or null
- */
- public static String getWebComponentURL(IProject project,
- String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- if (server != null) {
- IURLProvider urlProvider = (IURLProvider) server.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- } else {
- webProjectURL = getWebComponentURL(project, serverFactoryId);
- }
- }
- return webProjectURL;
- }
-
- public static String getEncodedWebComponentURL(IProject project, String serverFactoryId) {
- String url = getWebComponentURL(project, serverFactoryId);
- return encodeURL(url);
- }
-
- public static String getEncodedWebComponentURL(IProject project, String serverFactoryId, IServer server) {
- String url = getWebComponentURL(project, serverFactoryId, server);
- return encodeURL(url);
- }
-
- public static String encodeURL(String url) {
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- public static IServer getDefaultExistingServer(IVirtualComponent component) {
- IProject project = component.getProject();
- IModule module = getModule(project);
- IServer preferredServer = ServerCore.getDefaultServer(module);
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(module,
- null);
-
- if (configuredServers != null && configuredServers.length > 0) {
- preferredServer = configuredServers[0];
- } else {
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(module, false, null);
-
- if (nonConfiguredServers != null
- && nonConfiguredServers.length > 0) {
- preferredServer = nonConfiguredServers[0];
- }
- }
-
- return preferredServer;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getDefaultExistingServer( IVirtualComponent )
- */
- public static IServer getDefaultExistingServer(IProject project) {
-
- IModule module = ServerUtil.getModule(project);
- IServer preferredServer = null;
- preferredServer = ServerCore.getDefaultServer(module);
-
-// Workaround for 113621
-// IModule[] modules = ServerUtil.getModules(project);
-// IServer preferredServer = null;
-// if (modules.length > 0){
-// preferredServer = ServerCore.getDefaultServer(modules[0]);
-// }
-
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(
- ResourceUtils.getModule(project), null);
- if (configuredServers != null && configuredServers.length > 0) {
- return configuredServers[0];
- }
-
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(ResourceUtils.getModule(project),
- false, null);
- if (nonConfiguredServers != null && nonConfiguredServers.length > 0) {
- return nonConfiguredServers[0];
- }
- return null;
- }
-
- /*
- * @param moduleType - ad defined in IServerTargetConstants (i.e. EAR_TYPE,
- * WEB_TYPE, etc.) @param j2eeVersion String representation of the int
- * values in J2EEVersionConstants i.e. "12" or "13" or "14" @return String
- * the id of the server target - to be used in project creation operations.
- */
- public static String getServerTargetIdFromFactoryId(String serverFactoryId,
- String moduleType, String j2eeVersion) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(moduleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- return runtime.getId();
- }
- }
- }
-
- return null;
- }
-
- /*
- * @param serverFactoryId the server's factory id @returns the runtime type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getRuntimeTargetIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverRuntimeId = serverType.getRuntimeType().getId();
- return serverRuntimeId;
- } else
- return "";
- }
-
- public static String getFactoryIdFromRuntimeTargetId(String runtimeTargetId){
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0;i<serverTypes.length;i++) {
- IRuntimeType runtimeTyp = serverTypes[i].getRuntimeType();
- if (runtimeTyp!=null){
- if (runtimeTyp.getId().equals(runtimeTargetId))
- return serverTypes[i].getId();
- }
- }
- return "";
-
- }
-
-
- /*
- * @param serverFactoryId the server's factory id @returns the server type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getServerTypeIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverTypeId = serverType.getId();
- return serverTypeId;
- } else
- return "";
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14"
- */
- public static boolean isTargetValidForEAR(String runtimeTargetId,
- String j2eeVersion) {
- if (runtimeTargetId == null)
- return false;
-
- String earModuleType = IModuleConstants.JST_EAR_MODULE;
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(earModuleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisId = runtimeType.getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14" @param the project type
- * from IServerTargetConstants
- */
- public static boolean isTargetValidForProjectType(String runtimeTargetId,
- String j2eeVersion, String projectType) {
- if (runtimeTargetId == null)
- return false;
-
- if (projectType == null || projectType.length() == 0)
- return false;
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(projectType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisId = runtimeType.getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
- }
-
- return false;
- }
-
- public static String getServerTargetJ2EEVersion(String j2eeVersion) {
-
- if (j2eeVersion == null || j2eeVersion.length() == 0)
- return null;
-
- int j2eeVersionInt = Integer.parseInt(j2eeVersion);
- switch (j2eeVersionInt) {
- case (J2EEVersionConstants.J2EE_1_2_ID):
- return IServerTargetConstants.J2EE_12;
- case (J2EEVersionConstants.J2EE_1_3_ID):
- return IServerTargetConstants.J2EE_13;
- case (J2EEVersionConstants.J2EE_1_4_ID):
- return IServerTargetConstants.J2EE_14;
- default:
- return null;
- }
- }
-
- //Converts a module type from J2EEUtils to a module type like
- //the one in IServerTargetConstants.
- public static String getServerTargetModuleType(int moduleType)
- {
- switch (moduleType)
- {
- case J2EEUtils.WEB :
- return IServerTargetConstants.WEB_TYPE;
- case J2EEUtils.EJB :
- return IServerTargetConstants.EJB_TYPE;
- case J2EEUtils.APPCLIENT :
- return IServerTargetConstants.APP_CLIENT_TYPE;
- case J2EEUtils.EAR :
- return IServerTargetConstants.EAR_TYPE;
- default:
- return null;
-
- }
- }
-
- /*
- * Returns a non-stub runtime if one is available for the the given server type.
- * @param serverFactoryId - server type id
- * @returns IRuntime Returns a non-stub runtime if one is available for the the given server type.
- * Returns null otherwise.
- */
- public static IRuntime getNonStubRuntime(String serverFactoryId)
- {
- //Find a Runtime which is not a stub
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- IRuntime nonStubRuntime = null;
- if (serverType != null)
- {
- //boolean foundNonStubRuntime = false;
- IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- for (int i = 0; i < runtimes.length; i++)
- {
- IRuntime runtime = runtimes[i];
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub())
- {
- // Found an appropriate IRuntime that is not a stub
- //foundNonStubRuntime = true;
- nonStubRuntime = runtime;
- break;
- }
- }
- }
- }
-
- return nonStubRuntime;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
deleted file mode 100644
index 1f499b0..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,140 +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.common;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-public class StatusObjectHandler
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static final int MAX_DETAILS = 16;
-
- public static IStatus generateTreeStatus (IStatus status)
- {
- //
- // There could be lots of Throwables, CoreExceptions,
- // WrappedExceptions and IStatus objects beneath the
- // given status. Find them.
- //
- LinkedList statusList = new LinkedList();
- appendStatus(MAX_DETAILS, statusList, status, status.getSeverity());
- if (statusList.size() > 0)
- {
- IStatus newStatus = (IStatus)statusList.removeFirst();
- if (statusList.size() > 0)
- {
- IStatus[] secondaryStatusArray = new IStatus[statusList.size()];
- int n = 0;
- Iterator i = statusList.iterator();
- while (i.hasNext())
- {
- secondaryStatusArray[n++] = (IStatus)i.next();
- }
- newStatus = new MultiStatus(status.getPlugin(),status.getCode(),secondaryStatusArray,status.getMessage(),status.getException());
- }
- return newStatus;
- }
- else
- return null;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon an IStatus.
- //
- private static int appendStatus ( int max, List statusList, IStatus status, int severity )
- {
- if (max > 0 && status != null)
- {
- //
- // Append an IStatus object for the given status' message.
- //
- if (status.getMessage() != null)
- {
- max = append(statusList,max,severity,status.getPlugin(),status.getCode(),status.getMessage(),status.getException());
- }
- //
- // Append the IStatus' Throwable, if any.
- //
- max = appendThrowable(max,statusList,status.getException(),severity);
- //
- // If the IStatus is a multi status, append the children.
- //
- IStatus[] children = status.getChildren();
- for (int i=0; i<children.length && max>0; i++)
- {
- max = appendStatus(max,statusList,children[i],severity);
- }
- }
- return max;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon a Throwable. WrappedExceptions and CoreExceptions are
- // given special treatment.
- //
- private static int appendThrowable ( int max, List statusList, Throwable throwable, int severity )
- {
- if (max > 0 && throwable != null)
- {
- //
- // Append an IStatus object for the exception's message.
- //
- if (throwable.getLocalizedMessage() != null)
- {
- max = append(statusList,max,severity,WebServicePlugin.ID,0,throwable.getLocalizedMessage(),throwable);
- }
- //
- // If the exception is a WrappedException, append the wrapped Exception.
- //
- if (throwable instanceof WrappedException)
- {
- WrappedException wexc = (WrappedException)throwable;
- max = appendThrowable(max,statusList,wexc.exception(),severity);
- }
- //
- // If the exception is a CoreException, append the enclosed IStatus.
- //
- if (throwable instanceof CoreException)
- {
- CoreException cexc = (CoreException)throwable;
- max = appendStatus(max,statusList,cexc.getStatus(),severity);
- }
- }
- return max;
- }
-
- //
- // Creates and appends an IStatus to the list of IStatus objects.
- //
- private static int append ( List statusList, int max, int severity, String id, int code, String message, Throwable throwable )
- {
- if (max > 0)
- {
- IStatus status = new Status(severity,id,code,message,throwable);
- statusList.add(status);
- max--;
- }
- return max;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
deleted file mode 100644
index da7e1da..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
+++ /dev/null
@@ -1,32 +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.common;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- *
- * Transforms a input String to a Path
- *
- * @author joan
- *
- */
-
-public class String2PathTransformer implements Transformer {
-
- public Object transform(Object value) {
- Path path = new Path(value.toString());
- return path;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
deleted file mode 100644
index 06067de..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
+++ /dev/null
@@ -1,100 +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
- * -------- -------- -----------------------------------------------------------
- * 20060222 128094 joan@ca.ibm.com - Joan Haggarty
- * 20070305 175194 makandre@ca.ibm.com - Andrew Mak, Ant task InitialSelection only allows wsdl within the workspace
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.java.JavaClass;
-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.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Transforms a string value representing a workspace resource path into a StructuredSelection object
- *
- * @author joan
- *
- */
-
-public class String2SelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
-
- StructuredSelection selection = null;
- IResource resource = FileResourceUtils.getWorkspaceRoot().findMember(new Path(value.toString()));
- if (resource != null)
- {
- IProject resProject = resource.getProject();
- // check if resource is part of an EJB
- if (J2EEUtils.isEJBComponent(resProject))
- {
- // if resource is part of EJB need to get the EnterpriseBean as the selection
- IVirtualComponent[] ejbComponents = J2EEUtils.getEJBComponents(resProject);
- EJBArtifactEdit ejbEdit = null;
- try{
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[0]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar ejbJar = ejbRes.getEJBJar();
- IPath path = resource.getFullPath();
- String resourcePath = ResourceUtils.getJavaResourcePackageName(path);
- String javaClassName = resource.getName();
- // strip off file extension if necessary
- if (javaClassName.lastIndexOf('.')>-1)
- {
- javaClassName = javaClassName.substring(0, javaClassName.lastIndexOf('.'));
- }
- JavaClass javaClass = JavaMOFUtils.getJavaClass(resourcePath, javaClassName, resProject);
- EnterpriseBean ejb = ejbJar.getEnterpriseBeanWithReference(javaClass);
- if (ejb != null)
- {
- selection = new StructuredSelection(ejb.getName());
- }
- }
- catch (Exception exc)
- {
-
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- // if selection not already set - create it from the resource object
- if (selection == null)
- {
- selection = new StructuredSelection(resource);
- }
- }
- else if (value instanceof String && value.toString().indexOf(":") != -1) {
- // remote file
- selection = new StructuredSelection(value);
- }
- else
- {
- // string doesn't return resource - error condition
- throw new IllegalArgumentException(WSPluginMessages.ERROR_SELECTION_TRANSFORM);
- }
- return selection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java
deleted file mode 100644
index b859605..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java
+++ /dev/null
@@ -1,40 +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.common;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-
-public class String2TestFacilityListTransformer implements Transformer {
-
- public Object transform(Object value) {
- String testFacility = (String)value;
- //value represents name of a test facility
- //pick up list of test facilities
- String[] testTypes = WebServicePlugin.getInstance().getScenarioContext().getWebServiceTestTypes();
-
- int index = 0;
- //match value to name of test facility and set index accordingly
- for (int i = 0; i < testTypes.length; i++) {
- if (testTypes[i].equals(testFacility))
- {
- break;
- }
- index++;
- }
-
- SelectionList selectionList = new SelectionList(testTypes, index);
- return selectionList;
- }
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
deleted file mode 100644
index de87fe1..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
+++ /dev/null
@@ -1,93 +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
- * -------- -------- -----------------------------------------------------------
- * 20060303 128832 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Map;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-
-public class String2TypeRuntimeServerModifier implements BeanModifier {
-
- private String SERVICE_RT_ID_KEY = "Service.RuntimeId"; //$NON-NLS-N$
- private String RUNTIME_ID = "RuntimeId"; //$NON-NLS-N$
- private String SERVICE_SRV_ID_KEY = "Service.ServerId"; //$NON-NLS-N$
- private String SERVER_ID = "ServerId"; //$NON-NLS-N$
- private String TYPE_ID = "TypeId"; //$NON-NLS-N$
- private String TD_EJB = "TOP DOWN EJB"; //$NON-NLS-N$
- private String BU_EJB = "BOTTOM UP EJB"; //$NON-NLS-N$
- private String TD_EJB_TYPE_ID = "1/org.eclipse.jst.ws.wsImpl.ejb";
- private String BU_EJB_TYPE_ID = "0/org.eclipse.jst.ws.wsImpl.ejb";
- private String SERVICE_PREFIX = "Service."; //$NON-NLS-N$
- private String CLIENT_PREFIX = "Client."; //$NON-NLS-N$
-
- /**
- * Modifies the supplied TypeRuntimeServer bean with properties in holder.
- * If the bean is null, construct a new one and set its properties.
- * @param bean TypeRuntimeServer bean to be modified
- * @param holder Map containing values for TypeRuntimeServer properties
- * @return TypeRuntimeServer with properties set
- */
- public void modify(Object bean, Object holder) {
-
- TypeRuntimeServer types = null;
- if (bean == null || !(bean instanceof TypeRuntimeServer))
- {
- types = new TypeRuntimeServer();
- }
- else
- {
- types = (TypeRuntimeServer)bean;
- }
-
- if (holder instanceof Map)
- {
- Map typesMap = (Map)holder;
- String prefix = "";
-
-
- if (typesMap.containsKey(SERVICE_RT_ID_KEY)||typesMap.containsKey(SERVICE_SRV_ID_KEY))
- {
- prefix = SERVICE_PREFIX;
- }
- else
- {
- prefix = CLIENT_PREFIX;
- }
-
- String runtimeID = (String)typesMap.get(prefix+RUNTIME_ID);
- if (runtimeID != null)
- types.setRuntimeId(runtimeID);
-
- String serverID = (String)typesMap.get(prefix+SERVER_ID);
- if (serverID != null)
- types.setServerId(serverID);
-
- //check if web service type is EJB - if not, default for Java bean types
- String typeID = (String)typesMap.get(prefix+TYPE_ID);
- if (typeID != null)
- {
- if (typeID.toUpperCase().equals(TD_EJB)) //only setting typeID specifically for EJB case
- {
- types.setTypeId(TD_EJB_TYPE_ID);
- }
- else if (typeID.toUpperCase().equals(BU_EJB))
- {
- types.setTypeId(BU_EJB_TYPE_ID);
- }
- }
- }
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
deleted file mode 100644
index c1b66d8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,41 +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.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-/**
- * Transfroms a java.lang.String to an org.eclipse.core.runtime.IProject
- */
-public class StringToIProjectTransformer implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- * @param Object This must be a java.lang.String
- * @return Object Returns an IProject
- */
-
- public Object transform(Object value)
- {
- 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);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
deleted file mode 100644
index bb5eaa3..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,288 +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.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jdt.core.JavaConventions;
-
-/**
- * This class contains some useful string utilities that are not provided by
- * either String or StringBuffer.
- *
- * @author Peter Moogk
- * @date July 13, 2000
-**/
-public final class StringUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The platform-specific line separator.
- */
- public static final String NEWLINE = System.getProperty("line.separator");
-
- private StringUtils(){};
-
- /**
- * This method splits a single line of text into multiple lines
- * based on a maximum line length. The method will try to fit as
- * many words as possible onto a line without exceeding the maximum
- * line length. Note: the only case where a line might exceed the
- * maximum is if a single word is longer than the maximum.
- **/
- public static String[] splitter( String text, int max_length )
- {
- Vector return_text = new Vector(20);
- String[] return_str;
- int index = 0;
-
- while( index < text.length() )
- {
- String str = text.substring( index, Math.min( max_length + index,
- text.length() ) );
- int space_index = str.lastIndexOf( " " );
-
- if( index + str.length() < text.length() &&
- text.charAt( index + str.length() - 1 ) != ' ' &&
- text.charAt( index + str.length() ) != ' ' &&
- space_index != -1 )
- {
- return_text.addElement( str.substring( 0, space_index ) );
- index += space_index + 1;
- }
- else
- {
- return_text.addElement( str.trim() );
- index += str.length();
- }
- }
-
- return_str = new String[return_text.size()];
-
- for( index = 0; index < return_text.size(); index++ )
- {
- return_str[index] = (String)(return_text.elementAt(index));
- }
-
- return return_str;
- }
-
- /**
- * This method returns a string with a repeated number of characters.
- **/
- static public String repeat( char the_char, int count )
- {
- StringBuffer buf = new StringBuffer( count );
-
- for( int index = 0; index < count; index++ )
- {
- buf.append( the_char );
- }
-
- return buf.toString();
- }
-
- /**
- * This method flattens an array of arguments to a string.
- * The method respects embedded whitespace and quotes.
- * <ul>
- * <li>Any argument with embedded whitespace will be flattened out
- * with enclosing quotes. For example, the single argument
- * <u>Hello World</u>
- * will be returned as
- * <u>"Hello World"</u>.
- * <li>Any argument with quotes will be flattened out with the
- * quotes escaped. For example, the single argument
- * <u>"Happy days"</u>
- * will be returned as
- * <u>\"Happy days\"</u>.
- * </ul>
- * @param arguments The array of strings to flatten.
- * @return the flattened string.
- */
- static public String flattenArguments ( String[] arguments )
- {
- StringBuffer buf = new StringBuffer();
-
- for (int i=0; i<arguments.length; i++)
- {
- //
- // Append a separator (except the first time).
- //
- if (i > 0) buf.append(' ');
-
- //
- // Look for whitespace.
- //
- boolean whitespace = false;
- char[] chars = arguments[i].toCharArray();
- for (int j=0; !whitespace && j<chars.length; j++)
- {
- if (Character.isWhitespace(chars[j]))
- {
- whitespace = true;
- }
- }
-
- //
- // Append the argument, quoted as necessary.
- //
- if (whitespace) buf.append('"');
- for (int j=0; j<chars.length; j++)
- {
- if (chars[j] == '"') buf.append('\\');
- buf.append(chars[j]);
- }
- if (whitespace) buf.append('"');
- }
-
- return buf.toString();
- }
-
- /**
- * This method parses whitespace-delimitted filenames from
- * the given <code>input</code> stream. <b>Limitation:</b>
- * Quoted filenames or filenames with embedded whitespace
- * are not currently supported.
- * @param input The input stream.
- * @return An enumeration of filenames from the stream.
- */
- static public Enumeration parseFilenamesFromStream ( InputStream input )
- throws IOException
- {
- Vector filenames = new Vector(64,64);
- StringBuffer buffer = null;
- byte state = STATE_WS;
- int ic = input.read();
- while (ic >= 0)
- {
- char c = (char)ic;
- switch (state)
- {
- case STATE_WS:
- if (!Character.isWhitespace(c))
- {
- buffer = new StringBuffer();
- buffer.append(c);
- state = STATE_NWS;
- }
- break;
- case STATE_NWS:
- if (!Character.isWhitespace(c))
- {
- buffer.append(c);
- }
- else
- {
- String filename = buffer.toString();
- filenames.add(filename);
- buffer = null;
- state = STATE_WS;
- }
- break;
- default:
- break;
- }
- ic = input.read();
- }
- return filenames.elements();
- }
-
- private static final byte STATE_WS = 0;
- private static final byte STATE_NWS = 1;
-
-
- /**
- * Returns true is the type passed in is a primtive java type
- * @param class name String
- * @return true is primitive type
- */
- public static boolean isPrimitiveType(String typeName)
- {
-
- if (typeName.equalsIgnoreCase("boolean") ||
- typeName.equalsIgnoreCase("byte") ||
- typeName.equalsIgnoreCase("double") ||
- typeName.equalsIgnoreCase("float") ||
- typeName.equalsIgnoreCase("int") ||
- typeName.equalsIgnoreCase("long") ||
- typeName.equalsIgnoreCase("short") ||
- typeName.equalsIgnoreCase("char"))
- return true;
- return false;
-
- }
-
- /**
- * The method replace the characters that are allowed in URIs
- * and not allowed in Java class names to an underscore ('_')
- * @param URI String
- * @return valid Java class name String
- */
- public static String URI2ClassName( String uri ) {
- String className = uri;
- for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
- className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
- }
- return className;
- }
-
- private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
- private static final char UNDERSCORE = '_';
-
-
- /**
- * This returns a valid Java identifier based on the given name.
- * (follows JAX-RPC 1.0 Public Review Draft 2 recommendations)
- */
- public static String javaIdentifierFor(String localName)
- {
- StringBuffer result = new StringBuffer();
- boolean skipped = false;
- for (int i = 0, length = localName.length(); i < length; ++i)
- {
- char character = localName.charAt(i);
- if (Character.isJavaIdentifierPart(character) && !isDelimiter(character))
- {
- if (skipped && result.length() != 0)
- {
- character = Character.toUpperCase(character);
- }
- result.append(character);
- skipped = false;
- }
- else
- {
- skipped =true;
- }
- }
-
- if (!JavaConventions.validateIdentifier(result.toString()).isOK())
- {
- result.insert(0, "_");
- }
-
- return result.toString();
- }
-
- private static boolean isDelimiter(char character)
- {
- return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
deleted file mode 100644
index 9cfe27d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
+++ /dev/null
@@ -1,96 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object represents a simple or indexed property
- * as defined by the Java Bean specification. Every
- * IJavaBeanProperty is characterized by four things:
- * <ol>
- * <li>The name of the property.</li>
- * <li>Whether or not the property is indexed.</li>
- * <li>The JDT IMethod of the getter, if any.</li>
- * <li>The JDT IMethod of the setter, if any.</li>
- * </ol>
- */
-public interface IJavaBeanProperty
-{
- /**
- * Returns the name of the property.
- * @return The name of the property.
- */
- public String getName ();
-
- /**
- * Returns true if and only if the property is indexed.
- * @return True if and only if the property is indexed.
- */
- public boolean isIndexed ();
-
- /**
- * Returns the JDT IMethod of the getter.
- * For indexed properties,
- * the return type of the getter will be an array.
- * For simple properties,
- * the return type of the getter will not be an array.
- * @return The JDT IMethod of the getter,
- * or null if this is a write-only property.
- */
- public IMethod getGetter ();
-
- /**
- * Returns the JDT IMethod of the indexed getter,
- * or null if this is either not an indexed property,
- * or is an indexed property but has only the array-
- * based getter.
- * @return The JDT IMethod of the indexed getter,
- * or null if this is not an indexed property or
- * if there is no indexed getter.
- */
- public IMethod getIndexedGetter ();
-
- /**
- * Returns the JDT IMethod of the setter.
- * For indexed properties,
- * the parameter type of the setter will be an array.
- * For simple properties,
- * the parameter type of the setter will not be an array.
- * @return The JDT IMethod of the setter,
- * or null if this is a read-only property.
- */
- public IMethod getSetter ();
-
- /**
- * Returns the JDT IMethod of the indexed setter,
- * or null if this is either not an indexed property,
- * or is an indexed property but has only the array-
- * based setter.
- * @return The JDT IMethod of the indexed setter,
- * or null if this is not an indexed property or
- * if there is no indexed setter.
- */
- public IMethod getIndexedSetter ();
-
- /**
- * Returns the type within which the getter and/or setter
- * of this property is declared, or null if none.
- * @return The type within which the getter and/or setter
- * of this property is declared.
- */
- public IType getDeclaringType ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
deleted file mode 100644
index 0912c9d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
+++ /dev/null
@@ -1,129 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * A Java Web service conformance Rule tests some collection
- * of Java resources that implement, or are meant to implement,
- * a Web service against a single, concise requirement as is
- * typically defined by a specification (eg. JAX-RPC, JSR 109)
- * or a runtime (eg. Apache Axis).
- * <p>
- * Every rule must have a namespace and a unique ID under that
- * that namespace. Every rule may have a short name and a long
- * description, both of which are recommended but optional.
- * <p>
- * Every rule follows a lifecycle of initialization, analysis
- * and completion. A Java Web service rule engine will drive
- * the <code>init()</code> method to initialize the rule, then
- * drive the various <code>visit...()</code> methods as it
- * navigates some collection of JDT resources, then drive the
- * <code>getResults()</code> method to indicate analysis is done
- * and retrieve a status object with the results of the analysis.
- */
-public interface IJavaWebServiceRule
-{
- /**
- * Returns the unique identifier of the rule
- * within the namespace to which the rule belongs.
- * @return The unique identifier of the rule.
- * Valid rule identifiers must not be negative.
- */
- public int getId ();
-
- /**
- * Returns the namespace to which this rule belongs.
- * @return The namespace to which this rule belongs.
- * Never returns null.
- */
- public String getNamespace ();
-
- /**
- * Returns the translatable short name of this rule.
- * @return The translatable short name of this rule,
- * or null if the rule has no name.
- */
- public String getName ();
-
- /**
- * Returns the translatable description of this rule.
- * @return The translatable description of this rule,
- * or null if the rule has no description.
- */
- public String getDescription ();
-
- /**
- * Called by the rule engine to give this rule a chance
- * to initialize itself prior to visiting JDT objects.
- * @param engine The engine initializing this rule.
- */
- public void init ( IJavaWebServiceRuleEngine engine );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java class (ie. primitive types are excluded).
- * @param jdtClass The class to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java class found on the throws clause of a method.
- * @param jdtClass The exception class to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitException ( IType jdtClass, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a field belonging to a class.
- * @param jdtField The field to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitField ( IField jdtField, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java Bean property (ie. represented by a "get" and/or
- * "set" method) beloning to a class.
- * @param beanProperty The property to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit a method.
- * @param jdtMethod The method to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail );
-
- /**
- * Called by the rule engine after all JDT objects have
- * been visited so that the rule can return a status
- * object (usually a multi-status) with a summary of
- * any violations by JDT objects detected by this rule.
- * @return The results of the rule's analysis.
- */
- public IStatus getResults ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
deleted file mode 100644
index 23ef0b6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
+++ /dev/null
@@ -1,56 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is an engine that walks a JDT model and runs rules.
- */
-public interface IJavaWebServiceRuleEngine
-{
- /**
- * Analyzes the given class in the context of the given
- * project for compliance to a set of JAX-RPC rules.
- * @param project The project context of the analysis.
- * @param rootClass The IType of the class to analyze.
- * @param rules The rules to use for the analysis.
- * @return An IStatus summarizing the results of the analysis.
- */
- public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules );
-
- /**
- * Returns the JDTResolver in use by this analyzer.
- * The JDTResolver is guaranteed not to be null only
- * after the analyze method has been invoked and before
- * the first rule is visited. This method is intended
- * for use by implementations of IJavaWebServiceRule.
- * @return The JDTResolver in use by this analyzer.
- */
- public JDTResolver getJDTResolver ();
-
- /**
- * Returns the progress monitor in use by this analyzer,
- * or null if no progress monitor is in use.
- * This method is intended for use by implementations
- * of IJavaWebServiceRule.
- * @return The progress monitor in use by this analyzer,
- * or null for none.
- */
- public IProgressMonitor getProgressMonitor ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
deleted file mode 100644
index 115efb7..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
+++ /dev/null
@@ -1,214 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060607 145604 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.rules.JAXRPCRuleSetFactory;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This class provides convenience methods for analyzing
- * compliance of Java service classes and value types to
- * the JAX-RPC 1.1 specification. Typical usage of this
- * class:
- * <code>
- * IType type = JAXRPCWebServiceAnalyzer.asType(myJavaFileResource);
- * JavaWebServiceRuleSet rules = JAXRPCWebServiceAnalyzer.getRuleSet();
- * JAXRPCWebServiceAnalyzer.getRuleEngine().analyze(type,rules,myProgressMonitor);
- * </code>
- * @author cbrealey
- */
-public class JAXRPCWebServiceAnalyzer
-{
- private JavaWebServiceRuleSet ruleSet_;
-
- /**
- * Constructs a new JAX-RPC Web service analyzer,
- * a convenience class wrapped around a
- * JAXRPCWebServiceAnalyzer.
- */
- public JAXRPCWebServiceAnalyzer ()
- {
- ruleSet_ = JAXRPCRuleSetFactory.newRuleSet();
- }
-
- /**
- * Returns the set of rules in use, the contents of
- * which can be manipulated and will be respected by
- * this analyzer. In other words, this method returns a
- * reference to, not a copy of, the set of rules in use.
- * @return The set of rules in use by the analyzer.
- */
- public JavaWebServiceRuleSet getRuleSet ()
- {
- return ruleSet_;
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * JDT type for compliance to the JAX-RPC for compliance to
- * the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, IType rootClass, IProgressMonitor monitor )
- {
- IJavaWebServiceRuleEngine engine = new JAXRPCWebServiceRuleEngine(monitor);
- return engine.analyze(project,rootClass,ruleSet_);
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * JDT type for compliance to the JAX-RPC for compliance to
- * the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The fully qualified name of the
- * Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, String rootClass, IProgressMonitor monitor )
- {
- try
- {
- IType rootType = asType(rootClass,project);
- if (rootType == null)
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass,project.getName());
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
- }
- return analyze(project,rootType,monitor);
- }
- catch (JavaModelException e)
- {
- // An exception may be thrown from the call to asType(...),
- // not from the call to analyze(...). Exceptions within the
- // analyze(...) method are captured in the returned IStatus.
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
- }
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * ".java" compilation unit or ".class" file for compliance
- * to the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, IFile rootClass, IProgressMonitor monitor )
- {
- try
- {
- IType rootType = asType(rootClass);
- if (rootType == null)
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass.getFullPath().toString(),project.getName());
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
- }
- return analyze(project,rootType,monitor);
- }
- catch (JavaModelException e)
- {
- // An exception may be thrown from the call to asType(...),
- // not from the call to analyze(...). Exceptions within the
- // analyze(...) method are captured in the returned IStatus.
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
- }
- }
-
- /**
- * Returns the Java type represented by the given file,
- * or null if no such type can be clearly determined.
- * @param file The file whose type to infer, usually a
- * ".java" or ".class" file. For ".java" files, this
- * method will return the primary type.
- * @return The inferred JDT Java type.
- * @throws JavaModelException If the given file could not
- * mapped to a JDT IType.
- */
- private static IType asType ( String qname, IProject project )
- throws JavaModelException
- {
- IType type = null;
- IJavaElement javaElement = JavaCore.create(project);
- if (javaElement instanceof IJavaProject)
- {
- IJavaProject javaProject = (IJavaProject)javaElement;
- type = javaProject.findType(qname);
- }
- return type;
- }
- /**
- * Returns the Java type represented by the given file,
- * or null if no such type can be clearly determined.
- * @param file The file whose type to infer, usually a
- * ".java" or ".class" file. For ".java" files, this
- * method will return the primary type.
- * @return The inferred JDT Java type.
- * @throws JavaModelException If the given file could not
- * mapped to a JDT IType.
- */
- private static IType asType ( IFile file )
- throws JavaModelException
- {
- IType type = null;
- IJavaElement javaElement = JavaCore.create(file);
- if (javaElement instanceof ICompilationUnit)
- {
- ICompilationUnit compilationUnit = (ICompilationUnit)javaElement;
- type = compilationUnit.findPrimaryType();
- }
- else if (javaElement instanceof IClassFile)
- {
- IClassFile classFile = (IClassFile)javaElement;
- type = classFile.getType();
- }
- return type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
deleted file mode 100644
index 33597f0..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
+++ /dev/null
@@ -1,278 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 149411 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author cbrealey
- * This engine navigated JDT classes according to a JAX-RPC
- * interpretation. The root class is considered to be a
- * candidate JAX-RPC service class, and any non-standard
- * or non-primitive types used by the methods of the service
- * class are considered to be candidates for JAX-RPC value
- * type classes.
- */
-public class JAXRPCWebServiceRuleEngine implements IJavaWebServiceRuleEngine
-{
- /**
- * Creates a new JAX-RPC analysis engine with the given
- * progress monitor.
- * @param progressMonitor The progress monitor for the
- * engine to use, or null if monitoring is not desired.
- */
- public JAXRPCWebServiceRuleEngine ( IProgressMonitor progressMonitor )
- {
- progressMonitor_ = progressMonitor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#analyze(org.eclipse.core.resources.IProject, org.eclipse.jdt.core.IType, org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet, org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules )
- {
- visited_ = new HashSet();
- peanutTrail_ = new Stack();
- resolver_ = new JDTResolver(project,progressMonitor_);
- IStatus status = null;
- rules.init(this);
- try
- {
- analyzeServiceClass(rootClass,rules);
- String inCaseOfFailureMessage = NLS.bind(WSPluginMessages.MSG_JAXRPC11_NOT_COMPLIANT,rootClass.getFullyQualifiedName());
- status = rules.getResults(inCaseOfFailureMessage);
- }
- catch (JavaModelException e)
- {
- status = new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal Error",e);
- }
- return status;
- }
-
- private void analyzeServiceClass ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- rules.visitClass(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- IType[] superClasses = resolver_.getSuperClasses(type);
- IMethod[] methods = resolver_.getPublicMethods(type,superClasses);
- for (int m=0; m<methods.length; m++)
- {
- analyzeMethod(methods[m],rules);
- }
- }
- finally
- {
- pop();
- }
- }
-
- private void analyzeMethod ( IMethod method, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- rules.visitMethod(method,peanutTrail_);
- push(method);
- try
- {
- IType returnType = resolver_.getReturnType(method);
- analyzeDataType(returnType,rules);
- IType[] parameterTypes = resolver_.getParameterTypes(method);
- for (int p=0; p<parameterTypes.length; p++)
- {
- analyzeDataType(parameterTypes[p],rules);
- }
- IType[] exceptionTypes = resolver_.getExceptionTypes(method);
- for (int e=0; e<exceptionTypes.length; e++)
- {
- analyzeExceptionType(exceptionTypes[e],rules);
- }
- }
- finally
- {
- pop();
- }
- }
-
- private void analyzeDataType ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
- {
- rules.visitClass(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- IType[] superClasses = resolver_.getSuperClasses(type);
- IField[] fields = resolver_.getPublicFields(type,superClasses);
- for (int f=0; f<fields.length; f++)
- {
- analyzeField(fields[f],rules);
- }
- IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
- for (int p=0; p<properties.length; p++)
- {
- analyzeProperty(properties[p],rules);
- }
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeField ( IField field, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (field != null)
- {
- rules.visitField(field,peanutTrail_);
- push(field);
- try
- {
- //TODO: Get qualified name of the field type
- //and determine if we need to build an IType
- //for it and analyze it.
- IType type = resolver_.getFieldType(field);
- analyzeDataType(type,rules);
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeProperty ( IJavaBeanProperty property, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (property != null)
- {
- rules.visitProperty(property,peanutTrail_);
- push(property);
- try
- {
- IType type = resolver_.getPropertyType(property);
- analyzeDataType(type,rules);
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeExceptionType ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
- {
- rules.visitException(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- // We trust java.lang.Exception/Throwable as superclasses
- // for service specific exception classes, therefore we do
- // not try to analyze their properties (some of which would
- // otherwise violate JAX-RPC's rules anyways).
- IType[] superClasses = resolver_.getSuperClasses(type,"java.lang.Exception");
- IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
- for (int p=0; p<properties.length; p++)
- {
- analyzeProperty(properties[p],rules);
- }
- }
- finally
- {
- pop();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getJDTResolver()
- */
- public JDTResolver getJDTResolver ()
- {
- return resolver_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getProgressMonitor()
- */
- public IProgressMonitor getProgressMonitor ()
- {
- return progressMonitor_;
- }
-
- /*
- * Pushes a peanut onto the peanut trail.
- */
- private void push ( Object peanut )
- {
- peanutTrail_.push(peanut);
- }
-
- /*
- * Pops a peanut off the peanut trail.
- */
- private void pop ()
- {
- peanutTrail_.pop();
- }
-
- /*
- * The JDTResolver used by this analyzer.
- */
- private JDTResolver resolver_;
-
- /*
- * The progress monitor used by this analyzer.
- */
- private IProgressMonitor progressMonitor_;
-
- /*
- * This set keeps track of the fully qualified names of
- * classes we have visited so that we don't visit the same
- * service class, value type or exception class more than once.
- */
- private Set visited_;
-
- /*
- * This stack keeps a trail of JDT objects back to the
- * service class we began with. This can be useful to
- * visitors that need to inspect the JDT elements that
- * enclose the currently visited element.
- */
- private Stack peanutTrail_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
deleted file mode 100644
index bdc5748..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
+++ /dev/null
@@ -1,883 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 149411 cbrealey@ca.ibm.com - Chris Brealey
- * 20070102 196371 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * @author cbrealey
- * A JDTResolver provides several convenience methods for
- * navigating references between Java classes, methods,
- * fields and properties. A JDTResolver is constructed
- * for a Java project whose effective classpath will
- * govern the scope of search operations performed by the
- * JDTResolver whenever it needs to convert a signature
- * into a JDT IType object.
- */
-public class JDTResolver
-{
- /**
- * Creates a new JDTResolver for the given project.
- * @param project The project providing the context
- * @param monitor The progress monitor for this resolver
- * to use, or null if progress monitoring is not desired.
- * within which this resolver will search for classes.
- */
- public JDTResolver ( IProject project, IProgressMonitor monitor )
- {
- javaProject_ = JavaCore.create(project);
- monitor_ = monitor;
- }
-
- /**
- * Returns true if and only if the given JDT IType is an interface.
- * @param jdtType The type to analyze.
- * @return True if and only if the given JDT IType is an interface.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isInterface ( IType jdtType )
- throws JavaModelException
- {
- return jdtType.isInterface();
- }
-
- /**
- * Returns true if and only if the given JDT IType is an abstract class.
- * @param jdtType The type to analyze.
- * @return True if and only if the given JDT IType is an abstract class.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isAbstract ( IType jdtType )
- throws JavaModelException
- {
- return Flags.isAbstract(jdtType.getFlags());
- }
-
- /**
- * Returns true if and only if instances of the given JDT IType
- * can be instantiated via a public default constructor. The class
- * must have an explicit public default constructor, or have no
- * explicit constructors at all to meet this criteria.
- * @param jdtType The type to analyze.
- * @return True if and only if instances of the type are
- * public default constructable.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isConstructable ( IType jdtType )
- throws JavaModelException
- {
- IMethod[] methods = jdtType.getMethods();
- int numberOfConstructors = 0;
- for (int m=0; m<methods.length; m++)
- {
- if (methods[m].isConstructor())
- {
- numberOfConstructors++;
- if (methods[m].getNumberOfParameters() == 0 && Flags.isPublic(methods[m].getFlags()))
- {
- return true;
- }
- }
- }
- return numberOfConstructors == 0;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a type from the standard JDK, that is,
- * if the given type name belongs under the "java" or
- * "javax" packages.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a non-primitive,
- * Java standard type.
- */
- public boolean isStandardType ( String typeName )
- {
- return typeName.startsWith("java.") || typeName.startsWith("javax.");
- }
-
- /**
- * Returns true if and only if the given type name is a
- * Java primitive type.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java primitive type.
- */
- public boolean isPrimitiveType ( String typeName )
- {
- for (int i=0; i<primitiveTypes_.length; i++)
- {
- if (primitiveTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a Java wrapper type.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java wrapper type.
- */
- public boolean isWrapperType ( String typeName )
- {
- for (int i=0; i<wrapperTypes_.length; i++)
- {
- if (wrapperTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a Java primitive or standard type supported
- * by the JAX-RPC specification.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java wrapper type.
- */
- public boolean isJAXRPCStandardType ( String typeName )
- {
- for (int i=0; i<jaxrpcTypes_.length; i++)
- {
- if (jaxrpcTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- if (isWrapperType(typeName) && !"java.lang.Character".equals(typeName))
- {
- return true;
- }
- if (isPrimitiveType(typeName) && !"char".equals(typeName))
- {
- return true;
- }
- return false;
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the public fields belonging to the given type
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public field types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IField[] getPublicFields ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- List fieldsList = new LinkedList();
- harvestPublicFields(jdtType,fieldsList);
- if (jdtSuperClasses != null)
- {
- for (int t=0; t<jdtSuperClasses.length; t++)
- {
- harvestPublicFields(jdtSuperClasses[t],fieldsList);
- }
- }
- return (IField[])fieldsList.toArray(new IField[0]);
- }
-
- /**
- * Returns an array of zero or more JDT IMethod objects
- * for the public methods belonging to the given type.
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public methods.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IMethod[] getPublicMethods ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- List methodsList = new LinkedList();
- harvestPublicMethods(jdtType,methodsList);
- if (jdtSuperClasses != null)
- {
- for (int t=0; t<jdtSuperClasses.length; t++)
- {
- harvestPublicMethods(jdtSuperClasses[t],methodsList);
- }
- }
- return (IMethod[])methodsList.toArray(new IMethod[0]);
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the public properties (getters and/or setters)
- * belonging to the given type.
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public property types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IJavaBeanProperty[] getPublicProperties ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- IMethod[] methods = getPublicMethods(jdtType,jdtSuperClasses);
- Map properties = new HashMap();
- for (int m=0; m<methods.length; m++)
- {
- String name = getGetterName(methods[m]);
- if (name != null)
- {
- JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
- if (property == null)
- {
- property = new JavaBeanProperty();
- property.setName(name);
- properties.put(name,property);
- }
- property.setGetter(methods[m]);
- }
- else
- {
- name = getSetterName(methods[m]);
- if (name != null)
- {
- JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
- if (property == null)
- {
- property = new JavaBeanProperty();
- property.setName(name);
- properties.put(name,property);
- }
- property.setSetter(methods[m]);
- }
- }
- }
- return (IJavaBeanProperty[])properties.values().toArray(new JavaBeanProperty[0]);
- }
-
- /**
- * Returns the JDT IType object for the given field.
- * @param jdtField The field to analyze.
- * @return The field type.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given field to satisfy this request.
- */
- public IType getFieldType ( IField jdtField )
- throws JavaModelException
- {
- IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtField.getTypeSignature();
- String typeName = getTypeNameFromSignature(signature);
- return findType(typeName,ancestor);
- }
-
- /**
- * Returns the type name for the given field.
- * @param jdtField The field to analyze.
- * @return The field type name.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given field to satisfy this request.
- */
- public String getFieldTypeName ( IField jdtField )
- throws JavaModelException
- {
- IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtField.getTypeSignature();
- String typeName = getTypeNameFromSignature(signature);
- return resolveType(typeName,ancestor);
- }
-
- /**
- * Returns the JDT IType object for the given bean property.
- * @param javaBeanProperty The bean property to analyze.
- * @return The property type.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given bean property to satisfy this request.
- */
- public IType getPropertyType ( IJavaBeanProperty javaBeanProperty )
- throws JavaModelException
- {
- IMethod method = javaBeanProperty.getGetter();
- if (method != null)
- {
- return getReturnType(method);
- }
- else
- {
- method = javaBeanProperty.getSetter();
- if (method != null)
- {
- IType[] parameters = getParameterTypes(method);
- if (parameters.length > 0)
- {
- //
- // It's the last parameter's type we want,
- // for indexed or non-indexed setters.
- //
- return parameters[parameters.length-1];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the type name for the given bean property.
- * @param javaBeanProperty The bean property to analyze.
- * @return The property type name.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given bean property to satisfy this request.
- */
- public String getPropertyTypeName ( IJavaBeanProperty javaBeanProperty )
- throws JavaModelException
- {
- IMethod method = javaBeanProperty.getGetter();
- if (method != null)
- {
- return getReturnTypeName(method);
- }
- else
- {
- method = javaBeanProperty.getSetter();
- if (method != null)
- {
- String[] parameterTypeNames = getParameterTypeNames(method);
- if (parameterTypeNames.length > 0)
- {
- return parameterTypeNames[0];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the JDT IType object for the return type
- * of the given method, or null if the method is void.
- * @param jdtMethod The method to analyze.
- * @return The method return type, or null if none.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType getReturnType ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtMethod.getReturnType();
- String typeName = getTypeNameFromSignature(signature);
- return findType(typeName,ancestor);
- }
-
- /**
- * Returns the type name for the return type
- * of the given method, or null if the method is void.
- * @param jdtMethod The method to analyze.
- * @return The method return type name, or null if none.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String getReturnTypeName ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtMethod.getReturnType();
- String typeName = getTypeNameFromSignature(signature);
- return resolveType(typeName,ancestor);
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the parameters of the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more parameter types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType[] getParameterTypes ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getParameterTypes();
- IType[] types = new IType[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- types[s] = findType(typeName,ancestor);
- }
- return types;
- }
-
- /**
- * Returns an array of zero or more type names
- * for the parameters of the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more parameter type names.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String[] getParameterTypeNames ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getParameterTypes();
- String[] typeNames = new String[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- typeNames[s] = resolveType(typeName,ancestor);
- }
- return typeNames;
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the exceptions thrown by the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more exception types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType[] getExceptionTypes ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getExceptionTypes();
- IType[] types = new IType[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- types[s] = findType(typeName,ancestor);
- }
- return types;
- }
-
- /**
- * Returns an array of zero or more type names
- * for the exceptions thrown by the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more exception type names.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String[] getExceptionTypeNames ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getExceptionTypes();
- String[] typeNames = new String[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- typeNames[s] = resolveType(typeName,ancestor);
- }
- return typeNames;
- }
-
- /**
- * Returns an array of zero or more types representing
- * the superclasses, if any, of the given IType in bottom-up
- * order excluding java.lang.Object.
- * @param jdtType The type to analyze.
- * @return An array of zero or more superclass types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public IType[] getSuperClasses ( IType jdtType )
- throws JavaModelException
- {
- return getSuperClasses(jdtType,"java.lang.Object");
- }
-
- /**
- * Returns an array of zero or more types representing
- * the superclasses, if any, of the given IType.
- * Under normal circumstances, java.lang.Object is included.
- * @param jdtType The type to analyze.
- * @param stopClassName The name of a stop class used to limit
- * the superclasses returned to the caller. If the stop class
- * is null or names a class not found in the hierarchy, all
- * superclasses are returned. Otherwise, only superclasses up
- * to but excluding the stop class are returned.
- * @return An array of zero or more superclass types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public IType[] getSuperClasses ( IType jdtType, String stopClassName )
- throws JavaModelException
- {
- ITypeHierarchy hierarchy = jdtType.newSupertypeHierarchy(monitor_);
- IType[] allSuperClasses = hierarchy.getAllSuperclasses(jdtType);
- List superClasses = new LinkedList();
- for (int i=0; i<allSuperClasses.length; i++)
- {
- if (allSuperClasses[i].getFullyQualifiedName().equals(stopClassName))
- break;
- superClasses.add(allSuperClasses[i]);
- }
- return (IType[])superClasses.toArray(new IType[0]);
- }
-
- /**
- * Extracts the qualified type name from a JDT signature.
- * @param signature The signature to examine.
- * @return The qualified type name from the signature.
- */
- public String getTypeNameFromSignature ( String signature )
- {
-
- String packageName = Signature.getSignatureQualifier(signature);
- String baseName = Signature.getSignatureSimpleName(signature);
- if (baseName.endsWith("[]")){
- baseName = baseName.substring(0, baseName.indexOf("["));
- }
-
- String typeName = (packageName.trim().equals("")?"":packageName+".") + baseName;
- return typeName;
- }
-
- /**
- * Attempts to resolve an unresolved type name in the
- * context of the given ancestor type (ie. the type
- * acting as the context within which the type name
- * should be resolved).
- * @param typeName The qualified name of the type to find.
- * @param ancestor The type providing the context within
- * which to look up the type.
- * @return The qualified name, or the original type name
- * if it could not be resolved.
- */
- public String resolveType ( String typeName, IType ancestor )
- throws JavaModelException
- {
- if (ancestor != null)
- {
- String[][] matches = ancestor.resolveType(typeName);
- if (matches != null && matches.length > 0)
- {
- StringBuffer qname = new StringBuffer();
- int n = matches[0].length;
- for (int j=0; j<n-1; j++)
- {
- qname.append(matches[0][j]).append(".");
- }
- if (n >= 0)
- {
- qname.append(matches[0][n-1]);
- }
- return qname.toString();
- }
- }
- return typeName;
- }
-
- /**
- * Attempts to find a JDT IType object for the given
- * resolved or unresolved type name in the context of
- * the given ancestor type (ie. the type acting as the
- * context within which the type name should be resolved).
- * @param typeName The qualified name of the type to find.
- * @param ancestor The type providing the context within
- * which to look up the type.
- * @return The IType object of the given qualified name,
- * or null if no type could be found in the workspace.
- */
- public IType findType ( String typeName, IType ancestor )
- throws JavaModelException
- {
- IType type = javaProject_.findType(typeName);
- if (type == null && ancestor != null)
- {
- String[][] matches = ancestor.resolveType(typeName);
- if (matches != null)
- {
- int i=0;
- while (type == null && i<matches.length)
- {
- StringBuffer qname = new StringBuffer();
- int n = matches[i].length;
- for (int j=0; j<n-1; j++)
- {
- qname.append(matches[i][j]).append(".");
- }
- if (n >= 0)
- {
- qname.append(matches[i][n-1]);
- }
- type = javaProject_.findType(qname.toString());
- i++;
- }
- }
- }
- return type;
- }
-
- /**
- * Finds all public, non-constructor IMethods belonging
- * to the given IType and adds them to the given list.
- * @param jdtType The type whose methods are to be harvested.
- * @param list The list to which the harvested methods will be added.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public void harvestPublicMethods ( IType jdtType, List list )
- throws JavaModelException
- {
- IMethod[] methods = jdtType.getMethods();
- for (int m=0; m<methods.length; m++)
- {
- if (!methods[m].isConstructor() && Flags.isPublic(methods[m].getFlags()))
- {
- list.add(methods[m]);
- }
- }
- }
-
- /**
- * Finds all public IFields belonging
- * to the given IType and adds them to the given list.
- * @param jdtType The type whose fields are to be harvested.
- * @param list The list to which the harvested fields will be added.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public void harvestPublicFields ( IType jdtType, List list )
- throws JavaModelException
- {
- IField[] fields = jdtType.getFields();
- for (int f=0; f<fields.length; f++)
- {
- if (Flags.isPublic(fields[f].getFlags()))
- {
- list.add(fields[f]);
- }
- }
- }
-
- /**
- * If the given method is a getter according to the Bean spec
- * (eg. "MyType getMyProperty ()" or "boolean isMyProperty ()")
- * return the corresponding bean property name (eg. "myProperty"),
- * otherwise, return null.
- * @param method The method to check.
- * @return The property name or none if the method is not a getter.
- */
- public String getGetterName ( IMethod method )
- {
- try
- {
- String methodName = method.getElementName();
- if (methodName.startsWith("get") && methodName.length() > 3)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // Getters must not be void.
- //
- if (returnTypeName != null && returnTypeName != Signature.SIG_VOID)
- {
- String[] parameterSignatures = method.getParameterTypes();
- //
- // Non-indexed getters must have zero parameters.
- //
- if (parameterSignatures.length == 0)
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- //
- // Indexed getters must have exactly one parameter of type "int".
- //
- else if (parameterSignatures.length == 1)
- {
- String indexTypeName = getTypeNameFromSignature(parameterSignatures[0]);
- if (indexTypeName.equals("int"))
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- }
- }
- }
- else if (methodName.startsWith("is") && methodName.length() > 2)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // "is" getters must be boolean.
- //
- if (Signature.SIG_BOOLEAN.equals(returnTypeName))
- {
- //
- // "is" getters must have no parameters.
- //
- if (method.getParameterTypes().length == 0)
- {
- return methodName.substring(2,3).toLowerCase() + methodName.substring(3);
- }
- }
- }
- }
- catch (JavaModelException e)
- {
- return null;
- }
- return null;
- }
-
- /**
- * If the given method is a setter according to the Bean spec
- * (eg. "void setMyProperty (MyType)" return the corresponding
- * bean property name (eg. "myProperty"), otherwise, return null.
- * @param method The method to check.
- * @return The property name or none if the method is not a setter.
- */
- public String getSetterName ( IMethod method )
- {
- try
- {
- String methodName = method.getElementName();
- if (methodName.startsWith("set") && methodName.length() > 3)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // Setters must be void.
- //
- if (Signature.SIG_VOID.equals(returnTypeName))
- {
- String[] parameterSignatures = method.getParameterTypes();
- //
- // Non-indexed setters must have exactly one parameter.
- //
- if (parameterSignatures.length == 1)
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- //
- // Indexed setters must have exactly two parameters,
- // the first of which must be "int".
- //
- else if (parameterSignatures.length == 2)
- {
- if (Signature.SIG_INT.equals(parameterSignatures[0]))
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- }
- }
- }
- }
- catch (JavaModelException e)
- {
- return null;
- }
- return null;
- }
-
- /*
- * The Java project that governs the search scope for this resolver.
- */
- private IJavaProject javaProject_;
-
- /*
- * The progress monitor to use, if any.
- */
- private IProgressMonitor monitor_;
-
- /*
- * The set of Java wrapper types.
- */
- private static String[] wrapperTypes_ = {
- "java.lang.Character",
- "java.lang.Boolean",
- "java.lang.Byte",
- "java.lang.Short",
- "java.lang.Integer",
- "java.lang.Long",
- "java.lang.Float",
- "java.lang.Double"
- };
-
- /*
- * The set of Java primitive types.
- */
- private static String[] primitiveTypes_ = {
- "char",
- "boolean",
- "byte",
- "short",
- "int",
- "long",
- "float",
- "double"
- };
-
- /*
- * The set of JAX-RPC supported Java standard types,
- * excluding primitives and wrapper types.
- */
- private static String[] jaxrpcTypes_ = {
- "boolean",
- "byte",
- "short",
- "int",
- "long",
- "float",
- "double",
- "java.lang.String",
- "java.lang.Boolean",
- "java.lang.Byte",
- "java.lang.Short",
- "java.lang.Integer",
- "java.lang.Long",
- "java.lang.Float",
- "java.lang.Double",
- "java.util.Date",
- "java.util.Calendar",
- "java.math.BigInteger",
- "java.math.BigDecimal",
- "java.net.URI",
- "javax.xml.namespace.QName"
- };
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
deleted file mode 100644
index 529d552..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
+++ /dev/null
@@ -1,147 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is a garden variety implementation of IJavaBeanProperty,
- * constructable by default and equipped with getters and setters
- * for the properties of IJavaBeanProperty.
- */
-public class JavaBeanProperty implements IJavaBeanProperty
-{
- private String name_;
- private boolean indexed_;
- private IMethod getter_;
- private IMethod setter_;
- private IMethod indexedGetter_;
- private IMethod indexedSetter_;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getName()
- */
- public String getName ()
- {
- return name_;
- }
-
- /**
- * Sets the "name" property of this Java Bean Property descriptor.
- * @param name The string value to set.
- */
- public void setName ( String name )
- {
- name_ = name;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#isIndexed()
- */
- public boolean isIndexed ()
- {
- return indexed_;
- }
-
- /**
- * Sets the "indexed" property of this Java Bean Property descriptor.
- * @param indexed The boolean value to set.
- */
- public void setIndexed ( boolean indexed )
- {
- indexed_ = indexed;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getGetter()
- */
- public IMethod getGetter ()
- {
- return getter_;
- }
-
- /**
- * Sets the "getter" property of this Java Bean Property descriptor.
- * @param getter The IMethod to set.
- */
- public void setGetter ( IMethod getter )
- {
- getter_ = getter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getSetter()
- */
- public IMethod getSetter ()
- {
- return setter_;
- }
-
- /**
- * Sets the "setter" property of this Java Bean Property descriptor.
- * @param setter The IMethod to set.
- */
- public void setSetter ( IMethod setter )
- {
- setter_ = setter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedGetter()
- */
- public IMethod getIndexedGetter ()
- {
- return indexedGetter_;
- }
-
- /**
- * Sets the "indexedGetter" property of this Java Bean Property descriptor.
- * @param indexedGetter The IMethod to set.
- */
- public void setIndexedGetter ( IMethod indexedGetter )
- {
- indexedGetter_ = indexedGetter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedSetter()
- */
- public IMethod getIndexedSetter ()
- {
- return indexedSetter_;
- }
-
- /**
- * Sets the "indexedSetter" property of this Java Bean Property descriptor.
- * @param indexedSetter The IMethod to set.
- */
- public void setIndexedSetter ( IMethod indexedSetter )
- {
- indexedSetter_ = indexedSetter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getDeclaringType()
- */
- public IType getDeclaringType ()
- {
- IMethod method = getGetter();
- if (method == null) method = getSetter();
- if (method == null) method = getIndexedGetter();
- if (method == null) method = getIndexedSetter();
- return method != null ? method.getDeclaringType() : null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
deleted file mode 100644
index 39ffa31..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
+++ /dev/null
@@ -1,143 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * A basic default implementation of IJavaWebServiceRule.
- */
-public class JavaWebServiceRule implements IJavaWebServiceRule
-{
- protected IJavaWebServiceRuleEngine engine_;
- protected List statusList_;
- protected int id_;
- protected String namespace_;
- protected String name_;
- protected String description_;
-
- protected JavaWebServiceRule ()
- {
- // Not publicly constructable.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getId()
- */
- public int getId ()
- {
- return id_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getNamespace()
- */
- public String getNamespace ()
- {
- return namespace_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getName()
- */
- public String getName ()
- {
- return name_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getDescription()
- */
- public String getDescription ()
- {
- return description_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#init()
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- engine_ = engine;
- statusList_ = new LinkedList();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitException(org.eclipse.jdt.core.IField, java.util.Stack)
- */
- public void visitException ( IType jdtClass, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitField(org.eclipse.jdt.core.IField, java.util.Stack)
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitProperty(org.eclipse.jdt.core.IMethod, org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getResults()
- */
- public IStatus getResults ()
- {
- IStatus status = null;
- if (statusList_.size() == 0)
- {
- status = new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
- }
- else
- {
- MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,"",null);
- Iterator i = statusList_.iterator();
- while (i.hasNext())
- {
- multiStatus.add((IStatus)i.next());
- }
- status = multiStatus;
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
deleted file mode 100644
index f487714..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
+++ /dev/null
@@ -1,285 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object manages a set of rules.
- * Rules in the set may be enabled or disabled.
- */
-public class JavaWebServiceRuleSet
-{
- private Set enabledRules_ = new HashSet();
- private Set disabledRules_ = new HashSet();
-
- /**
- * Creates a new, initially empty set of rules.
- */
- public JavaWebServiceRuleSet ()
- {
- // Nothing to do.
- }
-
- /**
- * Creates a new set of rules initialized with those
- * from the given array of <code>rules</code>.
- * @param rules An array of rules to add.
- */
- public JavaWebServiceRuleSet ( IJavaWebServiceRule[] rules )
- {
- addRules(rules);
- }
-
- /**
- * Adds a <code>rule</code> to the set.
- * Rules added to the set are initially enabled.
- * @param rule The rule to add.
- */
- public void addRule ( IJavaWebServiceRule rule )
- {
- enabledRules_.add(rule);
- }
-
- /**
- * Adds several <code>rules</code> to the set.
- * Rules added to the set are initially enabled.
- * @param rules The array of rules to add.
- */
- public void addRules ( IJavaWebServiceRule[] rules )
- {
- enabledRules_.addAll(Arrays.asList(rules));
- }
-
- /**
- * Marks the given <code>rule</code> as disabled or enabled.
- * This method has no effect if the rule is not already in
- * the set, in other words, this method will not have the
- * side effect of adding a rule to the set.
- * @param rule The rule to disable or enable.
- * @param disabled True to disable the rule or false to enable it.
- * @return True if a change in status was actually made.
- */
- public boolean setRuleDisabled ( IJavaWebServiceRule rule, boolean disabled )
- {
- if (disabled)
- {
- if (enabledRules_.remove(rule))
- {
- disabledRules_.add(rule);
- return true;
- }
- }
- else
- {
- if (disabledRules_.remove(rule))
- {
- enabledRules_.add(rule);
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the number of rules in the set.
- * @return The number of rules in the set.
- */
- public int size ()
- {
- return enabledRules_.size() + disabledRules_.size();
- }
-
- /**
- * Returns the number of enabled rules in the set.
- * @return The number of enabled rules in the set.
- */
- public int numberEnabled ()
- {
- return enabledRules_.size();
- }
-
- /**
- * Returns the number of disabled rules in the set.
- * @return The number of disabled rules in the set.
- */
- public int numberDisabled ()
- {
- return disabledRules_.size();
- }
-
- /**
- * Returns an array of all currently enabled rules from the set.
- * @return An array of all currently enabled rules from the set.
- */
- public IJavaWebServiceRule[] getEnabledRules ()
- {
- return (IJavaWebServiceRule[])enabledRules_.toArray(new IJavaWebServiceRule[0]);
- }
-
- /**
- * Returns an array of all currently disabled rules from the set.
- * @return An array of all currently disabled rules from the set.
- */
- public IJavaWebServiceRule[] getDisabledRules ()
- {
- return (IJavaWebServiceRule[])disabledRules_.toArray(new IJavaWebServiceRule[0]);
- }
-
- /**
- * Initializes all rules in the set by calling
- * their init() methods with the given engine.
- * @param engine The engine initializing
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.init(engine);
- }
- }
-
- /**
- * Visits the "visitClass" method of all rules in the set.
- * @param jdtClass The JDT IType being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitClass(jdtClass,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitException" method of all rules in the set.
- * @param jdtClass The JDT IType being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitException ( IType jdtClass, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitException(jdtClass,peanutTrail);
- }
- }
-
-
- /**
- * Visits the "visitField" method of all rules in the set.
- * @param jdtClass The JDT IField being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitField(jdtField,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitProperty" method of all rules in the set.
- * @param jdtClass The IJavaBeanProperty being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitProperty(beanProperty,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitMethod" method of all rules in the set.
- * @param jdtClass The JDT IMethod being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitMethod(jdtMethod,peanutTrail);
- }
- }
-
- /**
- * Collects the results of all rules in the set together.
- * If one or more warnings or errors are found, returns
- * a status object whose top level message is the root
- * message passed to this message, otherwise, returns a
- * basic "OK" status.
- * @param rootMessage The warning/error message to act as
- * the root message if necessary (ie. if at least one rule
- * in the set reported at least one warning/error).
- * @return The collective status.
- */
- public IStatus getResults ( String rootMessage )
- {
- List list = new LinkedList();
- Iterator e = enabledRules_.iterator();
- while (e.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)e.next();
- IStatus status = rule.getResults();
- if (!status.isOK())
- {
- list.add(status);
- }
- }
- if (list.size() > 0)
- {
- MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,rootMessage,null);
- Iterator l = list.iterator();
- while (l.hasNext())
- {
- IStatus status = (IStatus)l.next();
- multiStatus.addAll(status);
- }
- return multiStatus;
- }
- else
- {
- return new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
deleted file mode 100644
index 1441079..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
+++ /dev/null
@@ -1,68 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a service class
- * is public default constructable.
- */
-public class JAXRPCRule0001 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0001 ()
- {
- id_ = 1;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- // An empty peanut trail implies this is the root
- // class or JAX-RPC service class.
- if (peanutTrail.size() == 0)
- {
- try
- {
- JDTResolver resolver = engine_.getJDTResolver();
- if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0001,jdtClass.getFullyQualifiedName());
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- catch (JavaModelException e)
- {
- statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
deleted file mode 100644
index 7049c33..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
+++ /dev/null
@@ -1,82 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a value type class
- * is public default constructable.
- */
-public class JAXRPCRule0002 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0002 ()
- {
- id_ = 2;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- // An empty peanut trail implies this is the root class
- // root class or JAX-RPC service class, whereas a non-empty
- // peanut trail implies this is a class from a method, field
- // or property signature. In the former case, remember the
- // qualified name of the type just in case we need it for the
- // latter case.
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- else
- {
- try
- {
- JDTResolver resolver = engine_.getJDTResolver();
- String qname = jdtClass.getFullyQualifiedName();
- if (!resolver.isStandardType(qname))
- {
- if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0002,qname,serviceClassName_);
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
deleted file mode 100644
index bc65bcd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
+++ /dev/null
@@ -1,151 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that a service class has no overloaded methods.
- */
-public class JAXRPCRule0003 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0003 ()
- {
- id_ = 3;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- methodNames_ = new HashMap();
- overloadedMethodNames_ = new HashSet();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- //
- // A peanut trail of length one implies this is a method
- // belonging to the root class, aka. JAX-RPC service class.
- //
- if (peanutTrail.size() == 1)
- {
- try
- {
- //
- // If we have encountered this method already but haven't
- // reported the overload condition, report it.
- //
- String methodName = jdtMethod.getElementName();
- String firstParameterSignature = (String)methodNames_.get(methodName);
- String thisParameterSignature = flattenedSignatureOf(jdtMethod);
- if (thisParameterSignature != null)
- {
- if (firstParameterSignature != null)
- {
- //
- // If we have encountered this method's name already,
- // but have not yet determined if it is overloaded,
- // then compare this method's parameter signature with
- // that of the "first signature" of the method name.
- // The moment we find a second signature for a given
- // method name, we have an overload condition.
- //
- if (!overloadedMethodNames_.contains(methodName) && !thisParameterSignature.equals(firstParameterSignature))
- {
- overloadedMethodNames_.add(methodName);
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0003,methodName,serviceClassName_);
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- else
- {
- //
- // If we have recorded no signature for the given method
- // name (ie. we have not encountered the method name yet),
- // then record this one. Any "first signature" will do.
- //
- methodNames_.put(methodName,thisParameterSignature);
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- /*
- * Grabs the types of the parameters of the given method
- * and flattens then into a single string sufficient to
- * distinguish between overloaded vs. overridden methods.
- */
- private String flattenedSignatureOf ( IMethod jdtMethod )
- throws JavaModelException
- {
- String[] signatures = engine_.getJDTResolver().getParameterTypeNames(jdtMethod);
- StringBuffer flattenedSignature = new StringBuffer();
- for (int s=0; s<signatures.length; s++)
- {
- flattenedSignature.append(signatures[s]).append(",");
- }
- return flattenedSignature.toString();
- }
-
- private Map methodNames_;
- private Set overloadedMethodNames_;
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
deleted file mode 100644
index c66cf7a..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
+++ /dev/null
@@ -1,121 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the methods of a service class
- * uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0005 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0005 ()
- {
- id_ = 5;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- //
- // A peanut trail of length one implies this is a method
- // belonging to the root class, aka. JAX-RPC service class.
- //
- if (peanutTrail.size() == 1)
- {
- try
- {
- String methodName = jdtMethod.getElementName();
- //
- // Check the method return type for compliance.
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String returnTypeName = resolver.getReturnTypeName(jdtMethod);
- if ((resolver.isPrimitiveType(returnTypeName) || resolver.isStandardType(returnTypeName)) && !resolver.isJAXRPCStandardType(returnTypeName))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,returnTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- //
- // Check the method parameter types for compliance.
- // Same comment as above, only applied to the method's parameters.
- //
- String[] parameterTypeNames = resolver.getParameterTypeNames(jdtMethod);
- for (int p=0; p<parameterTypeNames.length; p++)
- {
- if ((resolver.isPrimitiveType(parameterTypeNames[p]) || resolver.isStandardType(parameterTypeNames[p])) && !resolver.isJAXRPCStandardType(parameterTypeNames[p]))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,parameterTypeNames[p]});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
deleted file mode 100644
index 407afd3..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
+++ /dev/null
@@ -1,164 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the fields and properties of a
- * value type class uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0006 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0006 ()
- {
- id_ = 6;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- //
- // A peanut trail of length greater than one implies this is a
- // field belonging to a class other than the root (aka. JAX-RPC
- // service) class, namely a presumed value type class.
- //
- if (peanutTrail.size() > 1)
- {
- try
- {
- //
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String fieldTypeName = resolver.getFieldTypeName(jdtField);
- if ((resolver.isPrimitiveType(fieldTypeName) || resolver.isStandardType(fieldTypeName)) && !resolver.isJAXRPCStandardType(fieldTypeName))
- {
- //
- // The field pretty much MUST be declared in a type or
- // we would not have gotten here. Still, best to be safe.
- //
- IType valueType = jdtField.getDeclaringType();
- if (valueType != null)
- {
- String valueTypeClassName = valueType.getFullyQualifiedName();
- String fieldName = jdtField.getElementName();
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {fieldName,valueTypeClassName,serviceClassName_,fieldTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitProperty(org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty, java.util.Stack)
- */
- public void visitProperty ( IJavaBeanProperty property, Stack peanutTrail )
- {
- //
- // A peanut trail of length greater than one implies this is a
- // property belonging to a class other than the root (aka. JAX-RPC
- // service) class, namely a presumed value type class.
- //
- if (peanutTrail.size() > 1)
- {
- try
- {
- //
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String propertyTypeName = resolver.getPropertyTypeName(property);
- if ((resolver.isPrimitiveType(propertyTypeName) || resolver.isStandardType(propertyTypeName)) && !resolver.isJAXRPCStandardType(propertyTypeName))
- {
- //
- // The field pretty much MUST be declared in a type or
- // we would not have gotten here. Still, best to be safe.
- //
- IType valueType = property.getDeclaringType();
- if (valueType != null)
- {
- String valueTypeClassName = valueType.getFullyQualifiedName();
- String propertyName = property.getName();
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {propertyName,valueTypeClassName,serviceClassName_,propertyTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
deleted file mode 100644
index 0f1c7a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
+++ /dev/null
@@ -1,44 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet;
-
-/**
- * A factory that produces a JavaWebServiceRuleSet
- * for the JAX-RPC 1.1 specification.
- */
-public class JAXRPCRuleSetFactory
-{
- private JAXRPCRuleSetFactory ()
- {
- // Not publicly constructable.
- }
-
- /**
- * Returns a set of rules for analyzing Java classes
- * for compliance to the rules of JAX-RPC 1.1.
- * @return A set of JAX-RPC 1.1 analysis rules.
- */
- public static JavaWebServiceRuleSet newRuleSet ()
- {
- JavaWebServiceRuleSet set = new JavaWebServiceRuleSet();
- set.addRule(new JAXRPCRule0001());
- set.addRule(new JAXRPCRule0002());
- set.addRule(new JAXRPCRule0003());
- set.addRule(new JAXRPCRule0005());
- set.addRule(new JAXRPCRule0006());
- return set;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index 412c053..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,403 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- * 20080416 227359 makandre@ca.ibm.com - Andrew Mak, Test facilities do not respect default order in plugin customization
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-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.context.PersistentContext;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
- public PersistentScenarioContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- String[] ids = defaults.getWebServiceTestIds();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0) sb.append(",");
- sb.append(ids[i]);
- }
- String nonJavaTestService = defaults.getNonJavaTestServiceDefault();
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
- setDefaultStringIfNoDefault(PREFERENCE_NON_JAVA_TEST_SERVICE, nonJavaTestService);
-
- setDefaultStringIfNoDefault(PREFERENCE_CLIENT_WEBSERVICE_TYPE, defaults.webserviceClientTypeDefault() );
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TYPE, defaults.webserviceTypeIdDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_GENERATE_PROXY, defaults.generateProxyDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, defaults.launchWebserviceExplorerDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_INSTALL_WEBSERVICE, defaults.installWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_INSTALL_CLIENT, defaults.installClientDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_START_WEBSERVICE, defaults.startWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_TEST_WEBSERVICE, defaults.testWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_MONITOR_WEBSERVICE, defaults.getMonitorWebServiceDefault());
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_SAMPLE, defaults.launchSample() );
-
- setDefaultIntIfNoDefault(PREFERENCE_GENERATE_WEBSERVICE, defaults.serviceGenerationDefault()); //jvh
- setDefaultIntIfNoDefault(PREFERENCE_GENERATE_CLIENT, defaults.clientGenerationDefault());
- }
-
- public String[] getNonJavaTestService()
- {
- WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
- String[] ids = getWebServiceTestIds();
- Vector newTestCases = new Vector();
- for (int i = 0; i < ids.length; i++)
- {
- WebServiceTestExtension wse = (WebServiceTestExtension) registry
- .getWebServiceExtensionsById(ids[i]);
- if (wse != null && wse.testWSDL())
- newTestCases.addElement(wse.getLabel());
- }
- String[] wsdlTestArray = new String[newTestCases.size()];
- Enumeration e = newTestCases.elements();
- int i = 0;
- while(e.hasMoreElements()){
- wsdlTestArray[i] = (String)e.nextElement();
- i++;
- }
-
- return wsdlTestArray;
- }
-
- public void setWebServiceTestIds(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_WEBSERVICE_TEST_TYPES, sb.toString());
- }
-
- private String[] getWebServiceTestIds(String value)
- {
- StringTokenizer st = new StringTokenizer(value, ",");
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++) {
- // 154543: we have to continue to interpret the old label style preferences
- s[i] = WebServiceTestRegistry.getInstance().labelToId(st.nextToken());
- }
- return s;
- }
-
- public String[] getWebServiceTestIds()
- {
- return getWebServiceTestIds(getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES));
- }
-
- public String[] getDefaultWebServiceTestIds()
- {
- return getWebServiceTestIds(getDefaultString(PREFERENCE_WEBSERVICE_TEST_TYPES));
- }
-
- public void setWebServiceTestTypes(String[] ids)
- {
- // 154543: deprecated, noop
- }
-
- public String[] getWebServiceTestTypes()
- {
- WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
- String[] ids = getWebServiceTestIds();
- Vector labels = new Vector();
- for (int i = 0; i < ids.length; i++)
- {
- WebServiceTestExtension wse = (WebServiceTestExtension) registry
- .getWebServiceExtensionsById(ids[i]);
- if (wse != null)
- labels.addElement(wse.getLabel());
- }
- String[] s = new String[labels.size()];
- labels.copyInto(s);
- return s;
- }
-
- public ScenarioContext copy()
- {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestIds(getWebServiceTestIds());
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setWebServiceType( getWebServiceType() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setStartWebService( getStartWebService() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return getValueAsString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- public String getClientWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return getValueAsBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- public boolean getGenerateProxyDefault()
- {
- return getDefaultBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- public boolean getLaunchWebServiceExplorerDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return getValueAsBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- public boolean getStartWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallWebService()
- {
- return getValueAsBoolean(PREFERENCE_INSTALL_WEBSERVICE);
- }
-
- public boolean getInstallWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_INSTALL_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallClient()
- {
- return getValueAsBoolean(PREFERENCE_INSTALL_CLIENT);
- }
-
- public boolean getInstallClientDefault()
- {
- return getDefaultBoolean(PREFERENCE_INSTALL_CLIENT);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return getValueAsBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- public boolean getTestWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return getValueAsString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- public String getWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- setValue( PREFERENCE_CLIENT_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- setValue( PREFERENCE_GENERATE_PROXY, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallWebService(boolean value)
- {
- setValue( PREFERENCE_INSTALL_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallClient(boolean value)
- {
- setValue( PREFERENCE_INSTALL_CLIENT, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- setValue( PREFERENCE_START_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- setValue( PREFERENCE_TEST_WEBSERVICE, value);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- setValue( PREFERENCE_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return getValueAsBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- setValue(PREFERENCE_MONITOR_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_SAMPLE, value);
- }
-
- //jvh
- public int getGenerateWebService()
- {
- return getValueAsInt(PREFERENCE_GENERATE_WEBSERVICE);
- }
-
- public int getGenerateWebServiceDefault()
- {
- return getDefaultInt(PREFERENCE_GENERATE_WEBSERVICE);
- }
-
- public void setGenerateWebService(int value)
- {
- setValue(PREFERENCE_GENERATE_WEBSERVICE, value);
- }
-
- public int getGenerateClientDefault()
- {
- return getDefaultInt(PREFERENCE_GENERATE_CLIENT);
- }
-
- public int getGenerateClient()
- {
- return getValueAsInt(PREFERENCE_GENERATE_CLIENT);
- }
-
- public void setGenerateClient(int value)
- {
- setValue(PREFERENCE_GENERATE_CLIENT, value);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
deleted file mode 100644
index 542b1ed..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.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.context;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentUDDIPreferenceContext extends PersistentContext implements UDDIPreferenceContext
-{
- public PersistentUDDIPreferenceContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- setDefault(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataColumnDelimiter());
- setDefault(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataStringDelimiter());
- }
-
- public void setUddiCatDataColumnDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataColumnDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER);
- }
-
- public void setUddiCatDataStringDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataStringDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index 517d661..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,110 +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
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface ScenarioContext
-{
- public final String PREFERENCE_WEBSERVICE_TEST_TYPES = "webServiceTestTypes";
-
- public final String PREFERENCE_NON_JAVA_TEST_SERVICE= "nonJavaTestService";
-
- public final String PREFERENCE_WEBSERVICE_TYPE = "webServiceType";
-
- public final String PREFERENCE_START_WEBSERVICE = "startWebService";
-
- public final String PREFERENCE_INSTALL_WEBSERVICE = "installWebService";
-
- public final String PREFERENCE_INSTALL_CLIENT = "installClient";
-
- public final String PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER = "launchWebServiceExplorer";
-
- public final String PREFERENCE_GENERATE_PROXY = "generateProxy";
-
- public final String PREFERENCE_CLIENT_WEBSERVICE_TYPE = "clientWebServiceType";
-
- public final String PREFERENCE_TEST_WEBSERVICE = "testWebService";
-
- public final String PREFERENCE_MONITOR_WEBSERVICE = "monitorWebService";
-
- public final String PREFERENCE_LAUNCH_SAMPLE = "launchSample";
-
- public final String PREFERENCE_GENERATE_WEBSERVICE = "generateWebService"; //jvh
- public final String PREFERENCE_GENERATE_CLIENT = "generateClient"; //jvh
-
- public final static int WS_TEST=0;
- public final static int WS_START=1;
- public final static int WS_INSTALL=2;
- public final static int WS_DEPLOY=3;
- public final static int WS_ASSEMBLE=4;
- public final static int WS_DEVELOP=5;
- public final static int WS_NONE=6;
-
- public String[] getWebServiceTestIds();
- public void setWebServiceTestIds(String[] ids);
-
- public String[] getWebServiceTestTypes();
- public void setWebServiceTestTypes(String[] testTypes);
-
- public String[] getNonJavaTestService();
-
- public String getWebServiceType();
- public String getWebServiceTypeDefault();
- public void setWebServiceType( String value );
-
- public boolean getInstallWebService();
- public boolean getInstallWebServiceDefault();
- public void setInstallWebService( boolean value );
-
- public boolean getInstallClient();
- public boolean getInstallClientDefault();
- public void setInstallClient( boolean value );
-
- public boolean getStartWebService();
- public boolean getStartWebServiceDefault();
- public void setStartWebService( boolean value );
-
- public boolean getLaunchWebServiceExplorer();
- public boolean getLaunchWebServiceExplorerDefault();
- public void setLaunchWebServiceExplorer( boolean value );
-
- public boolean getGenerateProxy();
- public boolean getGenerateProxyDefault();
- public void setGenerateProxy( boolean value );
-
- public String getClientWebServiceType();
- public String getClientWebServiceTypeDefault();
- public void setClientWebServiceType( String value );
-
- public boolean getTestWebService();
- public boolean getTestWebServiceDefault();
- public void setTestWebService( boolean value );
-
- public boolean getMonitorWebService();
- public boolean getMonitorWebServiceDefault();
- public void setMonitorWebService(boolean value);
-
- public boolean isLaunchSampleEnabled();
- public boolean getLaunchSampleEnabledDefault();
- public void setLaunchSampleEnabled( boolean value );
-
- public int getGenerateWebServiceDefault();
- public int getGenerateWebService();
- public void setGenerateWebService(int value);
-
- public int getGenerateClientDefault();
- public int getGenerateClient();
- public void setGenerateClient(int value);
-
- public ScenarioContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
deleted file mode 100644
index af4e151..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,119 +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
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-
-
-
-public class ScenarioDefaults
-{
-
-
- public String[] getWebServiceTestIds()
- {
- //we will set the home grown sample as the first choice
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-
- LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
- String[] ids = labelsandids.getIds_();
-
- String[] newIds = new String[ids.length];
- int index = -1;
- for(int i = 0;i<ids.length;i++){
- if(ids[i].equals("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"))
- index = i;
- }
- if(index != -1){
- newIds[0] = ids[index];
- int j = 1;
- for(int i = 0;i<ids.length;i++){
- if(i != index){
- newIds[j] = ids[i];
- j++;
- }
- }
- }
- else return ids;
-
- return newIds;
- }
-
- public String getNonJavaTestServiceDefault()
- {
- return "Web Services Explorer";
- }
-
- public String webserviceTypeIdDefault()
- {
- return "0/org.eclipse.jst.ws.wsImpl.java";
- }
-
- public int serviceGenerationDefault()
- {
- return ScenarioContext.WS_START;
- }
-
- public int clientGenerationDefault()
- {
- return ScenarioContext.WS_NONE;
- }
-
- public boolean startWebserviceDefault()
- {
- return true;
- }
-
- public boolean installWebserviceDefault()
- {
- return true;
- }
-
- public boolean installClientDefault()
- {
- return true;
- }
-
- public boolean launchWebserviceExplorerDefault()
- {
- return false;
- }
-
- public boolean generateProxyDefault()
- {
- return false;
- }
-
- public String webserviceClientTypeDefault()
- {
- return "org.eclipse.jst.ws.client.type.java";
- }
-
- public boolean testWebserviceDefault()
- {
- return false;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return false;
- }
-
- public boolean launchSample()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index dece989..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,306 +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
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
- private String[] webServiceTestIds;
- private String[] webServiceTestTypes;
- private String[] nonJavaTestService;
- private String webServiceType_;
- private boolean installWebService_;
- private boolean installClient_;
- private boolean startWebService_;
- private boolean launchWebServiceExplorer_;
- private boolean generateProxy_;
- private String clientWebServiceType_;
- private boolean testWebService_;
- private boolean monitorWebService;
- private boolean launchSample_;
- private int generateWebService_; //jvh
- private int generateClient_; //jvh
-
- private ScenarioDefaults defaults = new ScenarioDefaults();
-
- public TransientScenarioContext () {}
-
- public String[] getNonJavaTestService()
- {
- return nonJavaTestService;
- }
-
- public void setNonJavaTestService(String[] nonJavaTestService)
- {
- this.nonJavaTestService = nonJavaTestService;
- }
-
- public void setWebServiceTestIds(String[] webServiceTestIds) {
- this.webServiceTestIds = webServiceTestIds;
- }
-
- public String[] getWebServiceTestIds() {
- return webServiceTestIds;
- }
-
- public void setWebServiceTestTypes(String[] webServiceTestTypes)
- {
- this.webServiceTestTypes = webServiceTestTypes;
- }
-
- public String[] getWebServiceTestTypes()
- {
- return webServiceTestTypes;
- }
-
- public ScenarioContext copy() {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestIds(getWebServiceTestIds());
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setWebServiceType( getWebServiceType() );
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setInstallWebService( getInstallWebService() );
- context.setInstallClient( getInstallClient() );
- context.setStartWebService( getStartWebService() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
- context.setGenerateWebService(getGenerateWebService()); //jvh
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return clientWebServiceType_;
- }
-
- public String getClientWebServiceTypeDefault(){ return defaults.webserviceClientTypeDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public boolean getGenerateProxyDefault(){ return defaults.generateProxyDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return launchWebServiceExplorer_;
- }
-
- public boolean getLaunchWebServiceExplorerDefault(){ return defaults.launchWebserviceExplorerDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallWebService()
- {
- return installWebService_;
- }
-
- public boolean getInstallWebServiceDefault(){ return defaults.installWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallClient()
- {
- return installClient_;
- }
-
- public boolean getInstallClientDefault(){ return defaults.installClientDefault(); }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return startWebService_;
- }
-
- public boolean getStartWebServiceDefault(){ return defaults.startWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return testWebService_;
- }
-
- public boolean getTestWebServiceDefault(){ return defaults.testWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return webServiceType_;
- }
-
- public String getWebServiceTypeDefault(){ return defaults.webserviceTypeIdDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- clientWebServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- generateProxy_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- launchWebServiceExplorer_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallWebService(boolean value)
- {
- installWebService_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallClient(boolean value)
- {
- installClient_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- startWebService_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- testWebService_ = value;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- webServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return monitorWebService;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return defaults.getMonitorWebServiceDefault();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- monitorWebService = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return defaults.launchSample();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return launchSample_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- launchSample_ = value;
- }
-
- public void setGenerateWebService(int value)
- {
- generateWebService_ = value;
- }
-
- public int getGenerateWebServiceDefault()
- {
- return defaults.serviceGenerationDefault();
- }
-
- public int getGenerateWebService()
- {
- return generateWebService_;
- }
-
- public int getGenerateClientDefault()
- {
- return defaults.clientGenerationDefault();
- }
-
- public int getGenerateClient()
- {
- return generateClient_;
- }
-
- public void setGenerateClient(int value)
- {
- generateClient_ = value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +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.context;
-
-public interface UDDIPreferenceContext
-{
- /*
- * This constant String is used to lookup the column delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-
- /*
- * This constant String is used to lookup the string delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-
- public void setUddiCatDataColumnDelimiter(String delimiter);
- public String getUddiCatDataColumnDelimiter();
- public void setUddiCatDataStringDelimiter(String delimiter);
- public String getUddiCatDataStringDelimiter();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
+++ /dev/null
@@ -1,24 +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.context;
-
-public class UDDIPreferenceDefaults
-{
- public static final String getUddiCatDataColumnDelimiter()
- {
- return "#";
- }
-
- public static final String getUddiCatDataStringDelimiter()
- {
- return "\"";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
+++ /dev/null
@@ -1,48 +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.data;
-
-public class LabelsAndIds
-{
- private String[] labels_;
- private String[] ids_;
-
- /**
- * @return Returns the ids_.
- */
- public String[] getIds_()
- {
- return ids_;
- }
- /**
- * @param ids_ The ids_ to set.
- */
- public void setIds_(String[] ids_)
- {
- this.ids_ = ids_;
- }
- /**
- * @return Returns the labels_.
- */
- public String[] getLabels_()
- {
- return labels_;
- }
- /**
- * @param labels_ The labels_ to set.
- */
- public void setLabels_(String[] labels_)
- {
- this.labels_ = labels_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 25b4441..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,114 +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.data;
-
-public class TypeRuntimeServer
-{
- private String typeId_ = "";
- private String runtimeId_ = "";
- private String serverId_ = "";
- private String serverInstanceId_;
-
- /**
- * @return Returns the runtimeId_.
- */
- public String getRuntimeId()
- {
- return runtimeId_;
- }
- /**
- * @param runtimeId_ The runtimeId_ to set.
- */
- public void setRuntimeId(String runtimeId_)
- {
- this.runtimeId_ = runtimeId_;
- }
- /**
- * @return Returns the serverId_.
- */
- public String getServerId()
- {
- return serverId_;
- }
- /**
- * @param serverId_ The serverId_ to set.
- */
- public void setServerId(String serverId_)
- {
- this.serverId_ = serverId_;
- }
- /**
- * @return Returns the serverInstanceId_.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId_;
- }
- /**
- * @param serverInstanceId_ The serverInstanceId_ to set.
- */
- public void setServerInstanceId(String serverInstanceId_)
- {
- this.serverInstanceId_ = serverInstanceId_;
- }
- /**
- * @return Returns the typeId_.
- */
- public String getTypeId()
- {
- return typeId_;
- }
- /**
- * @param typeId_ The typeId_ to set.
- */
- public void setTypeId(String typeId_)
- {
- this.typeId_ = typeId_;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return "type(" + typeId_ + ") runtime(" + runtimeId_ + ") factory(" + serverId_ + ") servInstId(" + serverInstanceId_ + ")";
- }
-
- public boolean equals(Object object)
- {
- if (object != null && object instanceof TypeRuntimeServer)
- {
- TypeRuntimeServer trs = (TypeRuntimeServer)object;
- String trsTypeId = trs.getTypeId();
- String trsRuntimeId = trs.getRuntimeId();
- String trsServerId = trs.getServerId();
- String trsServerInstanceId = trs.getServerInstanceId();
-
- boolean typeIdsMatch = ((typeId_ == null) && (trsTypeId == null)) || ((typeId_ != null) && (typeId_.equals(trsTypeId)));
- if (!typeIdsMatch) return false;
- boolean runtimeIdsMatch = ((runtimeId_ == null) && (trsRuntimeId == null)) || ((runtimeId_ != null) && (runtimeId_.equals(trsRuntimeId)));
- if (!runtimeIdsMatch) return false;
- boolean serverIdsMatch = ((serverId_ == null) && (trsServerId == null)) || ((serverId_ != null) && (serverId_.equals(trsServerId)));
- if (!serverIdsMatch) return false;
- boolean serverInstanceIdsMatch = ((serverInstanceId_ == null) && (trsServerInstanceId == null)) || ((serverInstanceId_ != null) && (serverInstanceId_.equals(trsServerInstanceId)));
- if (!serverInstanceIdsMatch) return false;
-
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
deleted file mode 100644
index e5b134e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,40 +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.dialog;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
- /*
- * Button ID for the "Yes" button
- */
- public static final int YES_ID = 2;
- /*
- * Button ID for the "Yes to all" button
- */
- public static final int YES_TO_ALL_ID = 4;
- /*
- * Button ID for the "Cancel" button
- */
- public static final int CANCEL_ID = 1;
- /*
- * Button ID for the "OK" button
- */
- public static final int OK_ID = 0;
- /*
- * Button ID for the "Details" button
- */
- public static final int DETAILS_ID = 13;
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 69c6910..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.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.ext;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* All Extensions with exectutable extensions should implement this
-* to fit our framework
-*/
-public interface WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- *Returns a wizard fragment for this exention type
- *
- */
- public AbstractDataModelOperation getFinishCommand();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 286a9a1..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +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.ext;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public interface WebServiceExtension
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension();
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement);
-
- /**
- * If the extension has code that
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index 60720d4..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.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.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public class WebServiceExtensionImpl implements WebServiceExtension
-{
-
- private ILog log_;
-
- /*
- * The ConfigElement that holds extension info
- */
- protected IConfigurationElement configElement_;
-
- /*
- * The extension executable
- */
- protected WebServiceExecutable webServiceExecutable_;
-
-
- public WebServiceExtensionImpl(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- log_ = EnvironmentService.getEclipseLog();
- }
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension()
- {
- if(webServiceExecutable_ != null) return webServiceExecutable_;
-
- try{
- return configElement_.createExecutableExtension("class");
- }catch (CoreException e){
- log_.log(ILog.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
- }
-
- return null;
- }
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- }
-
- /**
- * This is the config element that holds the extension info
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement()
- {
- return configElement_;
- }
-
- /**
- * The name of the extension being used
- * @return String name of this extension
- */
- public String getName()
- {
- return getConfigElement().getAttribute( "name" );
- }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index afc1d07..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +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.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point
-* also returns the extension objects
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ();
-
- /**
- * Returns the extension object of the given name
- *@return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name);
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 46bea11..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.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
- * -------- -------- -----------------------------------------------------------
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-
-
-/**
-* This is a generic registry which sets up general code in handling
-* IConfigElements for an extension
-*/
-public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- protected Hashtable nameExtensionTable_;
- protected Vector id_;
- protected Vector label_;
- private LabelsAndIds labelsandids_;
-
- public WebServiceExtensionRegistryImpl()
- {
- nameExtensionTable_ = new Hashtable();
- label_ = new Vector();
- id_ = new Vector();
- loadExtensions();
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement);
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public abstract IConfigurationElement[] getConfigElements();
-
- /*
- * Loads WebServiceExtensions for WebServiceClientTest into this registry.
- * This is done by querying the plugin registry for all extensions
- * that extend webServiceClientTest
- */
- protected void loadExtensions ()
- {
- IConfigurationElement[] config = getConfigElements();
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- String label = elem.getAttribute( "label" );
- String id = elem.getAttribute( "id" );
- WebServiceExtension webServiceExtension = createWebServiceExtension(elem);
- nameExtensionTable_.put(label,webServiceExtension);
- label_.add(label);
- id_.add(id);
- }
- }
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ()
- {
- return (String[])nameExtensionTable_.keySet().toArray( new String[0] );
- }
-
- /**
- * Return the names and Ids
- */
- public LabelsAndIds getLabelsAndIDs()
- {
- labelsandids_ = new LabelsAndIds();
- labelsandids_.setLabels_((String[])label_.toArray( new String[0] ));
- labelsandids_.setIds_((String[])id_.toArray( new String[0] ));
- return labelsandids_;
- }
-
- /**
- * Returns the extension object of the given name
- * @return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name)
- {
- return (WebServiceExtension)nameExtensionTable_.get(name);
- }
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions()
- {
- return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] );
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index 9fb367e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.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.ext.test;
-
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-
-public interface JavaProxyTestCommand extends WebServiceTestFinishCommand
-{
-
- /**
- * This holds an info class that comes from user input or some calcilations that needs to be
- * used for the finish
- */
-
- public void setJspFolder(String jspFolder);
-
- public void setRunClientTest(boolean runClientTest);
-
- public void setSampleProject(String sampleProject);
-
- public void setProxyBean(String proxyBean);
-
- public void setSetEndpointMethod(String setEndpointMethod);
-
- public void setClientProject(String clientProject);
-
- public void setMethods(BooleanSelection[] methods);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
deleted file mode 100644
index 8317253..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +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.ext.test;
-
-public interface WSDLTestFinishCommand extends WebServiceTestFinishCommand
-{
- public void setServiceProject(String serverProject);
- public void setWsdlServiceURL(String wsdlURI);
- public void setExternalBrowser(boolean external);
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
deleted file mode 100644
index 257ef4e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
+++ /dev/null
@@ -1,205 +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
- * -------- -------- -----------------------------------------------------------
- * 20060816 104870 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
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionImpl;
-
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-* In particular it holds a client test extension element
-*/
-public class WebServiceTestExtension extends WebServiceExtensionImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private List supportedRuntimes_ = new ArrayList();
-
- public WebServiceTestExtension(IConfigurationElement configElement)
- {
- super(configElement);
-
- String runtimesList = getConfigElement().getAttribute("supportedClientRuntimes");
-
- addRuntimes(runtimesList);
- }
-
- /**
- * Adds a list of space delimited runtime IDs.
- *
- * @param runtimesList The list of runtime IDs.
- */
- public void addRuntimes(String runtimesList) {
-
- if (runtimesList == null)
- return;
-
- String[] runtimes = runtimesList.split("\\s+");
-
- for (int i = 0; i < runtimes.length; i++) {
- if (runtimes[i].length() > 0)
- supportedRuntimes_.add(runtimes[i]);
- }
- }
-
- /**
- * Will this testClient generate code
- * @return boolean true if codegen needed
- */
- public boolean isCodeGenNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "codeGenerated" )).booleanValue();
- }
-
- /**
- * Use the default Folder Provided by us
- * @return boolean true if no special folder requires
- */
- public boolean useDefaultCodeGenFolder()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultcodegenfolder" )).booleanValue();
- }
-
- /**
- * Use Special Folder for generated code
- * @return String special folder name
- */
- public String getCodeGenFolder()
- {
- return getConfigElement().getAttribute( "codegenfolder" );
- }
-
- public boolean isDefaultJAXRPC()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "isdefaultjaxrpc" )).booleanValue();
- }
-
- /**
- * Do we need to launch something
- * @return Boolean if true launch codegen
- */
- public boolean isLaunchRequired()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "launchRequired" )).booleanValue();
- }
-
- /**
- * Do we need the methods for the proxy
- * @return boolean true if proxy methods needed
- */
- public boolean areMethodsNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "methodsneeded" )).booleanValue();
- }
-
- /**
- * Does this test machine need a server
- * @return boolean true if a server is required
- */
- public boolean isServerNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "serverRequired" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public boolean useDefaultServer()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultserver" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public String useServer()
- {
- return getConfigElement().getAttribute( "useserver" );
- }
-
- public boolean testWSDL()
- {
- String wsdl = getConfigElement().getAttribute( "testWSDL" );
- if(wsdl.equals("yes") || wsdl.equals("true"))
- return true;
-
- return false;
- }
-
- public boolean testJavaProxy()
- {
- String javaProxy = getConfigElement().getAttribute( "testJavaProxy" );
- if(javaProxy == null) return false;
- if(javaProxy.equals("yes") || javaProxy.equals("true"))
- return true;
-
- return false;
- }
-
- /**
- * Returns the id attribute of this WebServiceTestExtension
- *
- * @return The value of the id attribute.
- */
- public String getId() {
- return getConfigElement().getAttribute( "id" );
- }
-
- /**
- * Returns the label attribute of this WebServiceTestExtension
- *
- * @return The value of the label attribute.
- */
- public String getLabel() {
- return getConfigElement().getAttribute( "label" );
- }
-
- /**
- * Does this extension allow extenders to restrict the runtimes that are supported?
- *
- * @return The value of the allowRunimesRestriction attribute, false if not present.
- */
- public boolean allowClientRuntimesRestriction() {
- return Boolean.valueOf(getConfigElement().getAttribute( "allowClientRuntimesRestriction" )).booleanValue();
- }
-
- /**
- * Determines if this WebServiceTestExtension supports the give client runtime ID.
- *
- * @return true if the client runtime ID is supported, false otherwise.
- */
- public boolean supportsRuntime(String runtimeId) {
-
- if (!allowClientRuntimesRestriction() || supportedRuntimes_.isEmpty())
- return true;
-
- return supportedRuntimes_.contains(runtimeId);
- }
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
deleted file mode 100644
index c11e9d0..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.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.ext.test;
-
-import java.util.List;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand
-{
-
- /**
- * If the command needs a server this is the chosen
- * client serverID
- * @param sampleServerTypeID
- */
- public void setServerTypeID(String serviceServerTypeID);
-
- /**
- * This is the IServer if required
- * @param sampleExistingServer
- */
- public void setExistingServer(IServer serviceExistingServer);
-
- /**
- * This is the endpoints if monitor service is enabled
- * @param endpoints
- */
- public void setEndpoint(List endpoints);
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
deleted file mode 100644
index 8cfeccc..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,181 +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
- * -------- -------- -----------------------------------------------------------
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /*
- * This is a singleton becasue it was decided that the memory foot print
- * is not as expensive as the time taken retrieving the data
- *
- */
-
-
- private static WebServiceTestRegistry wstr;
-
- public static WebServiceTestRegistry getInstance()
- {
- if(wstr == null) wstr = new WebServiceTestRegistry();
- return wstr;
- }
-
- private WebServiceTestRegistry()
- {
- super();
- }
-
- /**
- * Helper method to "join" an existing value and a new value together by
- * a space in between. Handles special case when either value is null.
- *
- * @param existingValue The existing value
- * @param newValue The new value
- * @return If eiter the existing or new value is null, simply returns the
- * new value as is (which could be null). Otherwise returns the value joined
- * by a space.
- */
- private String genNewValue(String existingValue, String newValue) {
-
- if (existingValue == null || newValue == null)
- return newValue;
-
- return existingValue + " " + newValue;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#loadExtensions()
- */
- protected void loadExtensions ()
- {
- // keep track of the support runtimes for each test facility ID
- Hashtable supportedClientRuntimes = new Hashtable();
-
- IConfigurationElement[] config = getConfigElements();
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- String label = elem.getAttribute( "label" );
- String id = elem.getAttribute( "id" );
-
- // label is found, hence we have a master extension element
- if (label != null) {
- WebServiceExtension webServiceExtension = createWebServiceExtension(elem);
- nameExtensionTable_.put(id,webServiceExtension);
- label_.add(label);
- id_.add(id);
- }
-
- // slave extension element, which only has the id and supportedClientRuntimes attributes
- else {
- String existingValue = (String) supportedClientRuntimes.get(id);
- String newValue = genNewValue(existingValue, elem.getAttribute("supportedClientRuntimes"));
-
- if (newValue != null)
- supportedClientRuntimes.put(id, newValue);
- }
- }
-
- // merge any supportedClientRuntimes attributes from the slave elements back to the master elements
-
- Iterator iter = nameExtensionTable_.values().iterator();
-
- while (iter.hasNext()) {
- WebServiceTestExtension webServiceTestExtension = (WebServiceTestExtension) iter.next();
-
- // skip if the extension does not allow restriction on the supported client runtimes
- if (webServiceTestExtension.allowClientRuntimesRestriction()) {
- String id = webServiceTestExtension.getId();
- webServiceTestExtension.addRuntimes((String) supportedClientRuntimes.get(id));
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionNames()
- */
- public String[] getWebServiceExtensionNames() {
- return (String[])label_.toArray( new String[0] );
- }
-
- /**
- * Return the ID corresponding to the label.
- * @param label The label.
- * @return The ID corresponding to the label, or if the label parameter is not a label
- * (must be already an ID), it is returned.
- */
- public String labelToId(String label) {
- int labelIndex = label_.indexOf(label);
- if (labelIndex == -1)
- return label;
- return (String) id_.elementAt(labelIndex);
- }
-
- /**
- * Returns the WebServiceExtension with the given ID.
- * @param id The ID.
- * @return The WebServiceExtension object.
- */
- public WebServiceExtension getWebServiceExtensionsById(String id) {
- return (WebServiceExtension) nameExtensionTable_.get(id);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionsByName(java.lang.String)
- */
- public WebServiceExtension getWebServiceExtensionsByName(String name) {
- return getWebServiceExtensionsById(labelToId(name));
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement)
- {
- return new WebServiceTestExtension(configElement);
- }
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public IConfigurationElement[] getConfigElements()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "tester");
- return config;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
deleted file mode 100644
index b520d13..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,97 +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.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-/**
-* 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 WebServicePlugin extends Plugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServicePlugin instance_;
-
- private PersistentResourceContext resourceContext_;
- private PersistentScenarioContext scenarioContext_;
- private PersistentUDDIPreferenceContext uddiPreferenceContext;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServicePlugin()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- * @return The WebServicePlugin singleton.
- */
- public static WebServicePlugin getInstance ()
- {
- return instance_;
- }
-
- protected void initializeDefaultPluginPreferences()
- {
- ((PersistentUDDIPreferenceContext) getUDDIPreferenceContext()).load();
- }
-
- public ResourceContext getResourceContext()
- {
- if (resourceContext_ == null)
- resourceContext_ = PersistentResourceContext.getInstance();
- return resourceContext_;
- }
-
- public ScenarioContext getScenarioContext()
- {
- if (scenarioContext_ == null)
- {
- scenarioContext_ = new PersistentScenarioContext();
- scenarioContext_.load();
- }
-
- return scenarioContext_;
- }
-
- public UDDIPreferenceContext getUDDIPreferenceContext()
- {
- if (uddiPreferenceContext == null)
- uddiPreferenceContext = new PersistentUDDIPreferenceContext();
- return uddiPreferenceContext;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
deleted file mode 100644
index 919002b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060620 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-/**
- * This subclass of WebServiceClientInfo adds properties
- * relevant to descriptors of Java Web service clients.
- */
-public class WebServiceJavaClientInfo extends WebServiceClientInfo
-{
- private IType jdtType_;
-
- /**
- * Returns the JDT IType of the primary Java proxy class
- * of a Web service client, or null if no such class has
- * been located.
- * @return The JDT IType of the Java client proxy class.
- */
- public IType getType ()
- {
- return jdtType_;
- }
-
- /**
- * Sets the JDT IType of the primary Java proxy class
- * of a Web service client.
- * @param jdtType The JDT IType of the Java client proxy class.
- */
- public void setType ( IType jdtType )
- {
- jdtType_ = jdtType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
deleted file mode 100644
index 66d9ec9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060620 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * This subclass of WebServiceInfo adds properties
- * relevant to descriptors of Java Web services.
- */
-public class WebServiceJavaInfo extends WebServiceInfo
-{
- private IType jdtType_;
-
- /**
- * Returns the JDT IType of the primary Java implementation
- * class of a Web service, or null if no such class has
- * been located.
- * @return The JDT IType of the Java implementation class.
- */
- public IType getType ()
- {
- return jdtType_;
- }
-
- /**
- * Sets the JDT IType of the primary Java implementation
- * class of a Web service.
- * @param jdtType The JDT IType of the Java implementation class.
- */
- public void setType ( IType jdtType )
- {
- jdtType_ = jdtType;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/.classpath b/bundles/org.eclipse.wst.ws.explorer/.classpath
deleted file mode 100644
index 2a93ce8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="wsexplorer-properties"/>
- <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.wst.ws.explorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
deleted file mode 100644
index 80aae3b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build
-webapps
-temp.folder
-build.xml
-*.war
-explorersrc.zip
-javaCompiler.*.args
-*.jar
diff --git a/bundles/org.eclipse.wst.ws.explorer/.project b/bundles/org.eclipse.wst.ws.explorer/.project
deleted file mode 100644
index 9621998..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws.explorer</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.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4e68f51..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 22 19:56:34 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7e16122..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-#Wed Jun 06 14:32:37 EDT 2007
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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.maxProblemPerUnit=100
-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=warning
-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
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1300f78..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 03 00:32:02 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5c1e93a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40: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.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
deleted file mode 100644
index 603098a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true
-Bundle-Version: 1.0.312.qualifier
-Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.explorer;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.favorites;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.plugin;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.popup;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.transport;x-internal:=true
-Require-Bundle: 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.help.appserver;bundle-version="[3.1.100,3.2.0)",
- org.eclipse.ui;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.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.core;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.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.wsdl;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
- org.uddi4j;bundle-version="[2.0.4,2.1.0)",
- org.apache.axis;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.equinox.http.jetty,
- org.eclipse.equinox.jsp.jasper.registry,
- org.eclipse.equinox.http.registry,
- javax.xml.rpc;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="2.4.0",
- javax.servlet.http;version="2.4.0",
- org.osgi.service.http;version="1.2.0"
diff --git a/bundles/org.eclipse.wst.ws.explorer/about.html b/bundles/org.eclipse.wst.ws.explorer/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/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.wst.ws.explorer/build.properties b/bundles/org.eclipse.wst.ws.explorer/build.properties
deleted file mode 100644
index 27863b6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/build.properties
+++ /dev/null
@@ -1,29 +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
-###############################################################################
-source.. = src/,wsexplorer-properties/
-jars.compile.order = .
-
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- properties/,\
- META-INF/,\
- about.html,\
- icons/,\
- wsexplorer/,\
- wsexplorer-properties/
-
-
-customBuildCallbacks=buildJSPs.xml
-
-
-src.includes = schema/
diff --git a/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml b/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml
deleted file mode 100644
index bd4ba35..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-<!-- ===================================================================== -->
-<!-- Ant build script for JSPs -->
-<!-- ===================================================================== -->
-<project name="JSP Build">
-
- <!-- ===================================================================== -->
- <!-- Workspace (dev) build; called as an Ant builder -->
- <!-- ===================================================================== -->
- <target name="build">
-
- <!-- Construct the full classpath -->
- <path id="explorer.jar.classpath" >
- <pathelement path="${target.folder}"/>
- <dirset dir="${workspace_loc}">
- <patternset>
- <include name="org.eclipse.wst.ws.explorer/bin"/>
-
- </patternset>
- </dirset>
- <fileset dir="${target_home}/plugins">
- <patternset>
- <include name="javax.servlet*.jar"/>
- <include name="javax.servlet.jsp*.jar"/>
- <include name="org.apache.ant*/lib/ant.jar"/>
- <include name="org.apache.commons.el*.jar"/>
- <include name="org.apache.commons.logging*.jar"/>
- <include name="org.apache.jasper*.jar"/>
-
- </patternset>
- </fileset>
- </path>
-
- <!-- Compile the JSPs -->
- <antcall target="compile">
- <reference refid="explorer.jar.classpath"/>
- </antcall>
-
- </target>
-
- <property name="wsexplorerDir" value="${basedir}/wsexplorer"/>
-
- <!-- ===================================================================== -->
- <!-- Compile the JSPs -->
- <!-- ===================================================================== -->
- <target name="compile">
-
- <!-- Invoke Jasper compiler -->
- <java
- classname="org.apache.jasper.JspC"
- classpathref="explorer.jar.classpath"
- fork="true"
- failonerror="true">
- <arg value="-compile"/>
- <arg value="-d"/>
- <arg value="${wsexplorerDir}" />
- <arg value="-p"/>
- <arg value="org.eclipse.wst.ws.explorer.jsp"/>
- <arg value="-webapp"/>
- <arg value="${wsexplorerDir}"/>
- <arg value="-die"/>
- <classpath>
- <pathelement path="${target.folder}"/>
- <dirset dir="${basedir}">
- <include name="*/@dot" />
- </dirset>
- <fileset dir="${basedir}">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- </java>
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="pre.explorer.jar">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do during the compilation target <name>, after the compile -->
- <!-- but before jaring. Substitute "name" with the name of the compilation-->
- <!-- target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.compile.explorer.jar">
-
- <!-- Compile the JSPs -->
- <antcall target="compile">
- <reference refid="explorer.jar.classpath"/>
- </antcall>
-
- <!-- JspC always generates .java files; delete them -->
- <delete>
- <fileset dir="${target.folder}" includes="**/*.java"/>
- </delete>
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- jar.location - the location of the compilation results -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.explorer.jar">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target clean -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target clean -->
- <!-- Available parameters : -->
- <!-- plugin.destination - final destination of the build -->
- <!-- build.result.folder - results of the compilation -->
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
- </target>
-
- <target name="pre.wsexplorer-properties.jar">
- </target>
- <target name="post.wsexplorer-properties.jar">
- </target>
- <target name="post.compile.wsexplorer-properties.jar">
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif b/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif
deleted file mode 100644
index 21a0baa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.properties b/bundles/org.eclipse.wst.ws.explorer/plugin.properties
deleted file mode 100644
index b0986d7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# -------- -------- -----------------------------------------------------------
-# 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
-# 20070820 191585 pmoogk@ca.ibm.com - Peter Moogk
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Explorer
-PLUGIN_PROVIDER=Eclipse.org
-
-XP_WSE_TRANSPORT_PROVIDER=Web Services Explorer Transport Provider
-SOAP_TRANSPORT_PROVIDER=Default SOAP Transport Provider
-
-#
-# Messages for the client type extension
-#
-WEBSERVICECLIENTTYPE_NAME_WSEXPLORER=Stubless (Web Services Explorer)
-TASK_LABEL_EXPLORE_WSDL_USING_WSE=Explorer WSDL using Web Services Explorer.
-
-#
-# Messages for the WSExplorer type extension
-#
-MSG_ERROR_LAUNCH_WSEXPLORER=IWAB0366E Unable to launch Web Services Explorer.
-MSG_ERROR_LOAD_LAUNCH_OPTIONS=IWAB0367E Unable to load launch options.
-MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8=Broken VM does not support UTF-8.
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-#
-# SOAP transport messages
-#
-MSG_ERROR_UNSUPPORTED_BINDING={0} binding is unsupported.
-MSG_ERROR_UNSUPPORTED_TRANSPORT={0} transport is unsupported.
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.xml b/bundles/org.eclipse.wst.ws.explorer/plugin.xml
deleted file mode 100644
index 8d3ce02..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
- <extension-point id="wseTransportProvider" name="%XP_WSE_TRANSPORT_PROVIDER" schema="schema/wseTransportProvider.exsd"/>
-
-
-<!-- ================================================================= -->
-<!-- Extension point: Eclipse Popup Action (org.eclipse.ui.popupMenus) -->
-<!-- ================================================================= -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.file.wsdl">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.file.wsil">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSIL"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSIL">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.wsdlres">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.service"
- adaptable="true">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- </extension>
- <extension
- point="org.eclipse.wst.ws.explorer.wseTransportProvider">
- <soapTransportProvider
- class="org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.SOAPTransportProvider"
- id="org.eclipse.wst.ws.explorer.soapTransportProvider"
- name="%SOAP_TRANSPORT_PROVIDER"
- namespaceURI="http://schemas.xmlsoap.org/wsdl/soap/"
- transportURI="http://schemas.xmlsoap.org/soap/http"/>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.httpcontexts">
- <httpcontext
- id="wse">
- <resource-mapping
- path="/wsexplorer">
- </resource-mapping>
- </httpcontext>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.resources">
- <resource
- alias="/"
- base-name="/"
- httpcontextId="wse">
- </resource>
- <serviceSelector
- filter="(other.info=org.eclipse.wst.ws.explorer)">
- </serviceSelector>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.servlets">
- <servlet
- alias="/*.jsp"
- class="org.eclipse.equinox.jsp.jasper.registry.JSPFactory:/"
- httpcontextId="wse">
- </servlet>
- <serviceSelector
- filter="(other.info=org.eclipse.wst.ws.explorer)">
- </serviceSelector>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="org.eclipse.jst.j2ee.J2EEPerspective">
- <actionSet
- id="org.eclipse.wst.ws.explorer.explorer">
- </actionSet>
- </perspectiveExtension>
-
- <perspectiveExtension
- targetID="org.eclipse.wst.web.ui.webDevPerspective">
- <actionSet
- id="org.eclipse.wst.ws.explorer.explorer">
- </actionSet>
- </perspectiveExtension>
- </extension>
-
-
- <!-- Main Menu Actions -->
-
- <extension point="org.eclipse.ui.actionSets">
-
- <actionSet
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- visible="false"
- id="org.eclipse.wst.ws.explorer.explorer">
- <menu
- label="%MENU_RUN"
- path="additions"
- id="org.eclipse.ui.run">
- <separator name="explorer">
- </separator>
- </menu>
- <action
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- icon="icons/etool16/launch_ws_explorer.gif"
- tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
- class="org.eclipse.wst.ws.internal.explorer.action.LaunchWSEAction"
- menubarPath="org.eclipse.ui.run/explorer"
- toolbarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.action.LaunchWSEAction">
- </action>
- </actionSet>
-
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil b/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
deleted file mode 100644
index 56e8b38..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspection xmlns="http://schemas.xmlsoap.org/ws/2001/10/inspection/"
- xmlns:wsilwsdl="http://schemas.xmlsoap.org/ws/2001/10/inspection/wsdl/"
- xmlns:wsiluddi="http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/"
- xmlns:uddi="urn:uddi-org:api">
- <abstract xml:lang="en-US">v5_0_1_0</abstract>
-
-
-
-
-
- <link referencedNamespace="http://schemas.xmlsoap.org/ws/2001/10/inspection/" location="http://www.xmethods.com/inspection.wsil"/>
-</inspection>
diff --git a/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd b/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd
deleted file mode 100644
index 232eef3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.ws.explorer">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.ws.explorer" id="wseTransportProvider" name="Web Services Explorer Transport Provider"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="soapTransportProvider"/>
- </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 for this extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- An optional name this extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="soapTransportProvider">
- <annotation>
- <documentation>
- This extension point entry allows an extender to plug in a new factory for creating org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport instances. The ISOAPTranport is used by the Web Services Explorer for invoking web services operations that uses the SOAP message protocol.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class must implement the org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider interface.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This id uniquely identifies this soapTransportProvider element.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of this soapTransportProvider element.
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="namespaceURI" type="string">
- <annotation>
- <documentation>
- The namespace URI of the soap:binding element that this transport provider claims support for. For example, if this transport provider supports the SOAP 1.1 binding, the value of this attribute would be http://schemas.xmlsoap.org/wsdl/soap/. If unspecified, this transport provider claims support for all SOAP bindings.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transportURI" type="string">
- <annotation>
- <documentation>
- The transport protocol URI of the soap:binding element that this transport provider claims support for. For example, if this transport provider supports SOAP over HTTP, the value of this attribute would be http://schemas.xmlsoap.org/soap/http. If unspecified, this transport provider claims support for all transport protocols.
- </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>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2007 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.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar b/bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar
deleted file mode 100644
index 2dad577..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java
deleted file mode 100644
index e3742c9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java
+++ /dev/null
@@ -1,55 +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.wst.ws.internal.explorer;
-
-import org.eclipse.help.internal.appserver.AppserverPlugin;
-
-
-public class JettyRunnable {
-
- private static JettyRunnable jettyRunnable_;
-
- private JettyRunnable() {
- }
-
- public static JettyRunnable getJettyRunnable() {
- if (jettyRunnable_ == null) {
- jettyRunnable_ = new JettyRunnable();
- jettyRunnable_.init();
- }
- return jettyRunnable_;
- }
-
- public boolean isJettyStarted() {
- try {
- return AppserverPlugin.getDefault().getAppServer().isRunning();
- } catch (Throwable t) {
- return false;
- }
- }
-
- public int getJettyPort() {
- return WebappManager.getPort();
- }
-
- public String getJettyHost() {
- return WebappManager.getHost();
- }
-
-
- private void init() {
- try {
- WebappManager.start("wse");
- } catch (Throwable t) {
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
deleted file mode 100644
index 3666ede..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
+++ /dev/null
@@ -1,51 +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.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This simple class is used to hold a single Web Services
- * Explorer launch option property and its value. Allowed
- * launch option properties are defined by
- * <code>{@link LaunchOptions}</code>.
- */
-public class LaunchOption {
- private String key_;
-
- private String option_;
-
- /*
- * Constructs a new launch option with the given
- * property name and value.
- */
- public LaunchOption(String key, String option) {
- key_ = key;
- option_ = option;
- }
-
- /**
- * Returns the property name of this launch option.
- * @return The property name.
- */
- public String getKey() {
- return key_;
- }
-
- /**
- * Returns the property value of this launch option.
- * @return The property value.
- */
- public String getOption() {
- return option_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
deleted file mode 100644
index 2a5b968..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20080506 202945 pmoogk@ca.ibm.com - Peter Moogk, Allow WSE to be launched from a WSIL file.
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This class defines the property names understood by the Web Services Explorer
- * and used to configure it's initial appearance and behaviour at the time it is
- * launched.
- * @see LaunchOption
- */
-public class LaunchOptions {
- // General purpose preload constants
-
- public static final String STATE_LOCATION = "stateLocation";
-
- public static final String DEFAULT_FAVORITES_LOCATION = "defaultFavoritesLocation";
-
- // WSDL Page preload constants
-
- public static final String WSDL_URL = "wsdl";
-
- public static final String WSIL_URL = "wsilurl";
-
- public static final String WEB_SERVICE_ENDPOINT = "webServiceEndpoint";
-
- public static final String SERVICE_QNAME_STRING = "serviceQNameString";
-
- public static final String BINDING_NAME_STRING = "bindingNameString";
-
- // UDDI Page preload constants
-
- public static final String INQUIRY_URL = "inquiry";
-
- public static final String PUBLISH_URL = "publish";
-
- public static final String SERVICE_NAME = "serviceName";
-
- public static final String SERVICE_KEY = "serviceKey";
-
- public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java
deleted file mode 100644
index 4d8b697..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-public class LaunchWizardRunnable extends Thread implements Runnable {
- private String id;
-
- private String wsdlURL;
-
- private boolean finish;
-
- public LaunchWizardRunnable(String id, String wsdlURL) {
- this.id = id;
- this.wsdlURL = (wsdlURL != null) ? wsdlURL : "";
- finish = false;
- }
-
- public boolean isFinish() {
- return finish;
- }
-
- public void run() {
- try {
- DynamicWizard wizard = new DynamicWizard();
- wizard.setInitialData(id);
- IStructuredSelection sel = new StructuredSelection(wsdlURL);
- wizard.init(null, sel);
- WizardDialog wd = new WizardDialog(new Shell(Display.getDefault(),
- SWT.APPLICATION_MODAL), wizard);
- wd.open();
- } catch (Exception e) {
- } finally {
- finish = true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
deleted file mode 100644
index c021537..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
+++ /dev/null
@@ -1,65 +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.wst.ws.internal.explorer;
-
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class LaunchWizardTask {
- // singleton
- private static LaunchWizardTask task_;
-
- // the shell for the wizard to be launched
- private Shell shell_;
-
- // the LaunchWizardRunnable that is currently running
- private LaunchWizardRunnable runnable_;
-
- private LaunchWizardTask(Shell shell) {
- shell_ = shell;
- runnable_ = null;
- }
-
- public static LaunchWizardTask getInstance() {
- if (task_ == null)
- task_ = new LaunchWizardTask(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell());
- return task_;
- }
-
- public void asyncExec(Runnable runnable) throws SWTException {
- shell_.getDisplay().asyncExec(runnable);
- }
-
- public boolean checkAndAsyncExec(LaunchWizardRunnable runnable) {
- try {
- if (!getIsExecuting()) {
- asyncExec(runnable);
- runnable_ = runnable;
- return true;
- } else
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public boolean getIsExecuting() {
- if (runnable_ != null) {
- boolean isFinish = runnable_.isFinish();
- if (isFinish)
- runnable_ = null;
- return !isFinish;
- } else
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
deleted file mode 100644
index fcf5f60..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
+++ /dev/null
@@ -1,294 +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
- * -------- -------- -----------------------------------------------------------
- * 20060721 151409 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on RH
- * 20060802 150428 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20061219 168620 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on Linux
- * 20070220 168620 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on Linux (cont.)
- * 20080430 229693 makandre@ca.ibm.com - Andrew Mak, WSE does not react to internal/external Web browser preference change
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class WSExplorer {
- private static WSExplorer instance;
-
- private static int launchOptionsKey_ = 0;
-
- private IWebBrowser internalBrowser_ = null;
-
- public WSExplorer() {
- }
-
- public static WSExplorer getInstance() {
- if (instance == null) {
- instance = new WSExplorer();
- }
- return instance;
- }
-
- public String getContextName() {
- return "wsexplorer";
- }
-
- public String getParentPluginID() {
- return ExplorerPlugin.ID;
- }
-
- public String getWebAppLocation() {
- return "wsexplorer";
- }
-
- public String getWelcomeURL() {
- return "wsexplorer.jsp";
- }
-
- public String getLaunchOptionRegistryURL() {
- return "launch_options_registry.jsp";
- }
-
- public String getBaseURL() {
- StringBuffer sb = new StringBuffer();
-
-
- sb.append("http://");
- sb.append(JettyRunnable.getJettyRunnable().getJettyHost());
- sb.append(":");
- sb.append(JettyRunnable.getJettyRunnable().getJettyPort());
- sb.append("/");
- sb.append("wse");
- sb.append("/");
- sb.append(getContextName());
- sb.append("/");
- return sb.toString();
- }
-
- public String getMetadataDirectory() {
- // <workspace>/.metadata/.plugins/org.eclipse.wst.ws.explorer/ (note
- // the trailing separator).
- return ExplorerPlugin.getInstance().getPluginStateLocation();
- }
-
- public IStatus launch(IWorkbench wb, IStructuredSelection sel,
- LaunchOption[] options, boolean forceLaunchOutsideIDE) {
- // launchOptionKey
- int launchOptionKey = getLaunchOptionsKey();
- // Web Services Explorer URL
- StringBuffer sb = new StringBuffer();
- sb.append(getBaseURL());
- sb.append(getWelcomeURL());
- sb.append("?");
- if (options != null && options.length > 0) {
- String encodedID = null;
- try {
- encodedID = URLEncoder.encode(ExplorerPlugin.ID,
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- sb.append(encodedID);
- sb.append("=");
- sb.append(launchOptionKey);
- }
- // launch Web Services Explorer
- try {
- IWorkbenchBrowserSupport browserSupport = ExplorerPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = null;
-
- IPreferencesService ps = Platform.getPreferencesService();
- int browserChoice = ps.getInt("org.eclipse.ui.browser", "browser-choice", 0, null);
-
- // force external or browser choice is external
- if (forceLaunchOutsideIDE || browserChoice == 1) {
-
- // external browser support uses swt Program.findProgram() to locate an appropriate browser for HTML files
- // certain versions of swt Program class need to be run from the UI thread, otherwise findProgram() does not
- // work properly (this applies to Linux only). The code below is to workaround this problem.
-
- // Display.getCurrent() will be null if this is not the UI thread
- if (Display.getCurrent() == null) {
-
- // create a runnable to open the browser, run it in the UI thread
- OpenBrowserRunnable runnable = new OpenBrowserRunnable(browserSupport, new URL(sb.toString()));
- Display.getDefault().syncExec(runnable);
-
- if (runnable.getException() != null)
- throw runnable.getException();
- }
- else {
- browser = browserSupport.getExternalBrowser();
- browser.openURL(new URL(sb.toString()));
- }
- }
- else {
- // browserId
- StringBuffer browserId = new StringBuffer();
- browserId.append(ExplorerPlugin.ID);
- browserId.append(getContextName());
-
- if (internalBrowser_==null)
- internalBrowser_ = browserSupport.createBrowser(browserId.toString());
- browser = internalBrowser_;
- browser.openURL(new URL(sb.toString()));
- }
- } catch (Exception e) {
- return new Status(IStatus.ERROR, ExplorerPlugin.ID, 0,
- ExplorerPlugin.getMessage("%MSG_ERROR_LAUNCH_WSEXPLORER"),
- e);
- }
- // register launch options
- if (options != null && options.length > 0) {
- try {
- StringBuffer launchOptionsRegURL = new StringBuffer();
- launchOptionsRegURL.append(getBaseURL());
- launchOptionsRegURL.append(getLaunchOptionRegistryURL());
- URL url = new URL(launchOptionsRegURL.toString());
- URLConnection connection = url.openConnection();
- connection.setDoOutput(true);
- PrintWriter out = new PrintWriter(connection.getOutputStream());
- StringBuffer params = new StringBuffer();
- String encodedID = null;
- try {
- encodedID = URLEncoder.encode(ExplorerPlugin.ID,
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- params.append(encodedID);
- params.append("=");
- params.append(launchOptionKey);
- params.append("&");
- for (int i = 0; i < options.length; i++) {
- if (options[i] != null) {
- params.append(options[i].getKey());
- params.append("=");
- String option = null;
- try {
- option = URLEncoder.encode(options[i].getOption(),
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- params.append(option);
- params.append("&");
- }
- }
- out.print(params.toString());
- out.close();
- out = null;
- InputStream is = connection.getInputStream();
- is.close();
- is = null;
- } catch (Exception e) {
- return new Status(IStatus.WARNING, ExplorerPlugin.ID, 0,
- ExplorerPlugin
- .getMessage("%MSG_ERROR_LOAD_LAUNCH_OPTIONS"),
- e);
- }
- }
- return new Status(IStatus.OK, ExplorerPlugin.ID, 0, "", null);
- }
-
- private static int getLaunchOptionsKey() {
- return launchOptionsKey_++;
- }
-
- public IStatus launch(IWorkbench wb, IStructuredSelection sel,
- String[] inquiryURL, String[] publishURL,
- boolean forceLaunchOutsideIDE) {
- int inquiryURLOptionLength = (inquiryURL != null) ? inquiryURL.length
- : 0;
- int publishURLOptionLength = (publishURL != null) ? publishURL.length
- : 0;
- LaunchOption[] options = new LaunchOption[inquiryURLOptionLength
- + publishURLOptionLength];
- int index = 0;
- if (inquiryURL != null) {
- for (int i = 0; i < inquiryURL.length; i++) {
- options[index] = new LaunchOption(LaunchOptions.INQUIRY_URL,
- inquiryURL[i]);
- index++;
- }
- }
- if (publishURL != null) {
- for (int i = 0; i < publishURL.length; i++) {
- options[index] = new LaunchOption(LaunchOptions.PUBLISH_URL,
- publishURL[i]);
- index++;
- }
- }
- return launch(wb, sel, options, forceLaunchOutsideIDE);
- }
-}
-
-/**
- * Helper class for opening a browser and storing the
- * Exception thrown if it was unsuccessful.
- */
-class OpenBrowserRunnable implements Runnable {
-
- private IWorkbenchBrowserSupport browserSupport;
- private URL url;
- private Exception exception = null;
-
- public OpenBrowserRunnable(IWorkbenchBrowserSupport browserSupport, URL url) {
- this.browserSupport = browserSupport;
- this.url = url;
- }
-
- public void run() {
- try {
- browserSupport.getExternalBrowser().openURL(url);
- }
- catch (Exception e) {
- exception = e;
- }
- }
-
- public Exception getException() {
- return exception;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
deleted file mode 100644
index 077de51..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer;
-
-public final class WSExplorerContext {
- public static final String ID = "org.eclipse.wst.ws.explorer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
deleted file mode 100644
index bbc765a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
+++ /dev/null
@@ -1,85 +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.wst.ws.internal.explorer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Properties;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This <code>Command</code>, when executed, launches the
- * Web Services Explorer.
- */
-public class WSExplorerLauncherCommand extends AbstractDataModelOperation {
- private boolean forceLaunchOutsideIDE;
-
- private LaunchOption[] launchOptions;
-
- public WSExplorerLauncherCommand() {
- }
-
- public void writeCategoryInfo(String inquiryURL, String categoriesDirectory) {
- try {
- Properties p = new Properties();
- p.setProperty(LaunchOptions.CATEGORIES_DIRECTORY,
- categoriesDirectory);
- StringBuffer propertiesFileName = new StringBuffer();
- propertiesFileName.append(WSExplorer.getInstance()
- .getMetadataDirectory());
- File metadataDirectoryFile = new File(propertiesFileName.toString());
- if (!metadataDirectoryFile.exists()) {
- metadataDirectoryFile.mkdirs();
- }
- propertiesFileName.append(URLEncoder.encode(inquiryURL,"UTF-8")).append(
- ".properties");
- FileOutputStream fout = new FileOutputStream(propertiesFileName
- .toString());
- p.store(fout, null);
- fout.close();
- } catch (IOException e) {
- }
- }
-
- public IStatus execute() {
- return WSExplorer.getInstance().launch(null, null, launchOptions,
- forceLaunchOutsideIDE);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- return execute();
- }
-
- /**
- * @param forceLaunchOutsideIDE
- * The forceLaunchOutsideIDE to set.
- */
- public void setForceLaunchOutsideIDE(boolean forceLaunchOutsideIDE) {
- this.forceLaunchOutsideIDE = forceLaunchOutsideIDE;
- }
-
- /**
- * @param launchOptions
- * The launchOptions to set.
- */
- public void setLaunchOptions(LaunchOption[] launchOptions) {
- this.launchOptions = launchOptions;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java
deleted file mode 100644
index a450752..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java
+++ /dev/null
@@ -1,107 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.equinox.http.jetty.JettyConfigurator;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-public class WebappManager {
-
- private static String host;
- private static int port = -1;
- private static final int AUTO_SELECT_JETTY_PORT = 0;
-
- public static void start(String webappName) throws Exception {
- Dictionary d = new Hashtable();
-
-
- d.put("http.port", new Integer(getPortParameter())); //$NON-NLS-1$
-
- // set the base URL
- d.put("context.path", "/wse"); //$NON-NLS-1$ //$NON-NLS-2$
- d.put("other.info", "org.eclipse.wst.ws.explorer"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // suppress Jetty INFO/DEBUG messages to stderr
- Logger.getLogger("org.mortbay").setLevel(Level.WARNING); //$NON-NLS-1$
-
- JettyConfigurator.startServer(webappName, d);
- checkBundle();
-
- }
-
- /*
- * Ensures that the bundle with the specified name and the highest available
- * version is started and reads the port number
- */
- private static void checkBundle() throws InvalidSyntaxException, BundleException {
- Bundle bundle = Platform.getBundle("org.eclipse.equinox.http.registry"); //$NON-NLS-1$if (bundle != null) {
- if (bundle.getState() == Bundle.RESOLVED) {
- bundle.start(Bundle.START_TRANSIENT);
- }
- if (port == -1) {
- // Jetty selected a port number for us
- ServiceReference[] reference = bundle.getBundleContext().getServiceReferences("org.osgi.service.http.HttpService", "(other.info=org.eclipse.wst.ws.explorer)"); //$NON-NLS-1$ //$NON-NLS-2$
- Object assignedPort = reference[0].getProperty("http.port"); //$NON-NLS-1$
- port = Integer.parseInt((String)assignedPort);
- }
- }
-
- public static void stop(String webappName) throws CoreException {
- try {
- JettyConfigurator.stopServer(webappName);
- }
- catch (Exception e) {
- //HelpBasePlugin.logError("An error occured while stopping the help server", e); //$NON-NLS-1$
- }
- }
-
- public static int getPort() {
- return port;
- }
-
- /*
- * Get the port number which will be passed to Jetty
- */
- private static int getPortParameter() {
- if (port == -1) {
- return AUTO_SELECT_JETTY_PORT;
- }
- return port;
- }
-
- public static String getHost() {
- if (host == null) {
- String hostCommandLineOverride = ExplorerPlugin.getBundleContext().getProperty("server_host"); //$NON-NLS-1$
- if (hostCommandLineOverride != null && hostCommandLineOverride.trim().length() > 0) {
- host = hostCommandLineOverride;
- }
- else {
- host = "127.0.0.1"; //$NON-NLS-1$
- }
- }
- return host;
- }
-
- private WebappManager() {
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java
deleted file mode 100644
index 6b324f9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20070820 191585 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-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 LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
- public void run(IAction action)
- {
- EclipseStatusHandler handler = new EclipseStatusHandler();
- TransientResourceContext context = new TransientResourceContext();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, handler );
- WSExplorerLauncherCommand cmd = new WSExplorerLauncherCommand();
-
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- LaunchOption[] launchOptions = new LaunchOption[] {
- new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation),
- new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)
- };
- cmd.setLaunchOptions(launchOptions);
- cmd.setEnvironment( environment );
- cmd.execute( null, null );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) { }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
deleted file mode 100644
index b09c814..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
+++ /dev/null
@@ -1,75 +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.wst.ws.internal.explorer.favorites;
-
-import java.io.IOException;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-public class FavoritesRegistryTypeDefault extends FavoritesRegistryTypeAbstract {
- private static WSILDocument wsilDoc_;
-
- public static final String FAVORITES_DEFAULT = "properties/favorites_default.wsil";
-
- private String defaultFavorites_ = null;
-
- public FavoritesRegistryTypeDefault() {
- super();
- wsilDoc_ = null;
- }
-
- public FavoritesRegistryTypeDefault(String defaultFavorites) {
- super();
- wsilDoc_ = null;
- defaultFavorites_ = defaultFavorites;
- }
-
- public String getReadLocation() {
- StringBuffer readLocation = new StringBuffer();
- if (defaultFavorites_ == null)
- {
- readLocation.append(ExplorerPlugin.getInstance().getPluginInstallLocation());
- readLocation.append(FAVORITES_DEFAULT);
- }
- else
- {
- readLocation.append(defaultFavorites_);
- }
- return readLocation.toString();
- }
-
- public String getWriteLocation() {
- return null;
- }
-
- protected WSILDocument getWSILDocument() {
- if (wsilDoc_ == null) {
- wsilDoc_ = loadWSILDocument(getReadLocation(), true);
- getFavoritesUDDIRegistries();
- /* TODO: Public registry strings shouldn't be in properties - Ain't extensible.
- for (int i = 0; i < registries.length; i++) {
- registries[i].setName(WSPlugin.getResourceString(registries[i].getName()));
- }
- */
- }
- return wsilDoc_;
- }
-
- public WSILDocument getFavoritesDefault() {
- return getWSILDocument();
- }
-
- public void save() throws WSILException, IOException {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
deleted file mode 100644
index da76a1e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
+++ /dev/null
@@ -1,76 +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.wst.ws.internal.explorer.favorites;
-
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-
-public class FavoritesRegistryTypeWSE extends FavoritesRegistryTypeAbstract
-{
- private static WSILDocument wsilDoc_;
- public static final String FAVORITES_WSEXPLORER = "favorites.wsil";
- private String defaultFavorites_ = null;
- private String stateLocation_ = null;
-
- public FavoritesRegistryTypeWSE()
- {
- super();
- wsilDoc_ = null;
- }
-
- public FavoritesRegistryTypeWSE(String defaultFavorites, String stateLocation) {
- super();
- wsilDoc_ = null;
- defaultFavorites_ = defaultFavorites;
- stateLocation_ = stateLocation;
- }
-
- public String getReadLocation()
- {
- StringBuffer readLocation = new StringBuffer();
- readLocation.append(stateLocation_ == null ? ExplorerPlugin.getInstance().getPluginStateLocation() : stateLocation_);
- readLocation.append(FAVORITES_WSEXPLORER);
- return readLocation.toString();
- }
-
- public String getWriteLocation()
- {
- return getReadLocation();
- }
-
- protected WSILDocument getWSILDocument()
- {
- if (wsilDoc_ == null)
- {
- wsilDoc_ = loadWSILDocument(getReadLocation(), false);
- if (wsilDoc_ == null)
- {
- restoreFavoritesDefault();
- try
- {
- save();
- }
- catch (Throwable t)
- {
- }
- }
- }
- return wsilDoc_;
- }
-
- public void restoreFavoritesDefault()
- {
- wsilDoc_ = (new FavoritesRegistryTypeDefault(defaultFavorites_)).getWSILDocument();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
deleted file mode 100644
index 2207fe5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
+++ /dev/null
@@ -1,134 +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.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class Action
-{
- protected Controller controller_;
- protected Hashtable propertyTable_;
- protected Vector removedProperties_;
-
- public Action()
- {
- this(null);
- }
-
- public Action(Controller controller)
- {
- controller_ = controller;
- propertyTable_ = new Hashtable();
- removedProperties_ = new Vector();
- }
-
- public final Controller getController()
- {
- return controller_;
- }
-
- /**
- * Read properties from an HttpServletRequest and add them to the property table.
- * @param HttpServletRequest The HttpServletRequest containing the embedded parameters.
- * @return boolean Whether or not the operation was successful.
- */
- public abstract boolean populatePropertyTable(HttpServletRequest request);
-
- /**
- * Get the property table.
- * @return Hashtable A hashtable containing the properties for this action.
- */
- public final Hashtable getPropertyTable()
- {
- return propertyTable_;
- }
-
- /**
- * Set the property table.
- * @return void
- */
- public void setPropertyTable(Hashtable propertyTable)
- {
- propertyTable_ = propertyTable;
- }
-
- /**
- * Add a property to the property table.
- * @param void
- */
- public final void addProperty(Object key, Object value)
- {
- propertyTable_.put(key, value);
- }
-
- /**
- * Remove a property from the property table. Track the deletions.
- * @param Object The key of the property being removed.
- */
- public final void removeProperty(Object key)
- {
- propertyTable_.remove(key);
- removedProperties_.addElement(key);
- }
-
- public final String[] getPropertyAsStringArray(Object key)
- {
- Object object = propertyTable_.get(key);
- if (object instanceof String[])
- return (String[])object;
- else if (object != null)
- return new String[] {object.toString()};
- else
- return new String[0];
- }
-
- public final boolean execute()
- {
- return execute(true);
- }
-
- public final boolean execute(boolean useActionEngine)
- {
- if (useActionEngine)
- return controller_.getActionEngine().executeAction(this);
- else
- return run();
- }
-
- // Abstract method for running this action.
- public abstract boolean run();
-
- /**
- * Return the transformers used to normalize the input/output parameters for this action
- * @return ITransformer[]
- */
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
- }
-
- protected void handleUnexpectedException(Perspective perspective,MessageQueue messageQueue,String exceptionName,Throwable t)
- {
- messageQueue.addMessage(perspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage(exceptionName);
- messageQueue.addMessage(t.getMessage());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
deleted file mode 100644
index 77832f6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class CheckWorkbenchFileReadOnlyAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/CheckWorkbenchFileReadOnlyActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
deleted file mode 100644
index c53fdc6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
+++ /dev/null
@@ -1,98 +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
- * -------- -------- -----------------------------------------------------------
- * 20060906 156398 jeffliu@ca.ibm.com - Jeffrey Liu
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ClearNodeAction extends NodeAction
-{
- public ClearNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- //element.disconnectAll();
- List elements2remove = new ArrayList();
- collectElements2Remove(element, elements2remove);
- for (Iterator it = elements2remove.iterator(); it.hasNext();)
- {
- TreeElement e = (TreeElement)it.next();
- e.getModel().removeElement(e);
- }
- if (element.getModel().getRootElement() != element)
- nodeManager_.removeFromNodeTable(nodeId);
- // Do not add this to the history.
- MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
- messageQueue.addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED",node.getNodeName()));
- return true;
- }
- return false;
- }
-
- private void collectElements2Remove(TreeElement element, List elements2remove)
- {
- if (!elements2remove.contains(element))
- {
- if (element.getModel().getRootElement() != element)
- elements2remove.add(element);
- Enumeration rels = element.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel)rels.nextElement();
- String relName = rel.getName();
- if (!ModelConstants.REL_OWNER.equals(relName))
- {
- Enumeration children = element.getElements(rel.getName());
- while (children.hasMoreElements())
- {
- collectElements2Remove((TreeElement)children.nextElement(), elements2remove);
- }
- }
- }
- }
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- // Deleting a node from the tree results in changes to the treeview and status contents.
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
deleted file mode 100644
index b7598d6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class ClearViewElementAction extends LinkAction
-{
- private String listManagerRel_;
- private NodeManager nodeManager_;
- public ClearViewElementAction(Controller controller,NodeManager nodeManager,String listManagerRel)
- {
- super(controller);
- nodeManager_ = nodeManager;
- listManagerRel_ = listManagerRel;
- }
-
- // ...jsp?viewId=...
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- String viewIdString = request.getParameter(ActionInputs.VIEWID);
- // Perform data validation.
- try
- {
- Integer.parseInt(viewIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.VIEWID,viewIdString);
- return true;
- }
-
- public final boolean run()
- {
- int viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getSelectedNode();
- ViewTool viewTool = (ViewTool)selectedNode.getToolManager().getSelectedTool();
- if (viewTool.getToolManager(viewId) == null)
- {
- // Stale view.
- return false;
- }
- TreeElement element = selectedNode.getTreeElement();
- ListManager listManager = (ListManager)element.getPropertyAsObject(listManagerRel_);
- listManager.removeElementWithViewId(viewId);
- viewTool.clearViewToolManager(viewId);
- selectedNode.setViewId(ActionInputs.VIEWID_DEFAULT);
- // Do not add this to the history.
- return true;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
deleted file mode 100644
index a94d30d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
+++ /dev/null
@@ -1,72 +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.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class FormAction extends Action
-{
- public FormAction(Controller controller)
- {
- super(controller);
- }
-
- protected abstract boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- try
- {
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- getSelectedFormTool().clearErrors();
- boolean result = processParsedResults(parser);
- removedProperties_.removeAllElements();
- return result;
- }
- catch (MultipartFormDataException e)
- {
- }
- return false;
- }
-
- public void setPropertyTable(Hashtable propertyTable)
- {
- try
- {
- processParsedResults(new MultipartFormDataParser(propertyTable));
- }
- catch (MultipartFormDataException mfde)
- {
- }
- for (Iterator it = propertyTable.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Hashtable thisPropertyTable = getPropertyTable();
- if (!thisPropertyTable.containsKey(key))
- addProperty(key, propertyTable.get(key));
- }
- }
-
- protected final void addToHistory(int perspectiveId,String url)
- {
- controller_.addToHistory(perspectiveId,url);
- }
-
- public abstract FormTool getSelectedFormTool();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
deleted file mode 100644
index 3f2cca4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-// A class for reporting form input exceptions.
-public class FormInputException extends Exception
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257846601685938742L;
-
-public FormInputException(String msg)
- {
- super(msg);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
deleted file mode 100644
index dd7245b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
+++ /dev/null
@@ -1,127 +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.wst.ws.internal.explorer.platform.actions;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public abstract class ImportToFileSystemAction extends LinkAction
-{
- public ImportToFileSystemAction(Controller controller)
- {
- super(controller);
- }
-
- // os is the OutputStream of the file in the file system
- public abstract boolean write(OutputStream os);
-
- // the default name for the file
- public abstract String getDefaultFileName();
-
- public boolean writeWSDLDefinition(OutputStream os, Definition definition)
- {
- try
- {
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- wsdlWriter.writeWSDL(definition, os);
- return true;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- public boolean writeWSILDocument(OutputStream os, WSILDocument wsilDoc)
- {
- OutputStreamWriter osw = null;
- try
- {
- osw = new OutputStreamWriter(os);
- wsilDoc.write(osw);
- return true;
- }
- catch (Exception e)
- {
- return false;
- }
- finally
- {
- try
- {
- if (osw != null)
- osw.close();
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, String jspPage)
- {
- StringBuffer actionLink = new StringBuffer(jspPage);
- actionLink.append('?');
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- String toolID = request.getParameter(ActionInputs.TOOLID);
- String viewID = request.getParameter(ActionInputs.VIEWID);
- String viewToolID = request.getParameter(ActionInputs.VIEWTOOLID);
- try
- {
- Integer.parseInt(nodeID);
- Integer.parseInt(toolID);
- Integer.parseInt(viewID);
- Integer.parseInt(viewToolID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- propertyTable_.put(ActionInputs.TOOLID, toolID);
- propertyTable_.put(ActionInputs.VIEWID, viewID);
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolID);
- }
- catch (Exception e)
- {
- return false;
- }
- return true;
- }
-
- public abstract String getStatusContentVar();
-
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
deleted file mode 100644
index 8a0c3f9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
+++ /dev/null
@@ -1,220 +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
- * -------- -------- -----------------------------------------------------------
- * 20060721 149070 gilberta@ca.ibm.com - Gilbert Andrews, update to respect preferences
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-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.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-public abstract class ImportToWorkbenchAction extends FormAction {
- private IWorkspaceRoot iWorkspaceRoot_;
- private IProject iProject_;
- private IResource targetFileResource_;
-
- public ImportToWorkbenchAction(Controller controller) {
- super(controller);
- iWorkspaceRoot_ = ResourcesPlugin.getWorkspace().getRoot();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
- getSelectedFormTool();
- MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
- boolean inputsValid = true;
- String workbenchProjectName = parser.getParameter(ActionInputs.WORKBENCH_PROJECT_NAME);
- if (workbenchProjectName == null || workbenchProjectName.length() <= 0) {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WORKBENCH_PROJECT"));
- inputsValid = false;
- }
- else
- {
- iProject_ = iWorkspaceRoot_.getProject(workbenchProjectName);
- propertyTable_.put(ActionInputs.WORKBENCH_PROJECT_NAME, workbenchProjectName);
- }
- String importFile = parser.getParameter(ActionInputs.IMPORT_FILE);
- if (importFile != null)
- {
- propertyTable_.put(ActionInputs.IMPORT_FILE, ActionInputs.IMPORT_FILE);
- String importedFileName = parser.getParameter(ActionInputs.IMPORTED_FILE_NAME);
- if (importedFileName == null || importedFileName.length() <= 0)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_FILE_NAME"));
- inputsValid = false;
- }
- else
- propertyTable_.put(ActionInputs.IMPORTED_FILE_NAME, importedFileName);
- }
- String importToWSIL = parser.getParameter(ActionInputs.IMPORT_TO_WSIL);
- if (importToWSIL != null)
- {
- propertyTable_.put(ActionInputs.IMPORT_TO_WSIL, ActionInputs.IMPORT_TO_WSIL);
- propertyTable_.put(ActionInputs.IMPORTED_WSDL_URL, parser.getParameter(ActionInputs.IMPORTED_WSDL_URL));
- String wsilFileName = parser.getParameter(ActionInputs.WSIL_FILE_NAME);
- if (wsilFileName == null || wsilFileName.length() <= 0)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WSIL_FILE_NAME"));
- inputsValid = false;
- }
- else
- propertyTable_.put(ActionInputs.WSIL_FILE_NAME, wsilFileName);
- }
- if (importFile == null && importToWSIL == null)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_NO_IMPORT_OPTION_SELECTED"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- private OutputStream getOutputStream(String defaultFileName) throws FileNotFoundException {
- File file = new File(controller_.getServletEngineStateLocation() + defaultFileName);
- FileOutputStream fos = new FileOutputStream(file);
- return fos;
- }
-
- private boolean importTempFileToWebProject(String defaultFileName) throws FileNotFoundException, CoreException
- {
- if (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE)
- targetFileResource_.delete(true,new NullProgressMonitor());
-
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- File file = new File(controller_.getServletEngineStateLocation()+defaultFileName);
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-
- IFile iFile = iProject_.getFile("/"+importedFileName);
- iFile.create(bis,true,new NullProgressMonitor());
-
- // Remove the temporary file
- file.delete();
- return true;
- }
-
- public boolean fileExists()
- {
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- if (importedFileName != null)
- {
- targetFileResource_ = iProject_.findMember(importedFileName);
- return (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE);
- }
- else
- return false;
- }
-
- public boolean isTargetFileResourceReadOnly()
- {
- return targetFileResource_.getResourceAttributes().isReadOnly();
- }
-
-
- public boolean isCheckoutFilesEnabled()
- {
- return PersistentResourceContext.getInstance().isCheckoutFilesEnabled();
- }
-
- public String getWebServicePluginFileMessage(String messageId)
- {
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- return controller_.getMessage(messageId,new String[]{iProject_.getFullPath().toString(),importedFileName});
- }
-
-
- public boolean isOverwriteFilesEnabled()
- {
- return PersistentResourceContext.getInstance().isOverwriteFilesEnabled();
- }
-
- public boolean validateEdit()
- {
- IFile[] files = new IFile[1];
- files[0] = (IFile)targetFileResource_;
- IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files,null);
- MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
- messageQueue.addMessage(status.getMessage());
- return status.isOK();
- }
-
- public boolean run() {
- MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
- if (propertyTable_.get(ActionInputs.IMPORT_FILE) != null)
- {
- try {
- ImportToFileSystemAction action = newImportToFileSystemAction();
- action.run();
- String defaultFileName = action.getDefaultFileName();
- if (!action.write(getOutputStream(defaultFileName))) {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_WRITING_TEMP_FILE_TO_FS"));
- return false;
- }
- importTempFileToWebProject(defaultFileName);
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL", importedFileName));
- }
- catch (FileNotFoundException fnfe) {
- msgQueue.addMessage(fnfe.getMessage());
- return false;
- }
- catch (CoreException ce) {
- msgQueue.addMessage(ce.getMessage());
- return false;
- }
- }
- if (propertyTable_.get(ActionInputs.IMPORT_TO_WSIL) != null)
- {
- String projectName = (String)propertyTable_.get(ActionInputs.WORKBENCH_PROJECT_NAME);
- String importedWSILFileName = (String)propertyTable_.get(ActionInputs.WSIL_FILE_NAME);
- String wsdlURL = (String)propertyTable_.get(ActionInputs.IMPORTED_WSDL_URL);
- StringBuffer wsilPlatformURL = new StringBuffer("platform:/resource/");
- wsilPlatformURL.append(projectName);
- wsilPlatformURL.append('/');
- wsilPlatformURL.append(importedWSILFileName);
- AddWSDLToWSILCommand command = new AddWSDLToWSILCommand();
- String[] args = new String[5];
- args[0] = AddWSDLToWSILCommand.ARG_WSIL;
- args[1] = wsilPlatformURL.toString();
- args[2] = AddWSDLToWSILCommand.ARG_WSDL;
- args[3] = wsdlURL;
- args[4] = AddWSDLToWSILCommand.ARG_RESOLVE_WSDL;
- command.setArguments(args);
- IEnvironment env = new EclipseEnvironment(null, null, null);
- command.setEnvironment( env );
- command.execute( null, null );
- msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL", importedWSILFileName));
- }
- return true;
- }
-
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
- public abstract ImportToFileSystemAction newImportToFileSystemAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
deleted file mode 100644
index 853a36b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardRunnable;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class LaunchWebServiceWizardAction extends FormAction
-{
- public LaunchWebServiceWizardAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String wizardID = parser.getParameter(ActionInputs.WEB_SERVICE_WIZARD);
- propertyTable_.put(ActionInputs.WEB_SERVICE_WIZARD, wizardID);
- return true;
- }
-
- public boolean launchWizard(String wsdlURL)
- {
- LaunchWizardTask task = LaunchWizardTask.getInstance();
- if (task.getIsExecuting())
- {
- controller_.getCurrentPerspective().getMessageQueue().addMessage(controller_.getMessage("MSG_ERROR_WIZARD_ALREADY_RUNNING"));
- return false;
- }
- int wizardID = Integer.parseInt((String)propertyTable_.get(ActionInputs.WEB_SERVICE_WIZARD));
- LaunchWizardRunnable runnable;
- if (wizardID == ActionInputs.WEB_SERVICE_CLIENT_WIZARD)
- runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard", wsdlURL);
- else if (wizardID == ActionInputs.WEB_SERVICE_SKELETON_WIZARD)
- runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.creation.ui.wizard.serverwizard", wsdlURL);
- else
- return false;
- task.checkAndAsyncExec(runnable);
- return true;
- }
-
- public abstract String getStatusContentVar();
-
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
deleted file mode 100644
index c7f644d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-// Abstract class representing the action of clicking a link. These actions
-// may change the history list.
-public abstract class LinkAction extends Action
-{
- private boolean isAddedToHistory_;
- private boolean isStaleBreadCrumb_;
-
- public LinkAction(Controller controller)
- {
- super(controller);
- isAddedToHistory_ = false;
- isStaleBreadCrumb_ = false;
- }
-
- // Determine if the action was successfully added to this history list.
- // This should be called after the run() method.
- public final boolean isAddedToHistory()
- {
- return isAddedToHistory_;
- }
-
- protected abstract boolean processLinkParameters(HttpServletRequest request);
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- String isHistoryString = request.getParameter(ActionInputs.ISHISTORY);
- if (isHistoryString != null)
- propertyTable_.put(ActionInputs.ISHISTORY,isHistoryString);
- return processLinkParameters(request);
- }
-
- // Add the action's URL to the controller's history list.
- protected final void addToHistory(int perspectiveId,String url)
- {
- if (!isHistoryAction())
- isAddedToHistory_ = controller_.addToHistory(perspectiveId,url);
- }
-
- public final boolean isHistoryAction()
- {
- return (propertyTable_.get(ActionInputs.ISHISTORY) != null);
- }
-
- public final void setStaleBreadCrumb()
- {
- if (isHistoryAction())
- {
- isStaleBreadCrumb_ = true;
- controller_.processStaleBreadCrumb();
- }
- }
-
- public final boolean isStaleBreadCrumb()
- {
- return isStaleBreadCrumb_;
- }
-
- // Call this when a stale breadcrumb is encountered while traversing history chain.
- public final String getNextHistoryActionLink()
- {
- return RetrieveHistoryAction.getActionLink(controller_.getHistoryDirection());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
deleted file mode 100644
index cb44a61..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
+++ /dev/null
@@ -1,132 +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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class NodeAction extends LinkAction
-{
- protected NodeManager nodeManager_;
- private boolean requiresTreeViewRefresh_;
- private boolean requiresNodeSelection_;
- private boolean requiresViewSelection_;
- private boolean requiresStatusUpdate_;
-
- public NodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller);
- nodeManager_ = nodeManager;
- requiresTreeViewRefresh_ = false;
- requiresNodeSelection_ = false;
- requiresViewSelection_ = false;
- requiresStatusUpdate_ = false;
- }
-
- // ...jsp?nodeId=...<&isHistory=1>
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeIdString = request.getParameter(ActionInputs.NODEID);
- // Perform data validation.
- try
- {
- Integer.parseInt(nodeIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.NODEID,nodeIdString);
- return true;
- }
-
- protected final boolean isStaleNode(int nodeId)
- {
- return (nodeManager_.getNode(nodeId) == null);
- }
-
- /**
- * Make a node visible. A node is visible when all of its ancestors are expanded.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
- */
- protected final boolean makeNodeVisible(Node node)
- {
- requiresTreeViewRefresh_ = node.getNodeManager().makeNodeVisible(node);
- return requiresTreeViewRefresh_;
- }
-
- /**
- * Make a node visible. A node is visible when all of its ancestors are expanded.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
- */
- public final void setTreeRefreshNeeded()
- {
- requiresTreeViewRefresh_ = true;
-
- }
-
- /**
- * Select a node with id nodeId.
- * @param int The id of the node to be selected.
- */
- protected final void setSelectedNodeId(int nodeId)
- {
- if (nodeManager_.getSelectedNodeId() != nodeId)
- {
- requiresNodeSelection_ = true;
- nodeManager_.setSelectedNodeId(nodeId);
- }
- }
-
- protected final void setSelectedViewId(int viewId)
- {
- Node selectedNode = nodeManager_.getSelectedNode();
- if (selectedNode.getViewId() != viewId)
- {
- requiresViewSelection_ = true;
- selectedNode.setViewId(viewId);
- }
- }
-
- // Determine whether or not the treeview requires reloading as a result of this action.
- // Reloading is required when branches are added/removed.
- public boolean requiresTreeViewRefresh()
- {
- return requiresTreeViewRefresh_;
- }
-
- // Determine whether or not a new node has been selected as a result of the action.
- public boolean requiresNodeSelection()
- {
- return requiresNodeSelection_;
- }
-
- // Determine if a new view element is selected.
- public boolean requiresViewSelection()
- {
- return requiresViewSelection_;
- }
-
- // Determine if any status messages arose from this action.
- public boolean requiresStatusUpdate()
- {
- return requiresStatusUpdate_;
- }
-
- protected abstract String getActionLinkForHistory();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
deleted file mode 100644
index dd22119..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenCalendarBrowserAction extends Action
-{
- public OpenCalendarBrowserAction()
- {
- }
-
- // calendar_browser.jsp?sessionId=...&calendarType=...
- public static final String getActionLink(String sessionId,int calendarType)
- {
- StringBuffer actionLink = new StringBuffer("calendar_browser.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType);
- return actionLink.toString();
- }
-
- public static final String getActionLinkForDate(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATE);
- }
-
- public static final String getActionLinkForDateTime(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATETIME);
- }
-
- public static final String getActionLinkForGYearMonth(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GYEARMONTH);
- }
-
- public static final String getActionLinkForGDay(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GDAY);
- }
-
- public static final String getActionLinkForGMonthDay(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GMONTHDAY);
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
deleted file mode 100644
index 204cd80..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenWSDLBrowserAction extends Action
-{
- public OpenWSDLBrowserAction()
- {
- }
-
- public static final String getActionLink(String sessionId,int wsdlType)
- {
- StringBuffer actionLink = new StringBuffer("wsdl_browser.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.WSDL_TYPE).append('=').append(wsdlType);
- return actionLink.toString();
- }
-
- public static final String getActionLinkForService(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE);
- }
-
- public static final String getActionLinkForServiceInterface(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE_INTERFACE);
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
deleted file mode 100644
index 5ee9309..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ProxyLoadPageAction extends Action
-{
- // Get the action given a relative targetPage URL. e.g. "forms/LongLoadingForm.jsp"
- public static final String getActionLink(String targetPage)
- {
- return getActionLink(null,targetPage);
- }
-
- // Get the action given a sessionId and a relative targetPage URL.
- public static final String getActionLink(String sessionId,String targetPage)
- {
- StringBuffer actionLink = new StringBuffer("forms/ProxyLoadPage.jsp?");
- if (sessionId != null)
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
- actionLink.append(ActionInputs.TARGET_PAGE).append('=').append(targetPage);
- return actionLink.toString();
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
deleted file mode 100644
index 677050e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class ResizeFramesAction extends Action
-{
- protected Controller controller_;
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String frameName = parser.getParameter(ActionInputs.FRAME_NAME);
- if (frameName != null)
- propertyTable_.put(ActionInputs.FRAME_NAME,frameName);
- else
- return false;
- return processOthers(parser);
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public ResizeFramesAction(Controller controller)
- {
- controller_ = controller;
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- try
- {
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- boolean result = processParsedResults(parser);
- return result;
- }
- catch (MultipartFormDataException e)
- {
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
deleted file mode 100644
index 9d9d22c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.BreadCrumb;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class RetrieveHistoryAction extends LinkAction
-{
- private BreadCrumb breadCrumb_;
-
- public RetrieveHistoryAction(Controller controller)
- {
- super(controller);
- breadCrumb_ = null;
- }
-
- // actions/RetrieveHistoryAction.jsp?jump=1 - forward (ActionInputs.JUMP_FORWARD)
- // actions/RetrieveHistoryAction.jsp?jump=-1 - backward (ActionInputs.JUMP_BACK)
- public final static String getActionLink(int jump)
- {
- StringBuffer actionLink = new StringBuffer("actions/RetrieveHistoryActionJSP.jsp?");
- actionLink.append(ActionInputs.JUMP).append('=').append(jump);
- return actionLink.toString();
- }
-
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- String jumpString = request.getParameter(ActionInputs.JUMP);
- // Perform data validation.
- try
- {
- Integer.parseInt(jumpString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.JUMP,jumpString);
- return true;
- }
-
- public final boolean run()
- {
- int jump = Integer.parseInt((String)propertyTable_.get(ActionInputs.JUMP));
- switch (jump)
- {
- case ActionInputs.JUMP_FORWARD:
- breadCrumb_ = controller_.forward();
- return true;
- case ActionInputs.JUMP_BACK:
- breadCrumb_ = controller_.back();
- return true;
- }
- return false;
- }
-
- public final BreadCrumb getBreadCrumb()
- {
- return breadCrumb_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
deleted file mode 100644
index 3238e88..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
+++ /dev/null
@@ -1,73 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class SelectNodeAction extends NodeAction
-{
- protected Node selectedNode_;
-
- public SelectNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- selectedNode_ = null;
- }
-
- public final void performBaseAction(int nodeId)
- {
- setSelectedNodeId(nodeId);
- selectedNode_ = nodeManager_.getSelectedNode();
- }
-
- public void performExtendedAction()
- {
- //the extended classes can interject here
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- // Ensure that the node is visible.
- makeNodeVisible(nodeManager_.getNode(nodeId));
- performBaseAction(nodeId);
- performExtendedAction();
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public final Node getSelectedNode()
- {
- return selectedNode_;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new NodeSelectionTransformer(controller_)};
- }
-
- // Selecting a node changes the treeview content and the properties container.
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
deleted file mode 100644
index cf6ffe8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
+++ /dev/null
@@ -1,163 +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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public abstract class SelectNodeToolAction extends SelectNodeAction
-{
- protected NodeManager nodeManager_;
- protected Tool selectedTool_;
-
- public SelectNodeToolAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- nodeManager_ = nodeManager;
- selectedTool_ = null;
- }
-
- public final NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- // ...jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- String toolIdString = request.getParameter(ActionInputs.TOOLID);
- String viewIdString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIdString = request.getParameter(ActionInputs.VIEWTOOLID);
-
- // Perform data validation.
- try
- {
- Integer.parseInt(toolIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed.
- return false;
- }
- propertyTable_.put(ActionInputs.TOOLID,toolIdString);
-
- // Optional properties
- try
- {
- int viewId = Integer.parseInt(viewIdString);
- propertyTable_.put(ActionInputs.VIEWID,viewIdString);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- Integer.parseInt(viewToolIdString);
- propertyTable_.put(ActionInputs.VIEWTOOLID,viewToolIdString);
- }
- }
- catch (NumberFormatException e)
- {
- }
- return result;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- // Ensure that the node is visible.
- makeNodeVisible(nodeManager_.getNode(nodeId));
- setSelectedNodeId(nodeId);
- selectedNode_ = nodeManager_.getSelectedNode();
- int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
- ToolManager toolManager = selectedNode_.getToolManager();
- toolManager.setSelectedToolId(toolId);
- selectedTool_ = toolManager.getSelectedTool();
- String viewIdString = ((String)propertyTable_.get(ActionInputs.VIEWID));
- if (viewIdString != null)
- {
- int viewId = Integer.parseInt(viewIdString);
- setSelectedViewId(viewId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- String viewToolIdString = ((String)propertyTable_.get(ActionInputs.VIEWTOOLID));
- ViewTool viewTool = (ViewTool)selectedTool_;
- if (viewToolIdString != null)
- {
- int viewToolId = Integer.parseInt(viewToolIdString);
- ToolManager viewToolManager = selectedNode_.getViewToolManager();
- if (viewToolManager == null)
- {
- if (!isHistoryAction())
- {
- viewToolManager = viewTool.createToolManager(viewId);
- viewToolId = viewToolManager.getSelectedToolId();
- }
- else
- {
- setStaleBreadCrumb();
- return false;
- }
- }
- viewToolManager.setSelectedToolId(viewToolId);
- }
- }
- }
- else
- setSelectedViewId(ActionInputs.VIEWID_DEFAULT);
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
- }
-
- public final Tool getSelectedViewTool()
- {
- if (propertyTable_.get(ActionInputs.VIEWID) != null)
- return selectedNode_.getViewToolManager().getSelectedTool();
- return null;
- }
-
- public final Tool getSelectedTool()
- {
- return selectedTool_;
- }
-
- // Selecting a node tool updates the properties content. Also, in the event
- // of a history switch, nodes may need to be selected resulting in changes to
- // both the treeview content and the properties container. These requirements are
- // covered through the base class.
- public abstract String getPropertiesContentVar();
- public abstract String getPropertiesContentPage();
- public String getStatusContentVar()
- {
- return null;
- }
-
- public String getStatusContentPage()
- {
- return null;
- }
-
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
deleted file mode 100644
index da74fa0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ShowPerspectiveAction extends LinkAction
-{
- public ShowPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- // actions/show_perspective.jsp?perspective=0<&isHistory=1> - UDDI (ActionInputs.PERSPECTIVE_UDDI)
- // actions/show_perspective.jsp?perspective=1<&isHistory=1> - WSIL (ActionInputs.PERSPECTIVE_WSIL)
- // actions/show_perspective.jsp?perspective=2<&isHistory=1> - WSDL (ActionInputs.PERSPECTIVE_WSDL)
- // actions/show_perspective.jsp?perspective=3<&isHistory=1> - Favorites (ActionInputs.PERSPECTIVE_FAVORITES)
- public final static String getActionLink(int newPerspective,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("actions/ShowPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.PERSPECTIVE).append('=').append(newPerspective);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- return true;
- }
-
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = false;
- String perspectiveString = request.getParameter(ActionInputs.PERSPECTIVE);
- // Perform data validation.
- try
- {
- Integer.parseInt(perspectiveString);
- propertyTable_.put(ActionInputs.PERSPECTIVE,perspectiveString);
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- result = processParsedResults(parser);
- removedProperties_.removeAllElements();
- }
- catch (NumberFormatException e)
- {
- // Validation failed! - This should not happen.
- }
- catch (MultipartFormDataException e)
- {
- }
- return result;
- }
-
- public boolean run()
- {
- int perspective = Integer.parseInt((String)propertyTable_.get(ActionInputs.PERSPECTIVE));
- controller_.setCurrentPerspective(perspective);
- addToHistory(perspective,getActionLink(perspective,true));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
deleted file mode 100644
index 2c05b40..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ToggleNodeAction extends NodeAction
-{
- protected Node toggledNode_;
- public ToggleNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- toggledNode_ = null;
- }
-
- // Toggle the current node and update the selection iff the currently selected
- // is a related descendant of a collapsed node.
- /**
- * Toggle the current node and update the selection iff the currently selected
- * node is a related descendant of the current node and the current node is
- * now collapsed as a result of this action.
- *
- * @param int The node ID of the node for which this action applies to.
- * @return boolean Indicator of whether or not a selection change was necessary.
- */
- public final boolean performBaseAction(int nodeId)
- {
- toggledNode_ = nodeManager_.getNode(nodeId);
- nodeManager_.setFocusedNodeId(nodeId);
- toggledNode_.setVisibilityOfChildren(!toggledNode_.isOpen());
- Node selectedNode = nodeManager_.getSelectedNode();
- if (selectedNode != null)
- {
- if (!selectedNode.isVisible())
- {
- setSelectedNodeId(nodeId);
- return true;
- }
- }
- return false;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- if (performBaseAction(nodeId))
- {
- // Save the selection of the toggle link in the history.
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- }
- // Do not save the toggle in history.
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public final Node getToggledNode()
- {
- return toggledNode_;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new NodeIdTransformer(controller_)};
- }
-
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
deleted file mode 100644
index 0094f54..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class ValidateEditAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/ValidateEditActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
deleted file mode 100644
index 3624f25..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-public class WSDLFileNameHelper
-{
- private static final String default_ = "temp.wsdl";
-
- /**
- * Given a wsdl path (file, URL etc.), guess at the file name by looking for the .wsdl extension at the end of the
- * path and the file that it belongs to. If this is not possible, return the default defined in this class.
- * @param String The path (file, URL etc.) of this WSDL file.
- * @return String The WSDL file name determined by this routine.
- */
- public static final String getWSDLFileName(String wsdlPathname)
- {
- if (wsdlPathname != null)
- {
- if (wsdlPathname.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlPathname.lastIndexOf("/"),wsdlPathname.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- return wsdlPathname.substring(lastSeparatorPos+1,wsdlPathname.length());
- }
- }
- return default_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
deleted file mode 100644
index 91369b2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class WriteWSDLToWorkbenchAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/WriteWSDLToWorkbenchActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
deleted file mode 100644
index d560cf0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
+++ /dev/null
@@ -1,105 +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.wst.ws.internal.explorer.platform.constants;
-
-public class ActionInputs
-{
- // URL parm for all actions which are in the history list.
- public static final String ISHISTORY = "isHistory";
-
- // Utility constant for tree node identification.
- public static final String NODEID = "nodeId";
-
- // Utility constant for tool identification.
- public static final String TOOLID = "toolId";
-
- // Utility constant for view identification.
- public static final String VIEWID = "viewId";
- public static final int VIEWID_DEFAULT = -1;
-
- // Utility constant for view tool identification.
- public static final String VIEWTOOLID = "viewToolId";
- public static final int VIEWTOOLID_DEFAULT = -1;
-
- // Utility constants for transport classes
- public static final String TRANSPORT_CLASS_NAME = "org.uddi4j.TransportClassName";
- public static final String TRASPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
- //public static final String AXIS_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
- //public static final String SOAP_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheSOAPTransport";
-
- // ToggleNodeAction and its derivatives.
- public static final String OPEN = "open";
- public static final int OPEN_NODE = 1;
- public static final int CLOSE_NODE = 0;
-
- // ShowPerspectiveAction
- public static final String PERSPECTIVE = "perspective";
- public static final int PERSPECTIVE_UDDI = 0;
- public static final int PERSPECTIVE_WSIL = 1;
- public static final int PERSPECTIVE_WSDL = 2;
- public static final int PERSPECTIVE_FAVORITES = 3;
-
- // RetrieveHistoryAction
- public static final String JUMP = "jump";
- public static final int JUMP_FORWARD = 1;
- public static final int JUMP_BACK = -1;
-
- // LaunchWebServiceWizardAction
- public final static String WEB_SERVICE_WIZARD = "webServiceWizard";
- public final static int WEB_SERVICE_CLIENT_WIZARD = 0;
- public final static int WEB_SERVICE_SKELETON_WIZARD = 1;
-
- // ImportToWorkbenchAction
- public final static String WORKBENCH_PROJECT_NAME = "workbenchProjectName";
- public final static String IMPORT_FILE = "importWSDL";
- public final static String IMPORTED_FILE_NAME = "importedFileName";
- public final static String IMPORT_TO_WSIL = "importToWSIL";
- public final static String WSIL_FILE_NAME = "WSILFileName";
- public final static String IMPORTED_WSDL_URL = "importedWsdlUrl";
- public final static String IMPORT_ACTION = "importAction";
-
- // ProxyLoadAction
- public final static String TARGET_PAGE = "targetPage";
-
- // Session ID for pop ups whose browsers choose to ignore the session.
- public final static String SESSIONID = "sId";
-
- // WSDL Browser
- public static final String PROJECT = "project";
- public static final String CATEGORY = "category";
- public static final String WSDL_TYPE = "wsdlType";
- public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
- public static final int WSDL_TYPE_SERVICE = 1;
- public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
- public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
- public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-
- // Calendar Browser
- public static final String CALENDAR_TYPE = "calendarType";
- public static final int CALENDAR_TYPE_DATE = 0;
- public static final int CALENDAR_TYPE_DATETIME = 1;
- public static final int CALENDAR_TYPE_GYEARMONTH = 2;
- public static final int CALENDAR_TYPE_GDAY = 3;
- public static final int CALENDAR_TYPE_GMONTHDAY = 4;
-
- // ResizeFrameAction
- public static final String FRAME_NAME = "frameName";
-
- // Other Actions
- public static final String CURRENT_TOOL_MANAGER = "currentToolManager";
-
- // Action Engine
- public static final String ACTION_ENGINE_SCENARIO = "actionEngineScenario";
- public static final String ACTION_ENGINE_MODE = "actionEngineMode";
-
- // MultipartFormDataParser
- public static final String MULTIPART_FORM_DATA_PARSER = "multipartFormDataParser";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
deleted file mode 100644
index 1e85387..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
+++ /dev/null
@@ -1,28 +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.wst.ws.internal.explorer.platform.constants;
-
-public class FrameNames
-{
- // wsexplorer.jsp
- public final static String WINDOW_NAME_WSEXPLORER_JSP = "wsexplorer.jsp";
- public final static String PERSPECTIVE_WORKAREA = "perspective_workarea";
- public final static String PERSPECTIVE_TOOLBAR = "perspective_toolbar";
- public final static String PERSPECTIVE_CONTENT = "perspective_content";
-
- // WSDL Browser
- public final static String WSDL_TOOLBAR = "wsdl_toolbar";
- public final static String WSDL_CONTENT = "wsdl_content";
-
- // Calendar Browser
- public final static String CALENDAR_TOOLBAR = "calendar_toolbar";
- public final static String CALENDAR_CONTENT = "calendar_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
deleted file mode 100644
index 1a87dd2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ModelConstants
-{
- public static final String REL_ID = "relationshipId";
- public static final String REL_LOCALNAME_SEPARATOR = "#";
- public static final String REL_OWNER = "owner";
- public static final String REL_CHILDREN = "children";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
deleted file mode 100644
index 7b92cb4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.constants;
-
-public class ToolTypes
-{
- public static final byte FORM = 0;
- public static final byte ACTION = 1;
- public static final byte VIEW = 2;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
deleted file mode 100644
index 6de8c26..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ListElement
-{
- private int viewId_;
- private Object object_;
- // For search parameters: info on the Node and ViewTool holding this element.
- private int targetNodeId_;
- private int targetToolId_;
- private int targetViewId_;
-
- public ListElement(Object object)
- {
- object_ = object;
- viewId_ = ActionInputs.VIEWID_DEFAULT;
- targetNodeId_ = -1;
- targetToolId_ = -1;
- targetViewId_ = ActionInputs.VIEWID_DEFAULT;
- }
-
- public final Object getObject()
- {
- return object_;
- }
-
- public final void setViewId(int viewId)
- {
- viewId_ = viewId;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final void setTargetViewToolInfo(int nodeId,int toolId,int viewId)
- {
- targetNodeId_ = nodeId;
- targetToolId_ = toolId;
- targetViewId_ = viewId;
- }
-
- public final int getTargetNodeId()
- {
- return targetNodeId_;
- }
-
- public final int getTargetToolId()
- {
- return targetToolId_;
- }
-
- public final int getTargetViewId()
- {
- return targetViewId_;
- }
-
- public final String toString() {
- return getObject().toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
deleted file mode 100644
index f8a78ab..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class ListManager
-{
- private int nextViewId_;
- private Vector itemsList_;
- private Hashtable itemsTable_;
-
- public ListManager()
- {
- nextViewId_ = 0;
- itemsList_ = new Vector();
- itemsTable_ = new Hashtable();
- }
-
- private final void updateManager(ListElement element)
- {
- itemsTable_.put(String.valueOf(nextViewId_),element);
- element.setViewId(nextViewId_);
- nextViewId_++;
- }
-
- public final void add(ListElement element)
- {
- itemsList_.addElement(element);
- updateManager(element);
- }
-
- public final void addWithCurrentViewId(ListElement element)
- {
- itemsList_.addElement(element);
- itemsTable_.put(String.valueOf(element.getViewId()),element);
- }
-
- public final ListElement elementAt(int index)
- {
- return (ListElement)itemsList_.elementAt(index);
- }
-
- public final ListElement getElementWithViewId(int viewId)
- {
- return (ListElement)itemsTable_.get(String.valueOf(viewId));
- }
-
- public final void removeElementWithViewId(int viewId)
- {
- itemsTable_.remove(String.valueOf(viewId));
- for (int i=0;i<itemsList_.size();i++)
- {
- ListElement listElement = elementAt(i);
- if (listElement.getViewId() == viewId)
- {
- itemsList_.removeElementAt(i);
- break;
- }
- }
- }
-
- public final void removeElementAt(int index)
- {
- ListElement listElement = (ListElement)elementAt(index);
- itemsList_.removeElementAt(index);
- itemsTable_.remove(String.valueOf(listElement.getViewId()));
- }
-
- public final void insertElementAt(ListElement element,int index)
- {
- itemsList_.insertElementAt(element,index);
- updateManager(element);
- }
-
- public final Enumeration getListElements()
- {
- return itemsList_.elements();
- }
-
- public final void clear()
- {
- itemsList_.removeAllElements();
- itemsTable_.clear();
- }
-
- public final ListManager copy(ListManager newListManager)
- {
- newListManager.clear();
- for (int i=0;i<itemsList_.size();i++)
- {
- ListElement listElement = (ListElement)elementAt(i);
- ListElement newListElement = new ListElement(listElement.getObject());
- newListElement.setViewId(listElement.getViewId());
- newListElement.setTargetViewToolInfo(listElement.getTargetNodeId(),listElement.getTargetToolId(),listElement.getTargetViewId());
- newListManager.addWithCurrentViewId(newListElement);
- }
- newListManager.setNextViewId(nextViewId_);
- return newListManager;
- }
-
- public final void setNextViewId(int nextViewId)
- {
- nextViewId_ = nextViewId;
- }
-
- public final int getNextViewId()
- {
- return nextViewId_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
deleted file mode 100644
index 25d0981..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class TreeElement extends BasicElement
-{
- private String key_;
-
- public TreeElement(String name,Model model)
- {
- super(name,model);
- key_ = name;
- }
-
- public void setKey(String key)
- {
- key_ = key;
- }
-
- public String getKey()
- {
- return key_;
- }
-
- public boolean equals(TreeElement element)
- {
- if (key_ == null)
- return false;
- return key_.equals(element.getKey());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
deleted file mode 100644
index 93af2b4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
+++ /dev/null
@@ -1,229 +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.wst.ws.internal.explorer.platform.engine;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ActionDataParser
-{
- private Document doc;
-
- public ScenarioDescriptor parseScenario(Element e)
- {
- ScenarioDescriptor scenarioDescriptor = new ScenarioDescriptor();
- NodeList transactions = e.getElementsByTagName(ActionDataConstants.ELEMENT_TRANSACTION);
- TransactionDescriptor[] transactionDescriptors = new TransactionDescriptor[transactions.getLength()];
- for (int i = 0; i < transactionDescriptors.length; i++)
- transactionDescriptors[i] = parseTransaction((Element) transactions.item(i));
- scenarioDescriptor.setTransactionDescriptors(transactionDescriptors);
- return scenarioDescriptor;
- }
-
- public TransactionDescriptor parseTransaction(Element e)
- {
- TransactionDescriptor transactionDescriptor = new TransactionDescriptor();
- NodeList actions = e.getElementsByTagName(ActionDataConstants.ELEMENT_ACTION);
- ActionDescriptor[] actionDescriptors = new ActionDescriptor[actions.getLength()];
- for (int i = 0; i < actionDescriptors.length; i++)
- actionDescriptors[i] = parseAction((Element) actions.item(i));
- transactionDescriptor.setActionDescriptors(actionDescriptors);
- return transactionDescriptor;
- }
-
- public ActionDescriptor parseAction(Element e)
- {
- ActionDescriptor actionDescriptor = new ActionDescriptor();
- actionDescriptor.setId(e.getAttribute(ActionDataConstants.ATTR_ID));
- try
- {
- actionDescriptor.setAttempts(Integer.parseInt(e.getAttribute(ActionDataConstants.ATTR_ATTEMPTS)));
- }
- catch (Throwable t)
- {
- actionDescriptor.setAttempts(1);
- }
- actionDescriptor.setStatusId(e.getAttribute(ActionDataConstants.ATTR_STATUS_ID));
- Hashtable propertiesTable = new Hashtable();
- NodeList properties = e.getElementsByTagName(ActionDataConstants.ELEMENT_PROPERTY);
- for (int i = 0; i < properties.getLength(); i++)
- {
- Element property = (Element) properties.item(i);
- String name = property.getAttribute(ActionDataConstants.ATTR_NAME);
- NodeList valueList = property.getElementsByTagName(ActionDataConstants.ELEMENT_VALUE);
- if (valueList.getLength() > 1)
- {
- String[] values = new String[valueList.getLength()];
- for (int j = 0; j < values.length; j++)
- {
- Element value = (Element) valueList.item(j);
- Node textNode = value.getFirstChild();
- values[j] = (textNode != null) ? textNode.getNodeValue().trim() : "";
- }
- propertiesTable.put(name, values);
- }
- else
- {
- Node textNode = ((Element) valueList.item(0)).getFirstChild();
- propertiesTable.put(name, (textNode != null) ? textNode.getNodeValue().trim() : "");
- }
- }
- actionDescriptor.setProperties(propertiesTable);
- NodeList statusList = e.getElementsByTagName(ActionDataConstants.ELEMENT_STATUS);
- for (int i = 0; i < statusList.getLength(); i++)
- {
- Element status = (Element)statusList.item(i);
- CDATASection cData = (CDATASection)status.getFirstChild();
- actionDescriptor.addStatus(cData.getData());
- }
- return actionDescriptor;
- }
-
- public Element toElement(ScenarioDescriptor scenarioDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element scenarioElement = document.createElement(ActionDataConstants.ELEMENT_SCENARIO);
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- {
- Element transactionElement = toElement(transactionDescriptors[i]);
- if (transactionElement != null)
- scenarioElement.appendChild(transactionElement);
- }
- return scenarioElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- public Element toElement(TransactionDescriptor transactionDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element transactionElement = document.createElement(ActionDataConstants.ELEMENT_TRANSACTION);
- ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
- for (int i = 0; i < actionDescriptors.length; i++)
- {
- Element actionElement = toElement(actionDescriptors[i]);
- if (actionElement != null)
- transactionElement.appendChild(actionElement);
- }
- return transactionElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- public Element toElement(ActionDescriptor actionDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element actionElement = document.createElement(ActionDataConstants.ELEMENT_ACTION);
- actionElement.setAttribute(ActionDataConstants.ATTR_ID, actionDescriptor.getId());
- actionElement.setAttribute(ActionDataConstants.ATTR_ATTEMPTS, String.valueOf(actionDescriptor.getAttempts()));
- String statusId = actionDescriptor.getStatusId();
- if (statusId != null)
- actionElement.setAttribute(ActionDataConstants.ATTR_STATUS_ID, statusId);
- Hashtable properties = actionDescriptor.getProperties();
- if (properties != null)
- {
- for (Iterator it = properties.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Object value = properties.get(key);
- Object[] values;
- if (value.getClass().isArray())
- values = (Object[])value;
- else if (value instanceof List)
- values = ((List)value).toArray();
- else
- values = new Object[] {value};
- boolean isAdded = false;
- Element propertyElement = document.createElement(ActionDataConstants.ELEMENT_PROPERTY);
- propertyElement.setAttribute(ActionDataConstants.ATTR_NAME, key.toString());
- for (int i = 0; i < values.length; i++)
- {
- if (values[i] instanceof String)
- {
- Element valueElement = document.createElement(ActionDataConstants.ELEMENT_VALUE);
- valueElement.appendChild(document.createTextNode(values[i].toString()));
- propertyElement.appendChild(valueElement);
- isAdded = true;
- }
- }
- if (isAdded)
- actionElement.appendChild(propertyElement);
- }
- }
- List status = actionDescriptor.getStatus();
- if (status != null)
- {
- for (Iterator it = status.iterator(); it.hasNext();)
- {
- Element statusElement = document.createElement(ActionDataConstants.ELEMENT_STATUS);
- CDATASection cData = document.createCDATASection(it.next().toString());
- statusElement.appendChild(cData);
- actionElement.appendChild(statusElement);
- }
- }
- return actionElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- private Document getDocument()
- {
- try
- {
- if (doc == null)
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- doc = builder.newDocument();
- }
- return doc;
- }
- catch (FactoryConfigurationError fce)
- {
- return null;
- }
- catch (ParserConfigurationException pce)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
deleted file mode 100644
index b02e2db..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
+++ /dev/null
@@ -1,233 +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.wst.ws.internal.explorer.platform.engine;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ActionEngine
-{
- public static final byte MODE_DISABLED = 0x0;
- public static final byte MODE_STOP = 0x1;
- public static final byte MODE_RECORD = 0x2;
- public static final byte MODE_PLAY = 0x3;
-
- private Controller controller;
- private byte mode;
- private Vector actionDescriptors;
-
- public ActionEngine(Controller controller)
- {
- this.controller = controller;
- mode = MODE_DISABLED;
- actionDescriptors = new Vector();
- }
-
- public void executeScenario(ScenarioDescriptor scenarioDescriptor)
- {
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- executeTransaction(transactionDescriptors[i]);
- }
-
- public boolean executeTransaction(TransactionDescriptor transactionDescriptor)
- {
- boolean result = true;
- ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
- for (int i = 0; i < actionDescriptors.length; i++)
- {
- if (result)
- {
- if (!executeAction(actionDescriptors[i]))
- result = false;
- }
- else
- actionDescriptors[i].setStatusId(ActionDataConstants.VALUE_STATUS_ID_UNATTEMPTED);
- }
- return result;
- }
-
- public boolean executeAction(ActionDescriptor actionDescriptor)
- {
- int attempts = actionDescriptor.getAttempts();
- for (int i = 0; i < attempts; i++)
- {
- try
- {
- Class classAction = Class.forName(actionDescriptor.getId());
- if (Action.class.isAssignableFrom(classAction))
- {
- Action action = (Action) newInstance(classAction);
- if (action != null)
- {
- Hashtable properties = actionDescriptor.getProperties();
- ITransformer[] transformers = action.getTransformers();
- for (int j = 0; j < transformers.length; j++)
- properties = transformers[j].deNormalize(properties);
- action.setPropertyTable(properties);
- boolean actionResult = action.run();
- // TODO actionDescriptor.addStatus(action.getStatus());
- if (actionResult)
- {
- actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_PASSED);
- return true;
- }
- }
- else
- throw new ClassNotFoundException(actionDescriptor.getId());
- }
- }
- catch (ClassNotFoundException cnfe)
- {
- cnfe.printStackTrace();
- StringWriter sw = new StringWriter();
- cnfe.printStackTrace(new PrintWriter(sw));
- actionDescriptor.addStatus(sw.getBuffer().toString());
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
- actionDescriptor.addStatus(sw.getBuffer().toString());
- }
- }
- actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_FAILED);
- return false;
- }
-
- private ScenarioDescriptor newScenarioDescriptor()
- {
- return new ScenarioDescriptor();
- }
-
- private TransactionDescriptor newTransactionDescriptor()
- {
- return new TransactionDescriptor();
- }
-
- private ActionDescriptor newActionDescriptor(Action action)
- {
- ActionDescriptor actionDescriptor = new ActionDescriptor();
- actionDescriptor.setId(action.getClass().getName());
- Hashtable properties = new Hashtable(action.getPropertyTable());
- ITransformer[] transformers = action.getTransformers();
- for (int i = 0; i < transformers.length; i++)
- properties = transformers[i].normalize(properties);
- actionDescriptor.setProperties(properties);
- return actionDescriptor;
- }
-
- private Object newInstance(Class c)
- {
- try
- {
- // instantiates the action using the constructor that takes in a
- // controller object
- Constructor constructor = c.getConstructor(new Class[]{Controller.class});
- return constructor.newInstance(new Object[]{controller});
- }
- catch (NoSuchMethodException nsme)
- {
- }
- catch (InstantiationException ie)
- {
- }
- catch (IllegalAccessException iae)
- {
- }
- catch (InvocationTargetException ite)
- {
- }
- catch (Throwable t)
- {
- }
- Object instance = null;
- try
- {
- // instantiates the action using the default constructor
- Constructor constructor = c.getConstructor(new Class[0]);
- instance = constructor.newInstance(new Object[0]);
- Method method = c.getMethod("setController", new Class[]{Controller.class});
- method.invoke(instance, new Object[]{controller});
- }
- catch (NoSuchMethodException nsme)
- {
- }
- catch (InstantiationException ie)
- {
- }
- catch (IllegalAccessException iae)
- {
- }
- catch (IllegalArgumentException iae)
- {
- }
- catch (InvocationTargetException ite)
- {
- }
- catch (Throwable t)
- {
- }
- return instance;
- }
-
- public byte getMode()
- {
- return mode;
- }
-
- public void setMode(byte mode)
- {
- this.mode = mode;
- if (mode == MODE_RECORD)
- {
- actionDescriptors = new Vector();
- ShowPerspectiveAction showPerspectiveAction = new ShowPerspectiveAction(controller);
- showPerspectiveAction.addProperty(ActionInputs.PERSPECTIVE, String.valueOf(controller.getCurrentPerspective().getPerspectiveId()));
- actionDescriptors.add(newActionDescriptor(showPerspectiveAction));
- }
- }
-
- public boolean executeAction(Action action)
- {
- if (mode == MODE_RECORD)
- {
- ActionDescriptor actionDescriptor = newActionDescriptor(action);
- actionDescriptors.add(actionDescriptor);
- }
- return action.run();
- }
-
- public ScenarioDescriptor getScenario()
- {
- ScenarioDescriptor scenarioDescriptor = newScenarioDescriptor();
- TransactionDescriptor transactionDescriptor = newTransactionDescriptor();
- ActionDescriptor[] actionDescriptorArray = (ActionDescriptor[])actionDescriptors.toArray(new ActionDescriptor[0]);
- transactionDescriptor.setActionDescriptors(actionDescriptorArray);
- scenarioDescriptor.setTransactionDescriptors(new TransactionDescriptor[] {transactionDescriptor});
- return scenarioDescriptor;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
deleted file mode 100644
index cf716de..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.constants;
-
-public class ActionDataConstants
-{
- public static final String ATTR_ID = "id";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_ATTEMPTS = "attempts";
- public static final String ATTR_STATUS_ID = "statusId";
-
- public static final String ELEMENT_SCENARIO = "scenario";
- public static final String ELEMENT_TRANSACTION = "transaction";
- public static final String ELEMENT_ACTION = "action";
- public static final String ELEMENT_PROPERTY = "property";
- public static final String ELEMENT_VALUE = "value";
- public static final String ELEMENT_STATUS = "status";
-
- public static final String VALUE_STATUS_ID_UNATTEMPTED = "unattempted";
- public static final String VALUE_STATUS_ID_PASSED = "passed";
- public static final String VALUE_STATUS_ID_FAILED = "failed";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
deleted file mode 100644
index 17a600e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.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.wst.ws.internal.explorer.platform.engine.data;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-public class ActionDescriptor
-{
- private String id;
- private Hashtable properties;
- private int attempts;
- private String statusId;
- private List statusList;
-
- public ActionDescriptor()
- {
- attempts = 1;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public Hashtable getProperties()
- {
- return properties;
- }
-
- public void setProperties(Hashtable properties)
- {
- this.properties = properties;
- }
-
- public int getAttempts()
- {
- return attempts;
- }
-
- public void setAttempts(int attempts)
- {
- this.attempts = attempts;
- }
-
- public String getStatusId()
- {
- return statusId;
- }
-
- public void setStatusId(String statusId)
- {
- this.statusId = statusId;
- }
-
- public void addStatus(Object status)
- {
- if (status != null)
- {
- if (statusList == null)
- statusList = new Vector();
- statusList.add(status);
- }
- }
-
- public boolean removeStatus(Object status)
- {
- if (status != null && statusList != null)
- return statusList.remove(status);
- else
- return false;
- }
-
- public List getStatus()
- {
- return statusList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
deleted file mode 100644
index 86e92ad..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
+++ /dev/null
@@ -1,26 +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.wst.ws.internal.explorer.platform.engine.data;
-
-public class ScenarioDescriptor
-{
- private TransactionDescriptor[] transactionDescriptors;
-
- public TransactionDescriptor[] getTransactionDescriptors()
- {
- return transactionDescriptors;
- }
-
- public void setTransactionDescriptors(TransactionDescriptor[] transactionDescriptors)
- {
- this.transactionDescriptors = transactionDescriptors;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
deleted file mode 100644
index d917a10..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
+++ /dev/null
@@ -1,26 +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.wst.ws.internal.explorer.platform.engine.data;
-
-public class TransactionDescriptor
-{
- private ActionDescriptor[] actionDescriptors;
-
- public ActionDescriptor[] getActionDescriptors()
- {
- return actionDescriptors;
- }
-
- public void setActionDescriptors(ActionDescriptor[] actionDescriptors)
- {
- this.actionDescriptors = actionDescriptors;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
deleted file mode 100644
index 3966e6d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
+++ /dev/null
@@ -1,46 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class CurrentNodeSelectionTransformer implements ITransformer
-{
- protected Controller controller;
- protected String key;
-
- public CurrentNodeSelectionTransformer(Controller controller)
- {
- this(controller, ActionInputs.NODEID);
- }
-
- public CurrentNodeSelectionTransformer(Controller controller, String key)
- {
- this.controller = controller;
- this.key = key;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- properties.put(key, String.valueOf(currNode.getNodeId()));
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
deleted file mode 100644
index d416d30..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-
-public interface ITransformer
-{
- public Hashtable normalize(Hashtable properties);
- public Hashtable deNormalize(Hashtable properties);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
deleted file mode 100644
index 5b74e83..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
+++ /dev/null
@@ -1,104 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class MassNodeIdTransformer extends NodeIdTransformer
-{
- protected String massNodeIdKey;
-
- public MassNodeIdTransformer(Controller controller, String massNodeIdKey)
- {
- super(controller);
- this.massNodeIdKey = massNodeIdKey;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- if (!properties.containsKey(massNodeIdKey))
- return super.normalize(properties);
- Object origNodeId = properties.get(ActionInputs.NODEID);
- String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
- for (int i = 0; i < massNodeIds.length; i++)
- {
- properties.put(ActionInputs.NODEID, massNodeIds[i]);
- properties = super.normalize(properties);
- String[] rels = getValueAsStringArray(properties, ModelConstants.REL_ID);
- if (rels.length > 0)
- {
- StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
- sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- sb.append(massNodeIds[i]);
- properties.put(sb.toString(), rels);
- }
- properties.remove(ActionInputs.NODEID);
- properties.remove(ModelConstants.REL_ID);
- }
- if (origNodeId != null)
- properties.put(ActionInputs.NODEID, origNodeId);
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- if (!properties.containsKey(massNodeIdKey))
- return super.deNormalize(properties);
- Vector massNodeIdVector = new Vector();
- Object origNodeId = properties.get(ActionInputs.NODEID);
- properties.remove(ActionInputs.NODEID);
- String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
- for (int i = 0; i < massNodeIds.length; i++)
- {
- StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
- sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- sb.append(massNodeIds[i]);
- Object rels = properties.get(sb.toString());
- if (rels != null)
- {
- properties.put(ModelConstants.REL_ID, rels);
- properties = super.deNormalize(properties);
- Object nodeId = properties.get(ActionInputs.NODEID);
- if (nodeId != null)
- {
- massNodeIdVector.add(nodeId);
- properties.remove(ActionInputs.NODEID);
- }
- properties.remove(ModelConstants.REL_ID);
- }
- }
- if (origNodeId != null)
- properties.put(ActionInputs.NODEID, origNodeId);
- int size = massNodeIdVector.size();
- if (size == 1)
- properties.put(massNodeIdKey, massNodeIdVector.get(0));
- else if (size > 1)
- properties.put(massNodeIdKey, massNodeIdVector.toArray(new String[0]));
- else
- properties.remove(massNodeIdKey);
- return properties;
- }
-
- private String[] getValueAsStringArray(Hashtable properties, String key)
- {
- Object values = properties.get(key);
- if (values == null)
- return new String[0];
- else if (values instanceof String[])
- return (String[])values;
- else
- return new String[] {values.toString()};
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
deleted file mode 100644
index 732c165..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
+++ /dev/null
@@ -1,76 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class MultipartFormDataParserTransformer implements ITransformer
-{
- protected Controller controller;
-
- public MultipartFormDataParserTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- MultipartFormDataParser parser = (MultipartFormDataParser)properties.get(ActionInputs.MULTIPART_FORM_DATA_PARSER);
- String[] keys;
- try
- {
- keys = parser.getParameterNames();
- }
- catch (Throwable t)
- {
- keys = new String[0];
- }
- for (int i = 0; i < keys.length; i++)
- {
- StringBuffer newKey = new StringBuffer(ActionInputs.MULTIPART_FORM_DATA_PARSER);
- newKey.append(keys[i]);
- try
- {
- properties.put(newKey.toString(), parser.getParameterValues(keys[i]));
- }
- catch (Throwable t)
- {
- }
- }
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Enumeration e = properties.keys();
- while (e.hasMoreElements())
- {
- Object key = e.nextElement();
- if (key instanceof String)
- {
- if (((String)key).startsWith(ActionInputs.MULTIPART_FORM_DATA_PARSER))
- {
- String realKey = ((String)key).substring(ActionInputs.MULTIPART_FORM_DATA_PARSER.length());
- if (!properties.containsKey(realKey))
- {
- Object value = properties.remove(key);
- properties.put(realKey, value);
- }
- }
- }
- }
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
deleted file mode 100644
index 2a5413a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
+++ /dev/null
@@ -1,134 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeIdTransformer implements ITransformer
-{
- protected Controller controller;
-
- public NodeIdTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- Vector rels = new Vector();
- try
- {
- int nodeId = Integer.parseInt((String)properties.get(ActionInputs.NODEID));
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- Node node = nodeManager.getNode(nodeId);
- int depth = 0;
- if (node != null)
- depth = node.getNodeDepth();
- while (rels.size() < depth && node != null && node != rootNode)
- {
- Node parentNode = node.getParent();
- Element element = node.getTreeElement();
- Rel rel = getRel(parentNode.getTreeElement(), element);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(element.getName());
- rels.insertElementAt(relValue.toString(), 0);
- node = parentNode;
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- int numRelationships = rels.size();
- if (numRelationships == 1)
- properties.put(ModelConstants.REL_ID, rels.get(0).toString());
- else if (numRelationships > 1)
- properties.put(ModelConstants.REL_ID, (String[])rels.toArray(new String[0]));
- return properties;
- }
-
- private Rel getRel(Element sourceElement, Element targetElement)
- {
- Enumeration rels = sourceElement.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel)rels.nextElement();
- Enumeration targetElements = rel.getTargetElements();
- while (targetElements.hasMoreElements())
- {
- if (targetElements.nextElement() == targetElement)
- return rel;
- }
- }
- return null;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node node = nodeManager.getRootNode();
- Object value = properties.get(ModelConstants.REL_ID);
- String[] relationships = null;
- if (value instanceof String[])
- relationships = (String[])value;
- else if (value != null)
- relationships = new String[] {value.toString()};
- if (relationships != null)
- {
- for (int i = 0; i < relationships.length; i++)
- {
- int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
- if (index == -1)
- return deNormalizeAsSelectedNode(properties);
- String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
- String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
- if (localname == null)
- return deNormalizeAsSelectedNode(properties);
- node = getNode(node, rel, localname);
- if (node == null)
- return deNormalizeAsSelectedNode(properties);
- }
- properties.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
- return properties;
- }
- else
- return deNormalizeAsSelectedNode(properties);
- }
-
- private Hashtable deNormalizeAsSelectedNode(Hashtable properties)
- {
- return (new CurrentNodeSelectionTransformer(controller)).deNormalize(properties);
- }
-
- private Node getNode(Node parent, String rel, String localname)
- {
- Element parentElement = parent.getTreeElement();
- Enumeration e = parentElement.getElements(rel);
- while (e.hasMoreElements())
- {
- Element element = (Element)e.nextElement();
- if (localname.equals(element.getName()))
- return parent.getChildNode((TreeElement)element);
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
deleted file mode 100644
index 93f57ef..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
+++ /dev/null
@@ -1,163 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeSelectionTransformer implements ITransformer
-{
- protected Controller controller;
-
- public NodeSelectionTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- try
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node nextNode = nodeManager.getNode(Integer.parseInt((String) properties.get(ActionInputs.NODEID)));
- Node currNode = nodeManager.getSelectedNode();
- if (currNode == null)
- currNode = nodeManager.getRootNode();
- Vector nextRels = new Vector();
- Vector currRels = new Vector();
- while (nextNode != null && currNode != null && (!isRootElement(nextNode.getTreeElement()) || !isRootElement(currNode.getTreeElement())) && nextNode != currNode)
- {
- if (nextNode.getNodeDepth() >= currNode.getNodeDepth())
- {
- Node parentNode = nextNode.getParent();
- Element nextElement = nextNode.getTreeElement();
- Rel rel = getRel(parentNode.getTreeElement(), nextElement);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(nextElement.getName());
- nextRels.insertElementAt(relValue.toString(), 0);
- nextNode = parentNode;
- }
- else
- {
- Node parentNode = currNode.getParent();
- Element parentElement = parentNode.getTreeElement();
- Rel rel = getRel(currNode.getTreeElement(), parentElement);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(parentElement.getName());
- currRels.add(relValue.toString());
- currNode = parentNode;
- }
- }
- currRels.addAll(nextRels);
- int numRelationships = currRels.size();
- if (numRelationships == 1)
- properties.put(ModelConstants.REL_ID, currRels.get(0).toString());
- else if (numRelationships > 1)
- properties.put(ModelConstants.REL_ID, (String[]) currRels.toArray(new String[0]));
- }
- catch (NumberFormatException nfe)
- {
- }
- return properties;
- }
-
- private boolean isRootElement(Element e)
- {
- return e.getModel().getRootElement() == e;
- }
-
- private Rel getRel(Element sourceElement, Element targetElement)
- {
- Enumeration rels = sourceElement.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel) rels.nextElement();
- Enumeration targetElements = rel.getTargetElements();
- while (targetElements.hasMoreElements())
- {
- if (targetElements.nextElement() == targetElement)
- return rel;
- }
- }
- return null;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- Node currNode = nodeManager.getSelectedNode();
- if (currNode == null)
- currNode = rootNode;
- Object value = properties.get(ModelConstants.REL_ID);
- String[] relationships = null;
- if (value instanceof String[])
- relationships = (String[]) value;
- else if (value != null)
- relationships = new String[]{value.toString()};
- if (relationships != null)
- {
- Element currElement = currNode.getTreeElement();
- for (int i = 0; i < relationships.length; i++)
- {
- int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
- String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
- String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
- Enumeration e = currElement.getElements(rel);
- Element targetElement = null;
- if (localname != null)
- {
- Element firstElement = null;
- while (e.hasMoreElements())
- {
- Element nextElement = (Element) e.nextElement();
- if (firstElement == null)
- firstElement = nextElement;
- if (localname.equals(nextElement.getName()))
- {
- targetElement = nextElement;
- break;
- }
- }
- if (targetElement == null)
- targetElement = firstElement;
- }
- else
- {
- if (e.hasMoreElements())
- targetElement = (Element) e.nextElement();
- }
- if (targetElement != null)
- {
- currElement = (Element) targetElement;
- Node parentNode = currNode.getParent();
- if (parentNode != null && parentNode.getTreeElement() == currElement)
- currNode = parentNode;
- else
- currNode = currNode.getChildNode((TreeElement) currElement);
- }
- }
- }
- properties.put(ActionInputs.NODEID, String.valueOf(currNode.getNodeId()));
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
deleted file mode 100644
index 0261f2a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
+++ /dev/null
@@ -1,121 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class ViewSelectionTransformer implements ITransformer
-{
- protected Controller controller;
- protected String listManagerKey;
- protected String viewKey;
-
- public ViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey)
- {
- this.controller = controller;
- this.listManagerKey = listManagerKey;
- this.viewKey = viewKey;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- Vector normalizedViewIds = new Vector();
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node currNode = nodeManager.getSelectedNode();
- TreeElement currElement = currNode.getTreeElement();
- Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
- if (listManagerObj instanceof ListManager)
- {
- ListManager listManager = (ListManager) listManagerObj;
- String[] viewIds = getViewValues(properties);
- for (int i = 0; i < viewIds.length; i++)
- {
- ListElement listElement = null;
- try
- {
- listElement = listManager.getElementWithViewId(Integer.parseInt(viewIds[i]));
- }
- catch (NumberFormatException nfe)
- {
- }
- if (listElement != null)
- {
- Object object = listElement.getObject();
- if (object != null && object instanceof Element)
- {
- Element element = (Element) object;
- normalizedViewIds.add(element.getName());
- }
- }
- }
- }
- properties.put(viewKey, normalizedViewIds.toArray(new String[0]));
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Vector viewIds = new Vector();
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- TreeElement currElement = currNode.getTreeElement();
- Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
- if (listManagerObj instanceof ListManager)
- {
- ListManager listManager = (ListManager) listManagerObj;
- String[] normalizedViewIds = getViewValues(properties);
- for (int i = 0; i < normalizedViewIds.length; i++)
- {
- Enumeration e = listManager.getListElements();
- while (e.hasMoreElements())
- {
- ListElement listElement = (ListElement) e.nextElement();
- Element element = (Element) listElement.getObject();
- if (element != null && normalizedViewIds[i].equals(element.getName()))
- {
- viewIds.add(String.valueOf(listElement.getViewId()));
- break;
- }
- }
- }
- }
- }
- int size = viewIds.size();
- if (size == 1)
- properties.put(viewKey, viewIds.get(0));
- else if (size > 1)
- properties.put(viewKey, viewIds.toArray(new String[0]));
- return properties;
- }
-
- private String[] getViewValues(Hashtable properties)
- {
- Object viewValueObj = properties.get(viewKey);
- String[] viewValues;
- if (viewValueObj == null)
- viewValues = new String[0];
- else if (viewValueObj.getClass().isArray())
- viewValues = (String[]) viewValueObj;
- else
- viewValues = new String[]{(String) viewValueObj};
- return viewValues;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 63a27e9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddBusinessToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement) selectedElement;
- String businessName = busElement.getName();
- String inquiryAPI = busElement.getInquiryURL();
- String businessKey = busElement.getBusinessKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index d4a614f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,45 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class AddRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddRegistryToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement) selectedElement;
- String registryName = regElement.getName();
- String inquiryAPI = regElement.getInquiryURL();
- String publishAPI = regElement.getPublishURL();
- String registrationURL = regElement.getRegistrationURL();
- if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, false))
- return false;
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
deleted file mode 100644
index efff821..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceInterfaceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceInterfaceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceInterfaceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement) selectedElement;
- String serIntName = serIntElement.getName();
- String inquiryAPI = serIntElement.getInquiryURL();
- String serIntKey = serIntElement.getServiceInterfaceKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY, serIntKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serIntName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serIntName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serIntName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index c9239c1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement) selectedElement;
- String serviceName = serElement.getName();
- String inquiryAPI = serElement.getInquiryURL();
- String serviceKey = serElement.getServiceKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index 4d86b6f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction {
- public AddToUDDIPerspectiveAction(Controller controller) {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink() {
- return "favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp";
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, boolean useExisting)
- {
- return createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, null, null, null, useExisting);
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, String defaultLogin, String defaultPassword, Taxonomy[] taxonomies, boolean useExisting) {
- Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
- if (registryNodes != null)
- {
- if (useExisting)
- {
- Node registryNode = (Node)registryNodes.elementAt(0);
- NodeManager nodeManager = registryNode.getNodeManager();
- nodeManager.setSelectedNodeId(registryNode.getNodeId());
- return true;
- }
- }
-
- // open the registry if it is not already opened in the UDDI perspective
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-
- // populate the property table
- Hashtable propertyTable = openRegAction.getPropertyTable();
- if (Validator.validateString(registryName))
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME,registryName);
- else
- return false;
-
- if (Validator.validateURL(inquiryAPI))
- propertyTable.put(UDDIActionInputs.INQUIRY_URL,inquiryAPI);
- else
- return false;
-
- if (Validator.validateURL(publishAPI))
- propertyTable.put(UDDIActionInputs.PUBLISH_URL,publishAPI);
-
- if (Validator.validateURL(registrationURL))
- propertyTable.put(UDDIActionInputs.REGISTRATION_URL,registrationURL);
-
- if (defaultLogin != null)
- propertyTable.put(UDDIActionInputs.UDDI_USERNAME, defaultLogin);
-
- if (defaultPassword != null)
- propertyTable.put(UDDIActionInputs.UDDI_PASSWORD, defaultPassword);
-
- // If user-defined category metadata exists, search and make the associations.
- StringBuffer directoryBuffer = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
- File categoriesDirectory = new File(directoryBuffer.toString());
- File[] categoryFiles = null;
- if (categoriesDirectory.exists())
- {
- categoryFiles = categoriesDirectory.listFiles();
- if (categoryFiles.length > 0)
- propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
- }
-
- // run the action
- if (!openRegAction.run())
- return false;
-
- if (taxonomies != null)
- {
- Hashtable taxonomyTable = new Hashtable();
- for (int i=0; i<taxonomies.length; i++)
- {
- Taxonomy taxonomy = taxonomies[i];
- String name = taxonomy.getName();
- String tmodelKey = taxonomy.getTmodelKey();
- CategoryModel catModel = new CategoryModel();
- catModel.setDisplayName(name);
- catModel.setCategoryKey(name);
- catModel.setTModelKey(tmodelKey);
- catModel.loadFromTaxonomy(taxonomy);
- taxonomyTable.put(tmodelKey, catModel);
- }
- RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
- regElement.setUserDefinedCategories(taxonomyTable);
- }
-
- if (categoryFiles != null && categoryFiles.length > 0)
- {
- RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
- regElement.setCheckForUserDefinedCategories(true);
- regElement.getUserDefinedCategories();
- linkCategoryModelsWithSavedData(registryName,regElement.getUserDefinedCategories());
- }
- return true;
- }
-
- public final void linkCategoryModelsWithSavedData(String registryName,Enumeration userDefinedCategories)
- {
- StringBuffer directoryBuffer = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
- linkCategoryModelsWithSavedData(userDefinedCategories,directoryBuffer.toString());
- }
-
- public final void linkCategoryModelsWithSavedData(Enumeration userDefinedCategories,String categoriesDirectory)
- {
- File categoriesDirectoryFile = new File(categoriesDirectory);
- File[] categoryFiles = null;
- if (categoriesDirectoryFile.exists())
- {
- categoryFiles = categoriesDirectoryFile.listFiles();
- if (userDefinedCategories != null)
- {
- while (userDefinedCategories.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
- String categoryKey = categoryModel.getCategoryKey();
- for (int i=0;i<categoryFiles.length;i++)
- {
- String categoryPropertiesFileName = categoryFiles[i].getName();
- int lastDotPos = categoryPropertiesFileName.lastIndexOf(".");
- String decodedCategoryPropertiesFileNameBase = URLUtils.decode(categoryPropertiesFileName.substring(0,lastDotPos));
- if (lastDotPos > 0 && categoryPropertiesFileName.endsWith(".properties") && categoryKey.equals(decodedCategoryPropertiesFileNameBase))
- {
- categoryModel.setDefaultDataFile(categoryFiles[i].getAbsolutePath());
- categoryModel.loadFromDelimiterFile();
- break;
- }
- }
- }
- }
- }
- }
-
- protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
- {
- Vector registryNodes = null;
- NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)(navigatorManager.getRootNode());
- Vector childNodes = uddiMainNode.getChildNodes();
- for (int i=0;i<childNodes.size();i++)
- {
- Node childNode = (Node)childNodes.elementAt(i);
- if (childNode instanceof RegistryNode)
- {
- RegistryElement regElement = (RegistryElement)childNode.getTreeElement();
- String currInquiryURL = regElement.getInquiryURL();
- if (currInquiryURL != null && currInquiryURL.equals(inquiryURL))
- {
- if (registryNodes == null)
- registryNodes = new Vector();
- registryNodes.addElement(childNode);
- }
- }
- }
- return registryNodes;
- }
-
- public static AddToUDDIPerspectiveAction newAction(Controller controller) {
- TreeElement selectedElement = controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getTreeElement();
- FavoritesFolderElement favoritesFolderElement = null;
-
- if (selectedElement instanceof FavoritesFolderElement) {
- favoritesFolderElement = (FavoritesFolderElement)selectedElement;
- }
- else if (selectedElement instanceof FavoritesElement) {
- favoritesFolderElement = ((FavoritesElement)selectedElement).getParentFolderElement();
- }
- else {
- return null;
- }
-
- // return an instance of AddToUDDIPerspectiveAction depending on the type of
- // favorites folder element being selected.
- if (favoritesFolderElement instanceof FavoritesUDDIRegistryFolderElement)
- return new AddRegistryToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUserDefUDDIRegistryFolderElement)
- return new AddUserDefRegistryToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIBusinessFolderElement)
- return new AddBusinessToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIServiceFolderElement)
- return new AddServiceToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIServiceInterfaceFolderElement)
- return new AddServiceInterfaceToUDDIPerspectiveAction(controller);
- else
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index 7809538..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public class AddUserDefRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddUserDefRegistryToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
- String registryName = regElement.getName();
- String inquiryAPI = regElement.getInquiryURL();
- String publishAPI = regElement.getPublishURL();
- String defaultLogin = regElement.getDefaultLogin();
- String defaultPassword = regElement.getDefaultPassword();
- Taxonomy[] taxonomies = regElement.getTaxonomies();
- if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, null, defaultLogin, defaultPassword, taxonomies, false))
- return false;
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
deleted file mode 100644
index e1b58c9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
+++ /dev/null
@@ -1,77 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public class AddWSILToWSILPerspectiveAction extends MultipleLinkAction
-{
- public AddWSILToWSILPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesWSILElement wsilElement = (FavoritesWSILElement) selectedElement;
- String wsilURL = wsilElement.getWsilUrl();
- OpenWSILAction openWSILAction = new OpenWSILAction(controller_);
- Hashtable propertyTable = openWSILAction.getPropertyTable();
- propertyTable.put(WsilActionInputs.WSIL_URL, wsilURL);
- propertyTable.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
- boolean actionResult = openWSILAction.run();
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL", wsilURL));
- else
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE", wsilURL));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
deleted file mode 100644
index da528d8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,73 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-
-public class FavoritesAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
- public FavoritesAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement) selectedNode.getTreeElement();
- String wsdlUrl = wsdlElement.getWsdlUrl();
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- boolean actionResult = openWSDLAction.run();
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
- else
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
deleted file mode 100644
index 06c1e3d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-public class FavoritesImportToFileSystemAction extends ImportToFileSystemAction {
-
- private Definition def_;
- private String wsdlFileName_;
-
- public FavoritesImportToFileSystemAction(Controller controller) {
- super(controller);
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"favorites/actions/FavortiesImportToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os) {
- if (def_ != null) {
- return writeWSDLDefinition(os, def_);
- }
- else {
- return false;
- }
- }
-
- public String getDefaultFileName() {
- return wsdlFileName_;
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
- // return false if nodeID == 0, that is the main node
- if (nodeID == 0)
- return false;
-
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- String wsdlURL = ((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl();
- wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
- try {
- def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
- }
- catch (Throwable t) {
- favPerspective.getMessageQueue().addMessage(t.getMessage());
- return false;
- }
- return true;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
deleted file mode 100644
index 93f51e5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesImportToWorkbenchAction extends ImportToWorkbenchAction {
- public FavoritesImportToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
deleted file mode 100644
index 616fa7c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
- public FavoritesLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public static LaunchWebServiceWizardAction newAction(Controller controller) {
- return new FavoritesLaunchWebServiceWizardAction(controller);
- }
-
- public FormTool getSelectedFormTool() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (selectedElement instanceof FavoritesWSDLServiceElement)
- return launchWizard(((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl());
- else
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
deleted file mode 100644
index 1d05321..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesRestoreDefaultFavoritesAction extends LinkAction
-{
- public FavoritesRestoreDefaultFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp");
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node mainNode = nodeManager.getRootNode();
- FavoritesMainElement mainElement = (FavoritesMainElement)mainNode.getTreeElement();
- boolean actionResult = mainElement.restoreFavoritesDefault();
- if (actionResult)
- {
- Vector folderNodes = mainNode.getChildNodes();
- for (int i = 0; i < folderNodes.size(); i++)
- {
- Node folderNode = (Node)folderNodes.elementAt(i);
- TreeElement treeElement = folderNode.getTreeElement();
- if (treeElement instanceof FavoritesFolderElement)
- {
- FavoritesFolderElement folderElement = (FavoritesFolderElement)treeElement;
- folderElement.removeAllFavorites(controller_.getServletEngineStateLocation());
- folderElement.init(mainElement);
- }
- }
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT"));
- return true;
- }
- else
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_OPEN_FAVORITES_BACKUP"));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
deleted file mode 100644
index d8e9923..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesToggleNodeAction extends ToggleNodeAction {
- public FavoritesToggleNodeAction(Controller controller) {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeId, boolean open) {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesToggleNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.OPEN);
- actionLink.append('=');
- if (open)
- actionLink.append(ActionInputs.OPEN_NODE);
- else
- actionLink.append(ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory() {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectFavoritesToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
- else
- return SelectFavoritesNodeAction.getActionLink(nodeId, true);
- }
-
- public final String getTreeContentVar()
- {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage()
- {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar()
- {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage()
- {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
deleted file mode 100644
index b80defe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,109 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MassNodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
- public MultipleLinkAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String isMultipleLinkAction = request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- if (isMultipleLinkAction != null)
- {
- propertyTable_.put(FavoritesActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
- return processMultipleLinkActionParameters(request);
- }
- else
- {
- propertyTable_.remove(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String toolIDString = request.getParameter(ActionInputs.TOOLID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
- if (nodeIDString != null)
- propertyTable_.put(ActionInputs.NODEID, nodeIDString);
- if (toolIDString != null)
- propertyTable_.put(ActionInputs.TOOLID, toolIDString);
- if (viewIDString != null)
- propertyTable_.put(ActionInputs.VIEWID, viewIDString);
- if (viewToolIDString != null)
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
- return true;
- }
- }
-
- protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
- {
- String[] massActionNodeIDs = request.getParameterValues(FavoritesActionInputs.MASS_ACTION_NODE_ID);
- propertyTable_.put(FavoritesActionInputs.MASS_ACTION_NODE_ID, massActionNodeIDs);
- if (massActionNodeIDs.length == 0)
- return false;
- else
- return true;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new MassNodeIdTransformer(controller_, FavoritesActionInputs.MASS_ACTION_NODE_ID)};
- }
-
- protected boolean isMultipleLinkAction()
- {
- return propertyTable_.containsKey(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- }
-
- protected String[] getMassActionNodeIds()
- {
- Object object = propertyTable_.get(FavoritesActionInputs.MASS_ACTION_NODE_ID);
- if (object == null)
- return new String[0];
- else if (object.getClass().isArray())
- return (String[])object;
- else
- return new String[] {(String)object};
- }
-
- public boolean run()
- {
- return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- boolean result = false;
- String[] massActionNodeIDs = getMassActionNodeIds();
- if (massActionNodeIDs != null)
- {
- for (int i = 0; i < massActionNodeIDs.length; i++)
- {
- propertyTable_.put(ActionInputs.NODEID, massActionNodeIDs[i]);
- if (executeSingleLinkAction())
- result = true;
- }
- propertyTable_.remove(ActionInputs.NODEID);
- }
- return result;
- }
-
- protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
deleted file mode 100644
index 38a3181..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class RemoveFavoritesAction extends MultipleLinkAction
-{
- public RemoveFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/RemoveFavoritesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/RemoveFavoritesActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- String nodeIDString = (String) propertyTable_.get(ActionInputs.NODEID);
- int nodeID;
- try
- {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe)
- {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node selectedNode = nodeManager.getNode(nodeID);
- if (selectedNode == null)
- return false;
- TreeElement selectedElement = selectedNode.getTreeElement();
- String pluginMetadataDirectory = controller_.getServletEngineStateLocation();
- boolean actionResult;
- if (selectedElement instanceof FavoritesElement)
- actionResult = ((FavoritesElement) selectedElement).getParentFolderElement().removeFavoriteByNodeID(nodeID, pluginMetadataDirectory);
- else if (selectedElement instanceof FavoritesFolderElement)
- actionResult = ((FavoritesFolderElement) selectedElement).removeAllFavorites(pluginMetadataDirectory);
- else if (selectedElement instanceof FavoritesMainElement)
- {
- Enumeration e;
- FavoritesMainElement mainElement = (FavoritesMainElement) selectedElement;
- e = mainElement.getElements(FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
- actionResult = ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- }
- else
- actionResult = false;
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED", selectedNode.getNodeName()));
- return actionResult;
- }
-
- public String getTreeContentVar()
- {
- return "favNavigatorContent";
- }
-
- public String getTreeContentPage()
- {
- return "favorites/fav_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar()
- {
- return "favPropertiesContainer";
- }
-
- public String getPropertiesContainerPage()
- {
- return "favorites/fav_properties_container.jsp";
- }
-
- public String getStatusContentVar()
- {
- return "favStatusContent";
- }
-
- public String getStatusContentPage()
- {
- return "favorites/fav_status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
deleted file mode 100644
index bc4be33..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeFavoritesFramesAction extends ResizeFramesAction
-{
- public ResizeFavoritesFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(FavoritesFrameNames.NAVIGATOR_CONTAINER))
- {
- favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(FavoritesFrameNames.PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(FavoritesFrameNames.STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
deleted file mode 100644
index 6297475..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
+++ /dev/null
@@ -1,73 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectFavoritesNodeAction extends SelectNodeAction
-{
- public SelectFavoritesNodeAction(Controller controller)
- {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- Node selectedNode = getSelectedNode();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool == null)
- return null;
- else if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- else
- return getActionLink(selectedNode.getNodeId(), true);
- }
-
- public final String getTreeContentVar() {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage() {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar() {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage() {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
deleted file mode 100644
index f16727c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class SelectFavoritesToolAction extends SelectNodeToolAction
-{
- public SelectFavoritesToolAction(Controller controller)
- {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT) {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- if (getSelectedTool().getToolType() != ToolTypes.ACTION) {
- Node selectedNode = getSelectedNode();
- return getActionLink(selectedNode.getNodeId(), getSelectedTool().getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- }
- else
- return null;
- }
-
- public final String getTreeContentVar() {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage() {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar() {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage() {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final String getPropertiesContentVar() {
- return controller_.getFavoritesPerspective().getPropertiesContentVar();
- }
-
- public final String getPropertiesContentPage() {
- return controller_.getFavoritesPerspective().getPropertiesContentPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java
deleted file mode 100644
index 2464592..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java
+++ /dev/null
@@ -1,46 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectFavoritesUserDefUDDIRegistryNodeAction extends SelectFavoritesNodeAction
-{
- public SelectFavoritesUserDefUDDIRegistryNodeAction(Controller controller)
- {
- super(controller);
- }
-
- public void performExtendedAction()
- {
- TreeElement selectedElement = selectedNode_.getTreeElement();
- ((FavoritesUserDefUDDIRegistryFolderElement)selectedElement).refresh();
- }
-
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
deleted file mode 100644
index 5cd908b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromFavoritesAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- favPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
deleted file mode 100644
index 634d37b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesActionInputs
-{
- // mass actions
- public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
- public final static String MASS_ACTION_NODE_ID = "massActionNodeID";
-
- // resize favorites frames action
- public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
deleted file mode 100644
index 8b6c269..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesFrameNames
-{
- public final static String NAVIGATOR_CONTAINER = "fav_navigator_container";
- public final static String NAVIGATOR_TOOLBAR = "fav_navigator_toolbar";
- public final static String NAVIGATOR_CONTENT = "fav_navigator_content";
- public final static String ACTIONS_CONTAINER = "fav_actions_container";
- public final static String PROPERTIES_CONTAINER = "fav_properties_container";
- public final static String PROPERTIES_TOOLBAR = "fav_properties_toolbar";
- public final static String PROPERTIES_CONTENT = "fav_properties_content";
- public final static String STATUS_CONTAINER = "fav_status_container";
- public final static String STATUS_TOOLBAR = "fav_status_toolbar";
- public final static String STATUS_CONTENT = "fav_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
deleted file mode 100644
index bcf0c20..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesModelConstants {
- // Relations
- public final static String REL_WSIL_FOLDER_NODE = "relWSILFolderNode";
- public final static String REL_WSDL_SERVICE_FOLDER_NODE = "relWSDLServiceFolderNode";
- public final static String REL_UDDI_SERVICE_FOLDER_NODE = "relUDDIServiceFolderNode";
- public final static String REL_UDDI_BUSINESS_FOLDER_NODE = "relUDDIBusinessFolderNode";
- public final static String REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE = "relUDDIServiceInterfaceFolderNode";
- public final static String REL_UDDI_REGISTRY_FOLDER_NODE = "relUDDIRegistryFolerNode";
- public final static String REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE = "relUserDefUDDIRegistryFolderNode";
- public final static String REL_WSIL_NODE = "relWSILNode";
- public final static String REL_WSDL_SERVICE_NODE = "relWSDLServiceNode";
- public final static String REL_UDDI_SERVICE_NODE = "relUDDIServiceNode";
- public final static String REL_UDDI_BUSINESS_NODE = "relUDDIBusinessNode";
- public final static String REL_UDDI_SERVICE_INTERFACE_NODE = "relUDDIServiceInterfaceNode";
- public final static String REL_UDDI_REGISTRY_NODE = "relUDDIRegistryNode";
- public final static String REL_USER_DEF_UDDI_REGISTRY_NODE = "relUserDefUDDIRegistryNode";
-
- // Properties
- public final static String PROP_PLUGIN_METADATA_DIRECTORY = "pluginMetadataDirectory";
- public final static String PROP_WSIL_URL = "wsilURL";
- public final static String PROP_WSDL_URL = "wsdlURL";
- public final static String PROP_UDDI_SERVICE_NAME = "UDDIServiceName";
- public final static String PROP_UDDI_SERVICE_INQUIRY_API = "UDDIServiceInquiryAPI";
- public final static String PROP_UDDI_SERVICE_KEY = "UDDIServiceKey";
- public final static String PROP_UDDI_BUSINESS_NAME = "UDDIBusinessName";
- public final static String PROP_UDDI_BUSINESS_INQUIRY_API = "UDDIBusinessInquiryAPI";
- public final static String PROP_UDDI_BUSINESS_KEY = "UDDIBusinessKey";
- public final static String PROP_UDDI_SERVICE_INTERFACE_NAME = "UDDIServiceInterfaceName";
- public final static String PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API = "UDDIServiceInterfaceInquiryAPI";
- public final static String PROP_UDDI_SERVICE_INTERFACE_KEY = "UDDIServiceInterfaceKey";
- public final static String PROP_UDDI_REGISTRY_NAME = "UDDIRegistryName";
- public final static String PROP_UDDI_REGISTRY_INQUIRY_API = "UDDIRegistryInquiryAPI";
- public final static String PROP_UDDI_REGISTRY_PUBLISH_API = "UDDIRegistryPublishAPI";
- public final static String PROP_UDDI_REGISTRY_REGISTRATION_URL = "UDDIRegistryRegistrationURL";
- public final static String PROP_UDDI_REGISTRY_CATEGORIES_ENUM = "UDDIRegistryCategoriesEnum";
-
- // List Managers for Favorites
- public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
- public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
- public final static String LIST_MANAGER_UDDI_BUSINESS = "uddiBusiness";
- public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
- public final static String LIST_MANAGER_UDDI_REGISTRY = "uddiRegistry";
- public final static String LIST_MANAGER_UDDI_SERVICE_INTERFACE = "uddiServiceInterface";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
deleted file mode 100644
index 7b677d2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesElement extends TreeElement {
-
- public FavoritesElement(String name, Model model) {
- super(name, model);
- }
-
- public FavoritesFolderElement getParentFolderElement() {
- Enumeration e = getElements(ModelConstants.REL_OWNER);
- if (!e.hasMoreElements())
- return null;
- else
- return (FavoritesFolderElement)e.nextElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
deleted file mode 100644
index e9b9c0c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public abstract class FavoritesFolderElement extends TreeElement
-{
- protected NodeManager nodeManager_;
-
- public FavoritesFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model);
- nodeManager_ = nodeManager;
- }
-
- protected FavoritesMainElement getFavoritesMainElement() {
- return (FavoritesMainElement)nodeManager_.getRootNode().getTreeElement();
- }
-
- public abstract void init(FavoritesMainElement favMainElement);
-
- public abstract boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory);
-
- public abstract boolean removeAllFavorites(String pluginMetadataDirectory);
-
- public abstract boolean addFavorite(Hashtable table);
-
- public abstract boolean favoriteExists(Hashtable table);
-
- public abstract Enumeration getAllFavorites();
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
deleted file mode 100644
index 299eecd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeWSE;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesMainElement extends TreeElement
-{
- private Controller controller_;
- private FavoritesRegistryTypeWSE favRegistry_;
-
- public FavoritesMainElement(String name, Model model, Controller controller)
- {
- super(name, model);
- controller_ = controller;
- favRegistry_ = new FavoritesRegistryTypeWSE(
- controller.getDefaultFavoritesLocation(),
- controller.getServletEngineStateLocation()
- );
- }
-
- public boolean restoreFavoritesDefault()
- {
- favRegistry_.restoreFavoritesDefault();
- return saveFavorites();
- }
-
- public boolean saveFavorites()
- {
- try
- {
- favRegistry_.save();
- return true;
- }
- catch (Throwable t)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_SAVE_FAVORITES_WSIL", favRegistry_.getWriteLocation()));
- return false;
- }
- }
-
- public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL)
- {
- return favRegistry_.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
- }
-
- public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey)
- {
- return favRegistry_.addUDDIBusiness(businessName, inquiryAPI, businessKey);
- }
-
- public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey)
- {
- return favRegistry_.addUDDIService(serviceName, inquiryAPI, serviceKey);
- }
-
- public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey)
- {
- return favRegistry_.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
- }
-
- public Service addWSDLService(String url)
- {
- return favRegistry_.addWSDLService(url);
- }
-
- public Link addWSILLink(String url)
- {
- return favRegistry_.addWSILLink(url);
- }
-
- public boolean removeService(Service service) {
- favRegistry_.removeService(service);
- return true;
- }
-
- public boolean removeLink(Link link) {
- favRegistry_.removeLink(link);
- return true;
- }
-
- public Link[] loadUDDIRegistries()
- {
- return favRegistry_.loadUDDIRegistries();
- }
-
- public Link[] loadUDDIBusinesses()
- {
- return favRegistry_.loadUDDIBusinesses();
- }
-
- public Service[] loadUDDIServices()
- {
- return favRegistry_.loadUDDIServices();
- }
-
- public Service[] loadUDDIServiceInterfaces()
- {
- return favRegistry_.loadUDDIServiceInterfaces();
- }
-
- public Service[] loadWSDLServices()
- {
- return favRegistry_.loadWSDLServices();
- }
-
- public Link[] loadWSILs()
- {
- return favRegistry_.loadWSILs();
- }
-
- public final FavoritesUDDIRegistryFolderElement getFavoritesUDDIRegistryFolderElement()
- {
- return (FavoritesUDDIRegistryFolderElement)(getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
deleted file mode 100644
index 62d17fc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIBusiness;
-
-public class FavoritesUDDIBusinessElement extends FavoritesElement {
-
- private FavoritesUDDIBusiness uddiBusiness_;
-
- public FavoritesUDDIBusinessElement(String name, Model model, Link link) {
- super(name, model);
- uddiBusiness_ = new FavoritesUDDIBusiness();
- uddiBusiness_.setLink(link);
- }
-
- public Link getLink() {
- return uddiBusiness_.getLink();
- }
-
- public String getName() {
- return uddiBusiness_.getName();
- }
-
- public String getInquiryURL() {
- return uddiBusiness_.getInquiryURL();
- }
-
- public String getBusinessKey() {
- return uddiBusiness_.getBusinessKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
deleted file mode 100644
index 014ab4e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIBusinessFolderElement extends FavoritesFolderElement
-{
- public FavoritesUDDIBusinessFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadUDDIBusinesses();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement((link.getAbstracts())[0].getText(), getModel(), link);
- connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String businessName = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
- String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
- if (businessName == null || inquiryAPI == null || businessKey == null)
- return false;
- FavoritesUDDIBusinessElement e = getFavorite(inquiryAPI, businessKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addUDDIBusiness(businessName, inquiryAPI, businessKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement(businessName, getModel(), link);
- connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
- String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
- if (inquiryAPI == null || businessKey == null)
- return false;
- return (getFavorite(inquiryAPI, businessKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIBusinessElement)
- return (removeFavorite((FavoritesUDDIBusinessElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIBusinessElement element) {
- Link link = element.getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
- Link link = favUDDIBusinessElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
- }
-
- private FavoritesUDDIBusinessElement getFavorite(String inquiryAPI, String businessKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)e.nextElement();
- if (inquiryAPI.equals(busElement.getInquiryURL()) &&
- businessKey.equals(busElement.getBusinessKey()))
- return busElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
deleted file mode 100644
index 683f66f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
+++ /dev/null
@@ -1,58 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-
-public class FavoritesUDDIRegistryElement extends FavoritesElement {
-
- private FavoritesUDDIRegistry uddiReg_;
-
- public FavoritesUDDIRegistryElement(String name, Model model, Link link) {
- super(name, model);
- uddiReg_ = new FavoritesUDDIRegistry();
- uddiReg_.setLink(link);
- }
-
- public Link getLink() {
- return uddiReg_.getLink();
- }
-
- public String getName() {
- return uddiReg_.getName();
- }
-
- public String getInquiryURL() {
- return uddiReg_.getInquiryURL();
- }
-
- public String getPublishURL() {
- return uddiReg_.getPublishURL();
- }
-
- public String getRegistrationURL() {
- return uddiReg_.getRegistrationURL();
- }
-
- public String toString() {
- return getName();
- }
-
- public IFavoritesUDDIRegistry getIFavoritesUDDIRegistryInterface()
- {
- return uddiReg_;
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
deleted file mode 100644
index 0a8fcc9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIRegistryFolderElement extends FavoritesFolderElement
-{
- public FavoritesUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadUDDIRegistries();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement((link.getAbstracts())[0].getText(), getModel(), link);
- connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API);
- String publishAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API);
- String registrationURL = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_REGISTRATION_URL);
- Enumeration userDefinedCategories = (Enumeration)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM);
- // Save the category data first and undo if necessary.
- if (userDefinedCategories != null)
- {
- String pluginMetadataDirectory = (String)table.get(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY);
- StringBuffer directoryBuffer = new StringBuffer();
- formCategoriesDirectory(directoryBuffer,pluginMetadataDirectory,registryName);
- File categoriesDirectoryFile = new File(directoryBuffer.toString());
- categoriesDirectoryFile.mkdirs();
- StringBuffer categoryFileName = new StringBuffer();
- while (userDefinedCategories.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
- categoryFileName.setLength(0);
- String encodedCategoryKey = URLUtils.encode(categoryModel.getCategoryKey());
- categoryFileName.append(categoriesDirectoryFile.getAbsolutePath()).append(File.separatorChar).append(encodedCategoryKey).append(".txt");
- byte rc = categoryModel.saveData(categoryFileName.toString());
- if (rc != CategoryModel.OPERATION_SUCCESSFUL)
- {
- // Delete the category file if it exists.
- File categoryFile = new File(categoryFileName.toString());
- if (categoryFile.exists())
- categoryFile.delete();
- }
- }
- cleanupCategoryDirectories(categoriesDirectoryFile);
- }
- if (registryName == null || inquiryAPI == null || publishAPI == null)
- return false;
- FavoritesUDDIRegistryElement e = getFavorite(registryName);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement(registryName, getModel(), link);
- connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public static final void formCategoriesDirectory(StringBuffer categoriesDirectory,String pluginMetadataDirectory,String registryName)
- {
- // <metadata>/uddi/<registryId>/categories
- String encodedRegistryName = URLUtils.encode(registryName);
- categoriesDirectory.append(pluginMetadataDirectory).append("uddi").append(File.separatorChar).append(encodedRegistryName).append(File.separatorChar).append("categories");
- }
-
- private final void clearRegistryMetadata(String pluginMetadataDirectory,String registryName)
- {
- StringBuffer categoriesDirectory = new StringBuffer();
- formCategoriesDirectory(categoriesDirectory,pluginMetadataDirectory,registryName);
- File categoriesDirectoryFile = new File(categoriesDirectory.toString());
- File[] categoryFiles = categoriesDirectoryFile.listFiles();
- if (categoryFiles != null)
- {
- for (int i=0;i<categoryFiles.length;i++)
- categoryFiles[i].delete();
- }
- cleanupCategoryDirectories(categoriesDirectoryFile);
- }
-
- private final void cleanupCategoryDirectories(File categoriesDirectoryFile)
- {
- // Delete the categories subdirectory if it is empty.
- String[] fileList;
- fileList = categoriesDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- categoriesDirectoryFile.delete();
- // Delete the <registryId> subdirectory if it is empty.
- File registryIdDirectoryFile = categoriesDirectoryFile.getParentFile();
- fileList = registryIdDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- registryIdDirectoryFile.delete();
- // Delete the uddi subdirectory if it is empty.
- File uddiDirectoryFile = registryIdDirectoryFile.getParentFile();
- fileList = uddiDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- uddiDirectoryFile.delete();
- }
-
- public boolean favoriteExists(Hashtable table) {
- String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
- if (registryName == null)
- return false;
- return (getFavorite(registryName) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIRegistryElement)
- {
- clearRegistryMetadata(pluginMetadataDirectory,selectedElement.getName());
- boolean rc = removeFavorite((FavoritesUDDIRegistryElement)selectedElement);
- rc = rc && favMainElement.saveFavorites();
- return rc;
- }
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIRegistryElement element) {
- Link link = ((FavoritesUDDIRegistryElement)element).getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
- clearRegistryMetadata(pluginMetadataDirectory,favUDDIRegistryElement.getName());
- Link link = favUDDIRegistryElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-
- private FavoritesUDDIRegistryElement getFavorite(String registryName) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)e.nextElement();
- if (registryName.equals(regElement.getName()))
- return regElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
deleted file mode 100644
index 700b34e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIService;
-
-public class FavoritesUDDIServiceElement extends FavoritesElement {
-
- private FavoritesUDDIService uddiService_;
-
- public FavoritesUDDIServiceElement(String name, Model model, Service service) {
- super(name, model);
- uddiService_ = new FavoritesUDDIService();
- uddiService_.setService(service);
- }
-
- public Service getService() {
- return uddiService_.getService();
- }
-
- public String getName() {
- return uddiService_.getName();
- }
-
- public String getInquiryURL() {
- return uddiService_.getInquiryURL();
- }
-
- public String getServiceKey() {
- return uddiService_.getServiceKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
deleted file mode 100644
index 3ab4f91..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIServiceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesUDDIServiceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadUDDIServices();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement((service.getServiceNames())[0].getText(), getModel(), service);
- connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String serviceName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
- String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
- if (serviceName == null || inquiryAPI == null || serviceKey == null)
- return false;
- FavoritesUDDIServiceElement e = getFavorite(inquiryAPI, serviceKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addUDDIService(serviceName, inquiryAPI, serviceKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement(serviceName, getModel(), service);
- connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
- String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
- if (inquiryAPI == null || serviceKey == null)
- return false;
- return (getFavorite(inquiryAPI, serviceKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIServiceElement)
- return (removeFavorite((FavoritesUDDIServiceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIServiceElement element) {
- Service service = ((FavoritesUDDIServiceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
- Service service = favUDDIServiceElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
- }
-
- private FavoritesUDDIServiceElement getFavorite(String inquiryAPI, String serviceKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)e.nextElement();
- if (inquiryAPI.equals(serElement.getInquiryURL()) &&
- serviceKey.equals(serElement.getServiceKey()))
- return serElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
deleted file mode 100644
index 509b2c0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIServiceInterface;
-
-public class FavoritesUDDIServiceInterfaceElement extends FavoritesElement {
-
- private FavoritesUDDIServiceInterface uddiSerInt_;
-
- public FavoritesUDDIServiceInterfaceElement(String name, Model model, Service service) {
- super(name, model);
- uddiSerInt_ = new FavoritesUDDIServiceInterface();
- uddiSerInt_.setService(service);
- }
-
- public Service getService() {
- return uddiSerInt_.getService();
- }
-
- public String getName() {
- return uddiSerInt_.getName();
- }
-
- public String getInquiryURL() {
- return uddiSerInt_.getInquiryURL();
- }
-
- public String getServiceInterfaceKey() {
- return uddiSerInt_.getServiceInterfaceKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
deleted file mode 100644
index 9eb49dc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIServiceInterfaceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesUDDIServiceInterfaceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadUDDIServiceInterfaces();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement((service.getServiceNames())[0].getText(), getModel(), service);
- connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String serIntName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
- String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
- if (serIntName == null || inquiryAPI == null || serIntKey == null)
- return false;
- FavoritesUDDIServiceInterfaceElement e = getFavorite(inquiryAPI, serIntKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement(serIntName, getModel(), service);
- connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
- String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
- if (inquiryAPI == null || serIntKey == null)
- return false;
- return (getFavorite(inquiryAPI, serIntKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement)
- return (removeFavorite((FavoritesUDDIServiceInterfaceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIServiceInterfaceElement element) {
- Service service = ((FavoritesUDDIServiceInterfaceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- Service service = favUDDISerIntElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
- }
-
- private FavoritesUDDIServiceInterfaceElement getFavorite(String inquiryAPI, String serIntKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- if (inquiryAPI.equals(serIntElement.getInquiryURL()) &&
- serIntKey.equals(serIntElement.getServiceInterfaceKey()))
- return serIntElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
deleted file mode 100644
index 37a4de1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
+++ /dev/null
@@ -1,192 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-public class FavoritesUserDefUDDIRegistryElement extends FavoritesElement
-{
- private List names;
- private List descs;
- private String version;
- private String defaultLogin;
- private String defaultPassword;
- private String inquiryURL;
- private String publishURL;
- private String secureInquiryURL;
- private String securePublishURL;
- private Taxonomy[] taxonomies;
-
- public String getDefaultLogin()
- {
- return defaultLogin;
- }
-
- public void setDefaultLogin(String defaultLogin)
- {
- this.defaultLogin = defaultLogin;
- }
-
- public String getDefaultPassword()
- {
- return defaultPassword;
- }
-
- public void setDefaultPassword(String defaultPassword)
- {
- this.defaultPassword = defaultPassword;
- }
-
- public Taxonomy[] getTaxonomies()
- {
- return taxonomies;
- }
-
- public void setTaxonomies(Taxonomy[] taxonomies)
- {
- this.taxonomies = taxonomies;
- }
-
- public FavoritesUserDefUDDIRegistryElement(String name, Model model)
- {
- super(name, model);
- }
-
- public List getDescs()
- {
- return descs;
- }
-
- public void setDescs(List descs)
- {
- this.descs = descs;
- }
-
- public String getInquiryURL()
- {
- return inquiryURL;
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- this.inquiryURL = inquiryURL;
- }
-
- public List getNames()
- {
- return names;
- }
-
- public void setNames(List names)
- {
- this.names = names;
- }
-
- public String getPublishURL()
- {
- return publishURL;
- }
-
- public void setPublishURL(String publishURL)
- {
- this.publishURL = publishURL;
- }
-
- public String getSecureInquiryURL()
- {
- return secureInquiryURL;
- }
-
- public void setSecureInquiryURL(String secureInquiryURL)
- {
- this.secureInquiryURL = secureInquiryURL;
- }
-
- public String getSecurePublishURL()
- {
- return securePublishURL;
- }
-
- public void setSecurePublishURL(String securePublishURL)
- {
- this.securePublishURL = securePublishURL;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- public String toString()
- {
- return getName();
- }
-
- public void refreshMeta(){
-
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
- try
- {
-
-
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- List names = uddiReg.getName();
-
- if(uddiReg.getDiscoveryURL().equals(getInquiryURL())){
-
- setNames(names);
- setDescs(uddiReg.getDescription());
- setVersion(uddiReg.getVersion());
- setDefaultLogin(uddiReg.getDefaultLogin());
- setDefaultPassword(uddiReg.getDefaultPassword());
- setInquiryURL(uddiReg.getDiscoveryURL());
- setPublishURL(uddiReg.getPublicationURL());
- setSecureInquiryURL(uddiReg.getSecuredDiscoveryURL());
- setSecurePublishURL(uddiReg.getSecuredPublicationURL());
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- setTaxonomies(taxonomies);
- }
- }
- }
- }
- catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java
deleted file mode 100644
index a91ad11..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.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
- * -------- -------- -----------------------------------------------------------
- * 20060906 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class FavoritesUserDefUDDIRegistryFolderElement extends FavoritesFolderElement
-{
- public FavoritesUserDefUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager)
- {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement)
- {
- refresh();
- }
-
- public void refresh(){
- disconnectRel(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE);
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
- try
- {
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- List names = uddiReg.getName();
- String displayName = names != null && !names.isEmpty() ? ((Name)names.get(0)).getValue() : "";
- FavoritesUserDefUDDIRegistryElement favUserDefUDDIRegElement = new FavoritesUserDefUDDIRegistryElement(displayName, getModel());
- favUserDefUDDIRegElement.setNames(names);
- favUserDefUDDIRegElement.setDescs(uddiReg.getDescription());
- favUserDefUDDIRegElement.setVersion(uddiReg.getVersion());
- favUserDefUDDIRegElement.setDefaultLogin(uddiReg.getDefaultLogin());
- favUserDefUDDIRegElement.setDefaultPassword(uddiReg.getDefaultPassword());
- favUserDefUDDIRegElement.setInquiryURL(uddiReg.getDiscoveryURL());
- favUserDefUDDIRegElement.setPublishURL(uddiReg.getPublicationURL());
- favUserDefUDDIRegElement.setSecureInquiryURL(uddiReg.getSecuredDiscoveryURL());
- favUserDefUDDIRegElement.setSecurePublishURL(uddiReg.getSecuredPublicationURL());
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- favUserDefUDDIRegElement.setTaxonomies(taxonomies);
- connect(favUserDefUDDIRegElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- }
- }
- catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-
-
- public boolean addFavorite(Hashtable table)
- {
- // do nothing
- return true;
- }
-
- public boolean favoriteExists(Hashtable table)
- {
- // do nothing
- return true;
- }
-
- public boolean removeFavoriteByNodeID(int nodeID, String pluginMetadataDirectory)
- {
- // do nothing
- return true;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory)
- {
- // do nothing
- return true;
- }
-
- public Enumeration getAllFavorites()
- {
- return getElements(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
deleted file mode 100644
index 162bb6b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSDL;
-
-public class FavoritesWSDLServiceElement extends FavoritesElement {
-
- private FavoritesWSDL wsdl_;
-
- public FavoritesWSDLServiceElement(String name, Model model, Service service) {
- super(name, model);
- wsdl_ = new FavoritesWSDL();
- wsdl_.setService(service);
- }
-
- public Service getService() {
- return wsdl_.getService();
- }
-
- public String getWsdlUrl() {
- return wsdl_.getWsdlUrl();
- }
-
- public String toString() {
- return getWsdlUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
deleted file mode 100644
index 1f83f45..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesWSDLServiceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadWSDLServices();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement((service.getDescriptions())[0].getLocation(), getModel(), service);
- connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
- if (wsdlURL == null)
- return false;
- FavoritesWSDLServiceElement e = getFavorite(wsdlURL);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addWSDLService(wsdlURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement(wsdlURL, getModel(), service);
- connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
- if (wsdlURL == null)
- return false;
- return (getFavorite(wsdlURL) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesWSDLServiceElement)
- return (removeFavorite((FavoritesWSDLServiceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesWSDLServiceElement element) {
- Service service = ((FavoritesWSDLServiceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
- Service service = favWSDLServiceElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- }
-
- private FavoritesWSDLServiceElement getFavorite(String wsdlUrl) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)e.nextElement();
- if (wsdlUrl.equals(wsdlElement.getWsdlUrl()))
- return wsdlElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
deleted file mode 100644
index 280b607..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSIL;
-
-public class FavoritesWSILElement extends FavoritesElement {
-
- private FavoritesWSIL wsil_;
-
- public FavoritesWSILElement(String name, Model model, Link link) {
- super(name, model);
- wsil_ = new FavoritesWSIL();
- wsil_.setLink(link);
- }
-
- public Link getLink() {
- return wsil_.getLink();
- }
-
- public String getWsilUrl() {
- return wsil_.getWsilUrl();
- }
-
- public String toString() {
- return getWsilUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
deleted file mode 100644
index 2ea4930..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderElement extends FavoritesFolderElement {
-
- public FavoritesWSILFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadWSILs();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesWSILElement favWSILElement = new FavoritesWSILElement(link.getLocation(), getModel(), link);
- connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
- if (wsilURL == null)
- return false;
- FavoritesWSILElement e = getFavorite(wsilURL);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addWSILLink(wsilURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesWSILElement favWSILElement = new FavoritesWSILElement(wsilURL, getModel(), link);
- connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
- if (wsilURL == null)
- return false;
- return (getFavorite(wsilURL) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesWSILElement)
- return (removeFavorite((FavoritesWSILElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesWSILElement element) {
- Link link = element.getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
- Link link = favWSILElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_WSIL_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_WSIL_NODE);
- }
-
- private FavoritesWSILElement getFavorite(String wsilUrl) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesWSILElement wsilElement = (FavoritesWSILElement)e.nextElement();
- if (wsilUrl.equals(wsilElement.getWsilUrl()))
- return wsilElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
deleted file mode 100644
index 98a1797..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddToUDDIPerspectiveTool extends ActionTool {
-
- public AddToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/add_to_uddi_perspective_enabled.gif", "favorites/images/add_to_uddi_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
deleted file mode 100644
index 424812d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddWSILToWSILPerspectiveTool extends ActionTool {
-
- public AddWSILToWSILPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/add_to_wsil_perspective_enabled.gif", "favorites/images/add_to_wsil_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddWSILToWSILPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
deleted file mode 100644
index e100faa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
- public FavoritesAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return FavoritesAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
deleted file mode 100644
index a7110c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToFileSystemTool extends ImportToFileSystemTool {
-
- public FavoritesImportToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return ImportToFileSystemAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(),"favorites/actions/FavoritesImportToFileSystemActionJSP.jsp");
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
deleted file mode 100644
index 8cac8f0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToWorkbenchTool extends ImportToWorkbenchTool {
-
- public FavoritesImportToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesImportToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
deleted file mode 100644
index e19b359..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-
- public FavoritesLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
deleted file mode 100644
index b560106..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesMainNode extends FavoritesNavigatorNode {
- public FavoritesMainNode(TreeElement treeElement, NodeManager nodeManager) {
- super(treeElement, nodeManager, 1, "images/root_main.gif");
-
- // Create UDDI Registry Folder Node
- FavoritesUDDIRegistryFolderElement favUDDIRegistryFolderElement = new FavoritesUDDIRegistryFolderElement(getMessage("FAVORITES_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIRegistryFolderElement, FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIRegistryFolderNode favUDDIRegistryFolderNode = new FavoritesUDDIRegistryFolderNode(favUDDIRegistryFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIRegistryFolderNode);
- favUDDIRegistryFolderNode.setVisibilityOfChildren(false);
- favUDDIRegistryFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create User defined UDDI Registry Folder Node
- FavoritesUserDefUDDIRegistryFolderElement favUserDefUDDIFolderElement = new FavoritesUserDefUDDIRegistryFolderElement(getMessage("FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUserDefUDDIFolderElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUserDefUDDIRegistryFolderNode favUserDefUDDIFolderNode = new FavoritesUserDefUDDIRegistryFolderNode(favUserDefUDDIFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUserDefUDDIFolderNode);
- favUserDefUDDIFolderNode.setVisibilityOfChildren(false);
- favUserDefUDDIFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Business Folder Node
- FavoritesUDDIBusinessFolderElement favUDDIBusinessFolderElement = new FavoritesUDDIBusinessFolderElement(getMessage("FAVORITES_UDDI_BUSINESSES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIBusinessFolderElement, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIBusinessFolderNode favUDDIBusinessFolderNode = new FavoritesUDDIBusinessFolderNode(favUDDIBusinessFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIBusinessFolderNode);
- favUDDIBusinessFolderNode.setVisibilityOfChildren(false);
- favUDDIBusinessFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Service Folder Node
- FavoritesUDDIServiceFolderElement favUDDIServiceFolderElement = new FavoritesUDDIServiceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIServiceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIServiceFolderNode favUDDIServiceFolderNode = new FavoritesUDDIServiceFolderNode(favUDDIServiceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIServiceFolderNode);
- favUDDIServiceFolderNode.setVisibilityOfChildren(false);
- favUDDIServiceFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Service Interface Folder Node
- FavoritesUDDIServiceInterfaceFolderElement favUDDIServiceInterfaceFolderElement = new FavoritesUDDIServiceInterfaceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIServiceInterfaceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIServiceInterfaceFolderNode favUDDIServiceInterfaceFolderNode = new FavoritesUDDIServiceInterfaceFolderNode(favUDDIServiceInterfaceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIServiceInterfaceFolderNode);
- favUDDIServiceInterfaceFolderNode.setVisibilityOfChildren(false);
- favUDDIServiceInterfaceFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create WSIL Folder Node
- FavoritesWSILFolderElement favWSILFolderElement = new FavoritesWSILFolderElement(getMessage("FAVORITES_WSIL_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favWSILFolderElement, FavoritesModelConstants.REL_WSIL_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesWSILFolderNode favWSILFolderNode = new FavoritesWSILFolderNode(favWSILFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favWSILFolderNode);
- favWSILFolderNode.setVisibilityOfChildren(false);
- favWSILFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create WSDL Service Folder Node
- FavoritesWSDLServiceFolderElement favWSDLServiceFolderElement = new FavoritesWSDLServiceFolderElement(getMessage("FAVORITES_WSDL_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favWSDLServiceFolderElement, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesWSDLServiceFolderNode favWSDLServiceFolderNode = new FavoritesWSDLServiceFolderNode(favWSDLServiceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favWSDLServiceFolderNode);
- favWSDLServiceFolderNode.setVisibilityOfChildren(false);
- favWSDLServiceFolderElement.init((FavoritesMainElement)treeElement);
-
- }
-
- protected void initTools() {
- }
-
- private String getMessage(String msg) {
- Controller controller = nodeManager_.getController();
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- return favPerspective.getMessage(msg);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
deleted file mode 100644
index 035d0ac..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorFolderNode extends FolderNode {
-
- public FavoritesNavigatorFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- }
-
- protected String getToggleNodeActionHref() {
- return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
deleted file mode 100644
index 3b87d66..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorNode extends Node {
-
- public FavoritesNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected String getToggleNodeActionHref() {
- return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
deleted file mode 100644
index de498f9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SwitchPerspectiveFromFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-
-public class FavoritesPerspective extends Perspective
-{
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public FavoritesPerspective(Controller controller)
- {
- super("favorites",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("FavoritesModel");
- FavoritesMainElement favoritesMainElement = new FavoritesMainElement(getMessage("FAVORITES_MAIN_NODE"), model_, controller_);
- model_.setRootElement(favoritesMainElement);
- nodeManager_ = new NodeManager(controller_);
- FavoritesMainNode favMainNode = new FavoritesMainNode(favoritesMainElement, nodeManager_);
- nodeManager_.setRootNode(favMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public NodeManager getNodeManager() {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "favorites/fav_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-
- public String getPanesFile() {
- return "favorites/scripts/favoritesPanes.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "favorites/forms/ProcessFavoritesFramesetsForm.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "favorites/scripts/favoritesframesets.jsp";
- }
-
- public String getTreeContentVar() {
- return "favNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "favorites/fav_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "favPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "favorites/fav_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "favStatusContent";
- }
-
- public String getStatusContentPage() {
- return "favorites/fav_status_content.jsp";
- }
-
- public String getPropertiesContentVar() {
- return "favPropertiesContent";
- }
-
- public String getPropertiesContentPage() {
- return "favorites/fav_properties_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromFavoritesAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
deleted file mode 100644
index 026c6cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesRestoreDefaultFavoritesTool extends ActionTool {
- public FavoritesRestoreDefaultFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return FavoritesRestoreDefaultFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
deleted file mode 100644
index 6cec4f7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesSetDefaultViewTool extends SetDefaultViewTool {
- public FavoritesSetDefaultViewTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
deleted file mode 100644
index f761536..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIBusinessDetailsTool extends FormTool {
-
- public FavoritesUDDIBusinessDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
deleted file mode 100644
index 2622fce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIBusinessFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- FavoritesUDDIBusinessNode favoritesUDDIBusinessNode = new FavoritesUDDIBusinessNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIBusinessNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIBusinessTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
deleted file mode 100644
index 7cc8a2b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessNode extends FavoritesNavigatorNode {
- public FavoritesUDDIBusinessNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_business_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIBusinessDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
deleted file mode 100644
index b3f6cd6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIRegistryDetailsTool extends FormTool {
-
- public FavoritesUDDIRegistryDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
deleted file mode 100644
index a460a11..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import java.io.File;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- TreeElement regElement = (TreeElement)event.getParentElement();
- String imagePath;
- StringBuffer categoriesDirectory = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoriesDirectory,nodeManager_.getController().getServletEngineStateLocation(),regElement.getName());
- File categoryDirectoryFile = new File(categoriesDirectory.toString());
- String[] categoryFiles = categoryDirectoryFile.list();
- if (categoryFiles != null && categoryFiles.length > 0)
- imagePath = "favorites/images/uddi_registry_cat_node.gif";
- else
- imagePath = "favorites/images/uddi_registry_node.gif";
- FavoritesUDDIRegistryNode favoritesUDDIRegistryNode = new FavoritesUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
- addChild(favoritesUDDIRegistryNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
deleted file mode 100644
index a8f2813..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryNode extends FavoritesNavigatorNode {
- public FavoritesUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth,String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
deleted file mode 100644
index 324f4e0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceDetailsTool extends FormTool {
-
- public FavoritesUDDIServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIServiceDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
deleted file mode 100644
index 3314d26..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- FavoritesUDDIServiceNode favoritesUDDIServiceNode = new FavoritesUDDIServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
deleted file mode 100644
index cb92e7b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceInterfaceDetailsTool extends FormTool {
-
- public FavoritesUDDIServiceInterfaceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
deleted file mode 100644
index 83f6672..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIServiceInterfaceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- FavoritesUDDIServiceInterfaceNode favoritesUDDIServiceInterfaceNode = new FavoritesUDDIServiceInterfaceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIServiceInterfaceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIServiceInterfaceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
deleted file mode 100644
index 0286ccc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceNode extends FavoritesNavigatorNode {
- public FavoritesUDDIServiceInterfaceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_interface_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIServiceInterfaceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
deleted file mode 100644
index 4eab77c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceNode extends FavoritesNavigatorNode {
- public FavoritesUDDIServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIServiceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
deleted file mode 100644
index d495724..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,36 +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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUserDefUDDIRegistryDetailsTool extends FormTool
-{
- public FavoritesUserDefUDDIRegistryDetailsTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
deleted file mode 100644
index 72fc0ec..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,68 +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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesUserDefUDDIRegistryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode
-{
- public FavoritesUserDefUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth)
- {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- TreeElement regElement = (TreeElement)event.getParentElement();
- String imagePath = "favorites/images/uddi_registry_node.gif";
- FavoritesUserDefUDDIRegistryNode favUserDefUDDIRegistryNode = new FavoritesUserDefUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
- addChild(favUserDefUDDIRegistryNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools()
- {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUserDefUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY"));
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesUserDefUDDIRegistryNodeAction.getActionLink(nodeId_, false);
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java
deleted file mode 100644
index 1261756..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryNode extends FavoritesNavigatorNode
-{
- public FavoritesUserDefUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath)
- {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected void initTools()
- {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUserDefUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
deleted file mode 100644
index 9d0e52e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSDLDetailsTool extends FormTool {
-
- public FavoritesWSDLDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesWSDLDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
deleted file mode 100644
index 62f48db..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesWSDLServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- FavoritesWSDLServiceNode favoritesWSDLServiceNode = new FavoritesWSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesWSDLServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteWSDLServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
deleted file mode 100644
index 2c416a6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceNode extends FavoritesNavigatorNode {
- public FavoritesWSDLServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/wsdl_service_node.gif");
- }
-
- protected void initTools() {
- Controller controller = nodeManager_.getController();
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- new FavoritesWSDLDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS"));
- new FavoritesImportToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new FavoritesImportToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new FavoritesLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new FavoritesAddToWSDLPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
deleted file mode 100644
index a702b81..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSILDetailsTool extends FormTool {
-
- public FavoritesWSILDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesWSILDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
deleted file mode 100644
index 1df461b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesWSILFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- FavoritesWSILNode favoritesWSILNode = new FavoritesWSILNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesWSILNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteWSILTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSIL"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
deleted file mode 100644
index a9f2d19..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILNode extends FavoritesNavigatorNode {
- public FavoritesWSILNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/wsil_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesWSILDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS"));
- new AddWSILToWSILPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
deleted file mode 100644
index ec1a8ff..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIBusinessTool extends FormTool {
- public ListFavoriteUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_business_enabled.gif", "favorites/images/list_business_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIBusinessView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
deleted file mode 100644
index 70cd152..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIRegistryTool extends FormTool {
- public ListFavoriteUDDIRegistryTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIRegistryView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
deleted file mode 100644
index 8aaf24f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceInterfaceTool extends FormTool {
- public ListFavoriteUDDIServiceInterfaceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_service_interface_enabled.gif", "favorites/images/list_service_interface_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
deleted file mode 100644
index 4f49c0d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceTool extends FormTool {
- public ListFavoriteUDDIServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_service_enabled.gif", "favorites/images/list_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIServiceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
deleted file mode 100644
index dab8c95..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
+++ /dev/null
@@ -1,36 +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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUserDefUDDIRegistryTool extends FormTool
-{
- public ListFavoriteUserDefUDDIRegistryTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink()
- {
- return "favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
deleted file mode 100644
index 3bf2081..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSDLServiceTool extends FormTool {
- public ListFavoriteWSDLServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_wsdl_enabled.gif", "favorites/images/list_wsdl_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteWSDLServiceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
deleted file mode 100644
index 478325b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSILTool extends FormTool {
- public ListFavoriteWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_WSIL_enabled.gif", "favorites/images/list_WSIL_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteWSILView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
deleted file mode 100644
index e7672fa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class RemoveFavoritesTool extends ActionTool {
-
- public RemoveFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
deleted file mode 100644
index 533edd1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ActionTool extends Tool
-{
- public ActionTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.ACTION);
- }
-
- public String getFormLink()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
deleted file mode 100644
index c63d445..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class AddToWSDLPerspectiveTool extends ActionTool
-{
- public AddToWSDLPerspectiveTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/add_to_wsdl_perspective_enabled.gif","images/add_to_wsdl_perspective_highlighted.gif",alt);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
deleted file mode 100644
index 6497c23..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-// A class used to represent a brower breadcrumb. Each breadcrumb encapsulates
-// a navigated URL.
-public class BreadCrumb
-{
- private int perspectiveId_;
- private String url_;
-
- public BreadCrumb(int perspectiveId,String url)
- {
- perspectiveId_ = perspectiveId;
- url_ = url;
- }
-
- /**
- * Get the URL associated with this breadcrumb.
- * @return String The URL.
- */
- public String getURL()
- {
- return url_;
- }
-
- /**
- * Get the ID of the perspective where this breadcrumb belongs.
- * @return int The perspectiveID as defined in ActionInputs.
- */
- public int getPerspectiveId()
- {
- return perspectiveId_;
- }
-
- /**
- * Test equality between this breadcrumb and another. Both the URLs and perspective
- * IDs must be equal for two breadcrumbs to be equal.
- * @param BreadCrumb A breadcrumb.
- * @return boolean The result of the equality test.
- */
- public boolean equals(BreadCrumb b)
- {
- return ((url_.equals(b.getURL())) && (perspectiveId_ == b.getPerspectiveId()));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
deleted file mode 100644
index 1a9787f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class Controller extends MessageProvider
-{
- private String sessionId_;
- private String stateLocation_;
- private String defaultFavoritesLocation_;
- private String contextPath_;
- private int historyDirection_;
- private History history_;
- private UDDIPerspective uddiPerspective_;
- private WSILPerspective wsilPerspective_;
- private WSDLPerspective wsdlPerspective_;
- private FavoritesPerspective favoritesPerspective_;
- private Perspective currentPerspective_;
- private boolean isPerspectiveContentBlank_;
- private ActionEngine actionEngine;
-
- // WSDL Browser
- private int wsdlType_;
-
- public Controller()
- {
- super("explorer");
- contextPath_ = null;
- stateLocation_ = null;
- history_ = new History();
- uddiPerspective_ = new UDDIPerspective(this);
- wsilPerspective_ = new WSILPerspective(this);
- wsdlPerspective_ = new WSDLPerspective(this);
- favoritesPerspective_ = new FavoritesPerspective(this);
- // Set the default perspective to UDDI.
- currentPerspective_ = uddiPerspective_;
- historyDirection_ = ActionInputs.JUMP_BACK;
- wsdlType_ = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
- isPerspectiveContentBlank_ = true;
- actionEngine = new ActionEngine(this);
- }
-
- public final void setStateLocation(String stateLocation)
- {
- stateLocation_ = stateLocation;
- }
-
- public final void setDefaultFavoritesLocation(String defaultFavoritesLocation)
- {
- defaultFavoritesLocation_ = defaultFavoritesLocation;
- }
-
- // This method should be called immediately after the Controller bean is instantiated.
- private final void setContextPath(String contextPath)
- {
- if (contextPath_ == null)
- contextPath_ = contextPath;
- }
-
- public final String getPathWithContext(String relativePath)
- {
- if (relativePath == null)
- return relativePath;
- StringBuffer path = new StringBuffer(relativePath);
- if (contextPath_ != null)
- path.insert(0,'/').insert(0,contextPath_);
- return path.toString();
- }
-
- public final String getSessionId()
- {
- return sessionId_;
- }
-
- public final String getContextPath()
- {
- return contextPath_;
- }
-
- public final String getServletEngineStateLocation() {
- return stateLocation_;
- }
-
- public final String getDefaultFavoritesLocation () {
- return defaultFavoritesLocation_;
- }
-
- public final void init(String sessionId,ServletContext application,String contextPath)
- {
- sessionId_ = sessionId;
- setContextPath(contextPath);
- uddiPerspective_.initPerspective(application);
- wsilPerspective_.initPerspective(application);
- wsdlPerspective_.initPerspective(application);
- favoritesPerspective_.initPerspective(application);
- }
-
- // Setter for the current perspective.
- public final void setCurrentPerspective(int perspective)
- {
- switch (perspective)
- {
- case ActionInputs.PERSPECTIVE_UDDI:
- currentPerspective_ = uddiPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_WSIL:
- currentPerspective_ = wsilPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_WSDL:
- currentPerspective_ = wsdlPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_FAVORITES:
- currentPerspective_ = favoritesPerspective_;
- break;
- }
- }
-
- // Getter for the current perspective.
- public final Perspective getCurrentPerspective()
- {
- return currentPerspective_;
- }
-
- // Getter for the UDDI perspective.
- public final UDDIPerspective getUDDIPerspective()
- {
- return uddiPerspective_;
- }
-
- // Getter for the WSIL perspective.
- public final WSILPerspective getWSILPerspective()
- {
- return wsilPerspective_;
- }
-
- // Getter for the WSDL perspective.
- public final WSDLPerspective getWSDLPerspective()
- {
- return wsdlPerspective_;
- }
-
- // Getter for the Favorites perspective.
- public final FavoritesPerspective getFavoritesPerspective() {
- return favoritesPerspective_;
- }
-
- // Getter for the action engine
- public final ActionEngine getActionEngine() {
- return actionEngine;
- }
-
- public final boolean addToHistory(int perspectiveId,String url)
- {
- if (url != null)
- return history_.addBreadCrumb(new BreadCrumb(perspectiveId,url));
- return false;
- }
-
- // Wrapper for moving forward in the history list and obtaining the breadcrumb.
- public final BreadCrumb forward()
- {
- historyDirection_ = ActionInputs.JUMP_FORWARD;
- return history_.forward();
- }
-
- // Wrapper for moving back in the history list and obtaining the breadcrumb.
- public final BreadCrumb back()
- {
- historyDirection_ = ActionInputs.JUMP_BACK;
- return history_.back();
- }
-
- public final int getHistoryDirection()
- {
- return historyDirection_;
- }
-
- public final void processStaleBreadCrumb()
- {
- history_.removeCurrentBreadCrumb();
- }
-
- // WSDL Browser
- public final void setWSDLType(int wsdlType)
- {
- wsdlType_ = wsdlType;
- }
-
- public final int getWSDLType()
- {
- return wsdlType_;
- }
-
- public final boolean isPerspectiveContentBlank()
- {
- return isPerspectiveContentBlank_;
- }
-
- public final void enablePerspectiveContentBlank(boolean isPerspectiveContentBlank)
- {
- isPerspectiveContentBlank_ = isPerspectiveContentBlank;
- }
-
- public final void dumpHistory()
- {
- history_.dump();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
deleted file mode 100644
index bba3918..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class FolderNode extends Node
-{
- public FolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"images/folder_closed.gif");
- }
-
- public String getOpenImagePath()
- {
- return "images/folder_open.gif";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
deleted file mode 100644
index 9d2f47a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class FormTool extends Tool implements FormToolPropertiesInterface
-{
- protected FormToolProperties formToolProperties_;
-
- public FormTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.FORM);
- formToolProperties_ = new FormToolProperties();
- initDefaultProperties();
- }
-
- protected void initDefaultProperties()
- {
- }
-
- public final Object getProperty(Object key)
- {
- return formToolProperties_.getProperty(key);
- }
-
- public final void setProperty(Object key,Object value)
- {
- formToolProperties_.setProperty(key,value);
- }
-
- public final void removeProperty(Object key)
- {
- formToolProperties_.removeProperty(key);
- }
-
- public final void clearPropertyTable()
- {
- formToolProperties_.clearPropertyTable();
- }
-
- public final void updatePropertyTable(Hashtable newPropertyTable)
- {
- formToolProperties_.updatePropertyTable(newPropertyTable);
- }
-
- public final void setPropertyTable(Hashtable newPropertyTable)
- {
- formToolProperties_.setPropertyTable(newPropertyTable);
- }
-
- public final void flagError(Object inputKey)
- {
- formToolProperties_.flagError(inputKey);
- }
-
- public final void flagRowError(Object inputKey,int rowNumber)
- {
- formToolProperties_.flagRowError(inputKey,rowNumber);
- }
-
- public final void flagRowError(Object inputKey,Object rowId)
- {
- formToolProperties_.flagRowError(inputKey,rowId);
- }
-
- public final void clearErrors()
- {
- formToolProperties_.clearErrors();
- }
-
- public final boolean isInputValid(Object inputKey)
- {
- return formToolProperties_.isInputValid(inputKey);
- }
-
- public final boolean isRowInputValid(Object inputKey,int rowNumber)
- {
- return formToolProperties_.isRowInputValid(inputKey,String.valueOf(rowNumber));
- }
-
- // The row number may also be represented by a unique object (e.g. UUID)
- public final boolean isRowInputValid(Object inputKey,Object rowId)
- {
- return formToolProperties_.isRowInputValid(inputKey,rowId);
- }
-
- public final String getActionLink()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
deleted file mode 100644
index c0cf79c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class FormToolProperties implements FormToolPropertiesInterface
-{
- private Hashtable propertyTable_;
- private Hashtable errantValues_;
-
- public FormToolProperties()
- {
- propertyTable_ = new Hashtable();
- errantValues_ = new Hashtable();
- }
-
- public final Object getProperty(Object key)
- {
- return propertyTable_.get(key);
- }
-
- public final void setProperty(Object key,Object value)
- {
- propertyTable_.put(key,value);
- }
-
- public final void removeProperty(Object key)
- {
- propertyTable_.remove(key);
- }
-
- public final void clearPropertyTable()
- {
- propertyTable_.clear();
- }
-
- public final void updatePropertyTable(Hashtable newPropertyTable)
- {
- Enumeration e = newPropertyTable.keys();
- while (e.hasMoreElements())
- {
- String key = (String)e.nextElement();
- propertyTable_.put(key,newPropertyTable.get(key));
- }
- }
-
- public final void setPropertyTable(Hashtable newPropertyTable)
- {
- clearPropertyTable();
- updatePropertyTable(newPropertyTable);
- }
-
- public final void flagError(Object inputKey)
- {
- if (isInputValid(inputKey))
- errantValues_.put(inputKey,Boolean.TRUE);
- }
-
- public final void flagRowError(Object inputKey,int rowNumber)
- {
- flagRowError(inputKey,String.valueOf(rowNumber));
- }
-
- public final void flagRowError(Object inputKey,Object rowId)
- {
- Object errorObject = errantValues_.get(inputKey);
- Hashtable rowHash;
- if (errorObject instanceof Hashtable)
- rowHash = (Hashtable)errorObject;
- else
- rowHash = new Hashtable();
- rowHash.put(rowId,Boolean.TRUE);
- errantValues_.put(inputKey,rowHash);
- }
-
- public final void clearErrors()
- {
- errantValues_.clear();
- }
-
- public final boolean isInputValid(Object inputKey)
- {
- return (errantValues_.get(inputKey) == null);
- }
-
- public final boolean isRowInputValid(Object inputKey,int rowNumber)
- {
- return isRowInputValid(inputKey,String.valueOf(rowNumber));
- }
-
- public final boolean isRowInputValid(Object inputKey,Object rowId)
- {
- Hashtable rowHash = (Hashtable)errantValues_.get(inputKey);
- if (rowHash == null)
- return true;
- return (rowHash.get(rowId) == null);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
deleted file mode 100644
index b307479..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-
-public abstract interface FormToolPropertiesInterface
-{
- // Getter and Setter for a property.
- public abstract Object getProperty(Object key);
- public abstract void setProperty(Object key,Object value);
- public abstract void removeProperty(Object key);
-
- // Property table operators.
- public abstract void clearPropertyTable();
- public abstract void updatePropertyTable(Hashtable propertyTable);
- public abstract void setPropertyTable(Hashtable propertyTable);
-
- // Error handling.
- public abstract void flagError(Object inputKey);
- public abstract void flagRowError(Object inputKey,int rowNumber);
- public abstract void flagRowError(Object inputKey,Object rowId);
- public abstract void clearErrors();
- public abstract boolean isInputValid(Object inputKey);
- public abstract boolean isRowInputValid(Object inputKey,int rowNumber);
- public abstract boolean isRowInputValid(Object inputKey,Object rowId);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
deleted file mode 100644
index a802d45..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Vector;
-
-// A class representing a Vector of breadcrumbs. A position index is used
-// to navigate through the data structure.
-public class History
-{
- private Vector items_;
- private int position_;
-
- public History()
- {
- items_ = new Vector();
- position_ = -1;
- }
-
- // Add a new breadcrumb to the history list. When adding a new breadcrumb
- // within the current list, all breadcrumbs after the newly added one are
- // removed.
- public boolean addBreadCrumb(BreadCrumb b)
- {
- int numberOfItems = items_.size();
- if (numberOfItems == 0)
- {
- position_++;
- items_.addElement(b);
- return true;
- }
- else
- {
- BreadCrumb currentBreadCrumb = (BreadCrumb)items_.elementAt(position_);
- if (!currentBreadCrumb.equals(b))
- {
- position_++;
- items_.insertElementAt(b,position_);
- for (int i=items_.size()-1;i>position_;i--)
- items_.removeElementAt(i);
- return true;
- }
- }
- return false;
- }
-
- // Move forward within the history list and obtain the breadcrumb.
- public BreadCrumb forward()
- {
- if (position_ < items_.size()-1)
- {
- position_++;
- BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
- return b;
- }
- return null;
- }
-
- // Move back within the history list and obtain the breadcrumb.
- public BreadCrumb back()
- {
- if (position_ > 0)
- {
- position_--;
- BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
- return b;
- }
- return null;
- }
-
- public void removeCurrentBreadCrumb()
- {
- items_.removeElementAt(position_);
- if (position_ > items_.size()-1)
- position_--;
- }
-
- public void dump()
- {
- for (int i=0;i<items_.size();i++)
- {
- items_.elementAt(i);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
deleted file mode 100644
index b391bc3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToFileSystemTool extends ActionTool {
- public ImportToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/import_fs_enabled.gif", "images/import_fs_highlighted.gif", alt);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
deleted file mode 100644
index 08c3eee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToWorkbenchTool extends FormTool {
- public ImportToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/import_to_workbench_enabled.gif", "images/import_to_workbench_highlighted.gif", alt);
- }
-
- public String getFormLink() {
- return "forms/ImportToWorkbenchForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
deleted file mode 100644
index 6267be3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
+++ /dev/null
@@ -1,101 +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
- * -------- -------- -----------------------------------------------------------
- * 20080506 202945 pmoogk@ca.ibm.com - Peter Moogk, Allow WSE to be launched from a WSIL file.
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class LaunchOptionsManager
-{
- private static LaunchOptionsManager instance_;
-
- private Hashtable optionsTable_;
-
- private LaunchOptionsManager()
- {
- optionsTable_ = new Hashtable();
- }
-
- public static LaunchOptionsManager getInstance()
- {
- if (instance_ == null)
- instance_ = new LaunchOptionsManager();
- return instance_;
- }
-
- public synchronized void manage(String key, Object value, ServletContext application)
- {
- if (value instanceof String)
- manageSession(key, (String)value, application);
- else if (value instanceof Hashtable)
- manageOptions(key, (Hashtable)value, application);
- }
-
- private void manageSession(String key, String sessionId, ServletContext application)
- {
- Object obj = optionsTable_.remove(key);
- if (obj != null && (obj instanceof Hashtable))
- loadOptions(sessionId, (Hashtable)obj, application);
- else
- optionsTable_.put(key, sessionId);
- }
-
- private void manageOptions(String key, Hashtable options, ServletContext application)
- {
- Object obj = optionsTable_.remove(key);
- if (obj != null && (obj instanceof String))
- loadOptions((String)obj, options, application);
- else
- optionsTable_.put(key, options);
- }
-
- private void loadOptions(String sessionId, Hashtable options, ServletContext application)
- {
- HttpSession httpSession = (HttpSession)application.getAttribute(sessionId);
- if (httpSession != null)
- {
- Controller controller = (Controller)httpSession.getAttribute("controller");
- String[] stateLocations = (String[])options.get(LaunchOptions.STATE_LOCATION);
- String[] defaultFavoritesLocations = (String[])options.get(LaunchOptions.DEFAULT_FAVORITES_LOCATION);
- String[] inquiryURLs = (String[])options.get(LaunchOptions.INQUIRY_URL);
- String[] publishURLs = (String[])options.get(LaunchOptions.PUBLISH_URL);
- String[] serviceNames = (String[])options.get(LaunchOptions.SERVICE_NAME);
- String[] serviceKeys = (String[])options.get(LaunchOptions.SERVICE_KEY);
- String[] wsdlURLs = (String[])options.get(LaunchOptions.WSDL_URL);
- String[] wsilURLs = (String[])options.get(LaunchOptions.WSIL_URL);
- String[] endpoints = (String[])options.get(LaunchOptions.WEB_SERVICE_ENDPOINT);
- String[] serviceQNameStrings = (String[])options.get(LaunchOptions.SERVICE_QNAME_STRING);
- String[] bindingNameStrings = (String[])options.get(LaunchOptions.BINDING_NAME_STRING);
- String stateLocation = (stateLocations == null || stateLocations.length == 0) ? null : stateLocations[0];
- controller.setStateLocation(stateLocation);
- String defaultFavoritesLocation = (defaultFavoritesLocations == null || defaultFavoritesLocations.length == 0) ? null : defaultFavoritesLocations[0];
- controller.setDefaultFavoritesLocation(defaultFavoritesLocation);
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- uddiPerspective.preloadUDDIRegistries(inquiryURLs, publishURLs);
- uddiPerspective.preloadServices(inquiryURLs,serviceNames,serviceKeys);
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- wsdlPerspective.preloadWSDL(wsdlURLs);
- wsdlPerspective.preloadEndpoints(wsdlURLs, endpoints);
- wsdlPerspective.preselectServiceOrBinding(wsdlURLs,serviceQNameStrings,bindingNameStrings);
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- wsilPerspective.preloadWSIL( wsilURLs );
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
deleted file mode 100644
index d5b3d3d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class LaunchWebServiceWizardTool extends FormTool {
- public LaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/launch_wswizard_enabled.gif", "images/launch_wswizard_highlighted.gif", alt);
- }
-
- public String getFormLink() {
- return "forms/LaunchWebServiceWizardForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
deleted file mode 100644
index 53a5d52..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-* An message bundle is a collection of messages drawn from some
-* set of properties.
-*/
-public class MessageBundle
-{
- private ResourceBundle fResourceBundle;
-
- /**
- * Constructs a new MessageBundle from the given ResourceBundle.
- */
- public MessageBundle ( ResourceBundle resourceBundle )
- {
- fResourceBundle = resourceBundle;
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @return String The message text.
- */
- public String getMessage ( String messageId )
- {
- try
- {
- return fResourceBundle.getString(messageId);
- }
- catch (MissingResourceException e)
- {
- return messageId;
- }
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @param sub A substitution value for "%1" in the message.
- * @return String The message text.
- */
- public String getMessage ( String messageId, String sub )
- {
- String[] s = {sub};
- return getMessage(messageId,s);
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @param sub Substitution values for "%1..%n" (sub[0]..sub[n-1]) in
- * the message.
- * @return String The message text.
- */
- public String getMessage ( String messageId, String[] sub )
- {
- String m = getMessage(messageId);
- int len = m.length();
- int max = sub.length;
- StringBuffer b = new StringBuffer();
- int pos = 0;
- while (pos >= 0)
- {
- int pct = m.indexOf('%',pos);
- if (pct >= 0)
- {
- b.append(m.substring(pos,pct));
- pos = pct + 1;
- if (pos < len)
- {
- char d = m.charAt(pos);
- if (Character.isDigit(d) && d != '0')
- {
- int v = Integer.parseInt(new Character(d).toString());
- if (v <= max)
- {
- b.append(sub[v-1]);
- }
- else
- {
- b.append('?');
- }
- pos++;
- }
- else
- {
- b.append('%');
- b.append(d);
- pos++;
- }
- }
- else
- {
- b.append('%');
- pos = -1;
- }
- }
- else
- {
- b.append(m.substring(pos));
- pos = -1;
- }
- }
- return b.toString();
- }
-
- public ResourceBundle getResourceBundle()
- {
- return fResourceBundle;
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
deleted file mode 100644
index a052e4d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-// A Class which provides String messages.
-public class MessageProvider
-{
- protected MessageBundle messageBundle_;
- private String messageProviderName_;
-
- public MessageProvider(String messageBundleFileName)
- {
- try
- {
- // Load the message bundle from the WEB-INF\classes subdirectory.
- messageProviderName_ = messageBundleFileName;
- messageBundle_ = new MessageBundle(ResourceBundle.getBundle(messageBundleFileName));
- }
- catch (MissingResourceException e)
- {
- System.err.println("Could not load "+messageBundleFileName);
- e.printStackTrace();
- }
- }
-
- public String getMessage(String messageId)
- {
- return messageBundle_.getMessage(messageId);
- }
-
- public String getMessage(String messageId,String sub)
- {
- return messageBundle_.getMessage(messageId,sub);
- }
-
- public String getMessage(String messageId,String[] sub)
- {
- return messageBundle_.getMessage(messageId,sub);
- }
-
- public String getMessageProviderName()
- {
- return messageProviderName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
deleted file mode 100644
index 73808ef..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public class MessageQueue
-{
- protected Vector messageList_;
-
- public MessageQueue()
- {
- messageList_ = new Vector();
- }
-
- public void addMessage(String message)
- {
- messageList_.addElement(message);
- }
-
- public String getMessagesFromList()
- {
- StringBuffer messages = new StringBuffer();
-
- if (messageList_.size()==0)
- return "";
-
- Enumeration e = messageList_.elements();
- while (e.hasMoreElements())
- {
- String thisMessage = (String)e.nextElement();
- messages.append(thisMessage);
- messages.append(HTMLUtils.LINE_SEPARATOR);
- }
- messageList_.removeAllElements();
- return messages.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
deleted file mode 100644
index dba53b4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20080324 186456 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public abstract class Node
-{
- protected TreeElement element_;
- protected NodeManager nodeManager_;
- protected int nodeId_;
- protected int nodeDepth_;
- protected String imagePath_;
- protected boolean isOpen_;
- protected Vector childNodes_;
- protected ToolManager toolManager_;
- protected Node parent_;
- private String anchorName_;
- private int viewId_;
-
- public Node(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- element_ = element;
- nodeManager_ = nodeManager;
- nodeId_ = nodeManager.addToNodeTable(this);
- nodeDepth_ = nodeDepth;
- Controller controller = nodeManager_.getController();
- if (imagePath == null)
- imagePath_ = controller.getPathWithContext(NodeManager.PATH_SPACE);
- else
- imagePath_ = imagePath;
- isOpen_ = true;
- childNodes_ = new Vector();
- toolManager_ = new ToolManager(this);
- initTools();
- anchorName_ = (new StringBuffer("action")).append(nodeId_).toString();
- parent_ = null;
- viewId_ = ActionInputs.VIEWID_DEFAULT;
- }
-
- /**
- * Returns the TreeElement associated with this node.
- * @return TreeElement The element associated with this node.
- */
- public TreeElement getTreeElement()
- {
- return element_;
- }
-
- /**
- * Returns the name of the node.
- * @return String
- */
- public String getNodeName()
- {
- return element_.getName();
- }
-
- /**
- * Returns the NodeManager managing this node.
- * @return NodeManager
- */
- public NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- /**
- * Returns the id of this node.
- * @return int
- */
- public int getNodeId()
- {
- return nodeId_;
- }
-
- /**
- * Returns the depth in the tree of this node relative to the root node
- * @return int
- */
- public int getNodeDepth()
- {
- return nodeDepth_;
- }
-
- /**
- * Set the path of the image representing this class of Node.
- * @param String The path.
- */
- public void setImagePath(String path)
- {
- imagePath_ = path;
- }
-
- /**
- * Returns true if the children of this node are visible. Returns false
- * if they are not.
- * @return boolean
- */
- public boolean isOpen()
- {
- return isOpen_;
- }
-
- public boolean isVisible()
- {
- Node parentNode = parent_;
- while (parentNode != null)
- {
- if (!parentNode.isOpen())
- return false;
- parentNode = parentNode.getParent();
- }
- return true;
- }
-
- /**
- * Sets the visibility of this node's children to the specified value.
- * Updates the NodeManager's record of the maximum depth visible in the tree.
- * @param boolean
- */
- public final void setVisibilityOfChildren(boolean open)
- {
- isOpen_ = open;
- nodeManager_.updateMaxDepthVisible();
- }
-
- /**
- * Gets the maximum depth displayed in this node's branch of the tree
- * Used by NodeManager for html display purposes.
- * @return int
- */
- public int getMaxDepthVisible()
- {
- if (!isOpen_)
- return nodeDepth_;
- else
- {
- int currentDepth = nodeDepth_;
- Enumeration e = childNodes_.elements();
- while (e.hasMoreElements())
- {
- Node thisNode = (Node)e.nextElement();
- int depth = thisNode.getMaxDepthVisible();
- if (depth>currentDepth)
- currentDepth=depth;
- }
- return currentDepth;
- }
- }
-
- public final void setParent(Node node)
- {
- parent_ = node;
- }
-
- public final Node getParent()
- {
- return parent_;
- }
-
- public final void setViewId(int viewId)
- {
- viewId_ = viewId;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final int getViewToolId()
- {
- ToolManager viewToolManager = getViewToolManager();
- if (viewToolManager != null)
- return viewToolManager.getSelectedToolId();
- return ActionInputs.VIEWTOOLID_DEFAULT;
- }
-
- /**
- * Adds the specified node as a child of this node.
- * @param Node The child being added.
- * @return boolean Always true.
- */
- public final boolean addChild(Node childNode)
- {
- childNode.setParent(this);
- childNodes_.addElement(childNode);
- nodeManager_.updateMaxDepthVisible();
- return true;
- }
-
- /**
- * Returns the child nodes of this node. If this node has no children, an
- * empty vector is returned.
- * @return Vector
- */
- public Vector getChildNodes()
- {
- return childNodes_;
- }
-
- public final Node getChildNode(TreeElement element)
- {
- Enumeration e = childNodes_.elements();
- while (e.hasMoreElements())
- {
- Node presentNode = (Node)e.nextElement();
- if (presentNode.getTreeElement() == element)
- return presentNode;
- }
- return null;
- }
-
- public final void removeChildNodes(boolean isEntry)
- {
- int numberOfChildNodes = childNodes_.size();
- for (int i=numberOfChildNodes-1;i>=0;i--)
- {
- Node childNode = (Node)childNodes_.elementAt(i);
- childNode.removeChildNodes(false);
- nodeManager_.removeFromNodeTable(childNode.getNodeId());
- }
- if (numberOfChildNodes > 0)
- {
- childNodes_.removeAllElements();
- if (isEntry)
- nodeManager_.updateMaxDepthVisible();
- }
- }
-
- public final boolean removeChildNode(TreeElement element)
- {
- Node childNode = getChildNode(element);
- if (childNode != null)
- {
- int childNodeId = childNode.getNodeId();
- if (nodeManager_.getSelectedNodeId() == childNodeId)
- nodeManager_.setSelectedNodeId(nodeId_);
- childNodes_.removeElement(childNode);
- nodeManager_.removeFromNodeTable(childNodeId);
- nodeManager_.updateMaxDepthVisible();
- return true;
- }
- return false;
- }
-
- /**
- * Get the name of the HTML anchor associated with this node.
- * @return String The name of the anchor.
- */
- public String getAnchorName()
- {
- return anchorName_;
- }
-
- public ToolManager getToolManager()
- {
- return toolManager_;
- }
-
- public ToolManager getViewToolManager()
- {
- if (viewId_ != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)toolManager_.getSelectedTool();
- return viewTool.getToolManager(viewId_);
- }
- return null;
- }
-
- public ToolManager getCurrentToolManager()
- {
- ToolManager toolManager = getViewToolManager();
- if (toolManager == null)
- toolManager = toolManager_;
- return toolManager;
- }
-
- protected abstract void initTools();
-
- protected abstract String getToggleNodeActionHref();
-
- protected String getToggleNodeActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- protected void addToggle(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
- {
- if (nodeDepth_ != 1)
- {
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>");
- String toggleImageTag;
- if (childNodes_.size() > 0)
- {
- // <a href="..." target="...">toggleImageTag</a>
- String href = nodeManager_.getController().getPathWithContext(getToggleNodeActionHref());
- if (isOpen_)
- {
- String toggleAlt = nodeManager_.getController().getMessage("ALT_CLOSE");
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_LAST),toggleAlt,"16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_NOTLAST),toggleAlt,"16","16",null);
- }
- else
- {
- String toggleAlt = nodeManager_.getController().getMessage("ALT_OPEN");
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_LAST),toggleAlt,"16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_NOTLAST),toggleAlt,"16","16",null);
- }
- String linkTag = HTMLUtils.getHTMLLinkTag(response,href,getToggleNodeActionTarget(),String.valueOf(nodeId_),toggleImageTag,null);
- treeView.append(linkTag);
- }
- else
- {
- // <img...>
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_LAST),"","16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_NOTLAST),"","16","16",null);
- treeView.append(toggleImageTag);
- }
- treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- }
- }
-
- protected abstract String getLinkActionHref();
-
- protected String getLinkActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- public String getOpenImagePath()
- {
- return imagePath_;
- }
-
- public String getClosedImagePath()
- {
- return imagePath_;
- }
-
- protected void addHTMLLabel(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
- {
- // <a href="..." target="..." onClick="selectNode('...')"><img...></a>
- Hashtable additionalAttributes = new Hashtable();
- additionalAttributes.put("name",anchorName_);
- String imagePath = (nodeManager_.getSelectedNodeId() == nodeId_)?getOpenImagePath():getClosedImagePath();
-
- String imageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(imagePath),getNodeName(),"16","16",additionalAttributes);
- String baseHref = getLinkActionHref();
- String href = ((baseHref == null)?baseHref:nodeManager_.getController().getPathWithContext(baseHref));
- String target = getLinkActionTarget();
- additionalAttributes.clear();
-
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>");
- if (href != null)
- treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,null,imageTag,additionalAttributes));
- else
- treeView.append(imageTag);
- treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <td align=\"left\" width=3 height=10 nowrap>").append(HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","3","10",null)).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-
- // <a name="..." href="..." target="...">label</a>
- treeView.append(" <td align=\"left\" nowrap>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" ");
- if (href != null)
- {
- String textAnchorClass;
- if (nodeManager_.getSelectedNodeId() == nodeId_)
- textAnchorClass="selectedTextAnchor";
- else
- textAnchorClass="unselectedTextAnchor";
- additionalAttributes.put("class",textAnchorClass);
- treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,anchorName_,getNodeName(),additionalAttributes));
- }
- else
- treeView.append("<strong>").append(getNodeName()).append("</strong>");
- treeView.append(HTMLUtils.LINE_SEPARATOR).append(" </td>").append(HTMLUtils.LINE_SEPARATOR);
- }
-
- public void renderNode(HttpServletResponse response,StringBuffer treeView,String prefixColumns,boolean isLastChild)
- {
- String space_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","16","16",null);
- String line_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE),"","16","16",null);
-
- // Use border=1 to help with debugging.
- treeView.append("<table cellspacing=0 cellpadding=0 border=0>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <tr>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>").append(space_16x16).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- StringBuffer newPrefixColumns = new StringBuffer(prefixColumns);
- if (nodeDepth_ >= 2)
- {
- if (prefixColumns.length() > 0)
- treeView.append(prefixColumns).append(HTMLUtils.LINE_SEPARATOR);
- // generate a new prefix columns.
- newPrefixColumns.append(" <td align=\"left\" width=16 height=16 nowrap>");
- if (isLastChild)
- newPrefixColumns.append(space_16x16);
- else
- newPrefixColumns.append(line_16x16);
- newPrefixColumns.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- }
- addToggle(response,treeView,isLastChild);
- addHTMLLabel(response,treeView,isLastChild);
- treeView.append(" </tr>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append("</table>").append(HTMLUtils.LINE_SEPARATOR);
- int numberOfChildNodes = childNodes_.size();
- if (numberOfChildNodes > 0)
- {
- if (isOpen_)
- {
- for (int i=0;i<numberOfChildNodes-1;i++)
- {
- Node childNode = (Node)childNodes_.elementAt(i);
- childNode.renderNode(response,treeView,newPrefixColumns.toString(),false);
- }
- Node lastChildNode = (Node)childNodes_.elementAt(numberOfChildNodes-1);
- lastChildNode.renderNode(response,treeView,newPrefixColumns.toString(),true);
- }
- }
- }
-
- // For sorting purposes.
- public final String toString()
- {
- return getNodeName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
deleted file mode 100644
index b1d48c6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-
-public class NodeManager
-{
- // paths to icon images
- public static final String PATH_PLUS_NOTLAST = "images/plus_notlast.gif";
- public static final String PATH_PLUS_LAST = "images/plus_last.gif";
- public static final String PATH_MINUS_NOTLAST = "images/minus_notlast.gif";
- public static final String PATH_MINUS_LAST = "images/minus_last.gif";
- public static final String PATH_LINE = "images/line.gif";
- public static final String PATH_LINE_NOTLAST = "images/line_notlast.gif";
- public static final String PATH_LINE_LAST = "images/line_last.gif";
- public static final String PATH_SPACE = "images/space.gif";
-
- private Controller controller_;
- private Node rootNode_;
- private Hashtable nodeTable_;
- private int focusedNodeId_;
- private int selectedNodeId_;
- private int previousSelectedNodeId_;
- private int maxDepthVisible_;
- private int nextId_;
-
- public NodeManager(Controller controller)
- {
- controller_ = controller;
- rootNode_ = null;
- nodeTable_ = new Hashtable();
- focusedNodeId_ = -1;
- selectedNodeId_ = -1;
- previousSelectedNodeId_ = -1;
- maxDepthVisible_ = 1;
- nextId_ = 0;
- }
-
- /**
- * Hook for the controller.
- * @return Controller The perspective controller.
- */
- public Controller getController()
- {
- return controller_;
- }
-
- /**
- * Sets the root node of the tree.
- * @param rootNode The node being designated as the root node.
- */
- public void setRootNode(Node rootNode)
- {
- rootNode_ = rootNode;
- }
-
- /**
- * Returns the root node of the tree managed by this NodeManager.
- * @return Node The root node.
- */
- public Node getRootNode()
- {
- return rootNode_;
- }
-
- /**
- * @param Integer The id of the node being added.
- * @param Node The node being added.
- * @return The nodeId assigned to this node.
- */
- public int addToNodeTable(Node node)
- {
- int assignedNodeId = nextId_;
- nodeTable_.put(String.valueOf(assignedNodeId),node);
- nextId_++;
- return assignedNodeId;
- }
-
- public void removeFromNodeTable(int nodeId)
- {
- Vector nodesToRemove = new Vector();
- Node node = getNode(nodeId);
- gatherNodesToRemove(nodesToRemove, node);
- for (Iterator it = nodesToRemove.iterator(); it.hasNext();) {
- nodeTable_.remove(String.valueOf(((Node)it.next()).getNodeId()));
- }
- }
-
- private void gatherNodesToRemove(Vector nodesToRemove, Node node) {
- if (node != null) {
- nodesToRemove.add(node);
- Vector childNodes = node.getChildNodes();
- for (Iterator it = childNodes.iterator(); it.hasNext();) {
- gatherNodesToRemove(nodesToRemove, (Node)it.next());
- }
- }
- }
-
- /**
- * Returns the depth of the deepest visible node in the tree.
- * @return int
- */
- public int getMaxDepthVisible()
- {
- return maxDepthVisible_;
- }
-
- /**
- * Updates the depth of the deepest visible node in the tree. Nodes
- * must call this when the visibility of their children changes.
- * (e.g. expand/collapse of a parent node).
- */
- public void updateMaxDepthVisible()
- {
- if (rootNode_ != null)
- maxDepthVisible_ = rootNode_.getMaxDepthVisible();
- }
-
- /**
- * Returns the next available id for a newly created node.
- * @return int
- */
- public int getNextNodeId()
- {
- return nextId_;
- }
-
- /**
- * Returns the id of the currently focused node in the tree. A node
- * becomes focused when any of the following events occur:
- * 1) The node's icon or image are selected by a user.
- * 2) The node's expand/collapse icon is clicked.
- * 3) Programmatically set by the programmer.
- * The treeview will always scroll to the current focused node when loaded.
- * @return int The id.
- */
- public int getFocusedNodeId()
- {
- return focusedNodeId_;
- }
-
- /**
- * Allows modification of the focused node.
- * @param int The id of the node that is in focus.
- */
- public void setFocusedNodeId(int nodeId)
- {
- focusedNodeId_ = nodeId;
- }
-
- public Node getFocusedNode()
- {
- return getNode(focusedNodeId_);
- }
-
- /**
- * Returns the id of the currently selected node in the tree.
- * @return int The id.
- */
- public int getSelectedNodeId()
- {
- return selectedNodeId_;
- }
-
- public Node getSelectedNode()
- {
- return getNode(selectedNodeId_);
- }
-
- /**
- * Retrieve a reference to a Node in this manager's node table.
- * @return Node The node.
- */
- public Node getNode(int nodeId)
- {
- return (Node)nodeTable_.get(String.valueOf(nodeId));
- }
-
- /**
- * Allows modification of the selected Node. Note that setting a node to become
- * selected automatically makes it the focused node. However, this is only a one
- * way relationship.
- * @param int The id of the node that is being selected.
- */
- public void setSelectedNodeId(int nodeId)
- {
- previousSelectedNodeId_ = selectedNodeId_;
- selectedNodeId_ = nodeId;
- setFocusedNodeId(selectedNodeId_);
- }
-
- public int getPreviousSelectedNodeId()
- {
- return previousSelectedNodeId_;
- }
-
- public Node getPreviousSelectedNode()
- {
- return (Node)nodeTable_.get(String.valueOf(previousSelectedNodeId_));
- }
-
- /**
- * Render the HTML tree view for this node.
- * @param HttpServletResponse For encoding URLs.
- * @return String The HTML representing the tree view.
- */
- public String renderTreeView(HttpServletResponse response)
- {
- StringBuffer treeView = new StringBuffer();
- rootNode_.renderNode(response,treeView,"",false);
- return treeView.toString();
- }
-
- /**
- * Make the provided node is visible by ensuring that its ancestors are visible.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the treeview needs refreshing (i.e. an ancestor was not visible).
- */
- public final boolean makeNodeVisible(Node node)
- {
- boolean requiresTreeViewRefresh = false;
- while ((node = node.getParent()) != null)
- {
- if (!node.isOpen())
- {
- requiresTreeViewRefresh = true;
- node.setVisibilityOfChildren(true);
- }
- }
- return requiresTreeViewRefresh;
- }
-
- /**
- * Make the currently selected node visible by ensuring that its ancestors are visible.
- */
- public final boolean makeSelectedNodeVisible()
- {
- return makeNodeVisible(getSelectedNode());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
deleted file mode 100644
index 855f14e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-
-public abstract class Perspective extends MessageProvider
-{
- protected Controller controller_;
- protected MessageQueue messageQueue_;
-
- public Perspective(String messageBundleFileName,Controller controller)
- {
- super(messageBundleFileName);
- controller_ = controller;
- messageQueue_ = new MessageQueue();
- }
-
- public MessageQueue getMessageQueue()
- {
- return messageQueue_;
- }
-
- public Controller getController()
- {
- return controller_;
- }
-
- public abstract String getPanesFile();
- public abstract String getFramesetsFile();
- public abstract String getProcessFramesetsForm();
-
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-
- public abstract String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory);
- public abstract String getPerspectiveContentPage();
- public abstract int getPerspectiveId();
-
- // This should only be called after the perspective has been successfully instantiated.
- public abstract void initPerspective(ServletContext application);
-
- // Node manager for the navigator/tree content page
- public abstract NodeManager getNodeManager();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
deleted file mode 100644
index 07e5e4a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public class SectionHeaderInfo
-{
- private String containerId_;
- private boolean dynamic_;
- private Object otherProperties_;
-
- public SectionHeaderInfo()
- {
- clear();
- }
-
- public final void clear()
- {
- containerId_ = "";
- dynamic_ = true;
- otherProperties_ = null;
- }
-
- public final void setContainerId(String containerId)
- {
- containerId_ = containerId;
- }
-
- public final String getContainerId()
- {
- return containerId_;
- }
-
- public final void enableDynamic(boolean isEnabled)
- {
- dynamic_ = isEnabled;
- }
-
- public final boolean isDynamic()
- {
- return dynamic_;
- }
-
- public final void setOtherProperties(Object object)
- {
- otherProperties_ = object;
- }
-
- public final Object getOtherProperties()
- {
- return otherProperties_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
deleted file mode 100644
index 7c91b95..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class SetDefaultViewTool extends ActionTool
-{
- public SetDefaultViewTool(ToolManager viewToolManager,String alt)
- {
- super(viewToolManager,"images/top_enabled.gif","images/top_highlighted.gif",alt);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
deleted file mode 100644
index e8bfb99..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
+++ /dev/null
@@ -1,113 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-// A class for representing toolbar tools.
-public abstract class Tool
-{
- protected ToolManager toolManager_;
- private String enabledImageLink_;
- private String highlightedImageLink_;
- private String alt_;
- protected int toolId_;
- protected byte toolType_;
-
- public Tool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt,byte toolType)
- {
- toolManager_ = toolManager;
- enabledImageLink_ = enabledImageLink;
- highlightedImageLink_ = highlightedImageLink;
- alt_ = alt;
- toolId_ = toolManager_.addTool(this);
- toolType_ = toolType;
- }
-
- public abstract String getSelectToolActionHref(boolean forHistory);
-
- public String getSelectToolActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- private final void generateOnMouseValue(StringBuffer value,HttpServletResponse response,String fullImageLink)
- {
- value.append("src='").append(response.encodeURL(fullImageLink)).append('\'');
- }
-
- public String renderTool(HttpServletResponse response,Controller controller)
- {
- Hashtable jsImageProperties = new Hashtable();
- StringBuffer propertyValue = new StringBuffer();
- String fullEnabledImageLink = controller.getPathWithContext(enabledImageLink_);
- generateOnMouseValue(propertyValue,response,fullEnabledImageLink);
- int propertyValueLength = propertyValue.length();
- jsImageProperties.put("class","normal");
- jsImageProperties.put("onMouseOut",propertyValue.append(";mouseout(this)").toString());
- propertyValue.delete(propertyValueLength,propertyValue.length());
- jsImageProperties.put("onMouseUp",propertyValue.append(";mouseup(this)").toString());
- propertyValue.setLength(0);
- generateOnMouseValue(propertyValue,response,controller.getPathWithContext(highlightedImageLink_));
- propertyValueLength = propertyValue.length();
- jsImageProperties.put("onMouseOver",propertyValue.append(";mouseover(this)").toString());
- propertyValue.delete(propertyValueLength,propertyValue.length());
- jsImageProperties.put("onMouseDOwn",propertyValue.append(";mousedown(this)").toString());
-
- String imageTag = HTMLUtils.getHTMLImageTag(response,fullEnabledImageLink,alt_,"16","16",jsImageProperties);
- return HTMLUtils.getHTMLLinkTag(response,controller.getPathWithContext(getSelectToolActionHref(false)),getSelectToolActionTarget(),null,imageTag,null);
- }
-
- public final ToolManager getToolManager()
- {
- return toolManager_;
- }
-
- public final int getToolId()
- {
- return toolId_;
- }
-
- public final byte getToolType()
- {
- return toolType_;
- }
-
- public final String getEnabledImageLink()
- {
- return enabledImageLink_;
- }
-
- public final String getHighlightedImageLink()
- {
- return highlightedImageLink_;
- }
-
- public final String getAltText()
- {
- return alt_;
- }
-
- public final void setAltText(String alt)
- {
- alt_ = alt;
- }
-
- public abstract String getFormLink();
- public abstract String getActionLink();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
deleted file mode 100644
index 5aa91a6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
+++ /dev/null
@@ -1,75 +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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.List;
-import java.util.Vector;
-
-public class ToolManager
-{
- private Vector tools_;
- private int selectedToolId_;
- private Node node_;
-
- public ToolManager(Node node)
- {
- tools_ = new Vector();
- selectedToolId_ = 0;
- node_ = node;
- }
-
- public final int getSelectedToolId()
- {
- return selectedToolId_;
- }
-
- public final int setSelectedToolId(int toolId)
- {
- if (toolId >= 0 && toolId < tools_.size())
- selectedToolId_ = toolId;
- return selectedToolId_;
- }
-
- public final int addTool(Tool tool)
- {
- tools_.addElement(tool);
- return tools_.size()-1;
- }
-
- public final Tool getTool(int toolId)
- {
- if (toolId >=0 && toolId < getNumberOfTools())
- return (Tool)tools_.elementAt(toolId);
- return null;
- }
-
- public final List getTools()
- {
- return tools_;
- }
-
- public final Tool getSelectedTool()
- {
- if (selectedToolId_ >=0 && selectedToolId_ < getNumberOfTools())
- return (Tool)tools_.elementAt(selectedToolId_);
- return null;
- }
-
- public final int getNumberOfTools()
- {
- return tools_.size();
- }
-
- public final Node getNode()
- {
- return node_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java
deleted file mode 100644
index 73b98d8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java
+++ /dev/null
@@ -1,183 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.core.runtime.Preferences;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-
-/**
- * This class is responsible for loading the Web Services Explorer's transport provider
- * extensions and instantiating them when needed.
- */
-public class TransportProviderRegistry {
-
- private static final String PREF_TRANSPORT_PROVIDERS = "TRANSPORT_PROVIDERS";
- private static final String EXTENSION_NAME = "wseTransportProvider";
- private static final String SOAP_TRANSPORT_PROVIDER = "soapTransportProvider";
- private static final String NAMESPACE_URI = "namespaceURI";
- private static final String TRANSPORT_URI = "transportURI";
-
- private static TransportProviderRegistry instance = null;
-
- private List preferredIDs = null;
- private Map soapProviderElements = null;
- private Map soapProviderCache = null;
-
- /**
- * Returns a singleton instance of this TransportProviderRegistry.
- *
- * @return An instance of this class.
- */
- public synchronized static TransportProviderRegistry getInstance() {
- if (instance == null)
- instance = new TransportProviderRegistry();
- return instance;
- }
-
- /*
- * Constructor.
- */
- private TransportProviderRegistry() {
-
- // get the preference value
- Preferences preferences = ExplorerPlugin.getInstance().getPluginPreferences();
- String transportProviders = preferences.getString(PREF_TRANSPORT_PROVIDERS).replaceAll("\\s", "");
-
- // split it into a list of preferred transport provider IDs
- if (transportProviders.length() == 0)
- preferredIDs = new ArrayList();
- else
- preferredIDs = Arrays.asList(transportProviders.split(","));
-
- // now find all extenders
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] configs =
- registry.getConfigurationElementsFor(ExplorerPlugin.ID, EXTENSION_NAME);
-
- // currently we only have one type of providers: SOAP transport providers
- soapProviderElements = new Hashtable();
- for (int i = 0; i < configs.length; i++) {
- if (SOAP_TRANSPORT_PROVIDER.equals(configs[i].getName())) {
- String id = configs[i].getAttribute("id");
- soapProviderElements.put(id, configs[i]);
- }
- }
-
- soapProviderCache = new Hashtable();
- }
-
- /*
- * Determine if the URIs match.
- */
- private boolean uriMatch(String required, String supported) {
-
- // not specified mean support everything
- if (supported == null)
- return true;
-
- if (!required.endsWith("/")) required += "/";
- if (!supported.endsWith("/")) supported += "/";
-
- return required.equals(supported);
- }
-
- /*
- * Create the extension for the given key, but only if it supports the binding namespace and transport
- */
- private ISOAPTransportProvider createExtension(Object key, String namespaceURI, String transportURI) {
-
- IConfigurationElement element = (IConfigurationElement) soapProviderElements.get(key);
- if (element == null)
- return null;
-
- boolean supportsNamespace = uriMatch(namespaceURI, element.getAttribute(NAMESPACE_URI));
- boolean supportsTransport = uriMatch(transportURI, element.getAttribute(TRANSPORT_URI));
-
- if (supportsNamespace && supportsTransport) {
-
- String providerClassID = element.getAttribute("class");
- Object obj = null;
-
- try {
- // check if we already have the transport provider cached,
- // if not, then create one
- synchronized (soapProviderCache) {
- obj = soapProviderCache.get(providerClassID);
- if (obj == null) {
- obj = element.createExecutableExtension("class");
- soapProviderCache.put(providerClassID, obj);
- }
- }
- return (ISOAPTransportProvider) obj;
- }
- catch (CoreException e) {}
- }
-
- return null;
- }
-
- /**
- * Get an ISOAPTransportProvider that supports the binding namespace and transport. This method will
- * first look for preferred IDs defined using the TRANSPORT_PROVIDERS preference key. If a suitable
- * provider is not found, it will then look at all other extenders in non-deterministic order.
- *
- * @param namespaceURI The binding namespace URI
- * @param transportURI The binding transport URI
- *
- * @return Returns a suitable ISOAPTranportProvider for the given binding information, or null
- * if there's no match.
- */
- public ISOAPTransportProvider getSOAPTransportProvider(String namespaceURI, String transportURI) {
-
- ISOAPTransportProvider provider = null;
-
- Iterator iter = preferredIDs.iterator();
-
- // check preferred IDs first
- while (iter.hasNext()) {
- provider = createExtension(iter.next(), namespaceURI, transportURI);
- if (provider != null)
- return provider;
- }
-
- iter = soapProviderElements.keySet().iterator();
-
- // check rest of the providers
- while (iter.hasNext()) {
- Object key = iter.next();
-
- // already checked the preferred IDs
- if (preferredIDs.contains(key))
- continue;
-
- provider = createExtension(key, namespaceURI, transportURI);
- if (provider != null)
- return provider;
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
deleted file mode 100644
index fb59607..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ViewTool extends FormTool
-{
- private Hashtable viewToolManagers_;
-
- public ViewTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt);
- toolType_ = ToolTypes.VIEW;
- viewToolManagers_ = new Hashtable();
- }
-
- protected abstract void addSetDefaultViewTool(ToolManager viewToolManager,int index);
- protected abstract void addTools(ToolManager viewToolManager,int index);
-
- public final ToolManager createToolManager(int viewId)
- {
- ToolManager viewToolManager = new ToolManager(toolManager_.getNode());
- addTools(viewToolManager,viewId);
- addSetDefaultViewTool(viewToolManager,viewId);
- viewToolManagers_.put(String.valueOf(viewId),viewToolManager);
- return viewToolManager;
- }
-
- public final ToolManager getToolManager(int viewId)
- {
- return (ToolManager)(viewToolManagers_.get(String.valueOf(viewId)));
- }
-
- public final void clearViewToolManager(int viewId)
- {
- viewToolManagers_.remove(String.valueOf(viewId));
- }
-
- public final void clearViewToolManagers()
- {
- viewToolManagers_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
deleted file mode 100644
index 6c87e5c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class AddItemsToFavoritesAction extends UDDIPropertiesFormAction
-{
- public AddItemsToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public final boolean run()
- {
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- AddToFavoritesAction action = new AddToFavoritesAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- if (action.favoriteExists()) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- Node node = uddiPerspective.getNavigatorManager().getNode(Integer.parseInt(selectedNodeIds[i]));
- String nodeName = node.getNodeName();
- uddiPerspective.getMessageQueue().addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_ALREADY_EXISTS",nodeName));
- }
- else
- action.run();
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
deleted file mode 100644
index b96b761..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.KeyedReference;
-
-public class AddPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public AddPublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table.jsp
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds == null || selectedBusIds.length == 0) {
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
- inputsValid = false;
- }
- else {
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
- }
-
- String[] assertionTypes = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
- if (assertionTypes != null && assertionTypes.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE, assertionTypes);
- else
- inputsValid = false;
-
- String[] directions = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
- if (directions != null && directions.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION, directions);
- else
- inputsValid = false;
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] assertionTypes = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
- String[] directions = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
- String thisBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-
- // get all selected businesses
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- Vector selectedBusinesses = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- Enumeration e = selectedBusinesses.elements();
- if (!e.hasMoreElements())
- return true;
-
- // create a vector of publisher assertions based on all the selected businesses
- Vector pubAssertionVector = new Vector();
- int i = 0;
- while (e.hasMoreElements()) {
- ListElement le = (ListElement)e.nextElement();
- BusinessEntity sp = (BusinessEntity)le.getObject();
- KeyedReference keyedRef = new KeyedReference(assertionTypes[i], assertionTypes[i], TModel.RELATIONSHIPS_TMODEL_KEY);
- if (Integer.parseInt(directions[i]) == UDDIActionInputs.DIRECTION_TO)
- pubAssertionVector.add(new PublisherAssertion(sp.getBusinessKey(), thisBusinessKey, keyedRef));
- else
- pubAssertionVector.add(new PublisherAssertion(thisBusinessKey, sp.getBusinessKey(), keyedRef));
- i++;
- }
-
- // proxy.add_publisherAssertions(...)
- DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-
- // refresh publisher assertions iff proxy reports success
- if (report.success()) {
- selectedBusinesses.removeAllElements();
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
- }
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch(Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
deleted file mode 100644
index 7ac33ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddToFavoritesAction extends UDDINodeAction
-{
- public AddToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/CheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean registryExists(String registryName,Node registryNode)
- {
- registryNode.getTreeElement();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- }
-
- public final boolean businessExists(String businessName,Node businessNode)
- {
- BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String businessKey = busElement.getBusinessEntity().getBusinessKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public final boolean serviceExists(String serviceName,Node serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String serviceKey = serviceElement.getBusinessService().getServiceKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public final boolean serviceInterfaceExists(String siName,Node siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String tModelKey = siElement.getTModel().getTModelKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- }
-
- public final boolean addRegistryToFavorites(String registryName,Node registryNode)
- {
- RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
- String inquiryURL = regElement.getInquiryURL();
- String publishURL = regElement.getPublishURL();
- if (publishURL == null)
- publishURL = "";
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API,publishURL);
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
- Enumeration userDefinedCategoriesEnum = regElement.getUserDefinedCategories();
- if (userDefinedCategoriesEnum != null)
- {
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM,userDefinedCategoriesEnum);
- table.put(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY,controller_.getServletEngineStateLocation());
- }
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- }
-
- public final boolean addBusinessToFavorites(String businessName,Node businessNode)
- {
- BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String businessKey = busElement.getBusinessEntity().getBusinessKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public final boolean addServiceToFavorites(String serviceName,Node serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String serviceKey = serviceElement.getBusinessService().getServiceKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public final boolean addServiceInterfaceToFavorites(String siName,Node siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String tModelKey = siElement.getTModel().getTModelKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- }
-
- public boolean favoriteExists()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- String nodeName = node.getNodeName();
- if (node instanceof RegistryNode)
- return registryExists(nodeName,node);
- else if (node instanceof BusinessNode)
- return businessExists(nodeName,node);
- else if (node instanceof ServiceNode)
- return serviceExists(nodeName,node);
- else if (node instanceof ServiceInterfaceNode)
- return serviceInterfaceExists(nodeName,node);
- else
- return false;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- String nodeName = node.getNodeName();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- boolean addToFavoritesResult = false;
- if (node instanceof RegistryNode)
- {
- addToFavoritesResult = addRegistryToFavorites(nodeName,node);
- RegistryElement regElement = (RegistryElement)node.getTreeElement();
- Enumeration e = regElement.getUserDefinedCategories();
- if (e != null)
- {
- while (e.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)e.nextElement();
- Throwable errorException = categoryModel.getErrorException();
- if (errorException != null)
- {
- String[] args = {categoryModel.getDisplayName(),errorException.getMessage()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_SAVING_CATEGORY_DATA",args));
- }
- }
- }
- }
- else if (node instanceof BusinessNode)
- addToFavoritesResult = addBusinessToFavorites(nodeName,node);
- else if (node instanceof ServiceNode)
- addToFavoritesResult = addServiceToFavorites(nodeName,node);
- else if (node instanceof ServiceInterfaceNode)
- addToFavoritesResult = addServiceInterfaceToFavorites(nodeName,node);
- if (addToFavoritesResult)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_FAVORITE_ADDED",nodeName));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_NOT_ADDED",nodeName));
- return addToFavoritesResult;
- }
-
- protected boolean addToFavorites(Hashtable table, String rel)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements())
- return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.addFavorite(table);
- }
-
- protected boolean favoriteExists(Hashtable table, String rel)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements())
- return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
deleted file mode 100644
index 483d6f6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,53 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceAdvancedAction extends PublishAction
-{
- private RegPublishServiceAdvancedAction regPublishServiceAdvancedAction_;
- public BusPublishServiceAdvancedAction(Controller controller)
- {
- super(controller);
- regPublishServiceAdvancedAction_ = new RegPublishServiceAdvancedAction(controller);
- propertyTable_ = regPublishServiceAdvancedAction_.getPropertyTable();
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- Node businessNode = getSelectedNavigatorNode();
- BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
- BusinessEntity businessEntity = businessElement.getBusinessEntity();
- ListElement busListElement = new ListElement(businessEntity);
- Vector serviceBusinessCopy = new Vector();
- serviceBusinessCopy.addElement(busListElement);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- boolean result = regPublishServiceAdvancedAction_.processOthers(parser,formToolPI);
- if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER))
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,businessEntity);
- return result;
- }
-
- public final boolean run()
- {
- return regPublishServiceAdvancedAction_.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
deleted file mode 100644
index 91c7088..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,54 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceSimpleAction extends PublishAction
-{
- private RegPublishServiceSimpleAction regPublishServiceSimpleAction_;
-
- public BusPublishServiceSimpleAction(Controller controller)
- {
- super(controller);
- regPublishServiceSimpleAction_ = new RegPublishServiceSimpleAction(controller);
- propertyTable_ = regPublishServiceSimpleAction_.getPropertyTable();
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- Node businessNode = getSelectedNavigatorNode();
- BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
- BusinessEntity businessEntity = businessElement.getBusinessEntity();
- ListElement busListElement = new ListElement(businessEntity);
- Vector serviceBusinessCopy = new Vector();
- serviceBusinessCopy.addElement(busListElement);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- boolean result = regPublishServiceSimpleAction_.processOthers(parser,formToolPI);
- if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER))
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,businessEntity);
- return result;
- }
-
- public final boolean run()
- {
- return regPublishServiceSimpleAction_.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
deleted file mode 100644
index 5a9458a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessGetServicesAction extends UDDINodeAction
-{
- private BusinessNode busNode_;
- public BusinessGetServicesAction(Controller controller)
- {
- super(controller);
- busNode_ = null;
- }
-
- // uddi/actions/BusinessGetServicesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/BusinessGetServicesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateBusiness()
- {
- int busNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- busNode_ = (BusinessNode)nodeManager_.getNode(busNodeId);
- BusinessElement busElement = (BusinessElement)busNode_.getTreeElement();
- RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busElement.getBusinessEntity().getBusinessKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_BUSINESS_SERVICES",busNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-
- ListElement businessListElement = new ListElement(sp);
- businessListElement.setTargetViewToolInfo(busNode_.getNodeId(),busNode_.getToolManager().getSelectedToolId(),busNode_.getViewId());
- Vector businessListVector = new Vector();
- businessListVector.addElement(businessListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,businessListVector);
-
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
deleted file mode 100644
index 8dbeb87..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class ClearNavigatorFolderNodeAction extends ClearNavigatorNodeAction
-{
- public ClearNavigatorFolderNodeAction(Controller controller)
- {
- super(controller);
- }
-
- // uddi/actions/ClearNavigatorFolderNodeAction.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorFolderNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- element.disconnectRel(element.getPropertyAsString(ModelConstants.REL_CHILDREN));
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
deleted file mode 100644
index 3af63e4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearNavigatorNodeAction extends ClearNodeAction
-{
- public ClearNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
- }
-
- // uddi/actions/ClearNavigatorNodeAction.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
deleted file mode 100644
index e92e565..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ClearNavigatorNodesAction extends UDDIPropertiesFormAction
-{
- public ClearNavigatorNodesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- if (selectedNodeIds != null)
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- else
- removeProperty(UDDIActionInputs.SELECTED_NODEIDS);
- return true;
- }
-
- public final boolean run()
- {
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- if (selectedNodeIds != null)
- {
- ClearNavigatorNodeAction action = new ClearNavigatorNodeAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- action.run();
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
deleted file mode 100644
index c740396..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
+++ /dev/null
@@ -1,103 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.RegisteredInfo;
-
-public abstract class CommonPublisherAssertionsAction extends UDDIPropertiesFormAction
-{
-
- protected RegistryNode registryNode_;
- protected boolean isLoggedIn_;
-
- public CommonPublisherAssertionsAction(Controller controller)
- {
- super(controller);
-
- registryNode_ = getRegistryNode();
- if (registryNode_ != null)
- isLoggedIn_ = ((RegistryElement)registryNode_.getTreeElement()).isLoggedIn();
- }
-
- protected void synchronizeUDDIObjectTable() {
- String[] selectedBusIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- Node selectedNode = controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- Vector businessVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
- if (selectedBusIds == null || selectedBusIds.length <= 0) {
- businessVector.removeAllElements();
- businessCopy.clear();
- }
- Enumeration e = businessCopy.getListElements();
- while (e.hasMoreElements()) {
- boolean isIdFound = false;
- ListElement le = (ListElement)e.nextElement();
- int listElementViewId = le.getViewId();
- for (int i = 0; i < selectedBusIds.length; i++) {
- if (listElementViewId == Integer.parseInt(selectedBusIds[i])) {
- isIdFound = true;
- break;
- }
- }
- if (!isIdFound)
- businessVector.remove(le);
- }
- }
-
- protected boolean isBusinessOwned(BusinessElement busElement) {
- boolean isBusinessOwned = false;
- String isBusinessOwnedString = busElement.getPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED);
- if (isBusinessOwnedString != null) {
- isBusinessOwned = Boolean.valueOf(isBusinessOwnedString).booleanValue();
- }
- else if (isLoggedIn_) {
- try {
- RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
- Vector beVector = ri.getBusinessInfos().getBusinessInfoVector();
- for (Iterator it = beVector.iterator(); it.hasNext();)
- {
- BusinessInfo bi = (BusinessInfo)it.next();
- if (bi.getBusinessKey().equals(busElement.getBusinessEntity().getBusinessKey()))
- {
- isBusinessOwned = true;
- break;
- }
- }
- busElement.setPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED, String.valueOf(isBusinessOwned));
- }
- catch (Exception e) {}
- }
- return isBusinessOwned;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
deleted file mode 100644
index c184b4f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class CompletePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public CompletePublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- // ids from publisher assertion table
- String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
- inputsValid = false;
- else
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
- ListManager pubAssertions = busElement.getPublisherAssertions();
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- Vector pubAssertionVector = new Vector();
-
- for (int i = 0; i < pubAssertionViewIds.length; i++) {
- int viewID = Integer.parseInt(pubAssertionViewIds[i]);
- ListElement listElement = pubAssertions.getElementWithViewId(viewID);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
- if (!(pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE)))
- pubAssertionVector.add(pubAssertionElement.getPublisherAssertion());
- }
-
- if (pubAssertionVector.size() <= 0) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED"));
- return false;
- }
-
- DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
- //report status
- Vector reportErrInfo = report.getResultVector();
- for (int j = 0; j < reportErrInfo.size(); j++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
- }
-
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int j = 0; j < reportErrInfo.size(); j++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
deleted file mode 100644
index 7637f8a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
+++ /dev/null
@@ -1,266 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public abstract class FindAction extends UDDIPropertiesFormAction
-{
- protected QueryElement queryElement_;
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
- protected boolean subQueryInitiated_;
- protected RegistryNode regNode_;
- private boolean isRefreshAction_;
-
- public FindAction(Controller controller)
- {
- super(controller);
- queryElement_ = null;
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- isRefreshAction_ = false;
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String queryName = parser.getParameter(UDDIActionInputs.QUERY_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (queryName != null)
- propertyTable_.put(UDDIActionInputs.QUERY_NAME,queryName);
-
- if (!Validator.validateString(queryName) && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_QUERY_NAME"));
- }
-
- if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
- inputsValid = false;
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- // Process authentication information. If valid, these should be set in the formTool (not the formToolPI).
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = (ownedChecked != null) && (!regElement.isLoggedIn()) && !overrideAuthenticationValidation();
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- protected boolean overrideAuthenticationValidation()
- {
- return false;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public final void setRefreshAction(boolean isRefreshAction)
- {
- isRefreshAction_ = isRefreshAction;
- }
-
- public final boolean isRefreshAction()
- {
- return isRefreshAction_;
- }
-
- protected final void addQueryNode()
- {
- // If the queryElement already exists, remove it first.
- String queryName = queryElement_.getName();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- QueryParentElement queryParentElement = regElement.getQueryParentElement();
- Enumeration e = queryParentElement.getQueries();
- while (e.hasMoreElements())
- {
- QueryElement qe = (QueryElement)e.nextElement();
- if (qe.getName().equals(queryName))
- {
- SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)qe.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
- if (subQueryTransferTarget != null && (qe.getQueryType() == queryElement_.getQueryType()))
- queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
- qe.disconnectAll();
- break;
- }
- }
- if (!isRefreshAction_)
- {
- // We can make safe assumptions about the node that is currently selected.
- if (subQueryKey_ != null && subQueryKey_.length() > 0)
- {
- String parentQueryKey;
- int lastSeparatorPos = subQueryKey_.lastIndexOf(':');
- if (lastSeparatorPos == -1)
- parentQueryKey = "";
- else
- parentQueryKey = subQueryKey_.substring(0,lastSeparatorPos);
- FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)getSelectedFormTool()).getFormToolProperties(parentQueryKey);
- Object queryItem = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
- Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
- Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
- Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
- Hashtable parentQueryData = new Hashtable();
- if (queryItem != null)
- parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItem);
- if (queryStyleBus != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
- if (queryStyleSer != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
- if (queryStyleSerInt != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
- queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,new SubQueryTransferTarget(getSelectedNavigatorNode(),subQueryKey_,parentQueryData));
- }
- }
- queryParentElement.connect(queryElement_,UDDIModelConstants.REL_QUERIES,ModelConstants.REL_OWNER);
- QueryNode queryNode = (QueryNode)(regNode_.getChildNode(queryParentElement).getChildNode(queryElement_));
- int newSelectedNodeId;
- // If there is only 1 result, select the result. Otherwise, select the query node to present a summary.
- if (queryNode.getChildNodes().size() == 1 && (subQueryKey_ == null || subQueryKey_.length() == 0))
- newSelectedNodeId = ((Node)(queryNode.getChildNodes().elementAt(0))).getNodeId();
- else
- newSelectedNodeId = queryNode.getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- nodeManager.setSelectedNodeId(newSelectedNodeId);
- queryNode.setFindToolProperties(this);
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager toolManager = selectedNode.getCurrentToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java
deleted file mode 100644
index 0d7e0ab..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java
+++ /dev/null
@@ -1,222 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- * 20060427 136449 clbush@us.ibm.com - Christopher Bush
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import java.rmi.AlreadyBoundException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.transport.TransportException;
-
-public class LoginAdvancedAction extends PublishAction {
- public LoginAdvancedAction(Controller controller) {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM, String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_
- .put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET, String
- .valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS, String
- .valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser, FormToolPropertiesInterface formToolPI)
- throws MultipartFormDataException {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-
- // Validate the data.
- boolean inputsValid = true;
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED, ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
- return inputsValid;
- }
-
- private boolean attemptingDoubleLogin(){
- String userId = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String publishURL = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- Node rootNode = regNode_.getNodeManager().getRootNode();
- Vector allNodes = rootNode.getChildNodes();
-
- for(int k = 0; k < allNodes.size(); k++){
- Node n = (Node)allNodes.get(k);
- if (n instanceof RegistryNode){
- RegistryElement myElement = ((RegistryElement)n.getTreeElement());
- if (n.getNodeId() != regNode_.getNodeId() && publishURL.equals(myElement.getPublishURL()))
- if(userId.equals(myElement.getUserId()))
- return true;
- }
- }
- return false;
- }
-
- public final boolean run() {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- // System.out.println("+++++ Trying to login +++++");
- try {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String publishURL = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxResults = 300;
-
- // The action can be run under the context of either a registry or a
- // query node.
- RegistryElement regElement = (RegistryElement) regNode_.getTreeElement();
-
-
- if(attemptingDoubleLogin())
- throw new AlreadyBoundException(uddiPerspective.getMessage("MSG_INFO_NO_MULTIPLE_LOGIN"));
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL, userId, password);
-
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = null;
- TModelInfos tmInfos = null;
-
- RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
- busInfos = ri.getBusinessInfos();
- tmInfos = ri.getTModelInfos();
-
- int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++) {
- BusinessInfo busInfo = (BusinessInfo) busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0) {
- if (shouldAddQueryNode) {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity be = null;
- BusinessServices bs = null;
- int size = beVector.size();
- if (size > 0) {
- for (int i = 0; i < size; i++) {
- be = (BusinessEntity) beVector.elementAt(i);
- addPublishedItemNode(be, regElement);
- bs = be.getBusinessServices();
- if (bs != null) {
- Vector vServices = bs.getBusinessServiceVector();
- int services = vServices.size();
- for (int j = 0; j < services; j++) {
- addPublishedItemNode(bs.get(j), regElement);
- }
- }
- }
- messageQueue
- .addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND", String.valueOf(size)));
- }
- }
- }
-
- int finalNumberOfTModels = Math.min(maxResults, tmInfos.size());
- Vector tModelKeys = new Vector();
- for (int i = 0; i < finalNumberOfTModels; i++) {
- TModelInfo tmInfo = (TModelInfo) tmInfos.get(i);
- tModelKeys.addElement(tmInfo.getTModelKey());
- }
-
- if (finalNumberOfTModels > 0) {
- if (shouldAddQueryNode) {
- Vector finalTModelVector = proxy.get_tModelDetail(tModelKeys).getTModelVector();
-
- int size = finalTModelVector.size();
- if (size > 0) {
- TModel tm = null;
- for (int i = 0; i < size; i++) {
- tm = (TModel) finalTModelVector.elementAt(i);
- addPublishedItemNode(tm, regElement);
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND", String
- .valueOf(size)));
- }
- }
- }
-
- int id = 1;
- RegistryNode regNode = getRegistryNode();
-
- // we are logged in so change the loginTool to act as a logoutTool;
- regNode.getLoginTool().setAltText(uddiPerspective.getMessage("ALT_LOGOUT"));
- regNode.getLoginTool().setToLogoutLink();
- String registryName = regElement.getName();
- String[] s = new String[2];
- s[0] = registryName;
- s[1] = userId;
- regElement.setName(uddiPerspective.getMessage("MSG_INFO_LOGGED_IN_NODE", s));
-
- if (finalNumberOfBusinessEntities > 0) {
- Node pbeNode = regNode.getChildNode(regElement.getPublishedBusinessesElement());
- id = pbeNode.getNodeId();
- } else if (finalNumberOfTModels > 0) {
- Node psiNode = regNode.getChildNode(regElement.getPublishedServiceInterfacesElement());
- id = psiNode.getNodeId();
- }
- // System.out.println("Node id = " + id);
- uddiPerspective.getNodeManager().setSelectedNodeId(id);
- uddiPerspective.getNodeManager().makeSelectedNodeVisible();
-
- if ((finalNumberOfBusinessEntities < 1) && (finalNumberOfTModels < 1))
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NO_BUSINESSES_OR_SERVICE_INTERFACES_FOUND"));
-
- return true;
- } catch (TransportException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- } catch (UDDIException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- } catch (MalformedURLException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- } catch (AlreadyBoundException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("AlreadyBoundException");
- messageQueue.addMessage(e.getMessage());
- }
-
- return false;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java
deleted file mode 100644
index e76df39..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java
+++ /dev/null
@@ -1,72 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-
-public class LogoutAdvancedAction extends PublishAction
-{
- public LogoutAdvancedAction(Controller controller)
- {
- super(controller);
- regNode_.getLoginTool().setToRegistryLink();
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- // Validate the data.
- boolean inputsValid = true;
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (regElement.isLoggedIn()) {
- regElement.performLogout();
- regElement.remove();
- regNode_.getNodeManager().setSelectedNodeId(0);
- }
-
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
deleted file mode 100644
index 67a86f1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.transport.TransportException;
-
-public class ManageReferencedServicesAction extends UDDIPropertiesFormAction
-{
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
- protected boolean subQueryInitiated_;
- protected RegistryNode regNode_;
-
- public ManageReferencedServicesAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String[] referencedServicesCheckboxes = parser.getParameterValues(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
- String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
- String operation = parser.getParameter(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (operation != null)
- propertyTable_.put(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION,operation);
- else
- removeProperty(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-
- if (referencedServicesCheckboxes != null)
- propertyTable_.put(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE,referencedServicesCheckboxes);
- else
- removeProperty(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-
- if (serviceNodeIds != null)
- {
- Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
- if (services == null)
- services = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<serviceNodeIds.length;i++)
- resultHash.put(serviceNodeIds[i],Boolean.TRUE);
- for (int i=0;i<services.size();i++)
- {
- ListElement listElement = (ListElement)services.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) == null)
- {
- services.removeElementAt(i);
- i--;
- }
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- {
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- String operationString = (String)propertyTable_.get(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
- int operation = Integer.parseInt(operationString);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- BusinessElement busElement = (BusinessElement)(getSelectedNavigatorNode().getTreeElement());
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
- boolean operationResult = true;
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- UDDIProxy proxy = regElement.getProxy();
- BusinessEntity currentSP = busElement.getBusinessEntity();
- BusinessEntity sp = (BusinessEntity)proxy.get_businessDetail(currentSP.getBusinessKey()).getBusinessEntityVector().get(0);
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- Hashtable servicesHash = new Hashtable();
- Vector backupBusServiceVector = new Vector();
- switch (operation)
- {
- case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD:
- Vector services = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SERVICES);
- for (int i=0;i<services.size();i++)
- {
- ListElement serviceListElement = (ListElement)services.elementAt(i);
- BusinessService bs = (BusinessService)serviceListElement.getObject();
- servicesHash.put(bs.getServiceKey(),bs);
- }
-
- // Save the current list of BusinessServices for rollback operations.
- backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,true);
-
- try
- {
- Vector beVector = new Vector();
- beVector.add(sp);
- sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- for (int i=0;i<services.size();i++)
- {
- ListElement serviceElement = (ListElement)services.elementAt(i);
- BusinessService bs = (BusinessService)serviceElement.getObject();
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCED",bsName));
- services.removeElementAt(i);
- i--;
- }
- }
- catch (TransportException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
- break;
- case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE:
- String[] referencedServicesCheckboxes = (String[])propertyTable_.get(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
- Vector selectedReferencedServiceVector = new Vector();
- for (int i=0;i<referencedServicesCheckboxes.length;i++)
- {
- boolean isChecked = Boolean.valueOf(referencedServicesCheckboxes[i]).booleanValue();
- if (isChecked)
- {
- ListElement referencedServiceListElement = (ListElement)referencedServices.elementAt(i);
- BusinessService bs = (BusinessService)referencedServiceListElement.getObject();
- servicesHash.put(bs.getServiceKey(),bs);
- selectedReferencedServiceVector.addElement(bs);
- }
- }
-
- // Save the current list of business services for rollback operations.
- backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,false);
-
- try
- {
- Vector beVector = new Vector();
- beVector.add(sp);
- sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- for (int i=0;i<selectedReferencedServiceVector.size();i++)
- {
- BusinessService bs = (BusinessService)selectedReferencedServiceVector.elementAt(i);
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCE_REMOVED",bsName));
- }
- }
- catch (TransportException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- }
- // Ensure that the referenced services are refreshed when the form reloads.
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
- busElement.setBusinessEntity(sp);
- return operationResult;
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- operationResult = false;
- }
- return operationResult;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- // Backup the business services and remove those in serviceHash from the current list. Return the updated list of business services
- private final void backupAndUpdateBusinessServices(Vector backupBusServiceVector,BusinessEntity be,Hashtable servicesHash,boolean isAdd)
- {
- // Save the current list of business services for rollback operations.
- BusinessServices currentBusServices = be.getBusinessServices();
- if (currentBusServices == null)
- currentBusServices = new BusinessServices();
- Vector currentBusServiceVector = currentBusServices.getBusinessServiceVector();
- for (int i=0;i<currentBusServiceVector.size();i++)
- {
- BusinessService currentBusService = (BusinessService)currentBusServiceVector.elementAt(i);
- backupBusServiceVector.addElement(currentBusService);
- // If the current business service is a member of the list to be removed/added, remove it now.
- if (servicesHash.get(currentBusService.getServiceKey()) != null)
- {
- currentBusServiceVector.removeElementAt(i);
- i--;
- }
- }
-
- if (isAdd)
- {
- Enumeration e = servicesHash.elements();
- while (e.hasMoreElements())
- currentBusServiceVector.addElement((BusinessService)e.nextElement());
- }
- be.setBusinessServices(currentBusServices);
- }
-
- private final void rollbackBusinessServices(BusinessEntity be,Vector backupBusServiceVector,Vector operatedServices,Perspective perspective,MessageQueue messageQueue,String errorMessageKey)
- {
- // Roll back and restore the old list of services.
- be.getBusinessServices().setBusinessServiceVector(backupBusServiceVector);
- for (int i=0;i<operatedServices.size();i++)
- {
- ListElement serviceListElement = (ListElement)operatedServices.elementAt(i);
- BusinessService bs = (BusinessService)serviceListElement.getObject();
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(perspective.getMessage(errorMessageKey,bsName));
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
deleted file mode 100644
index bdcf84e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenCategoryBrowserAction extends Action
-{
- public OpenCategoryBrowserAction()
- {
- }
-
- private static final void addSessionAndTModelKey(StringBuffer result,String sessionId,String categoryTModelKey)
- {
- result.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
- }
-
- // uddi/category_browser.jsp?sessionId=...&categoryTModelKey=...
- public static final String getActionLink(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/category_browser.jsp?");
- addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
- return actionLink.toString();
- }
-
- public static final String getCategoryContentPage(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/category_content.jsp?");
- addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
- return actionLink.toString();
- }
-
- public static final String getWildCardActionLink(String sessionId)
- {
- return getActionLink(sessionId,"%");
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
deleted file mode 100644
index 9288c7d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
+++ /dev/null
@@ -1,250 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class OpenRegistryAction extends UDDIPropertiesFormAction
-{
- public OpenRegistryAction(Controller controller)
- {
- super(controller);
- // Select UDDI Main.
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String registryName = parser.getParameter(UDDIActionInputs.REGISTRY_NAME);
- String inquiryURL = parser.getParameter(UDDIActionInputs.INQUIRY_URL);
- String publishURL = parser.getParameter(UDDIActionInputs.PUBLISH_URL);
- String username = parser.getParameter(UDDIActionInputs.UDDI_USERNAME);
- String password = parser.getParameter(UDDIActionInputs.UDDI_PASSWORD);
- String checkUserDefinedCategoriesChecked = parser.getParameter(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
- String categoriesDirectory = parser.getParameter(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- if (registryName != null)
- propertyTable_.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-
- if (!Validator.validateString(registryName))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.REGISTRY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_REGISTRY_NAME"));
- }
-
- if (inquiryURL != null)
- propertyTable_.put(UDDIActionInputs.INQUIRY_URL,inquiryURL);
- if (!Validator.validateURL(inquiryURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.INQUIRY_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_INQUIRY_URL"));
- }
-
- if (publishURL != null)
- propertyTable_.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-
- if (username != null)
- propertyTable_.put(UDDIActionInputs.UDDI_USERNAME, username);
-
- if (password != null)
- propertyTable_.put(UDDIActionInputs.UDDI_PASSWORD, password);
-
- if (checkUserDefinedCategoriesChecked != null)
- propertyTable_.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,checkUserDefinedCategoriesChecked);
- else
- removeProperty(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-
- if (categoriesDirectory != null)
- propertyTable_.put(UDDIActionInputs.CATEGORIES_DIRECTORY,categoriesDirectory);
- else
- removeProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- formTool.updatePropertyTable(propertyTable_);
- return inputsValid;
- }
-
- public final void gatherWSUserDefinedCategories(UDDIProxy proxy,Hashtable categoryModels)
- {
- try
- {
- CategoryBag categoryBag = new CategoryBag();
- categoryBag.add(new KeyedReference("","categorization",TModel.TYPES_TMODEL_KEY));
- TModelList tModelList = proxy.find_tModel("%",categoryBag,null,null,100);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- Vector tModelKeyVector = new Vector();
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- }
- TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
- Vector tModelVector = tModelDetail.getTModelVector();
- for (int i=0;i<tModelVector.size();i++)
- {
- TModel tModel = (TModel)tModelVector.elementAt(i);
- boolean checked = false;
- String displayName = null;
- String categoryKey = null;
- categoryBag = tModel.getCategoryBag();
- for (int j=0;j<categoryBag.size();j++)
- {
- KeyedReference kr = categoryBag.get(j);
- String krTModelKey = kr.getTModelKey();
- if (krTModelKey.equalsIgnoreCase(TModel.GENERAL_KEYWORDS_TMODEL_KEY))
- {
- String krKeyName = kr.getKeyName();
- if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:key"))
- categoryKey = kr.getKeyValue();
- else if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:displayName"))
- displayName = kr.getKeyValue();
- }
- else if (krTModelKey.equalsIgnoreCase(TModel.TYPES_TMODEL_KEY))
- checked = kr.getKeyValue().equals("checked");
- }
- if (categoryKey != null)
- {
- if (displayName == null)
- displayName = tModel.getNameString();
- CategoryModel categoryModel = new CategoryModel();
- categoryModel.setCategoryKey(categoryKey);
- categoryModel.enableChecked(checked);
- categoryModel.setDisplayName(displayName);
- String tModelKey = tModel.getTModelKey();
- categoryModel.setTModelKey(tModelKey);
- categoryModels.put(tModelKey,categoryModel);
- }
- }
- }
- catch (UDDIException e)
- {
- }
- catch (TransportException e)
- {
- }
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String registryName = (String)propertyTable_.get(UDDIActionInputs.REGISTRY_NAME);
- String inquiryURL = (String)propertyTable_.get(UDDIActionInputs.INQUIRY_URL);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.PUBLISH_URL);
- String registrationURL = (String)propertyTable_.get(UDDIActionInputs.REGISTRATION_URL);
- String username = (String)propertyTable_.get(UDDIActionInputs.UDDI_USERNAME);
- String password = (String)propertyTable_.get(UDDIActionInputs.UDDI_PASSWORD);
- boolean checkForUserDefinedCategoriesChecked = (propertyTable_.get(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES) != null);
- String categoriesDirectory = (String)propertyTable_.get(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- String recognizedPublishURL = uddiPerspective.getKnownRegistryPublishURL(inquiryURL);
- String recognizedRegistrationURL = uddiPerspective.getKnownRegistryRegistrationURL(inquiryURL);
-
- if (publishURL == null)
- publishURL = recognizedPublishURL;
- if (registrationURL == null)
- registrationURL = recognizedRegistrationURL;
-
- UDDIMainNode uddiMainNode = (UDDIMainNode)(controller_.getUDDIPerspective().getNavigatorManager().getRootNode());
- UDDIMainElement uddiMainElement = (UDDIMainElement)uddiMainNode.getTreeElement();
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- UDDIProxy proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryURL));
- RegistryElement registryElement = new RegistryElement(proxy,inquiryURL,registryName,uddiMainElement.getModel());
- // Set registry element's publish URL and registration URL provided by external callers (e.g. favorites).
- if (publishURL != null)
- registryElement.setCachedPublishURL(publishURL);
- if (registrationURL != null)
- registryElement.setRegistrationURL(registrationURL);
- if (username != null)
- registryElement.setUserId(username);
- if (password != null)
- registryElement.setCred(password);
- registryElement.setCheckForUserDefinedCategories(checkForUserDefinedCategoriesChecked);
- if (checkForUserDefinedCategoriesChecked)
- {
- Hashtable categoryModels = new Hashtable();
- gatherWSUserDefinedCategories(proxy,categoryModels);
- if (categoryModels.size() > 0)
- registryElement.setUserDefinedCategories(categoryModels);
- }
- registryElement.setCategoriesDirectory(categoriesDirectory);
- uddiMainElement.connect(registryElement,UDDIModelConstants.REL_REGISTRIES,ModelConstants.REL_OWNER);
- NodeManager nodeManager = uddiMainNode.getNodeManager();
- int newRegistryNodeId = uddiMainNode.getChildNode(registryElement).getNodeId();
- // Select the new registry node and add the select action to the history.
- nodeManager.setSelectedNodeId(newRegistryNodeId);
- Node registryNode = nodeManager.getSelectedNode();
- ToolManager toolManager = registryNode.getCurrentToolManager();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,toolManager.getSelectedTool().getSelectToolActionHref(true));
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_OPENED",new String[]{registryName,inquiryURL}));
- return true;
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- FormTool formTool = getSelectedFormTool();
- formTool.flagError(UDDIActionInputs.INQUIRY_URL);
- }
- /*
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- */
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
deleted file mode 100644
index 8e29b62..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
+++ /dev/null
@@ -1,238 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class PublishAction extends UDDIPropertiesFormAction
-{
- protected String subQueryKey_;
- protected boolean subQueryInitiated_;
- protected String newSubQuery_;
- protected boolean isSubQueryGet_;
- protected String newSubQueryItem_;
- protected RegistryNode regNode_;
-
- public PublishAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
- inputsValid = false;
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = !regElement.isLoggedIn();
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- protected final void addPublishedItemNode(BusinessEntity be,RegistryElement regElement)
- {
- BusinessElement beElement = new BusinessElement(be,regElement.getModel());
- PublishedItemsElement publishedBusinessesElement = regElement.getPublishedBusinessesElement();
- Enumeration e = publishedBusinessesElement.getItems();
- while (e.hasMoreElements())
- {
- BusinessElement element = (BusinessElement)e.nextElement();
- BusinessEntity elementBE = element.getBusinessEntity();
- if (elementBE.getBusinessKey().equals(be.getBusinessKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedBusinessesElement,beElement);
- }
-
- protected final void addPublishedItemNode(BusinessService bs,RegistryElement regElement)
- {
- ServiceElement sElement = new ServiceElement(bs,regElement.getModel());
- PublishedItemsElement publishedServicesElement = regElement.getPublishedServicesElement();
- Enumeration e = publishedServicesElement.getItems();
- while (e.hasMoreElements())
- {
- ServiceElement element = (ServiceElement)e.nextElement();
- BusinessService elementBS = element.getBusinessService();
- if (elementBS.getServiceKey().equals(bs.getServiceKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedServicesElement,sElement);
- }
-
- protected final void addPublishedItemNode(TModel tModel,RegistryElement regElement)
- {
- ServiceInterfaceElement siElement = new ServiceInterfaceElement(tModel,regElement.getModel());
- PublishedItemsElement publishedServiceInterfacesElement = regElement.getPublishedServiceInterfacesElement();
- Enumeration e = publishedServiceInterfacesElement.getItems();
- while (e.hasMoreElements())
- {
- ServiceInterfaceElement element = (ServiceInterfaceElement)e.nextElement();
- TModel elementTModel = element.getTModel();
- if (tModel.getTModelKey().equals(elementTModel.getTModelKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedServiceInterfacesElement,siElement);
- }
-
- private final void connectElements(PublishedItemsElement publishedItemsElement,TreeElement itemElement)
- {
- publishedItemsElement.connect(itemElement,UDDIModelConstants.REL_PUBLISHED_ITEMS,ModelConstants.REL_OWNER);
- int newNodeId = regNode_.getChildNode(publishedItemsElement).getChildNode(itemElement).getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- nodeManager.setSelectedNodeId(newNodeId);
- Node newNode = nodeManager.getSelectedNode();
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
deleted file mode 100644
index 3c1ada6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryParentNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class RefreshUDDINodeAction extends UDDINodeAction
-{
- private Vector staleNodes_;
- public RefreshUDDINodeAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
- staleNodes_ = new Vector();
- }
-
- // uddi/actions/RefreshUDDINodeActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/RefreshUDDINodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean verifyNodeData()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- if (node instanceof BusinessNode)
- return refreshBusinessElement((BusinessNode)node);
- else if (node instanceof ServiceNode)
- return refreshServiceElement((ServiceNode)node);
- else if (node instanceof ServiceInterfaceNode)
- return refreshServiceInterfaceElement((ServiceInterfaceNode)node);
- else if (node instanceof QueryNode)
- {
- // Nothing to verify
- return true;
- }
- else if (node != null)
- {
- // RegistryNode
- if (node instanceof RegistryNode)
- refreshRegistryElement((RegistryNode)node);
-
- // FolderNodes
- Vector childNodes = node.getChildNodes();
- Vector refreshActions = new Vector();
- for (int i=0;i<childNodes.size();i++)
- {
- Node childNode = (Node)childNodes.elementAt(i);
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
- action.setStaleNodes(staleNodes_);
- Hashtable propertyTable = action.getPropertyTable();
- String childNodeIdString = String.valueOf(childNode.getNodeId());
- propertyTable.put(ActionInputs.NODEID,childNodeIdString);
- if (!action.verifyNodeData())
- staleNodes_.addElement(childNode);
- else
- refreshActions.addElement(action);
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,refreshActions);
- return true;
- }
- return true;
- }
-
- private final void refreshRegistryElement(RegistryNode regNode)
- {
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- Hashtable userDefinedCategories = null;
- if (regElement.getCheckForUserDefinedCategories())
- {
- userDefinedCategories = new Hashtable();
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
- openRegAction.gatherWSUserDefinedCategories(regElement.getProxy(),userDefinedCategories);
- if (!userDefinedCategories.keys().hasMoreElements())
- {
- userDefinedCategories = null;
- regNode.setImagePath(RegistryNode.IMAGE_PATH_STANDARD);
- }
- else
- {
- String categoriesDirectory = regElement.getCategoriesDirectory();
- AddRegistryToUDDIPerspectiveAction addAction = new AddRegistryToUDDIPerspectiveAction(controller_);
- if (categoriesDirectory != null)
- addAction.linkCategoryModelsWithSavedData(userDefinedCategories.elements(),categoriesDirectory);
- else
- addAction.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories.elements());
- regNode.setImagePath(RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES);
- }
- }
- regElement.setUserDefinedCategories(userDefinedCategories);
- }
-
- private final boolean refreshBusinessElement(BusinessNode busNode)
- {
- BusinessElement busElement = (BusinessElement)busNode.getTreeElement();
- String uuidKey = busElement.getBusinessEntity().getBusinessKey();
- RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,busNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new BusinessElement((BusinessEntity)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),busElement.getModel()));
- return verifyResult;
- }
-
- private final boolean refreshServiceElement(ServiceNode serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- String uuidKey = serviceElement.getBusinessService().getServiceKey();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,serviceNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceElement((BusinessService)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),serviceElement.getModel()));
- return verifyResult;
- }
-
- private final boolean refreshServiceInterfaceElement(ServiceInterfaceNode siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- String uuidKey = siElement.getTModel().getTModelKey();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,siNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceInterfaceElement((TModel)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),siElement.getModel()));
- return verifyResult;
- }
-
- public final void connectElements(Node parentNode,TreeElement newElement)
- {
- TreeElement parentElement = parentNode.getTreeElement();
- String rel = null;
- if (parentNode instanceof PublishedItemsNode)
- rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
- else if (parentNode instanceof QueryNode)
- rel = UDDIModelConstants.REL_QUERY_RESULTS;
- else if (parentNode instanceof QueryParentNode)
- rel = UDDIModelConstants.REL_QUERIES;
- parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
- Node newNode = parentNode.getChildNode(newElement);
- int newNodeId = newNode.getNodeId();
- nodeManager_.setSelectedNodeId(newNodeId);
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- Object latestObject = propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- if (latestObject != null)
- {
- if (latestObject instanceof Vector)
- {
- Vector refreshActions = (Vector)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- for (int i=0;i<refreshActions.size();i++)
- {
- RefreshUDDINodeAction refreshAction = (RefreshUDDINodeAction)refreshActions.elementAt(i);
- refreshAction.run();
- }
- nodeManager_.setSelectedNodeId(nodeId);
- }
- else
- {
- TreeElement oldElement = node.getTreeElement();
- oldElement.disconnectAll();
- connectElements(node.getParent(),(TreeElement)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT));
- }
- }
- else
- {
- // QueryNodes
- QueryNode queryNode = (QueryNode)node;
- FindAction findAction = queryNode.getFindAction();
- findAction.setRefreshAction(true);
- if (!findAction.run())
- queryNode.removeChildNodes(true);
- findAction.setRefreshAction(false);
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NODE_REFRESHED",node.getNodeName()));
- return true;
- }
- return false;
- }
-
- public final Vector getStaleNodes()
- {
- return staleNodes_;
- }
-
- public final void setStaleNodes(Vector staleNodes)
- {
- staleNodes_ = staleNodes;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
deleted file mode 100644
index fe3cadc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class RefreshUDDINodesAction extends UDDIPropertiesFormAction
-{
- private Vector staleNodes_;
-
- public RefreshUDDINodesAction(Controller controller)
- {
- super(controller);
- staleNodes_ = new Vector();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- int collectorNodeId = getSelectedNavigatorNode().getNodeId();
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- if (action.verifyNodeData())
- action.run();
- else
- {
- int nodeId = Integer.parseInt(selectedNodeIds[i]);
- staleNodes_.addElement(navigatorManager.getNode(nodeId));
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NODE_DATA_VALIDATION_FAILED",navigatorManager.getNode(nodeId).getNodeName()));
- }
- }
- navigatorManager.setSelectedNodeId(collectorNodeId);
- return true;
- }
-
- public final Vector getStaleNodes()
- {
- return staleNodes_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
deleted file mode 100644
index 7931728..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessUUIDAction extends FindAction
-{
- public RegFindBusinessUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- BusinessEntity[] beList = new BusinessEntity[1];
- Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
- if (beVector.size() > 0)
- {
- beVector.toArray(beList);
- if (shouldAddQueryNode)
- {
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,beList[0]);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
deleted file mode 100644
index 51a5757..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindBusinessesAdvancedAction extends FindAction
-{
- public RegFindBusinessesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- getSelectedNavigatorNode();
- getRegistryNode();
- regNode_.getTreeElement();
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
- if (languages != null && names != null)
- {
- Vector nameVector = new Vector();
- for (int i=0;i<names.length;i++)
- {
- Name uddi4jName;
- if (languages[i].length() > 0)
- uddi4jName = new Name(names[i],languages[i]);
- else
- uddi4jName = new Name(names[i]);
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- if (siNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
- if (busServiceInterfaces == null)
- busServiceInterfaces = new Vector();
- else
- busServiceInterfaces.removeAllElements();
- Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
- Vector tModelKeyStringVector = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<siNodeIds.length;i++)
- resultHash.put(siNodeIds[i],Boolean.TRUE);
- for (int i=0;i<busServiceInterfacesCopy.size();i++)
- {
- ListElement listElement = (ListElement)busServiceInterfacesCopy.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
- {
- busServiceInterfaces.addElement(listElement);
- TModel tModel = (TModel)listElement.getObject();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- }
- }
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
- }
-
- if (discoveryURLValues != null)
- {
- DiscoveryURLs discoveryURLs = new DiscoveryURLs();
- Vector discoveryURLVector = new Vector();
- for (int i=0;i<discoveryURLValues.length;i++)
- {
- DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLValues[i],"");
- discoveryURLVector.addElement(discoveryURL);
- }
- discoveryURLs.setDiscoveryURLVector(discoveryURLVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- private DiscoveryURLs dupDiscoveryURLs(DiscoveryURLs discoveryURLs, String useType, String dupUseType) {
- if (discoveryURLs == null)
- return discoveryURLs;
- Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
- if (discoveryURLVector == null)
- return discoveryURLs;
- Vector newDiscoveryURLVector = new Vector(discoveryURLVector);
- Enumeration e = discoveryURLVector.elements();
- while (e.hasMoreElements()) {
- DiscoveryURL discoveryURL = (DiscoveryURL)e.nextElement();
- if (discoveryURL.getUseType().equals(useType)) {
- newDiscoveryURLVector.add(new DiscoveryURL(discoveryURL.getText(), dupUseType));
- }
- }
- DiscoveryURLs newDiscoveryURLs = new DiscoveryURLs();
- newDiscoveryURLs.setDiscoveryURLVector(newDiscoveryURLVector);
- return newDiscoveryURLs;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (owned && !regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = null;
- if (owned)
- busInfos = proxy.get_registeredInfo(regElement.getAuthInfoString()).getBusinessInfos();
- else
- busInfos = proxy.find_business(nameVector, dupDiscoveryURLs(discoveryURLs,"",UDDIActionInputs.DISCOVERY_URL_TYPE), identifierBag, categoryBag, tModelBag, findQualifiers, maxSearchSet).getBusinessInfos();
-
- int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++)
- {
- BusinessInfo busInfo = (BusinessInfo)busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity[] beList = new BusinessEntity[beVector.size()];
- beVector.toArray(beList);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
deleted file mode 100644
index 9a304ca..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessesSimpleAction extends FindAction
-{
- public RegFindBusinessesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
- else
- {
- // This shouldn't occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- Vector nameVector = new Vector();
- nameVector.addElement(new Name(name));
-
- // The action can be run under the context of either a registry or a query node.
- getSelectedNavigatorNode();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = proxy.find_business(nameVector, null, null, null, null, null, UDDIActionInputs.QUERY_MAX_SEARCH_SET).getBusinessInfos();
- int finalNumberOfBusinessEntities = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++)
- {
- BusinessInfo busInfo = busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity[] beList = new BusinessEntity[beVector.size()];
- beVector.toArray(beList);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
deleted file mode 100644
index 1b5bd43..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfaceUUIDAction extends FindAction
-{
- public RegFindServiceInterfaceUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
- Vector tModelVector = tModelDetail.getTModelVector();
- if (tModelVector.size() > 0)
- {
- TModel tModel = (TModel)tModelVector.elementAt(0);
- if (shouldAddQueryNode)
- {
- TModel[] tModelArray = new TModel[1];
- tModelArray[0] = tModel;
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModel);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
deleted file mode 100644
index 371fd84..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
+++ /dev/null
@@ -1,378 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegFindServiceInterfacesAdvancedAction extends FindAction
-{
- public RegFindServiceInterfacesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String useServiceChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
- String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- regNode_.getTreeElement();
-
- if (useServiceChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,useServiceChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-
- if (serviceNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- if (siService == null)
- siService = new Vector();
- else
- siService.removeAllElements();
- Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
- // The browser will enforce the rule of having only one service in this list.
- ListElement listElement = (ListElement)siServiceCopy.elementAt(0);
- siService.addElement(listElement);
- BusinessService bs = (BusinessService)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
- if (!subQueryInitiated_ && useServiceChecked != null)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_SERVICE"));
- }
- }
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED);
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean overrideAuthenticationValidation()
- {
- return (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- boolean useService = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector tModelKeyVector = new Vector();
-
- if (owned)
- {
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- tModelKeyVector = findAllOwnedTModels(proxy, regElement.getAuthInfoString(), maxResults);
- }
- if (useService)
- {
- BindingTemplates bindingTemplates = bs.getBindingTemplates();
- boolean endSearch = false;
- if (bindingTemplates != null)
- {
- for (int i=0;i<bindingTemplates.size();i++)
- {
- BindingTemplate bt = bindingTemplates.get(i);
- TModelInstanceDetails tModelInstanceDetails = bt.getTModelInstanceDetails();
- for (int j=0;j<tModelInstanceDetails.size();j++)
- {
- TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(j);
- if (tModelKeyVector.size() < maxResults)
- tModelKeyVector.addElement(tModelInstanceInfo.getTModelKey());
- else
- {
- endSearch = true;
- break;
- }
- }
- if (endSearch)
- break;
- }
- }
- }
- else
- {
- TModelList tModelList = proxy.find_tModel(name,categoryBag,identifierBag,findQualifiers,maxSearchSet);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyVector.size() < maxResults)
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
- }
-
- int finalNumberOfTModelKeys = tModelKeyVector.size();
- if (finalNumberOfTModelKeys > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector finalTModelVector = new Vector();
- int currentIndex = 0;
- int windowSize = finalNumberOfTModelKeys;
- while (currentIndex < tModelKeyVector.size())
- {
- int subListToIndex = Math.min(currentIndex+windowSize,tModelKeyVector.size());
- try
- {
- TModelDetail tModelDetail = proxy.get_tModelDetail(new Vector(tModelKeyVector.subList(currentIndex,subListToIndex)));
- Vector tModelVector = tModelDetail.getTModelVector();
- for (int i=0;i<tModelVector.size();i++)
- finalTModelVector.addElement(tModelVector.elementAt(i));
- if (tModelDetail.getTruncatedBoolean())
- windowSize = tModelVector.size();
- currentIndex += windowSize;
- }
- catch (UDDIException e)
- {
- DispositionReport dr = e.getDispositionReport();
- if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
- {
- String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
- for (int i=currentIndex;i<subListToIndex;i++)
- {
- String tModelKey = (String)tModelKeyVector.elementAt(i);
- if (errInfoText.indexOf(tModelKey) != -1 || errInfoText.indexOf(tModelKey.toUpperCase()) != -1 || errInfoText.indexOf(tModelKey.toLowerCase()) != -1)
- {
- tModelKeyVector.removeElementAt(i);
- break;
- }
- }
- }
- else
- throw e;
- }
- catch (TransportException e)
- {
- throw e;
- }
- }
-
- int finalNumberOfTModels = finalTModelVector.size();
- if (finalNumberOfTModels > 0)
- {
- TModel[] tModelArray = new TModel[finalNumberOfTModels];
- finalTModelVector.toArray(tModelArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-
- // Copied directly from UDDIWSDLProxy's findAllServiceInterfaces() method with minor modifications. The hardcoded strings should NOT be translated.
- private final Vector findAllOwnedTModels(UDDIProxy proxy, String authInfoString, int maxResults) throws UDDIException, TransportException
- {
- RegisteredInfo registeredInfo = null;
-
- // Get the complete list of owned (registered) info.
- // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
- // BusinessInfos also contain ServiceInfos.)
- registeredInfo = proxy.get_registeredInfo(authInfoString);
-
- //Create a Vector to add the TModelKeys from the registeredInfo.
- Vector tModelKeyList = new Vector();
-
- //Get the TModelInfos from the registeredInfo.
- TModelInfos tModelInfos = registeredInfo.getTModelInfos();
-
- //Get all the TModelKeys from within the TModelInfos
- for (int i = 0; i < tModelInfos.size(); i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyList.size() < maxResults)
- tModelKeyList.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
- return tModelKeyList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
deleted file mode 100644
index 88bfed5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfacesSimpleAction extends FindAction
-{
- public RegFindServiceInterfacesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
- else
- {
- // This should never occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelList tModelList = proxy.find_tModel(name,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- Vector tModelKeyVector = new Vector();
-
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyVector.size() < UDDIActionInputs.QUERY_MAX_RESULTS)
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
-
- if (tModelKeyVector.size() > 0)
- {
- if (shouldAddQueryNode)
- {
- TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
- Vector tModelVector = tModelDetail.getTModelVector();
- TModel[] tModelArray = new TModel[tModelVector.size()];
- tModelVector.toArray(tModelArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
deleted file mode 100644
index 75ea5d1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceUUIDAction extends FindAction
-{
- public RegFindServiceUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- BusinessService[] bsArray = new BusinessService[1];
- ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidKey);
- Vector bsVector = serviceDetail.getBusinessServiceVector();
- if (bsVector.size() > 0)
- {
- bsVector.toArray(bsArray);
- if (shouldAddQueryNode)
- {
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,bsArray[0]);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
deleted file mode 100644
index 9b6d2c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
+++ /dev/null
@@ -1,392 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindServicesAdvancedAction extends FindAction
-{
- public RegFindServicesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String[] busNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_BUSINESS);
- String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- regNode_.getTreeElement();
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED);
-
- if (busNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- }
-
- if (languages != null && names != null)
- {
- Vector nameVector = new Vector();
- for (int i=0;i<names.length;i++)
- {
- Name uddi4jName;
- if (languages[i].length() > 0)
- uddi4jName = new Name(names[i],languages[i]);
- else
- uddi4jName = new Name(names[i]);
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- if (siNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- if (serviceServiceInterfaces == null)
- serviceServiceInterfaces = new Vector();
- else
- serviceServiceInterfaces.removeAllElements();
- Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- Vector tModelKeyStringVector = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<siNodeIds.length;i++)
- resultHash.put(siNodeIds[i],Boolean.TRUE);
- for (int i=0;i<serviceServiceInterfacesCopy.size();i++)
- {
- ListElement listElement = (ListElement)serviceServiceInterfacesCopy.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
- {
- serviceServiceInterfaces.addElement(listElement);
- TModel tModel = (TModel)listElement.getObject();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- }
- }
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
- }
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
- BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (owned && !regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- UDDIProxy proxy = regElement.getProxy();
- String businessKey;
- if (sp != null)
- businessKey = sp.getBusinessKey();
- else
- businessKey = "";
-
- int finalNumberOfServiceKeys;
- Vector serviceKeyVector;
- if (owned)
- {
- serviceKeyVector = findAllOwnedServices(proxy,regElement.getAuthInfoString(),businessKey,maxResults);
- finalNumberOfServiceKeys = serviceKeyVector.size();
- }
- else
- {
- ServiceList serviceList = proxy.find_service(businessKey,nameVector,categoryBag,tModelBag,findQualifiers,maxSearchSet);
- ServiceInfos sInfos = serviceList.getServiceInfos();
- finalNumberOfServiceKeys = Math.min(maxResults,sInfos.size());
- serviceKeyVector = new Vector();
- for (int i=0;i<finalNumberOfServiceKeys;i++)
- {
- ServiceInfo sInfo = sInfos.get(i);
- serviceKeyVector.addElement(sInfo.getServiceKey());
- }
- }
-
- if (finalNumberOfServiceKeys > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector finalBusServiceVector = new Vector();
- int currentIndex = 0;
- int windowSize = finalNumberOfServiceKeys;
- while (currentIndex < serviceKeyVector.size())
- {
- int subListToIndex = Math.min(currentIndex+windowSize,serviceKeyVector.size());
- try
- {
- ServiceDetail serviceDetail = proxy.get_serviceDetail(new Vector(serviceKeyVector.subList(currentIndex,subListToIndex)));
- Vector busServiceVector = serviceDetail.getBusinessServiceVector();
- for (int i=0;i<busServiceVector.size();i++)
- finalBusServiceVector.addElement(busServiceVector.elementAt(i));
- if (serviceDetail.getTruncatedBoolean())
- windowSize = busServiceVector.size();
- currentIndex += windowSize;
- }
- catch (UDDIException e)
- {
- DispositionReport dr = e.getDispositionReport();
- if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
- {
- String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
- for (int i=currentIndex;i<subListToIndex;i++)
- {
- String serviceKey = (String)serviceKeyVector.elementAt(i);
- if (errInfoText.indexOf(serviceKey) != -1 || errInfoText.indexOf(serviceKey.toUpperCase()) != -1 || errInfoText.indexOf(serviceKey.toLowerCase()) != -1)
- {
- serviceKeyVector.removeElementAt(i);
- break;
- }
- }
- }
- else
- throw e;
- }
- catch (TransportException e)
- {
- throw e;
- }
- }
-
- int finalNumberOfBusinessServices = finalBusServiceVector.size();
- if (finalNumberOfBusinessServices > 0)
- {
- BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
- finalBusServiceVector.toArray(bsArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-
- // Copied directly from UDDIWSDLProxy's findAllOwnedServices() method with minor modifications. The hardcoded strings should NOT be translated.
- private final Vector findAllOwnedServices(UDDIProxy proxy,String authInfoString,String businessKey,int maxResults) throws UDDIException, TransportException
- {
- RegisteredInfo registeredInfo = null;
-
- // Get the complete list of owned (registered) info.
- // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
- // BusinessInfos also contain ServiceInfos.)
- registeredInfo = proxy.get_registeredInfo(authInfoString);
-
- //Create a vector to add the serviceKeys from the registeredInfo to.
- Vector serviceKeyList = new Vector();
-
- //Get the businessInfos from the registeredInfo.
- BusinessInfos businessInfos = registeredInfo.getBusinessInfos();
-
- //Get all the serviceKeys from the serviceInfos within the businessInfos,
- //and add them to the serviceKeyList.
- boolean endSearch = false;
- for (int i = 0; i < businessInfos.size(); i++)
- {
- BusinessInfo businessInfo = businessInfos.get(i);
- String currentBusinessKey = businessInfo.getBusinessKey();
- if (businessKey.length() > 0 && currentBusinessKey.equals(businessKey))
- endSearch = true;
- ServiceInfos serviceInfos = businessInfo.getServiceInfos();
- for (int j = 0; j < serviceInfos.size(); j++)
- {
- ServiceInfo serviceInfo = serviceInfos.get(j);
- if (serviceInfo.getBusinessKey().equals(currentBusinessKey))
- {
- if (serviceKeyList.size() < maxResults)
- serviceKeyList.add(serviceInfo.getServiceKey());
- else
- {
- endSearch = true;
- break;
- }
- }
- }
- if (endSearch)
- break;
- }
- return serviceKeyList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
deleted file mode 100644
index d857541..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServicesSimpleAction extends FindAction
-{
- public RegFindServicesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
- else
- {
- // This shouldn't occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- Vector nameVector = new Vector();
- nameVector.addElement(new Name(name));
-
- // The action can be run under the context of either a registry or a query node.
- getSelectedNavigatorNode();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- ServiceList serviceList = proxy.find_service("",nameVector,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-
- ServiceInfos sInfos = serviceList.getServiceInfos();
- int finalNumberOfBusinessServices = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS,sInfos.size());
- Vector serviceKeyVector = new Vector();
- for (int i=0;i<finalNumberOfBusinessServices;i++)
- {
- ServiceInfo sInfo = sInfos.get(i);
- serviceKeyVector.addElement(sInfo.getServiceKey());
- }
-
- if (finalNumberOfBusinessServices > 0)
- {
- if (shouldAddQueryNode)
- {
- ServiceDetail serviceDetail = proxy.get_serviceDetail(serviceKeyVector);
- Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
- businessServiceVector.toArray(bsArray);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
deleted file mode 100644
index e340ccd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishBusinessAdvancedAction extends PublishAction
-{
- public RegPublishBusinessAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- Hashtable languageHash = new Hashtable();
- if (nameLanguages != null && names != null)
- {
- Vector nameVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (names[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- if (discoveryURLValues != null)
- {
- DiscoveryURLs discoveryURLs = new DiscoveryURLs();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
- for (int i=0;i<discoveryURLValues.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- if (!subQueryInitiated_ && !Validator.validateURL(discoveryURLValues[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- discoveryURLs.add(new DiscoveryURL(discoveryURLValues[i],""));
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("");
- be.setNameVector(nameVector);
- be.setDescriptionVector(descriptionVector);
- be.setIdentifierBag(identifierBag);
- be.setCategoryBag(categoryBag);
- be.setDiscoveryURLs(discoveryURLs);
- Vector beVector = new Vector();
- beVector.add(be);
-
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- addPublishedItemNode(be,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
deleted file mode 100644
index e2199b7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishBusinessSimpleAction extends PublishAction
-{
- public RegPublishBusinessSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("");
- be.setDefaultName(new Name(name));
- be.setDefaultDescriptionString(description);
- Vector beVector = new Vector();
- beVector.add(be);
-
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- addPublishedItemNode(be,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
deleted file mode 100644
index 2d241f6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,377 +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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceAdvancedAction extends PublishAction
-{
- public RegPublishServiceAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
- String[] serIntIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (busNodeIds != null)
- {
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,sp.getBusinessKey());
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
- }
- }
-
- if (serIntIds != null && serIntIds.length > 0)
- {
- Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- if (serviceInterfaces == null)
- serviceInterfaces = new Vector();
- else
- serviceInterfaces.removeAllElements();
- Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- Vector tmodels = new Vector();
- for (Iterator it = serviceInterfacesCopy.iterator(); it.hasNext();)
- {
- ListElement listElement = (ListElement)it.next();
- int targetNodeId = listElement.getTargetNodeId();
- for (int i = 0; i < serIntIds.length; i++)
- {
- try
- {
- if (targetNodeId == Integer.parseInt(serIntIds[i]))
- {
- serviceInterfaces.add(listElement);
- tmodels.add(listElement.getObject());
- break;
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES, serviceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL, tmodels);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
- }
-
- if (wsdlURL != null)
- {
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- Hashtable languageHash = new Hashtable();
- if (nameLanguages != null && names != null)
- {
- Vector nameVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (names[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- Vector tModelVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
- BusinessService bs;
- if (tModelVector != null && tModelVector.size() > 0)
- bs = uddi4jHelper.newBusinessService(wsdlURL, def, (TModel[])tModelVector.toArray(new TModel[0]));
- else
- {
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
- Hashtable tModelsTable = new Hashtable();
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
- bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- }
-
- if (be != null)
- bs.setBusinessKey(be.getBusinessKey());
- else if (businessKey != null)
- bs.setBusinessKey(businessKey);
- bs.setNameVector(nameVector);
- bs.setDescriptionVector(descriptionVector);
- bs.setCategoryBag(categoryBag);
- Vector bsVector = new Vector();
- bsVector.add(bs);
- regElement.handlePreInvocation(bs);
- bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- addPublishedItemNode(bs,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
deleted file mode 100644
index 001f5c7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceInterfaceAdvancedAction extends PublishAction
-{
- public RegPublishServiceInterfaceAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- Hashtable languageHash = new Hashtable();
-
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- tModel.setName(name);
- tModel.setDescriptionVector(descriptionVector);
- tModel.setIdentifierBag(identifierBag);
-
- // The category bag may contain wsdlSpec.
- CategoryBag defaultCategoryBag = tModel.getCategoryBag();
- Vector defaultKeyedReferenceVector = null;
- if (defaultCategoryBag != null)
- {
- if (categoryBag == null)
- categoryBag = defaultCategoryBag;
- else
- {
- defaultKeyedReferenceVector = defaultCategoryBag.getKeyedReferenceVector();
- for (int i=0;i<defaultKeyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)defaultKeyedReferenceVector.elementAt(i);
- if (categoryBag != null)
- categoryBag.add(kr);
- }
- }
- }
- tModel.setCategoryBag(categoryBag);
-
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
- addPublishedItemNode(tModel,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
deleted file mode 100644
index ba7ffe6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceInterfaceSimpleAction extends PublishAction
-{
- public RegPublishServiceInterfaceSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean populatePropertyTable(String wsdlURL, TModel tModel)
- {
- boolean inputsValid = true;
- String name = tModel.getNameString();
- String description = tModel.getDefaultDescriptionString();
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
- else
- inputsValid = false;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
- else
- inputsValid = false;
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
- else
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- tModel.setName(name);
- tModel.setDefaultDescriptionString(description);
-
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
- addPublishedItemNode(tModel,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
deleted file mode 100644
index dac6608..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,221 +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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceSimpleAction extends PublishAction
-{
- public RegPublishServiceSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (busNodeIds != null)
- {
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,be);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
- }
- }
-
- if (wsdlURL != null)
- {
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,wsdlURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
- String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
-
- Hashtable tModelsTable = new Hashtable();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
-
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- {
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- }
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
-
- BusinessService bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- if (be != null)
- bs.setBusinessKey(be.getBusinessKey());
- else if (businessKey != null)
- bs.setBusinessKey(businessKey);
- bs.setDefaultName(new Name(name));
- bs.setDefaultDescriptionString(description);
- Vector bsVector = new Vector();
- bsVector.add(bs);
- regElement.handlePreInvocation(bs);
- bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- addPublishedItemNode(bs,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
deleted file mode 100644
index 7fec492..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class RemovePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public RemovePublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateURL(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID!= null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- // ids from publisher assertion table
- String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
- inputsValid = false;
- else
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- if (!(selectedElement instanceof BusinessElement))
- return false;
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
- ListManager pubAssertions = busElement.getPublisherAssertions();
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- Vector pubAssertionVector = new Vector();
- boolean refreshRequired = false;
-
- for (int i = 0; i < pubAssertionViewIds.length; i++) {
- int viewID = Integer.parseInt(pubAssertionViewIds[i]);
- ListElement listElement = pubAssertions.getElementWithViewId(viewID);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
- PublisherAssertion pubAssertion = pubAssertionElement.getPublisherAssertion();
- pubAssertionVector.add(pubAssertion);
- if (pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE))
- refreshRequired = true;
- }
-
- DispositionReport report = proxy.delete_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
- //report status
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
-
- // refresh is required, refresh the whole publisher assertion table
- if (refreshRequired) {
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
- }
- // refresh is not required, delete the selected publisher assertion elements
- else {
- for (int k = 0; k < pubAssertionViewIds.length; k++) {
- pubAssertions.removeElementWithViewId(Integer.parseInt(pubAssertionViewIds[k]));
- }
- }
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
deleted file mode 100644
index e984e25..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class RemoveSubQueryItemAction extends Action
-{
- private Controller controller_;
-
- public RemoveSubQueryItemAction(Controller controller)
- {
- super();
- controller_ = controller;
- }
-
- // uddi/actions/RemoveSubQueryItemActionJSP.jsp?subQueryKey=...&subQueryListKey=...&subQueryListItemId=...
- public static final String getActionLink(String subQueryKey,String subQueryListKey,int subQueryListItemId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/RemoveSubQueryItemActionJSP.jsp?");
- actionLink.append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
- return actionLink.toString();
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
- String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-
- if (subQueryKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
- if (subQueryListKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
- if (subQueryListItemId != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
- return true;
- }
-
- public boolean run()
- {
- propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY);
- propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
- int subQueryListItemId = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node currentNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
- Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
- list.removeElementAt(subQueryListItemId);
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
deleted file mode 100644
index 1ede38f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeUDDIFramesAction extends ResizeFramesAction
-{
- public ResizeUDDIFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(UDDIFrameNames.NAVIGATOR_CONTAINER))
- {
- uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(UDDIFrameNames.PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(UDDIFrameNames.STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
deleted file mode 100644
index 8a165f4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectCategoryNodeAction extends SelectNodeAction
-{
- public SelectCategoryNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getCategoryManager());
- }
-
- // uddi/actions/SelectCategoryNodeAction.jsp?sessionId=...&nodeId=...
- public static String getActionLink(String sessionId,int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectCategoryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory()
- {
- // Do not add this action to the history.
- return null;
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- performBaseAction(nodeId);
- return true;
- }
-
- public final String getTreeContentVar()
- {
- return "categoryBrowserWindowContent";
- }
-
- public final String getTreeContentPage()
- {
- return null;
- }
-
- public final String getPropertiesContainerVar()
- {
- return null;
- }
-
- public final String getPropertiesContainerPage()
- {
- return null;
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
deleted file mode 100644
index cfe4774..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
+++ /dev/null
@@ -1,83 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class SelectFindToolAction extends SelectPropertiesToolAction
-{
- protected String subQueryKey_;
- protected boolean toolLinkChanged_;
-
- public SelectFindToolAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- toolLinkChanged_ = false;
- }
-
- public boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- subQueryKey_ = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- return result;
- }
-
- // /uddi/actions/SelectFindToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...>&subQueryKey=...<&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,String subQueryKey,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectFindToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
- }
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public boolean run()
- {
- if (!super.run())
- return false;
- FormTool formTool = (FormTool)(selectedNode_.getCurrentToolManager().getSelectedTool());
- String currentSubQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- if (subQueryKey_ != null && !subQueryKey_.equals(currentSubQueryKey))
- {
- toolLinkChanged_ = true;
- formTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,subQueryKey_);
- }
- return true;
- }
-
- public boolean requiresViewSelection()
- {
- return toolLinkChanged_;
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,subQueryKey_,true);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
deleted file mode 100644
index 9cbee39..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectNavigatorNodeAction extends SelectNodeAction
-{
- public SelectNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...<&isHistory=1>
- public static String getActionLink(int nodeId,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public String getActionLinkForHistory()
- {
- ToolManager toolManager = selectedNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = selectedNode_.getNodeId();
- selectedTool.getToolId();
- selectedNode_.getViewId();
- selectedNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return selectedTool.getSelectToolActionHref(true);
- else
- return getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
deleted file mode 100644
index b86e157..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
+++ /dev/null
@@ -1,83 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectPropertiesToolAction extends SelectNodeToolAction
-{
- public SelectPropertiesToolAction(Controller controller)
- {
- super(controller, controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // /uddi/actions/SelectPropertiesToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectPropertiesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
- }
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getPropertiesContentVar()
- {
- return "propertiesContent";
- }
-
- public final String getPropertiesContentPage()
- {
- return "uddi/properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
deleted file mode 100644
index e7bb5be..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
+++ /dev/null
@@ -1,229 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class SelectSubQueryItemAction extends SelectPropertiesToolAction
-{
- private boolean requiresTreeViewRefresh_;
- private boolean requiresViewSelection_;
- private boolean newUUIDQueryCreated_;
- private String itemName_;
- public SelectSubQueryItemAction(Controller controller)
- {
- super(controller);
- requiresTreeViewRefresh_ = false;
- requiresViewSelection_ = false;
- newUUIDQueryCreated_ = false;
- itemName_ = null;
- }
-
- // /uddi/actions/SelectSubQueryItemAction.jsp?nodeId=...&toolId=...<&viewId=...>&subQueryKey=...&subQueryListKey=...&subQueryListItemId=...&queryItem=...<&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,String subQueryKey,String subQueryListKey,int subQueryListItemId,int queryItem,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectSubQueryItemActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
- actionLink.append('&').append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
- String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
- String queryItemString = request.getParameter(UDDIActionInputs.QUERY_ITEM);
-
- if (subQueryKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
- if (subQueryListKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
- if (subQueryListItemId != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
- if (queryItemString != null)
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,queryItemString);
- return result;
- }
-
- private final boolean findByUUID()
- {
- Node currentNode = nodeManager_.getSelectedNode();
- FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
- Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
- ListElement listElement = (ListElement)list.elementAt(Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID)));
- int queryItem = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_ITEM));
- FindAction findAction = null;
- String uuidKey = null;
- String uuidKeyValue = null;
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- findAction = new RegFindBusinessUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY;
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- uuidKeyValue = sp.getBusinessKey();
- itemName_ = sp.getDefaultNameString();
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- findAction = new RegFindServiceUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY;
- BusinessService bs = (BusinessService)listElement.getObject();
- uuidKeyValue = bs.getServiceKey();
- itemName_ = bs.getDefaultNameString();
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- findAction = new RegFindServiceInterfaceUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY;
- TModel tModel = (TModel)listElement.getObject();
- uuidKeyValue = tModel.getTModelKey();
- itemName_ = tModel.getNameString();
- }
- Hashtable propertyTable = findAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uuidKeyValue);
- propertyTable.put(uuidKey,uuidKeyValue);
- boolean result = findAction.run();
- if (result)
- {
- Node itemNode = nodeManager_.getSelectedNode();
- int nodeId = itemNode.getNodeId();
- int toolId = itemNode.getToolManager().getSelectedToolId();
- int viewId = ActionInputs.VIEWID_DEFAULT;
- int viewToolId = ActionInputs.VIEWTOOLID_DEFAULT;
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(nodeId));
- propertyTable_.put(ActionInputs.TOOLID,String.valueOf(toolId));
- propertyTable_.put(ActionInputs.VIEWID,String.valueOf(viewId));
- propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
- super.run();
- requiresTreeViewRefresh_ = true;
- requiresViewSelection_ = true;
- newUUIDQueryCreated_ = true;
- listElement.setTargetViewToolInfo(nodeId,toolId,viewId);
- return true;
- }
- else
- {
- // The item is no longer in the registry.
- return false;
- }
- }
-
- public final String getItemName()
- {
- return itemName_;
- }
-
- public boolean run()
- {
- // Given the nodeId, toolId and viewId, check if the node or view is stale.
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
- int viewId = ActionInputs.VIEWID_DEFAULT;
- try
- {
- viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- }
- catch (NumberFormatException e)
- {
- }
- int viewToolId = 0;
- if (!isStaleNode(nodeId))
- {
- // Enusre the node is visible.
- requiresTreeViewRefresh_ = makeNodeVisible(nodeManager_.getNode(nodeId));
-
- Node node = nodeManager_.getNode(nodeId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)(node.getToolManager().getTool(toolId));
- ToolManager elementToolManager = viewTool.getToolManager(viewId);
- if (elementToolManager != null)
- viewToolId = elementToolManager.getSelectedToolId();
- else
- {
- // Stale view
- return findByUUID();
- }
- }
- propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
- return super.run();
- }
- else
- {
- // Stale node
- return findByUUID();
- }
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public boolean requiresTreeViewRefresh()
- {
- return super.requiresTreeViewRefresh()|requiresTreeViewRefresh_;
- }
-
- public boolean requiresViewSelection()
- {
- return super.requiresViewSelection()|requiresViewSelection_;
- }
-
- public boolean requiresStatusUpdate()
- {
- return newUUIDQueryCreated_;
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
deleted file mode 100644
index 1995301..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetBusinessAction extends NodeAction
-{
- private ServiceNode serviceNode_;
- public ServiceGetBusinessAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- serviceNode_ = null;
- }
-
- // uddi/actions/ServiceGetBusinessActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetBusinessActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateService()
- {
- int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
- ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_BUSINESS",serviceNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,bs.getBusinessKey());
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
deleted file mode 100644
index 336ef1a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetServiceInterfacesAction extends UDDINodeAction
-{
- private ServiceNode serviceNode_;
- public ServiceGetServiceInterfacesAction(Controller controller)
- {
- super(controller);
- serviceNode_ = null;
- }
-
- // uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateService()
- {
- int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
- ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_SERVICE_INTERFACES",serviceNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,Boolean.TRUE);
- ListElement serviceListElement = new ListElement(bs);
- serviceListElement.setTargetViewToolInfo(serviceNode_.getNodeId(),serviceNode_.getToolManager().getSelectedToolId(),serviceNode_.getViewId());
- Vector serviceListVector = new Vector();
- serviceListVector.addElement(serviceListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,serviceListVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
deleted file mode 100644
index 683b728..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetBusinessesAction extends UDDINodeAction
-{
- private ServiceInterfaceNode siNode_;
- public ServiceInterfaceGetBusinessesAction(Controller controller)
- {
- super(controller);
- siNode_ = null;
- }
-
- // uddi/actions/ServiceInterfacGetBusinessesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateServiceInterface()
- {
- int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_BUSINESSES",siNode_.getNodeName()));
-
- ListElement siListElement = new ListElement(tModel);
- siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
- Vector siListVector = new Vector();
- siListVector.addElement(siListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,siListVector);
-
- Vector tModelKeyStringVector = new Vector();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
deleted file mode 100644
index e53a479..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetServicesAction extends UDDINodeAction
-{
- private ServiceInterfaceNode siNode_;
- public ServiceInterfaceGetServicesAction(Controller controller)
- {
- super(controller);
- siNode_ = null;
- }
-
- // uddi/actions/ServiceInterfacGetServicesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateServiceInterface()
- {
- int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_SERVICES",siNode_.getNodeName()));
-
- ListElement siListElement = new ListElement(tModel);
- siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
- Vector siListVector = new Vector();
- siListVector.addElement(siListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,siListVector);
-
- Vector tModelKeyStringVector = new Vector();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
deleted file mode 100644
index aab8643..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.AssertionStatusItem;
-import org.uddi4j.response.AssertionStatusReport;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RelatedBusinessInfo;
-import org.uddi4j.response.RelatedBusinessesList;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.SharedRelationships;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-
-public class ShowPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected boolean subQueryInitiated_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
-
- public ShowPublisherAssertionsAction(Controller controller)
- {
- super(controller);
-
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
- // Validate the data.
- controller_.getUDDIPerspective();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- // if not yet logged in, validate the parameters needed to log in
- // NOTE: This action does NOT require the user to be logged in.
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- return true;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public boolean run()
- {
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- if (!(selectedElement instanceof BusinessElement))
- return false;
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- if (Validator.validateURL(publishURL) &&
- Validator.validateString(userID) &&
- password != null) {
- registryElement.performLogin(publishURL, userID, password);
- isLoggedIn_ = registryElement.isLoggedIn();
- }
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- // show all assertion iff is logged in and business is owned
- // else show only completed ones
- BusinessElement busElement = (BusinessElement)selectedElement;
- if (isLoggedIn_ && isBusinessOwned(busElement))
- return showPublisherAssertionsForOwnedBus(busElement);
- else
- return showPublisherAssertionsForNonOwnedBus(busElement);
- }
-
- private boolean showPublisherAssertionsForOwnedBus(BusinessElement busElement) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- // try to get a list of all publisher assertion based on the current registry's authToken
- ListManager listManager = new ListManager();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
- Vector queryInputVector = new Vector();
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- registryElement.getUserId();
- registryElement.getCred();
-
- // show all publisher assertions
- UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
- AssertionStatusReport assertionReport;
- try {
- assertionReport = proxy.get_assertionStatusReport(registryElement.getAuthInfoString(), (CompletionStatus)null);
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- Vector assertionVector = assertionReport.getAssertionStatusItemVector();
- Vector otherBusinessKeys = new Vector();
- Vector pubAssertionElements = new Vector();
-
- for (int i = 0; i < assertionVector.size(); i++) {
- AssertionStatusItem assertionItem = (AssertionStatusItem)assertionVector.elementAt(i);
- // determine the from/to business keys
- String fromKey = assertionItem.getFromKey().getText();
- String toKey = assertionItem.getToKey().getText();
- String owningBusinessKey = busElement.getBusinessEntity().getBusinessKey();
- // ignore this assertion if neither the from key nor the to key equals to this business's key
- if (!owningBusinessKey.equals(fromKey) && !owningBusinessKey.equals(toKey))
- continue;
- String otherBusinessKey = ((owningBusinessKey.equals(fromKey)) ? toKey : fromKey);
- // retrieve the information of the "other business"
- otherBusinessKeys.add(otherBusinessKey);
-
- // retrieve the status of the publisher assertion
- String status = assertionItem.getCompletionStatus().getText();
- KeyedReference keyedRef = assertionItem.getKeyedReference();
- PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
- fromKey,
- toKey,
- owningBusinessKey,
- null,
- -1,
- status,
- keyedRef);
- pubAssertionElements.add(pubAssertionElement);
- }
- if (otherBusinessKeys.size() > 0) {
- Vector busEntities;
- try {
- busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
- }
- catch (Exception ex) {
- busEntities = new Vector();
- if (otherBusinessKeys.size() > 1) {
- for (int j = 0; j < otherBusinessKeys.size(); j++) {
- try {
- busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception) {
- pubAssertionElements.remove(j);
- }
- }
- }
- else
- pubAssertionElements.remove(0);
- }
- for (int j = 0; j < busEntities.size(); j++) {
- BusinessEntity be = (BusinessEntity)busEntities.get(j);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)pubAssertionElements.get(j);
- ListElement le = new ListElement(be);
- queryInputVector.add(le);
- int subQueryItemId = queryInputVector.indexOf(le);
- pubAssertionElement.setServiceProvider(le);
- pubAssertionElement.setSubQueryItemId(subQueryItemId);
- listManager.add(new ListElement(pubAssertionElement));
- }
- }
- busElement.setPublisherAssertions(listManager);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
- return true;
- }
-
- private boolean showPublisherAssertionsForNonOwnedBus(BusinessElement busElement) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- // try to get a list of publisher assertions based on the business key
- ListManager listManager = new ListManager();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
- Vector queryInputVector = new Vector();
- UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
- RelatedBusinessesList relatedBusList;
- try {
- relatedBusList = proxy.find_relatedBusinesses(busElement.getBusinessEntity().getBusinessKey(),
- (KeyedReference)null,
- (FindQualifiers)null);
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- Vector relatedBusVector = relatedBusList.getRelatedBusinessInfos().getRelatedBusinessInfoVector();
- Vector otherBusinessKeys = new Vector();
- Vector pubAssertionElements = new Vector();
- for (int i = 0; i < relatedBusVector.size(); i++) {
- RelatedBusinessInfo relatedBusInfo = (RelatedBusinessInfo)relatedBusVector.elementAt(i);
- // determine the from/to business keys
- String fromKey;
- String toKey;
- String owningBusinessKey;
- if (relatedBusInfo.getDefaultSharedRelationships().getDirection().equals(SharedRelationships.DIRECTION_FROMKEY)) {
- fromKey = busElement.getBusinessEntity().getBusinessKey();
- toKey = relatedBusInfo.getBusinessKey();
- owningBusinessKey = fromKey;
- otherBusinessKeys.add(toKey);
- }
- else {
- fromKey = relatedBusInfo.getBusinessKey();
- toKey = busElement.getBusinessEntity().getBusinessKey();
- owningBusinessKey = toKey;
- otherBusinessKeys.add(fromKey);
- }
-
- Vector keyedRefVector = relatedBusInfo.getDefaultSharedRelationships().getKeyedReferenceVector();
- PublisherAssertionElement[] pubAssertionElementArray = new PublisherAssertionElement[keyedRefVector.size()];
- for (int k = 0; k < keyedRefVector.size(); k++) {
- // retrieve the status of the publisher assertion
- String status = CompletionStatus.COMPLETE;
- KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(k);
- PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
- fromKey,
- toKey,
- owningBusinessKey,
- null,
- -1,
- status,
- keyedRef);
- pubAssertionElementArray[k] = pubAssertionElement;
- }
- pubAssertionElements.add(pubAssertionElementArray);
- }
- if (otherBusinessKeys.size() > 0) {
- Vector busEntities;
- try {
- busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
- }
- catch (Exception ex) {
- busEntities = new Vector();
- if (otherBusinessKeys.size() > 1) {
- for (int j = 0; j < otherBusinessKeys.size(); j++) {
- try {
- busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception) {
- pubAssertionElements.remove(j);
- }
- }
- }
- else
- pubAssertionElements.remove(0);
- }
- for (int j = 0; j < busEntities.size(); j++) {
- BusinessEntity be = (BusinessEntity)busEntities.get(j);
- ListElement le = new ListElement(be);
- queryInputVector.add(le);
- int subQueryItemId = queryInputVector.indexOf(le);
- PublisherAssertionElement[] pubAssertionElementArray = (PublisherAssertionElement[])pubAssertionElements.get(j);
- for (int k = 0; k < pubAssertionElementArray.length; k++) {
- pubAssertionElementArray[k].setServiceProvider(le);
- pubAssertionElementArray[k].setSubQueryItemId(subQueryItemId);
- listManager.add(new ListElement(pubAssertionElementArray[k]));
- }
- }
- }
- busElement.setPublisherAssertions(listManager);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
deleted file mode 100644
index e9019b5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromUDDIAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromUDDIAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- uddiPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
deleted file mode 100644
index 513d366..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class ToggleCategoryNodeAction extends ToggleNodeAction
-{
- public ToggleCategoryNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getCategoryManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?sId=...&nodeId=...&open=...
- public static final String getActionLink(String sessionId,int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleCategoryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- performBaseAction(nodeId);
- return true;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final String getTreeContentVar()
- {
- return "categoryBrowserWindowContent";
- }
-
- public final String getTreeContentPage()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return OpenCategoryBrowserAction.getCategoryContentPage(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
- }
-
- public final String getTreeContainerPage()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return OpenCategoryBrowserAction.getActionLink(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
- }
-
- public final String getPropertiesContainerVar()
- {
- return null;
- }
-
- public final String getPropertiesContainerPage()
- {
- return null;
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
deleted file mode 100644
index a66d564..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleNavigatorNodeAction extends ToggleNodeAction
-{
- public ToggleNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
- public static String getActionLink(int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- // This should be called only to select the toggled node when, at the time of
- // the collapse event, a descendant node was selected.
- public final String getActionLinkForHistory()
- {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- else
- return SelectNavigatorNodeAction.getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
deleted file mode 100644
index fa62931..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class TransferSubQueryResultsAction extends UDDIPropertiesFormAction
-{
- private Node targetNode_;
- public TransferSubQueryResultsAction(Controller controller)
- {
- super(controller);
- targetNode_ = null;
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public static final String getActionLinkForReturn()
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/TransferSubQueryResultsActionJSP.jsp?");
- actionLink.append(UDDIActionInputs.SHOW_RESULTS_TARGET).append("=1");
- return actionLink.toString();
- }
-
- public final void enableShowResultsTarget()
- {
- // This should only be called if the user clicks on the target link on the query results page. Insert a zero element
- // array so that no results are transferred but the jump back to the correct query and its info occurs.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,new String[0]);
- }
-
- public final boolean run()
- {
- // Transfer the results in this Query node into the property expected by the originating node.
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
-
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- Node currentNode = getSelectedNavigatorNode();
- TreeElement currentElement = currentNode.getTreeElement();
- SubQueryTransferTarget target = (SubQueryTransferTarget)(currentElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET));
- String subQueryKey = target.getSubQueryKey();
- String targetQueryKey;
-
- int lastSeparatorPos = subQueryKey.lastIndexOf(':');
- if (lastSeparatorPos == -1)
- targetQueryKey = "";
- else
- targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-
- String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
- FormTool targetFormTool = target.getTargetFormTool();
- ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(subQueryKey);
- FormToolPropertiesInterface targetQueryFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
- Vector targetList = (Vector)targetQueryFormToolPI.getProperty(targetProperty);
- if (targetList == null)
- targetList = new Vector();
-
- NodeManager nodeManager = currentNode.getNodeManager();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- int selectedNodeId = Integer.parseInt(selectedNodeIds[i]);
- Node selectedNode = nodeManager.getNode(selectedNodeId);
- TreeElement treeElement = selectedNode.getTreeElement();
- Object object;
- if (treeElement instanceof BusinessElement)
- object = ((BusinessElement)treeElement).getBusinessEntity();
- else if (treeElement instanceof ServiceElement)
- object = ((ServiceElement)treeElement).getBusinessService();
- else
- {
- // Service interface
- object = ((ServiceInterfaceElement)treeElement).getTModel();
- }
- ListElement targetListElement = new ListElement(object);
- targetListElement.setTargetViewToolInfo(selectedNodeId,selectedNode.getToolManager().getSelectedToolId(),selectedNode.getViewId());
- if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
- {
- // Clear the manager so a replacement occurs.
- targetList.removeAllElements();
- }
- targetList.addElement(targetListElement);
- }
- targetQueryFormToolPI.setProperty(targetProperty,targetList);
- Hashtable savedParentQueryProperties = target.getParentQueryData();
- Enumeration e = savedParentQueryProperties.keys();
- while (e.hasMoreElements())
- {
- String key = (String)e.nextElement();
- targetQueryFormToolPI.setProperty(key,savedParentQueryProperties.get(key));
- }
-
- // Select the node and the datastructure which is the target of the subquery.
- int targetNodeId = target.getNodeId();
- int targetToolId = target.getToolId();
- int targetViewId = target.getViewId();
- int targetViewToolId = target.getViewToolId();
- nodeManager.setSelectedNodeId(targetNodeId);
- targetNode_ = nodeManager.getSelectedNode();
- targetNode_.getToolManager().setSelectedToolId(targetToolId);
- targetNode_.setViewId(targetViewId);
- if (targetViewId != ActionInputs.VIEWID_DEFAULT)
- targetNode_.getViewToolManager().setSelectedToolId(targetViewToolId);
- targetFormTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,targetQueryKey);
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,SelectFindToolAction.getActionLink(targetNodeId,targetToolId,targetViewId,targetViewToolId,targetQueryKey,true));
- return true;
- }
-
- public final Node getTargetNode()
- {
- return targetNode_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
deleted file mode 100644
index 41b5083..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class TransferToAddCategoryDataAction extends Action
-{
- public TransferToAddCategoryDataAction()
- {
- }
-
- // uddi/actions/TransferToAddCategoryDataActionJSP.jsp?sessionId=...&categoryTModelKey=...
- public static final String getActionLink(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/TransferToAddCategoryDataActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
- return actionLink.toString();
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
deleted file mode 100644
index b99e81b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class UDDIAddToWSDLPerspectiveAction extends LinkAction
-{
- public UDDIAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolId);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewId);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolId);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeIdString = request.getParameter(ActionInputs.NODEID);
- // Perform data validation.
- try
- {
- Integer.parseInt(nodeIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.NODEID,nodeIdString);
- return true;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node node = nodeManager.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlURL = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- if (wsdlURL == null)
- {
- try
- {
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
- File tempFile = File.createTempFile("temp",".wsdl");
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
- wsdlURL = tempFile.toURL().toString();
- }
- catch (WSDLException e)
- {
- wsdlURL = null;
- }
- catch (MalformedURLException e)
- {
- wsdlURL = null;
- }
- catch (IOException e)
- {
- wsdlURL = null;
- }
- }
-
- if (wsdlURL != null)
- {
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- boolean actionResult = openWSDLAction.run();
- if (actionResult) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE",wsdlURL));
- return true;
- }
- }
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE"));
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java
deleted file mode 100644
index cffa842..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java
+++ /dev/null
@@ -1,35 +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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-
-public class UDDIExceptionHandler {
-
- public static boolean requiresReset(UDDIException e){
-
- DispositionReport dp = e.getDispositionReport();
- Vector rv = dp.getResultVector();
- for(int i = 0;i < rv.size();i++){
- Result result = (Result)rv.get(i);
- if(result.getErrno().equals("10140"))
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
deleted file mode 100644
index bbfdd65..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
- private NodeManager nodeManager_;
- private Definition def_;
- private String defaultWSDLFileName_;
-
- public UDDIImportWSDLToFileSystemAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getUDDIPerspective().getNavigatorManager();
- def_ = null;
- defaultWSDLFileName_ = "temp.wsdl";
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public final boolean write(OutputStream os)
- {
- return writeWSDLDefinition(os,def_);
- }
-
- public final String getDefaultFileName()
- {
- return defaultWSDLFileName_;
- }
-
- public final boolean run()
- {
- MessageQueue messageQueue = controller_.getUDDIPerspective().getMessageQueue();
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlUrl = null;
- if (node != null)
- {
- TreeElement element = node.getTreeElement();
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- }
- else if (element instanceof ServiceInterfaceElement)
- {
- TModel tModel = ((ServiceInterfaceElement)element).getTModel();
- wsdlUrl = uddi4jHelper.getWSDL(tModel);
- }
- }
- if (wsdlUrl != null)
- {
- try
- {
- def_ = uddi4jHelper.getWSDLDefinition(wsdlUrl);
- if (def_ != null)
- {
- String wsdlPathname;
- int index = wsdlUrl.indexOf('/');
- if (index != -1)
- wsdlPathname = wsdlUrl.substring(index+1, wsdlUrl.length());
- else
- wsdlPathname = wsdlUrl;
- defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlPathname);
- }
- return true;
- }
- catch (Throwable t)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
- }
- }
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 7f823d9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class UDDIImportWSDLToWorkbenchAction extends ImportToWorkbenchAction
-{
- public UDDIImportWSDLToWorkbenchAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
deleted file mode 100644
index 6095284..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDILaunchWebServiceWizardAction extends LaunchWebServiceWizardAction
-{
- public UDDILaunchWebServiceWizardAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node node = nodeManager.getSelectedNode();
- TreeElement element = node.getTreeElement();
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlUrl = null;
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- }
- else if (element instanceof ServiceInterfaceElement)
- {
- TModel tModel = ((ServiceInterfaceElement)element).getTModel();
- wsdlUrl = uddi4jHelper.getWSDL(tModel);
- }
-
- try
- {
- if (wsdlUrl != null)
- {
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlUrl);
- File tempFile = File.createTempFile("temp",".wsdl");
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
- wsdlUrl = tempFile.toURL().toString();
- return launchWizard(wsdlUrl);
- }
- }
- catch (Throwable t)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
- }
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
deleted file mode 100644
index 9a5892a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDINodeAction extends NodeAction
-{
- protected RegistryNode regNode_;
- public UDDINodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- regNode_ = getRegistryNode();
- }
-
- public final Node getSelectedNavigatorNode()
- {
- Node selectedNavigatorNode = nodeManager_.getSelectedNode();
- return selectedNavigatorNode;
- }
-
- public final RegistryNode getRegistryNode()
- {
- UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager_.getRootNode();
- return uddiMainNode.getRegistryNode(getSelectedNavigatorNode());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
deleted file mode 100644
index 15801df..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDIPropertiesFormAction extends FormAction
-{
- protected NodeManager navigatorManager_;
- public UDDIPropertiesFormAction(Controller controller)
- {
- super(controller);
- navigatorManager_ = controller.getUDDIPerspective().getNavigatorManager();
- }
-
- public final Node getSelectedNavigatorNode()
- {
- return navigatorManager_.getSelectedNode();
- }
-
- public final FormTool getSelectedFormTool()
- {
- return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- }
-
- public final RegistryNode getRegistryNode()
- {
- return getRegistryNode(getSelectedNavigatorNode());
- }
-
- public final RegistryNode getRegistryNode(Node registryChildNode)
- {
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager_.getRootNode();
- return uddiMainNode.getRegistryNode(registryChildNode);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
deleted file mode 100644
index 9dc37d3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.transport.TransportException;
-
-public class UnpublishAction extends UDDIPropertiesFormAction
-{
- protected RegistryNode registryNode_;
- protected boolean isLoggedIn_;
-
- public UnpublishAction(Controller controller)
- {
- super(controller);
- registryNode_ = getRegistryNode();
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!regElement.isLoggedIn())
- {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- boolean inputsValid = true;
- if (publishURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL, publishURL);
-
- if (!Validator.validateURL(publishURL))
- {
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-
- if (!Validator.validateString(userId))
- {
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD, password);
-
- formTool.updatePropertyTable(propertyTable_);
-
- return inputsValid;
- }
-
- return true;
- }
-
- public boolean run()
- {
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- try
- {
- if (!registryElement.isLoggedIn())
- {
- // if not yet logged in, log in first
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- registryElement.performLogin(publishURL,userId,password);
- }
-
- String selectedElementKey = selectedElement.getKey();
- String unpublishTypeMessageKey = null;
- UDDIProxy proxy = registryElement.getProxy();
- String authInfo = registryElement.getAuthInfoString();
- DispositionReport dr = null;
- if (selectedElement instanceof BusinessElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_BUSINESS_UNPUBLISHED";
- dr = proxy.delete_business(authInfo,selectedElementKey);
- }
- else if (selectedElement instanceof ServiceElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_SERVICE_UNPUBLISHED";
- dr = proxy.delete_service(authInfo,selectedElementKey);
- }
- else if (selectedElement instanceof ServiceInterfaceElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED";
- dr = proxy.delete_tModel(authInfo,selectedElementKey);
- }
- if (!dr.success())
- throw new Exception(dr.toString());
- else
- {
- selectedElement.disconnectAll();
- messageQueue.addMessage(uddiPerspective.getMessage(unpublishTypeMessageKey,selectedElement.getName()));
- return true;
- }
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- return false;
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- registryElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- return false;
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- return false;
- }
- catch (Exception e)
- {
- handleUnexpectedException(uddiPerspective, messageQueue, "Exception", e);
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
deleted file mode 100644
index 62e466a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
+++ /dev/null
@@ -1,185 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class UpdateAction extends UDDIPropertiesFormAction
-{
- protected RegistryNode regNode_;
- private boolean requiresAuthentication_;
- public UpdateAction(Controller controller,boolean requiresAuthentication)
- {
- super(controller);
- regNode_ = getRegistryNode();
- requiresAuthentication_ = requiresAuthentication;
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = formTool;
- formToolPI.clearErrors();
- boolean inputsValid = processOthers(parser,formToolPI);
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = !regElement.isLoggedIn() & requiresAuthentication_;
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- public abstract boolean refreshFromRegistry();
-
- protected final void refreshNode(BusinessEntity be)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- BusinessElement newBusinessElement = new BusinessElement(be,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newBusinessElement);
- }
-
- protected final void refreshNode(BusinessService bs)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- ServiceElement newServiceElement = new ServiceElement(bs,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newServiceElement);
- }
-
- protected final void refreshNode(TModel tModel)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- ServiceInterfaceElement newServiceInterfaceElement = new ServiceInterfaceElement(tModel,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newServiceInterfaceElement);
- }
-
- private final void connectElements(Node parentNode,TreeElement newElement)
- {
- TreeElement parentElement = parentNode.getTreeElement();
- String rel = null;
- if (parentNode instanceof PublishedItemsNode)
- rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
- else
- {
- // QueryNode
- rel = UDDIModelConstants.REL_QUERY_RESULTS;
- }
- parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
- Node newNode = parentNode.getChildNode(newElement);
- int newNodeId = newNode.getNodeId();
- NodeManager nodeManager = parentNode.getNodeManager();
- nodeManager.setSelectedNodeId(newNodeId);
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- protected final void reindexListElementVector(Vector v)
- {
- for (int i=0;i<v.size();i++)
- {
- ListElement listElement = (ListElement)v.elementAt(i);
- listElement.setViewId(i);
- // targetViewId determines whether or not a successfully validated list element remains in edit state.
- }
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
deleted file mode 100644
index 7b51d03..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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:
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateBusinessAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateBusinessAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String[] discoveryURLModifiedStates = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_MODIFIED);
- String[] discoveryURLViewIds = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_VIEWID);
- String[] discoveryURLs = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
- String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
- String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
- String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-
-
- if (discoveryURLModifiedStates != null && discoveryURLViewIds != null && discoveryURLs != null)
- {
- Vector oldDiscoveryURLListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- Vector newDiscoveryURLListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
- for (int i=0;i<discoveryURLs.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLs[i],"");
- if (!Validator.validateURL(discoveryURLs[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int discoveryURLViewId = Integer.parseInt(discoveryURLViewIds[i]);
- boolean isModified = Boolean.valueOf(discoveryURLModifiedStates[i]).booleanValue();
-
- if (discoveryURLViewId == -1 || isModified)
- newDiscoveryURLListElementVector.addElement(new ListElement(discoveryURL));
- else
- newDiscoveryURLListElementVector.addElement(oldDiscoveryURLListElementVector.elementAt(discoveryURLViewId));
- }
- reindexListElementVector(newDiscoveryURLListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,newDiscoveryURLListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- Hashtable languageHash = new Hashtable();
- if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
- {
- Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector newNameListElementVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(names[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int nameViewId = Integer.parseInt(nameViewIds[i]);
- boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
- if (nameViewId == -1 || isModified)
- newNameListElementVector.addElement(new ListElement(uddi4jName));
- else
- newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
- }
- reindexListElementVector(newNameListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,newNameListElementVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
-
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
- if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- Vector newIdListElementVector = new Vector();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- int idViewId = Integer.parseInt(idViewIds[i]);
- boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
- if (idViewId == -1 || isModified)
- newIdListElementVector.addElement(new ListElement(kr));
- else
- newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
- }
- reindexListElementVector(newIdListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,newIdListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
- BusinessEntity be;
- if (beVector.size() > 0)
- be = (BusinessEntity)beVector.get(0);
- else
- be = null;
- if (be != null)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,be);
- return true;
- }
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- Vector discoveryURLListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- Vector discoveryURLVector = new Vector();
- if (discoveryURLListElementVector != null)
- {
- for (int i=0;i<discoveryURLListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)discoveryURLListElementVector.elementAt(i);
- DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
- discoveryURLVector.addElement(discoveryURL);
- }
- }
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- IdentifierBag idBag = null;
- if (idListElementVector != null)
- {
- idBag = new IdentifierBag();
- for (int i=0;i<idListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)idListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- idBag.add(kr);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- if (discoveryURLVector.size() > 0)
- be.setDiscoveryURLs(new DiscoveryURLs(discoveryURLVector));
- else
- be.setDiscoveryURLs(null);
- be.setNameVector(nameVector);
- be.setDescriptionVector(descriptionVector);
- be.setIdentifierBag(idBag);
- be.setCategoryBag(catBag);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = new Vector();
- beVector.add(be);
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- refreshNode(be);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_UPDATED",be.getDefaultNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
deleted file mode 100644
index 0f6f173..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
+++ /dev/null
@@ -1,127 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.text.ParseException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public class UpdateRegistryAction extends UpdateAction
-{
- public UpdateRegistryAction(Controller controller)
- {
- super(controller,false);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- String[] userDefinedCategoryTModelKeys = parser.getParameterValues(UDDIActionInputs.CATEGORY_TMODEL_KEY);
- String[] userDefinedCategoryData = parser.getParameterValues(UDDIActionInputs.CATEGORY_FILENAME);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (nameModifiedState != null && name != null)
- {
- boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
- String newName;
- if (isModified)
- newName = name;
- else
- newName = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,newName);
- if (!Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-
- if (userDefinedCategoryTModelKeys != null && userDefinedCategoryData != null)
- {
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- for (int i=0;i<userDefinedCategoryTModelKeys.length;i++)
- {
- CategoryModel userDefinedCategory = regElement.getUserDefinedCategory(userDefinedCategoryTModelKeys[i]);
-// TODO: Move UDDIPreferenceContext down to org.eclipse.wst.ws
-// UDDIPreferenceContext context = WebServicePlugin.getInstance().getUDDIPreferenceContext();
-// userDefinedCategory.setColumnDelimiter(context.getUddiCatDataColumnDelimiter());
-// userDefinedCategory.setStringDelimiter(context.getUddiCatDataStringDelimiter());
- userDefinedCategory.setColumnDelimiter("#");
- userDefinedCategory.setStringDelimiter("\"");
- String displayName = userDefinedCategory.getDisplayName();
- if (userDefinedCategoryData[i] == null || userDefinedCategoryData[i].length() < 1)
- {
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE",displayName));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- }
- else
- {
- byte rc = userDefinedCategory.loadData(new BufferedReader(new StringReader(userDefinedCategoryData[i])));
- switch (rc)
- {
- case CategoryModel.OPERATION_SUCCESSFUL:
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED",displayName));
- break;
- case CategoryModel.ERROR_FILE:
- inputsValid = false;
- ParseException pe = (ParseException)userDefinedCategory.getErrorException();
- String[] args1 = {String.valueOf(pe.getErrorOffset()),displayName,pe.getMessage(),userDefinedCategory.getCategoryKey()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT",args1));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- break;
- case CategoryModel.ERROR_CATEGORY_KEY:
- default:
- inputsValid = false;
- String[] args2 = {displayName,userDefinedCategory.getErrorException().getMessage(),userDefinedCategory.getCategoryKey()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY",args2));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- }
- }
- }
- }
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- return true;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setName(name);
- regNode_.getTreeElement().setName(name);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_UPDATED",name));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
deleted file mode 100644
index aaabfb6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegPublishTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateServiceAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidBusinessKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String uuidServiceKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
- String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
- String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidBusinessKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidBusinessKey);
-
- if (uuidServiceKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidServiceKey);
-
- if (wsdlURLModifiedState != null && wsdlURL != null)
- {
- ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
- if (isModified)
- wsdlURLListElement = new ListElement(wsdlURL);
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
- if (!Validator.validateURL(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-
- Hashtable languageHash = new Hashtable();
- if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
- {
- Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector newNameListElementVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(names[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int nameViewId = Integer.parseInt(nameViewIds[i]);
- boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
- if (nameViewId == -1 || isModified)
- newNameListElementVector.addElement(new ListElement(uddi4jName));
- else
- newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
- }
- reindexListElementVector(newNameListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,newNameListElementVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
-
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshBusinessFromRegistry()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- try
- {
- String uuidBusinessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = proxy.get_businessDetail(uuidBusinessKey).getBusinessEntityVector();
- BusinessEntity be;
- if (beVector.size() > 0)
- be = (BusinessEntity)beVector.get(0);
- else
- be = null;
- if (be != null)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_BUSINESS,be);
- return true;
- }
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- return false;
- }
-
- public final boolean refreshFromRegistry()
- {
- controller_.getUDDIPerspective();
- try
- {
- String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidServiceKey);
- Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
- if (businessServiceVector.size() > 0)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,businessServiceVector.elementAt(0));
- return true;
- }
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final RegPublishTool setupRegPublishTool()
- {
- // Prepare for re-publishing a now-stale service whose business has also been eliminated.
- RegPublishTool regPublishTool = regNode_.getRegPublishTool();
- regPublishTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- regPublishTool.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- regPublishTool.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL));
-
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
- else
- regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
- else
- regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- if (descriptionVector != null)
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
- if (catBag != null)
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- return regPublishTool;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_BUSINESS);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- String wsdlURL = (String)wsdlURLListElement.getObject();
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- // Note: The JSP will prevent this routine from executing if be is null.
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
- // Publish/update the service interfaces first.
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
-
- Hashtable tModelsTable = new Hashtable();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
-
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- {
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- }
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
-
- BusinessService busService = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- if (isUpdate_)
- busService.setServiceKey(uuidServiceKey);
- busService.setBusinessKey(be.getBusinessKey());
- busService.setNameVector(nameVector);
- busService.setDescriptionVector(descriptionVector);
- busService.setCategoryBag(catBag);
- regElement.handlePreInvocation(busService);
- Vector bsVector = new Vector();
- bsVector.add(busService);
- busService = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- refreshNode(busService);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_UPDATED",busService.getDefaultNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",busService.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
deleted file mode 100644
index b8456b2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceInterfaceAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateServiceInterfaceAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
- String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
- String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
- if (wsdlURLModifiedState != null && wsdlURL != null)
- {
- ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
- if (isModified)
- wsdlURLListElement = new ListElement(wsdlURL);
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
- if (!Validator.validateURL(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-
- if (nameModifiedState != null && name != null)
- {
- ListElement nameListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
- if (isModified)
- nameListElement = new ListElement(name);
- else
- name = (String)nameListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
- if (!Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-
- Hashtable languageHash = new Hashtable();
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
- if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- Vector newIdListElementVector = new Vector();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- int idViewId = Integer.parseInt(idViewIds[i]);
- boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
- if (idViewId == -1 || isModified)
- newIdListElementVector.addElement(new ListElement(kr));
- else
- newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
- }
- reindexListElementVector(newIdListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,newIdListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- controller_.getUDDIPerspective();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
- Vector tModelVector = tModelDetail.getTModelVector();
- if (tModelVector.size() > 0)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModelVector.elementAt(0));
- return true;
- }
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- ListElement nameListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- String wsdlURL = (String)wsdlURLListElement.getObject();
-
- String name = (String)nameListElement.getObject();
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- IdentifierBag idBag = null;
- if (idListElementVector != null)
- {
- idBag = new IdentifierBag();
- for (int i=0;i<idListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)idListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- idBag.add(kr);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- if (isUpdate_)
- tModel.setTModelKey(uuidKey);
- tModel.setName(name);
- tModel.setDescriptionVector(descriptionVector);
- tModel.setIdentifierBag(idBag);
- tModel.setCategoryBag(catBag);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- refreshNode(tModel);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_UPDATED",tModel.getNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
deleted file mode 100644
index f47b2b0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
+++ /dev/null
@@ -1,209 +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.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIActionInputs
-{
- // OpenRegistryAction
- public static final String REGISTRY_NAME = "registryName";
- public static final String INQUIRY_URL = "inquiryURL";
- public static final String PUBLISH_URL = "publishURL";
- public static final String REGISTRATION_URL = "registrationURL";
- public static final String CHECK_USER_DEFINED_CATEGORIES = "checkUserDefinedCategories";
- public static final String UDDI_USERNAME = "uddiUsername";
- public static final String UDDI_PASSWORD = "uddiPassword";
-
- // Fixed and user-defined categories
- public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
- public static final String CATEGORY_TMODEL_KEY = "categoryTModelKey";
- public static final String CATEGORY_FILENAME = "categoryFileName";
- public static final String USER_DEFINED_CATEGORIES = "userDefinedCategories";
-
- // Discovery URL use type
- public static final String DISCOVERY_URL_TYPE = "businessEntity";
-
- // Results (NODEID)
- public static final String NODEID_SERVICE_INTERFACE = "nodeId_ServiceInterface";
- public static final String NODEID_SERVICE = "nodeId_Service";
- public static final String NODEID_BUSINESS = "nodeId_Business";
-
- // RegFind..Actions/RegPublish..Actions
- public static final String QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE = "overrideAddQueryNode";
- public static final String QUERY_NAME = "queryName";
- public static final String QUERY_ITEM = "queryItem";
- public static final int QUERY_ITEM_QUERIES = -1;
- public static final int QUERY_ITEM_BUSINESSES = 0;
- public static final int QUERY_ITEM_SERVICES = 1;
- public static final int QUERY_ITEM_SERVICE_INTERFACES = 2;
- public static final int QUERY_STYLE_SIMPLE = 0;
- public static final int QUERY_STYLE_ADVANCED = 1;
- public static final int QUERY_STYLE_UUID = 2;
- public static final String QUERY_INPUT_ADVANCED_OWNED = "advancedOwned";
- public static final String QUERY_INPUT_ADVANCED_PUBLISH_URL = "advancedPublishURL";
- public static final String QUERY_INPUT_ADVANCED_USERID = "advancedUserId";
- public static final String QUERY_INPUT_ADVANCED_PASSWORD = "advancedPassword";
- public static final String QUERY_INPUT_ADVANCED_NAME_LANGUAGE = "advancedNameLanguage";
- public static final String QUERY_INPUT_ADVANCED_NAME = "advancedName";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE = "advancedIdentifierType";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME = "advancedIdentifierKeyName";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE = "advancedIdentifierKeyValue";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_TYPE = "advancedCategoryType";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME = "advancedCategoryKeyName";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE = "advancedCategoryKeyValue";
- public static final String QUERY_INPUT_ADVANCED_DISCOVERYURL = "advancedDiscoveryURL";
- public static final String QUERY_INPUT_ADVANCED_FINDQUALIFIER = "advancedFindQualifier";
- public static final String QUERY_INPUT_ADVANCED_SORT_BY_NAME = "advancedSortByName";
- public static final String QUERY_INPUT_ADVANCED_SORT_BY_DATE = "advancedSortByDate";
- public static final String QUERY_INPUT_ADVANCED_MAX_SEARCH_SET = "advancedMaxSearchSet";
- public static final int QUERY_MAX_SEARCH_SET = 100;
- public static final String QUERY_INPUT_ADVANCED_MAX_RESULTS = "advancedMaxResults";
- public static final int QUERY_MAX_RESULTS = 10;
-
- public static final String QUERY_STYLE_BUSINESSES = "queryStyleBusinesses";
- public static final String QUERY_INPUT_SIMPLE_BUSINESS_NAME = "simpleBusinessName";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_OWNED = "advancedBusinessOwned";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_NAMES = "advancedBusinessNames";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS = "advancedBusinessIdentifiers";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES = "advancedBusinessCategories";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS = "advancedBusinessDiscoveryURLs";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES = "advancedBusinessServiceInterfaces";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY = "advancedBusinessServiceInterfacesCopy";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG = "advancedBusinessTModelBag";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS = "advancedBusinessFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET = "advancedBusinessMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS = "advancedBusinessMaxResults";
-
- public static final String QUERY_STYLE_SERVICES = "queryStyleServices";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_NAME = "simpleServiceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_OWNED = "advancedServiceOwned";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS = "advancedServiceBusiness";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY = "advancedServiceBusinessCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER = "advancedServiceServiceProvider";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_NAMES = "advancedServiceNames";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES = "advancedServiceCategories";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES = "advancedServiceServiceInterfaces";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY = "advancedServiceServiceInterfacesCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODEL = "advancedServiceTModel";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG = "advancedServiceTModelBag";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS = "advancedServiceFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET = "advancedServiceMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS = "advancedServiceMaxResults";
-
- public static final String QUERY_STYLE_SERVICE_INTERFACES = "queryStyleServiceInterfaces";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME = "simpleServiceInterfaceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE = "advancedUseService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE = "advancedServiceInterfaceService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY = "advancedServiceInterfaceServiceCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE = "advancedServiceInterfaceBusinessService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED = "advancedServiceInterfaceOwned";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME = "advancedServiceInterfaceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS = "advancedServiceInterfaceIdentifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES = "advancedServiceInterfaceCategories";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS = "advancedServiceInterfaceFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET = "advancedServiceInterfaceMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS = "advancedServiceInterfaceMaxResults";
-
- public static final String QUERY_INPUT_ADVANCED_REGISTRY_NAME = "advancedRegistryName";
-
- public static final String QUERY_INPUT_UUID_KEY = "uuidKey";
- public static final String QUERY_INPUT_UUID_BUSINESS_KEY = "uuidBusinessKey";
- public static final String QUERY_INPUT_UUID_SERVICE_KEY = "uuidServiceKey";
- public static final String QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY = "uuidServiceInterfaceKey";
-
- public static final String QUERY_OUTPUT_SAVED_TMODEL = "savedTModel";
-
- // Sub Queries:
- public static final String SUBQUERIES_PROPERTIES = "subQueriesProperties";
- public static final String SUBQUERY_KEY = "subQueryKey";
- public static final String NEW_SUBQUERY_INITIATED = "newSubQueryInitiated";
- public static final String NEW_SUBQUERY_QUERY_ITEM = "newSubQueryQueryItem";
- public static final String SELECTED_NODEIDS = "selectedNodeIds";
- public static final String SUBQUERY_LIST_KEY = "subQueryListKey";
- public static final String SUBQUERY_LIST_ITEMID = "subQueryListItemId";
- public static final String SHOW_RESULTS_TARGET = "showResultsTarget";
- public static final String SUBQUERY_GET = "subQueryGet";
-
- // RegPublish..Actions (some constants from the RegFind...Actions will be reused.
- public static final String QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION = "simpleBusinessDescription";
-
- public static final String QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE = "advancedDescriptionLanguage";
- public static final String QUERY_INPUT_ADVANCED_DESCRIPTION = "advancedDescription";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS = "advancedBusinessDescriptions";
-
- public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL = "simpleServiceInterfaceWSDLURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION = "simpleServiceInterfaceDescription";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL = "advancedServiceInterfaceWSDLURL";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS = "advancedServiceInterfaceDescriptions";
-
- public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS = "simpleServiceBusiness";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY = "simpleServiceBusinessCopy";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER = "simpleServiceServiceProvider";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL = "simpleServiceWSDLURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION = "simpleServiceDescription";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL = "advancedServiceWSDLURL";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS = "advancedServiceDescriptions";
-
- // WSDL Browser
- public static final String PROJECT = "project";
- public static final String WSDL_TYPE = "wsdlType";
- public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
- public static final int WSDL_TYPE_SERVICE = 1;
- public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
- public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-
- // Details
- public static final String LATEST_OBJECT = "latestObject";
- public static final String DISCOVERYURL_MODIFIED = "discoveryURLModified";
- public static final String DISCOVERYURL_VIEWID = "discoveryURLViewId";
- public static final String NAME_MODIFIED = "nameModified";
- public static final String NAME_VIEWID = "businessViewId";
- public static final String DESCRIPTION_MODIFIED = "descriptionModified";
- public static final String DESCRIPTION_VIEWID = "descriptionViewId";
- public static final String IDENTIFIER_MODIFIED = "identifierModified";
- public static final String IDENTIFIER_VIEWID = "identifierViewId";
- public static final String CATEGORY_MODIFIED = "categoryModified";
- public static final String CATEGORY_VIEWID = "categoryViewId";
- public static final String WSDL_URL_MODIFIED = "wsdlURLModified";
- public static final String PUBLISH_ACTION = "publishAction";
- public static final String LATEST_BUSINESS = "latestBusiness";
-
- // Refresh action
- public static final String REFRESH_NODE = "refreshNode";
-
- // Manage PublisherAssertions
- // "To" means from another business to my owning business
- public static final int DIRECTION_TO = 0;
- // "From" means from my owning business to another business
- public static final int DIRECTION_FROM = 1;
- public static final String PUBLISHER_ASSERTIONS_VIEWID = "publisherAssertionsViewId";
- public static final String PUBLISHER_ASSERTIONS_SELECTED_BUS_ID = "publisherAssertionsSelectedBusID";
- public static final String PUBLISHER_ASSERTIONS_DIRECTION = "publisherAssertionsDirection";
- public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS = "queryInputAddPublisherAssertions";
- public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY = "queryInputAddPublisherAssertionsCopy";
- public static final String QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS = "queryInputExistingPublisherAssertions";
- public static final String PUBLISHER_ASSERTIONS_TYPE = "publisherAssertionsType";
- public static final String PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD = "parent-child";
- public static final String PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER = "peer-peer";
- public static final String PUBLISHER_ASSERTIONS_TYPE_IDENTITY = "identity";
-
- // Manage Referenced Services
- public static final String QUERY_INPUT_REFERENCED_SERVICES = "referencedServices";
- public static final String QUERY_INPUT_SERVICES = "services";
- public static final String MANAGE_REFERENCED_SERVICES_OPERATION = "managedReferencedServicesOperation";
- public static final int MANAGE_REFERENCED_SERVICES_OPERATION_ADD = 0;
- public static final int MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE = 1;
- public static final String REFERENCED_SERVICE_SELECT_STATE = "referencedServiceSelectState";
-
- // ResizeUDDIFrameAction
- public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
deleted file mode 100644
index f3d0b4d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIFrameNames
-{
- public final static String NAVIGATOR_CONTAINER = "uddi_navigator_container";
- public final static String NAVIGATOR_TOOLBAR = "uddi_navigator_toolbar";
- public final static String NAVIGATOR_CONTENT = "uddi_navigator_content";
- public final static String ACTIONS_CONTAINER = "uddi_actions_container";
- public final static String PROPERTIES_CONTAINER = "uddi_properties_container";
- public final static String PROPERTIES_TOOLBAR = "uddi_properties_toolbar";
- public final static String PROPERTIES_CONTENT = "uddi_properties_content";
- public final static String STATUS_CONTAINER = "uddi_status_container";
- public final static String STATUS_TOOLBAR = "uddi_status_toolbar";
- public final static String STATUS_CONTENT = "uddi_status_content";
-
- public final static String CATEGORIES_WORKAREA = "categories_workarea";
- public final static String CATEGORIES_TOOLBAR = "categories_toolbar";
- public final static String CATEGORIES_CONTENT = "categories_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
deleted file mode 100644
index ee3c9a2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIModelConstants
-{
- // Registries under UDDIMain.
- public static final String REL_REGISTRIES = "registries";
-
- // Executed Queries folder under a registry.
- public static final String REL_QUERIES_PARENT = "queriesParent";
-
- // Published Businesses folder under a registry.
- public static final String REL_PUBLISHED_BUSINESSES_PARENT = "publishedBusinessesParent";
-
- // Published Services folder under a registry.
- public static final String REL_PUBLISHED_SERVICES_PARENT = "publishedServicesParent";
-
- // Published Service interfaces folder under a registry.
- public static final String REL_PUBLISHED_SERVICE_INTERFACES_PARENT = "publishedServiceInterfacesParent";
-
- // Queries under the Queries folder.
- public static final String REL_QUERIES = "queries";
- public static final String INITIAL_RESULTS = "initialResults";
- public static final String QUERY_TYPE = "queryType";
- public static final String SUBQUERY_TRANSFER_TARGET = "subQueryTransferTarget";
-
- // Objects under a Query node.
- public static final String REL_QUERY_RESULTS = "queryResults";
-
- // Categories
- public static final String REL_SUBCATEGORIES = "subCategories";
-
- // Published items inside the Published items folder.
- public static final String REL_PUBLISHED_ITEMS = "publishedItems";
-
- // Businesses
- public static final String IS_BUSINESS_OWNED = "isBusinessOwned";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
deleted file mode 100644
index 0cb5d02..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class AbstractUDDIElement extends TreeElement
-{
- public AbstractUDDIElement(String name, Model model)
- {
- super(name, model);
- }
-
- public final TreeElement getParentElement()
- {
- return getParentElement(this);
- }
-
- public final TreeElement getParentElement(TreeElement child)
- {
- Enumeration e = child.getElements(ModelConstants.REL_OWNER);
- if (e.hasMoreElements())
- return (TreeElement)e.nextElement();
- else
- return null;
- }
-
- public final RegistryElement getRegistryElement()
- {
- if (this instanceof RegistryElement)
- return (RegistryElement)this;
- else
- {
- TreeElement childElement = this;
- TreeElement parentElement = getParentElement(childElement);
- while (parentElement != null && parentElement != childElement)
- {
- if (parentElement instanceof RegistryElement)
- return (RegistryElement)parentElement;
- childElement = parentElement;
- parentElement = getParentElement(childElement);
- }
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
deleted file mode 100644
index 61e613d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessElement extends AbstractUDDIElement
-{
- private BusinessEntity be_;
- private ListManager publisherAssertions_;
-
- public BusinessElement(BusinessEntity be,Model model)
- {
- super(be.getDefaultNameString(),model);
- be_ = be;
- setKey(be_.getBusinessKey());
- publisherAssertions_ = null;
- }
-
- public final BusinessEntity getBusinessEntity()
- {
- return be_;
- }
-
- public final void setBusinessEntity(BusinessEntity be)
- {
- be_ = be;
- setKey(be_.getBusinessKey());
- }
-
- public ListManager getPublisherAssertions()
- {
- return publisherAssertions_;
- }
-
- public void setPublisherAssertions(ListManager listManager)
- {
- publisherAssertions_ = listManager;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
deleted file mode 100644
index 907f3a1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryElement extends AbstractUDDIElement
-{
- private KeyedReference category_;
-
- public CategoryElement(String name,KeyedReference category,Model model)
- {
- super(name,model);
- category_ = category;
- saveCategoryProperties();
- }
-
- private final void saveCategoryProperties()
- {
- if (category_ != null)
- {
- String keyName = category_.getKeyName();
- if (keyName != null)
- setName(keyName);
- }
- }
-
- public final KeyedReference getCategory()
- {
- return category_;
- }
-
- public final String getNameForTree()
- {
- StringBuffer nameForTree = new StringBuffer("[");
- nameForTree.append(category_.getKeyValue()).append("] ").append(category_.getKeyName());
- return nameForTree.toString();
- }
-
- public final void updateCategory(String keyName,String keyValue,String tModelKey)
- {
- category_.setKeyName(keyName);
- category_.setKeyValue(keyValue);
- category_.setTModelKey(tModelKey);
- saveCategoryProperties();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
deleted file mode 100644
index f296656..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
+++ /dev/null
@@ -1,569 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryModel extends BasicModel
-{
- private ServletContext application_;
- private String defaultDataFile_;
- private Hashtable categoryElements_;
- private String columnDelimiter_;
- private String stringDelimiter_;
- private String categoryKey_;
- private boolean checked_;
- private String displayName_;
- private String tModelKey_;
- private Throwable errorException_;
-
- // Return codes for loading and saving category data.
- public static final byte OPERATION_SUCCESSFUL = 0x00;
- public static final byte ERROR_FILE = 0x01;
- public static final byte ERROR_SECURITY = 0x02;
- public static final byte ERROR_ENCODING = 0x03;
- public static final byte ERROR_IO = 0x04;
- public static final byte ERROR_CATEGORY_KEY = 0x05;
-
- private final String defaultColumnDelimiter_ = "#";
- private final String defaultStringDelimiter_ = "\"";
-
- public CategoryModel()
- {
- super("categories");
- application_ = null;
- defaultDataFile_ = null;
- columnDelimiter_ = defaultColumnDelimiter_;
- stringDelimiter_ = defaultStringDelimiter_;
- categoryElements_ = null;
- categoryKey_ = null;
- checked_ = true;
- displayName_ = null;
- tModelKey_ = null;
- errorException_ = null;
- }
-
- /**
- * CategoryModels load their data from the file named via the
- * {@link #setDefaultDataFile(String)} method. The data file
- * name is interpretted as either a physical pathname or a
- * context-root relative pathname depending on whether the
- * servlet context or "application" is null (default) or not.
- * @param application The application context, null by default.
- * Value can be the ServletContext of the WSExplorer or null.
- */
- public final void setServletContext(ServletContext application)
- {
- application_ = application;
- }
-
- public final void setDefaultDataFile(String defaultDataFile)
- {
- defaultDataFile_ = defaultDataFile;
- }
-
- public final void setCategoryKey(String categoryKey)
- {
- categoryKey_ = categoryKey;
- }
-
- public final String getCategoryKey()
- {
- return categoryKey_;
- }
-
- public final void setColumnDelimiter(String columnDelimiter)
- {
- columnDelimiter_ = columnDelimiter;
- }
-
- public final String getColumnDelimiter()
- {
- return columnDelimiter_;
- }
-
- public final void setStringDelimiter(String stringDelimiter)
- {
- stringDelimiter_ = stringDelimiter;
- }
-
- public final String getStringDelimiter()
- {
- return stringDelimiter_;
- }
-
- public final void enableChecked(boolean isChecked)
- {
- checked_ = isChecked;
- }
-
- public final boolean isChecked()
- {
- return checked_;
- }
-
- public final void setDisplayName(String displayName)
- {
- displayName_ = displayName;
- }
-
- public final String getDisplayName()
- {
- return displayName_;
- }
-
- public final void setTModelKey(String tModelKey)
- {
- tModelKey_ = tModelKey;
- }
-
- public final String getTModelKey()
- {
- return tModelKey_;
- }
-
- public final boolean isDataLoaded()
- {
- return (categoryElements_ != null);
- }
-
- public final Throwable getErrorException()
- {
- return errorException_;
- }
-
- private final boolean isEnclosedInQuotes(String string)
- {
- return string.startsWith("\"") && string.endsWith("\"");
- }
-
- public final void loadFromTaxonomy(Taxonomy taxonomy)
- {
- String name = taxonomy.getName();
- CategoryElement root = new CategoryElement(name,null,this);
- setRootElement(root);
- categoryElements_ = new Hashtable();
- for (Iterator it = taxonomy.getCategory().iterator(); it.hasNext();)
- {
- addCategory(root, (Category)it.next());
- }
- }
-
- private void addCategory(CategoryElement parent, Category category)
- {
- String keyName = category.getName();
- String keyValue = category.getCode();
- CategoryElement child = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
- parent.connect(child,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
- categoryElements_.put(keyValue, child);
- for (Iterator it = category.getCategory().iterator(); it.hasNext();)
- {
- addCategory(child, (Category)it.next());
- }
- }
-
- public final byte loadFromDefaultDataFile()
- {
- try
- {
- if (defaultDataFile_ == null)
- throw new FileNotFoundException();
- BufferedReader br = null;
- if (application_ == null)
- br = new BufferedReader(new InputStreamReader(new FileInputStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
- else
- br = new BufferedReader(new InputStreamReader(application_.getResourceAsStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
- return loadData(br);
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- return ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- return ERROR_SECURITY;
- }
- catch (UnsupportedEncodingException e)
- {
- errorException_ = e;
- return ERROR_ENCODING;
- }
- }
-
- public final byte loadFromDelimiterFile()
- {
- // Get the associated .properties file and set the delimiters. The defaultDataFile_ is set to the delimiter file in this case.
- // The properties file contains the following keys:
- // wsad.dataFile - location of the category data file.
- // wsad.checked - whether or not the category is checked.
- // wsad.name - the display name of the category.
- // column.delimiter - the delimiter character used for separating columns.
- // string.delimiter - the delimiter character used to encapsulate data such that column delimiter characters are treated as data.
- try
- {
- Properties p = new Properties();
- InputStream fin = null;
- if (application_ == null)
- fin = new FileInputStream(defaultDataFile_);
- else
- fin = application_.getResourceAsStream(defaultDataFile_);
- p.load(fin);
- fin.close();
- columnDelimiter_ = p.getProperty("column.delimiter");
- stringDelimiter_ = p.getProperty("string.delimiter");
- defaultDataFile_ = p.getProperty("wsad.dataFile");
- return loadFromDefaultDataFile();
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- return ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- return ERROR_SECURITY;
- }
- catch (IOException e)
- {
- errorException_ = e;
- return ERROR_IO;
- }
- }
-
- public final byte loadData(BufferedReader br)
- {
- errorException_ = null;
- CategoryElement rootElement = null;
- categoryElements_ = new Hashtable();
- byte returnCode = OPERATION_SUCCESSFUL;
- String line = null;
- int lineNumber = 0;
- try
- {
- char columnDelimiterChar = columnDelimiter_.charAt(0);
- char stringDelimiterChar = stringDelimiter_.charAt(0);
- Vector values = new Vector();
- while((line = br.readLine()) != null)
- {
- lineNumber++;
- // Ignore blank lines.
- if (line.trim().length() == 0)
- continue;
- int index = 0;
- int length = line.length();
- boolean inStringDelimiters = false;
- values.removeAllElements();
- StringBuffer currentToken = new StringBuffer();
- while (index < length)
- {
- char currentChar = line.charAt(index);
- if (inStringDelimiters)
- {
- // In quote so ignoring delimiters
- if (currentChar == stringDelimiterChar)
- {
- if (index < length - 1)
- {
- // currentChar could be a closing string delimiter or escape
- // Need to look ahead to be sure...
- char followingChar = line.charAt(index + 1);
- if (followingChar == stringDelimiterChar)
- {
- // There is an escaped quote
- currentToken.append(stringDelimiterChar);
- // jump forward two characters.
- index += 2;
- }
- else
- {
- // There was a closing string delimiter...jump forward to the next delimiter
- inStringDelimiters = false;
- //look for the next column delimiter character
- int nextDelimiter = line.indexOf(columnDelimiterChar, index);
- if (nextDelimiter == -1)
- {
- // There were no more delimiters so break out of the loop
- break;
- }
- else
- {
- values.addElement(currentToken.toString());
- //values[tokenCount++] = currentToken.toString();
- currentToken.setLength(0);
- inStringDelimiters = false;
- index = nextDelimiter + 1;
- }
- }
- }
- else
- {
- // This is the last character and it's a closing string delimiter.
- index++;
- inStringDelimiters = false;
- }
- }
- else
- {
- currentToken.append(currentChar);
- index++;
- }
- }
- else if (currentChar == columnDelimiterChar)
- {
- // There was a delimiter outside of quotes
- values.addElement(currentToken.toString());
- //values[tokenCount++] = currentToken.toString();
- currentToken.setLength(0);
- index++;
- }
- else if (currentChar == stringDelimiterChar)
- {
- // A quote appearing outside of quotes must be a opening quote
- inStringDelimiters = true;
- index++;
- }
- else
- {
- // There is a normal char outside of quotes
- currentToken.append(currentChar);
- index++;
- }
- }
- // Expect token count to be values.length - 1 at this point if everything is ok
- if (inStringDelimiters)
- {
- br.close();
- throw new ParseException(line,lineNumber);
- }
-
- // Add the final token.
- values.addElement(currentToken.toString());
-
- // 3 columns format. From left to right, these are:
- // 1) category's key value
- // 2) category's key name
- // 3) category's parent key value
- // Convert to 4 columns format.
- if (values.size() == 3)
- {
- if (categoryKey_ != null)
- values.insertElementAt(categoryKey_, 0);
- else
- values.insertElementAt(tModelKey_, 0);
- }
-
- // 4 columns format. From left to right, these are:
- // 1) type of category (categoryKey)
- // 2) category's key value
- // 3) category's key name
- // 4) category's parent key value
- if (values.size() == 4)
- {
- String categoryKey = (String)values.elementAt(0);
- if (categoryKey_ == null)
- categoryKey_ = categoryKey;
- else if (!categoryKey_.equals(categoryKey))
- throw new Exception(categoryKey);
- String keyValue = (String)values.elementAt(1);
- String keyName = (String)values.elementAt(2);
- String parentKeyValue = (String)values.elementAt(3);
- if (rootElement == null)
- {
- rootElement = new CategoryElement(displayName_,null,this);
- setRootElement(rootElement);
- }
- if (isEnclosedInQuotes(keyName))
- keyName = keyName.substring(1,keyName.length()-1);
- // Check if the CategoryElement already exists. If it does, refresh the Category.
- CategoryElement categoryElement = (CategoryElement)categoryElements_.get(keyValue);
- if (categoryElement != null)
- categoryElement.updateCategory(keyName,keyValue,tModelKey_);
- else
- categoryElement = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
- Element parentElement;
- if (parentKeyValue.equals(keyValue))
- parentElement = rootElement;
- else
- parentElement = (Element)categoryElements_.get(parentKeyValue);
- if (parentElement == null)
- {
- parentElement = new CategoryElement("temp",new KeyedReference("",parentKeyValue,tModelKey_),this);
- categoryElements_.put(parentKeyValue,parentElement);
- }
- else
- parentElement.connect(categoryElement,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
- categoryElements_.put(keyValue,categoryElement);
- }
- else
- {
- br.close();
- throw new ParseException(line,lineNumber);
- }
- }
- br.close();
- return returnCode;
- }
- catch (IOException e)
- {
- errorException_ = e;
- returnCode = ERROR_IO;
- }
- catch (ParseException e)
- {
- errorException_ = e;
- returnCode = ERROR_FILE;
- }
- catch (Exception e)
- {
- errorException_ = e;
- returnCode = ERROR_CATEGORY_KEY;
- }
- categoryElements_ = null;
- return returnCode;
- }
-
- private final void saveData(PrintWriter pw,CategoryElement categoryElement,CategoryElement parentElement,boolean isFirst)
- {
- // File format:
- // <categoryKey>#<keyValue>#<keyName>#<parentKeyValue>
- KeyedReference kr = categoryElement.getCategory();
- // Check if this is not the root element.
- if (kr != null)
- {
- String keyName = kr.getKeyName();
- String keyValue = kr.getKeyValue();
- String parentKeyValue;
- if (parentElement == null)
- parentKeyValue = keyValue;
- else
- {
- KeyedReference parentKr = parentElement.getCategory();
- // Check if the parent is the root element.
- if (parentKr == null)
- parentKeyValue = keyValue;
- else
- parentKeyValue = parentKr.getKeyValue();
- }
- if (!isFirst)
- pw.println();
- else
- isFirst = false;
- pw.print(mangle(categoryKey_));
- pw.print(columnDelimiter_);
- pw.print(mangle(keyValue));
- pw.print(columnDelimiter_);
- pw.print(mangle(keyName));
- pw.print(columnDelimiter_);
- pw.print(mangle(parentKeyValue));
- }
- Enumeration e = categoryElement.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (e != null)
- {
- while (e.hasMoreElements())
- saveData(pw,(CategoryElement)e.nextElement(),categoryElement,isFirst);
- }
- }
-
- // Mangle an input string if it contains default column delimiter characters by surrounding it with the string delimiters.
- private final String mangle(String input)
- {
- if (input != null && input.indexOf(columnDelimiter_) != -1)
- {
- StringBuffer s = new StringBuffer(input);
- s.insert(0,stringDelimiter_).append(stringDelimiter_);
- return s.toString();
- }
- return input;
- }
-
- public final byte saveData(String fileName)
- {
- // The fileName should already be URLEncoded.
- byte returnCode = OPERATION_SUCCESSFUL;
- errorException_ = null;
- if (isDataLoaded())
- {
- try
- {
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName),HTMLUtils.UTF8_ENCODING),true);
- CategoryElement rootElement = (CategoryElement)getRootElement();
- saveData(pw,rootElement,null,true);
- pw.flush();
- pw.close();
- // Save the properties file.
- Properties p = new Properties();
- p.setProperty("wsad.dataFile",fileName);
- p.setProperty("wsad.checked",String.valueOf(checked_));
- p.setProperty("wsad.name",displayName_);
- p.setProperty("column.delimiter",columnDelimiter_);
- p.setProperty("string.delimiter",stringDelimiter_);
- StringBuffer propertiesFileName = new StringBuffer(fileName.substring(0,fileName.lastIndexOf('.')));
- propertiesFileName.append(".properties");
- FileOutputStream fout = new FileOutputStream(propertiesFileName.toString());
- p.store(fout,null);
- fout.close();
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- returnCode = ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- returnCode = ERROR_SECURITY;
- }
- catch (UnsupportedEncodingException e)
- {
- errorException_ = e;
- returnCode = ERROR_ENCODING;
- }
- catch (IOException e)
- {
- errorException_ = e;
- returnCode = ERROR_IO;
- }
- }
- return returnCode;
- }
-
- public String toString()
- {
- return displayName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
deleted file mode 100644
index c275efe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class PublishedItemsElement extends AbstractUDDIElement
-{
- public PublishedItemsElement(int type,String name,Model model)
- {
- super(name,model);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_PUBLISHED_ITEMS);
- setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(type));
- }
-
- public final int getType()
- {
- return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
- }
-
- public Enumeration getItems()
- {
- return getElements(UDDIModelConstants.REL_PUBLISHED_ITEMS);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
deleted file mode 100644
index 5232c83..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.util.KeyedReference;
-
-public class PublisherAssertionElement {
-
- // owningBusinessKey_ is the key of the business element that owns this
- // publisherAssertionElement
- private String fromKey_;
- private String toKey_;
- private String owningBusinessKey_;
-
- // the other business that the containing business is asserted from or to
- private ListElement sp_;
- private int subQueryItemId_;
-
- // status of this publisherAssertion
- private String status_;
- private KeyedReference keyedReference_;
-
- public PublisherAssertionElement(String fromKey, String toKey, String owningBusinessKey, ListElement sp, int subQueryItemId, String status, KeyedReference keyedRef) {
- fromKey_ = fromKey;
- toKey_ = toKey;
- owningBusinessKey_ = owningBusinessKey;
- sp_ = sp;
- subQueryItemId_ = subQueryItemId;
- status_ = status;
- keyedReference_ = keyedRef;
- }
-
- public void setFromKey(String fromKey) {
- fromKey_ = fromKey;
- }
-
- public String getFromKey() {
- return fromKey_;
- }
-
- public void setToKey(String toKey) {
- toKey_ = toKey;
- }
-
- public String getToKey() {
- return toKey_;
- }
-
- public void setOwningBusinessKey(String key) {
- owningBusinessKey_ = key;
- }
-
- public String getOwningBusinessKey() {
- return owningBusinessKey_;
- }
-
- public void setServiceProvider(ListElement sp) {
- sp_ = sp;
- }
-
- public ListElement getServiceProvider() {
- return sp_;
- }
-
- public void setSubQueryItemId(int id) {
- subQueryItemId_ = id;
- }
-
- public int getSubQueryItemId() {
- return subQueryItemId_;
- }
-
- public void setStatus(String status) {
- status_ = status;
- }
-
- public String getStatus() {
- return status_;
- }
-
- public void setKeyedRef(KeyedReference keyedRef) {
- keyedReference_ = keyedRef;
- }
-
- public KeyedReference getKeyedRef() {
- return keyedReference_;
- }
-
- public PublisherAssertion getPublisherAssertion() {
- if (fromKey_ == null ||
- toKey_ == null ||
- keyedReference_ == null) {
- return null;
- }
-
- PublisherAssertion pubAssertion = new PublisherAssertion(fromKey_, toKey_, keyedReference_);
- return pubAssertion;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
deleted file mode 100644
index 046de91..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
+++ /dev/null
@@ -1,61 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryElement extends AbstractUDDIElement
-{
- private final void initQueryProperties(int itemType,Object[] results)
- {
- Vector resultsVector = new Vector();
- for (int i=0;i<results.length;i++)
- resultsVector.addElement(results[i]);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERY_RESULTS);
- setPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS,resultsVector);
- setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(itemType));
- }
-
- public QueryElement(BusinessEntity[] spList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_BUSINESSES,spList);
- }
-
- public QueryElement(BusinessService[] bsList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICES,bsList);
- }
-
- public QueryElement(TModel[] tModelList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,tModelList);
- }
-
- public int getQueryType()
- {
- return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
- }
-
- public QueryParentElement getQueryParentElement()
- {
- return (QueryParentElement)getParentElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
deleted file mode 100644
index 126f37e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class QueryParentElement extends AbstractUDDIElement
-{
- public QueryParentElement(String name,Model model)
- {
- super(name,model);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERIES);
- }
-
- public Enumeration getQueries()
- {
- return getElements(UDDIModelConstants.REL_QUERIES);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
deleted file mode 100644
index 7209f2a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
+++ /dev/null
@@ -1,308 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.AuthToken;
-import org.uddi4j.transport.TransportException;
-
-public class RegistryElement extends AbstractUDDIElement
-{
- private final long AUTH_INFO_TIMEOUT = 3000000;
- private UDDIProxy proxy_;
- private long authTokenTimestamp_;
- private AuthToken authToken_;
- private String id_;
- private String password_;
- private String inquiryURL_;
- private String publishURL_;
- private String cachedPublishURL_;
- private String registrationURL_;
- private Hashtable userDefinedCategories_;
- private boolean checkForUserDefinedCategories_;
- private String categoriesDirectory_;
-
- public RegistryElement(UDDIProxy proxy, String inquiryURL, String name, Model model)
- {
- super(name, model);
- proxy_ = proxy;
- inquiryURL_ = inquiryURL;
- publishURL_ = null;
- authTokenTimestamp_ = -1;
- authToken_ = null;
- id_ = null;
- password_ = null;
- cachedPublishURL_ = null;
- registrationURL_ = null;
- userDefinedCategories_ = null;
- checkForUserDefinedCategories_ = false;
- categoriesDirectory_ = null;
- }
-
- public final UDDIProxy getProxy()
- {
- return proxy_;
- }
-
- public void setDefaults()
- {
-
- authTokenTimestamp_ = -1;
- authToken_ = null;
- cachedPublishURL_ = null;
- }
-
- public final String getInquiryURL()
- {
- return inquiryURL_;
- }
-
- public final QueryParentElement getQueryParentElement()
- {
- return (QueryParentElement) (getElements(UDDIModelConstants.REL_QUERIES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedBusinessesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedServicesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedServiceInterfacesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT).nextElement());
- }
-
- public final void performLogin(String publishURL, String userId, String password) throws TransportException, UDDIException, MalformedURLException
- {
- publishURL_ = publishURL;
- proxy_.setPublishURL(NetUtils.createURL(publishURL));
- authToken_ = proxy_.get_authToken(userId, password);
- authTokenTimestamp_ = System.currentTimeMillis();
- id_ = userId;
- password_ = password;
- }
-
- public final void performLogout() throws TransportException, UDDIException
- {
- proxy_.discard_authToken(authToken_.getAuthInfoString());
- }
-
- public final String getAuthInfoString()
- {
- if (!isLoggedIn())
- return null;
- if ((System.currentTimeMillis() - authTokenTimestamp_) > AUTH_INFO_TIMEOUT)
- {
- try
- {
- authToken_ = proxy_.get_authToken(id_, password_);
- authTokenTimestamp_ = System.currentTimeMillis();
- }
- catch (Throwable t)
- {
- }
- }
- return authToken_.getAuthInfoString();
- }
-
- public final boolean isLoggedIn()
- {
- return authToken_ != null;
- }
-
- public final void setCachedPublishURL(String publishURL)
- {
- cachedPublishURL_ = publishURL;
- }
-
- public final String getPublishURL()
- {
- if (isLoggedIn() && publishURL_ != null)
- return publishURL_;
- return cachedPublishURL_;
- }
-
- public final void setRegistrationURL(String registrationURL)
- {
- registrationURL_ = registrationURL;
- }
-
- public final String getRegistrationURL()
- {
- return registrationURL_;
- }
-
- public final String getUserId()
- {
- return id_;
- }
-
- public final void setUserId(String userId)
- {
- id_ = userId;
- }
-
- public final String getCred()
- {
- return password_;
- }
-
- public final void setCred(String cred)
- {
- password_ = cred;
- }
-
- public final void setUserDefinedCategories(Hashtable userDefinedCategories)
- {
- userDefinedCategories_ = userDefinedCategories;
- }
-
- public final Enumeration getUserDefinedCategories()
- {
- if (userDefinedCategories_ != null)
- return userDefinedCategories_.elements();
- else
- return null;
- }
-
- public final CategoryModel getUserDefinedCategory(String tModelKey)
- {
- return (CategoryModel) userDefinedCategories_.get(tModelKey);
- }
-
- // Special handler to be invoked before sending a message to the registry.
- public final void handlePreInvocation(BusinessService busService)
- {
- // For XMethods, business services must contain a description of the form:
- // IMPLEMENTATION: ibmws
- if (getInquiryURL().equals("http://uddi.xmethods.net/inquire"))
- {
- Vector descriptionVector = busService.getDescriptionVector();
- if (descriptionVector == null)
- descriptionVector = new Vector();
- boolean containsImplementationDescription = false;
- for (int i = 0; i < descriptionVector.size(); i++)
- {
- Description description = (Description) descriptionVector.elementAt(i);
- if (description.getText().startsWith("IMPLEMENTATION: "))
- {
- containsImplementationDescription = true;
- break;
- }
- }
- if (!containsImplementationDescription)
- {
- descriptionVector.addElement(new Description("IMPLEMENTATION: ibmws"));
- busService.setDescriptionVector(descriptionVector);
- }
- }
- }
-
- public final void setCheckForUserDefinedCategories(boolean checkForUserDefinedCategories)
- {
- checkForUserDefinedCategories_ = checkForUserDefinedCategories;
- }
-
- public final boolean getCheckForUserDefinedCategories()
- {
- return checkForUserDefinedCategories_;
- }
-
- public final void setCategoriesDirectory(String directory)
- {
- categoriesDirectory_ = directory;
- }
-
- public final String getCategoriesDirectory()
- {
- return categoriesDirectory_;
- }
-
- public void refreshMeta(){
-
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
-
-
- try
- {
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- if(uddiReg.getDiscoveryURL().equals(getInquiryURL())){
-
-
-
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- if (taxonomies != null)
- {
- Hashtable taxonomyTable = new Hashtable();
- for (int j=0; j<taxonomies.length; j++)
- {
- Taxonomy taxonomy = taxonomies[j];
- String name = taxonomy.getName();
- String tmodelKey = taxonomy.getTmodelKey();
- CategoryModel catModel = new CategoryModel();
- catModel.setDisplayName(name);
- catModel.setCategoryKey(name);
- catModel.setTModelKey(tmodelKey);
- catModel.loadFromTaxonomy(taxonomy);
- taxonomyTable.put(tmodelKey, catModel);
- }
-
- setUserDefinedCategories(taxonomyTable);
- }
- }
-
- }
-
- }
- }catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
deleted file mode 100644
index 4f37cbc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceElement extends AbstractUDDIElement
-{
- private BusinessService bs_;
-
- public ServiceElement(BusinessService bs,Model model)
- {
- super(bs.getDefaultNameString(),model);
- setKey(bs.getServiceKey());
- bs_ = bs;
- }
-
- public final BusinessService getBusinessService()
- {
- return bs_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
deleted file mode 100644
index b72d881..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class ServiceInterfaceElement extends AbstractUDDIElement
-{
- private TModel tModel_;
-
- public ServiceInterfaceElement(TModel tModel,Model model)
- {
- super(tModel.getNameString(),model);
- tModel_ = tModel;
- setKey(tModel.getTModelKey());
- }
-
- public final TModel getTModel()
- {
- return tModel_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
deleted file mode 100644
index 2371200..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public class UDDIMainElement extends TreeElement
-{
- private Hashtable registryNames_;
-
- public UDDIMainElement(String name,Model model)
- {
- super(name,model);
- registryNames_ = new Hashtable();
- }
-
- public final boolean containsRegistryName(String name)
- {
- return (registryNames_.get(name) != null);
- }
-
- public final void addRegistryName(String name)
- {
- registryNames_.put(name,Boolean.TRUE);
- }
-
- public final void removeRegistryName(String name)
- {
- registryNames_.remove(name);
- }
-
- public final void clearRegistryNames()
- {
- registryNames_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
deleted file mode 100644
index 2853a40..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class AddToFavoritesTool extends ActionTool {
- public AddToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
deleted file mode 100644
index 9e79102..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusPublishServiceTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- private RegFindTool regFindTool_;
-
- public BusPublishServiceTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/publish_service_enabled.gif","uddi/images/publish_service_highlighted.gif",alt);
- regFindTool_ = new RegFindTool(new ToolManager(toolManager.getNode()), "");
- }
-
- protected final void initDefaultProperties()
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-
- // RegPublishServiceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
- // RegPublishServiceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/BusPublishServiceForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
deleted file mode 100644
index 2d1f63c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-
-public class BusinessDetailsTool extends DetailsTool
-{
- public BusinessDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/BusinessDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- BusinessElement busElement = (BusinessElement)(toolManager_.getNode().getTreeElement());
- BusinessEntity be = busElement.getBusinessEntity();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-
- Vector nameVector = new Vector();
- copyIndexVector(be.getNameVector(),nameVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(be.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-
- IdentifierBag idBag = be.getIdentifierBag();
- if (idBag != null)
- {
- Vector idVector = new Vector();
- copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idVector);
- }
-
- CategoryBag catBag = be.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catVector);
- }
-
- DiscoveryURLs discoveryURLs = be.getDiscoveryURLs();
- if (discoveryURLs != null)
- {
- Vector discoveryURLVector = new Vector();
- copyIndexVector(discoveryURLs.getDiscoveryURLVector(),discoveryURLVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLVector);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
deleted file mode 100644
index 756bae8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.BusinessGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusinessNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private BusPublishServiceTool publishServiceTool_;
- private ManagePublisherAssertionsTool managePublisherAssertionsTool_;
- private ManageReferencedServicesTool manageReferencedServicesTool_;
- private UnpublishTool unpublishTool_;
-
- public BusinessNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/business_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new BusinessDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_BUSINESS_DETAILS"));
- new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),BusinessGetServicesAction.getActionLink(nodeId_));
- publishServiceTool_ = new BusPublishServiceTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH_SERVICE"));
- manageReferencedServicesTool_ = new ManageReferencedServicesTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES"));
- managePublisherAssertionsTool_ = new ManagePublisherAssertionsTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS"));
- new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_bus_enabled.gif","uddi/images/unpublish_bus_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_BUSINESS"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- publishServiceTool_.addAuthenticationProperties(regElement);
- manageReferencedServicesTool_.addAuthenticationProperties(regElement);
- managePublisherAssertionsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
deleted file mode 100644
index 0c7fecc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class CategoryNode extends Node
-{
- public CategoryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/category.gif");
- setVisibilityOfChildren(false);
- }
-
- public final void createChildren()
- {
- Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (children != null)
- {
- while (children.hasMoreElements())
- {
- CategoryElement categoryElement = (CategoryElement)children.nextElement();
- CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
- addChild(categoryNode);
- categoryNode.createChildren();
- }
- }
- }
-
- public final String getNodeName()
- {
- CategoryElement categoryElement = (CategoryElement)element_;
- return categoryElement.getNameForTree();
- }
-
- protected final String getToggleNodeActionHref()
- {
- return ToggleCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_,isOpen_);
- }
-
- protected final String getLinkActionHref()
- {
- return SelectCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_);
- }
-
- protected final String getToggleNodeActionTarget()
- {
- return UDDIFrameNames.CATEGORIES_WORKAREA;
- }
-
- protected final String getLinkActionTarget()
- {
- return UDDIFrameNames.CATEGORIES_WORKAREA;
- }
-
- protected final void initTools()
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
deleted file mode 100644
index 11d6c5b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class DetailsTool extends FormTool
-{
- private String formLink_;
-
- public DetailsTool(ToolManager toolManager,String alt,String formLink)
- {
- super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
- formLink_ = formLink;
- }
-
- public void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-
- protected final void copyIndexVector(Vector source,Vector destination)
- {
- destination.removeAllElements();
- for (int i=0;i<source.size();i++)
- {
- ListElement listElement = new ListElement(source.elementAt(i));
- listElement.setViewId(i);
- // The next item indicates that this element is to be in non-edit state.
- listElement.setTargetViewToolInfo(-1,-1,i);
- destination.addElement(listElement);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
deleted file mode 100644
index 8089115..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetBusinessesTool extends ActionTool
-{
- private String actionLink_;
- public GetBusinessesTool(ToolManager toolManager,String enabledImagePath,String highlightedImagePath,String alt,String actionLink)
- {
- super(toolManager,enabledImagePath,highlightedImagePath,alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
deleted file mode 100644
index b71f48a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServiceInterfacesTool extends ActionTool
-{
- private String actionLink_;
- public GetServiceInterfacesTool(ToolManager toolManager,String alt,String actionLink)
- {
- super(toolManager,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
deleted file mode 100644
index 6e56868..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServicesTool extends ActionTool
-{
- private String actionLink_;
- public GetServicesTool(ToolManager toolManager,String alt,String actionLink)
- {
- super(toolManager,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
deleted file mode 100644
index 1807b8b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-public class ItemsSummaryTool extends FormTool
-{
- private String formLink_;
-
- public ItemsSummaryTool(ToolManager toolManager,String enabledImage,String highlightedImage,String alt,int queryItem)
- {
- super(toolManager,enabledImage,highlightedImage,alt);
- StringBuffer formLink = new StringBuffer("uddi/forms/ItemsSummaryForm.jsp?");
- formLink.append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
- String encodedFormLink = URLUtils.encode(formLink.toString());
- formLink_ = ProxyLoadPageAction.getActionLink(encodedFormLink);
- }
-
- public final void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java
deleted file mode 100644
index f36b256..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java
+++ /dev/null
@@ -1,73 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class LoginTool extends FormTool
-{
- private Controller controller_;
- private String formLink = "uddi/forms/LoginUddiForm.jsp";
-
- public LoginTool(ToolManager toolManager, String alt)
- {
- super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- controller_ = toolManager_.getNode().getNodeManager().getController();
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink;
- }
-
- public void setToLogoutLink()
- {
- formLink = "uddi/actions/LogoutAdvancedActionJSP.jsp";
- }
-
- public void setToRegistryLink()
- {
- formLink = "";
- }
-
- public final Enumeration getFavoriteRegistryElements()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favoritesNodeManager = favPerspective.getNodeManager();
- TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
- TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
deleted file mode 100644
index 1457d1e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManagePublisherAssertionsTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
-
- public ManagePublisherAssertionsTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "uddi/images/publisher_assertions_enabled.gif", "uddi/images/publisher_assertions_highlighted.gif", alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return ProxyLoadPageAction.getActionLink("uddi/forms/ManagePublisherAssertionsForm.jsp");
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
deleted file mode 100644
index 9b789fe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManageReferencedServicesTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
-
- public ManageReferencedServicesTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "uddi/images/referenced_services_enabled.gif", "uddi/images/referenced_services_highlighted.gif", alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/ManageReferencedServicesForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
deleted file mode 100644
index c10c887..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-
-public abstract interface MultipleFormToolPropertiesInterface
-{
- public abstract FormToolPropertiesInterface getFormToolProperties(Object key);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
deleted file mode 100644
index 6101cb2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20060224 122752 cbrealey@ca.ibm.com - Chris Brealey
- * 20080513 231351 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenRegistryTool extends FormTool
-{
- private Controller controller_;
-
- public OpenRegistryTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- controller_ = toolManager_.getNode().getNodeManager().getController();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-
- if(uddiPerspective.getDefaultUDDIRegistry() != null){
- setProperty(UDDIActionInputs.REGISTRY_NAME,uddiPerspective.getDefaultUDDIRegistry().getName());
- setProperty(UDDIActionInputs.INQUIRY_URL,uddiPerspective.getDefaultUDDIRegistry().getInquiryURL());
- }
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return "uddi/forms/OpenRegistryForm.jsp";
- }
-
- public final Enumeration getFavoriteRegistryElements()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favoritesNodeManager = favPerspective.getNodeManager();
- TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
- TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
deleted file mode 100644
index 69904ed..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-
-public class PublishedItemsNode extends UDDINavigatorFolderNode
-{
- public PublishedItemsNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- {
- TreeElement treeElement = (TreeElement)event.getParentElement();
- createChildNode(treeElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement treeElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- treeElement = (TreeElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- treeElement = (TreeElement)event.getOutBoundElement();
-
- if (treeElement != null)
- removeChildNode(treeElement);
- }
- });
- }
-
- private final void createChildNode(TreeElement element)
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- Node childNode = null;
- switch (publishedItemsElement.getType())
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
- }
- if (childNode != null)
- addChild(childNode);
- }
-
- protected final void initTools()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),publishedItemsType);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),publishedItemsType);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),publishedItemsType);
- }
- }
-
- public String getOpenImagePath()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- return "uddi/images/businesses_open_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- return "uddi/images/services_open_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- return "uddi/images/service_interfaces_open_highlighted.gif";
- }
- return super.getOpenImagePath();
- }
-
- public String getClosedImagePath()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- return "uddi/images/businesses_closed_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- return "uddi/images/services_closed_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- return "uddi/images/service_interfaces_closed_highlighted.gif";
- }
- return super.getClosedImagePath();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
deleted file mode 100644
index a02b8ce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.FindAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryNode extends UDDINavigatorNode
-{
- private FormTool regFindTool_;
- private FindAction findAction_;
- public QueryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/query.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERY_RESULTS))
- {
- TreeElement treeElement = (TreeElement)event.getParentElement();
- createChildNode(treeElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement treeElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
- treeElement = (TreeElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
- treeElement = (TreeElement)event.getOutBoundElement();
-
- if (treeElement != null)
- removeChildNode(treeElement);
- }
- });
- createChildren();
- setVisibilityOfChildren(false);
- findAction_ = null;
- }
-
- private final void createChildren()
- {
- Vector initialResults = (Vector)element_.getPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS);
- for (int i=0;i<initialResults.size();i++)
- {
- Object object = initialResults.elementAt(i);
- TreeElement childElement = null;
- if (object instanceof BusinessEntity)
- childElement = new BusinessElement((BusinessEntity)object,element_.getModel());
- else if (object instanceof BusinessService)
- childElement = new ServiceElement((BusinessService)object,element_.getModel());
- else if (object instanceof TModel)
- childElement = new ServiceInterfaceElement((TModel)object,element_.getModel());
- if (childElement != null)
- element_.connect(childElement,UDDIModelConstants.REL_QUERY_RESULTS,ModelConstants.REL_OWNER);
- }
- }
-
- private final void createChildNode(TreeElement element)
- {
- Node childNode = null;
- if (element instanceof BusinessElement)
- childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
- else if (element instanceof ServiceElement)
- childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
- else if (element instanceof ServiceInterfaceElement)
- childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
- if (childNode != null)
- addChild(childNode);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- new ResultsTool(toolManager_,controller.getMessage("ALT_RESULTS"));
- regFindTool_ = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
- }
-
- public final void setFindToolProperties(FindAction findAction)
- {
- findAction_ = findAction;
- regFindTool_.updatePropertyTable(findAction.getPropertyTable());
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- ((RegFindTool)regFindTool_).addAuthenticationProperties(regElement);
- Vector childNodes = getChildNodes();
- for (int i=0;i<childNodes.size();i++)
- {
- UDDINavigatorNode navigatorNode = (UDDINavigatorNode)childNodes.elementAt(i);
- navigatorNode.addAuthenticationProperties(regElement);
- }
- }
-
- public final FindAction getFindAction()
- {
- return findAction_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
deleted file mode 100644
index b7f42d0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class QueryParentNode extends UDDINavigatorFolderNode
-{
- public QueryParentNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERIES))
- {
- QueryElement queryElement = (QueryElement)event.getParentElement();
- createChildNode(queryElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- QueryElement queryElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
- queryElement = (QueryElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
- queryElement = (QueryElement)event.getOutBoundElement();
-
- if (queryElement != null)
- removeChildNode(queryElement);
- }
- });
- }
-
- private final void createChildNode(QueryElement element)
- {
- QueryNode queryNode = new QueryNode(element,nodeManager_,nodeDepth_+1);
- // Add registry authentication properties.
- RegistryElement regElement = (RegistryElement)(getParent().getTreeElement());
- queryNode.addAuthenticationProperties(regElement);
- addChild(queryNode);
- }
-
- protected final void initTools()
- {
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- new ItemsSummaryTool(toolManager_,"uddi/images/queries_closed_enabled.gif","uddi/images/queries_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_QUERIES"),UDDIActionInputs.QUERY_ITEM_QUERIES);
- new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),UDDIActionInputs.QUERY_ITEM_SERVICES);
- new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- }
-
- public String getOpenImagePath()
- {
- return "uddi/images/queries_open_highlighted.gif";
- }
-
- public String getClosedImagePath()
- {
- return "uddi/images/queries_closed_highlighted.gif";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
deleted file mode 100644
index f28a1be..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RefreshUDDINodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class RefreshTool extends ActionTool
-{
- public RefreshTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/refresh_enabled.gif","images/refresh_highlighted.gif",alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return RefreshUDDINodeAction.getActionLink(toolManager_.getNode().getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
deleted file mode 100644
index 2045169..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolProperties;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegFindTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- public RegFindTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/find_enabled.gif","uddi/images/find_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- initDefaultProperties(this);
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES,new Hashtable());
- UDDIPerspective uddiPerspective = toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
- setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_QUERY_NAME"));
- }
-
- private final void initDefaultProperties(FormToolPropertiesInterface formToolPI)
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- formToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
- String maxSearchSet = String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET);
- String maxResults = String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS);
-
- // RegFindBusinessesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-
- // RegFindBusinessesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-
- // RegFindServicesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-
- // RegFindServicesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-
- // RegFindServiceInterfacesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-
- // RegFindServiceInterfacesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- Hashtable subQueriesProperties = (Hashtable)getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = (FormToolPropertiesInterface)subQueriesProperties.get(subQueryKey);
- if (subQueryProperties == null)
- {
- subQueryProperties = new FormToolProperties();
- initDefaultProperties(subQueryProperties);
- subQueriesProperties.put(subQueryKey,subQueryProperties);
- }
- return subQueryProperties;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- }
- return "uddi/forms/RegFindForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
deleted file mode 100644
index d1b2e7c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegPublishTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
- public RegPublishTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/publish_enabled.gif","uddi/images/publish_highlighted.gif",alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
- // RegPublishBusinessSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,"");
-
- // RegPublishServiceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
- // RegPublishServiceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-
- // RegPublishServiceInterfaceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-
- // RegPublishServiceInterfaceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/RegPublishForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
deleted file mode 100644
index ad9758e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryDetailsTool extends DetailsTool
-{
- public RegistryDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/RegDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- RegistryElement regElement = (RegistryElement)(toolManager_.getNode().getTreeElement());
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,regElement.getName());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
deleted file mode 100644
index 7287843..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
+++ /dev/null
@@ -1,249 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryNode extends UDDINavigatorNode
-{
- private RegistryDetailsTool regDetailsTool_;
- private RegPublishTool regPublishTool_;
- private LoginTool loginTool_;
-
- public static final String IMAGE_PATH_STANDARD = "uddi/images/registry.gif";
- public static final String IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES = "uddi/images/regstrycat_obj.gif";
-
- public RegistryNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERIES_PARENT))
- {
- QueryParentElement queryParentElement = (QueryParentElement)event.getParentElement();
- createChildNode(queryParentElement);
- }
- else if (isPublishedItemsRel(rel))
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)event.getParentElement();
- createChildNode(publishedItemsElement);
- }
- }
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- String inBoundRelName = event.getInBoundRelName();
- String outBoundRelName = event.getOutBoundRelName();
- if (inBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(inBoundRelName))
- childElement = (TreeElement)event.getInboundElement();
- else if (outBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(outBoundRelName))
- childElement = (TreeElement)event.getOutBoundElement();
-
- if (childElement != null)
- removeChildNode(childElement);
- }
- });
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- element.connect(new QueryParentElement(uddiPerspective.getMessage("NODE_NAME_QUERIES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_QUERIES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_BUSINESSES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_BUSINESSES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT,ModelConstants.REL_OWNER);
- setVisibilityOfChildren(false);
- }
-
- private final boolean isPublishedItemsRel(String rel)
- {
- return rel.equals(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT);
- }
-
- private final void createChildNode(QueryParentElement queryParentElement)
- {
- QueryParentNode queryParentNode = new QueryParentNode(queryParentElement,nodeManager_,nodeDepth_+1);
- addChild(queryParentNode);
- }
-
- private final void createChildNode(PublishedItemsElement publishedItemsElement)
- {
- PublishedItemsNode publishedItemsNode = new PublishedItemsNode(publishedItemsElement,nodeManager_,nodeDepth_+1);
- addChild(publishedItemsNode);
- }
-
- protected final void initTools()
- {
- nodeManager_.getController();
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- regDetailsTool_ = new RegistryDetailsTool(toolManager_ ,uddiPerspective.getMessage("ALT_REGISTRY_DETAILS"));
- RegFindTool regFindTool = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
- regPublishTool_ = new RegPublishTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH"));
- loginTool_ = new LoginTool(toolManager_, uddiPerspective.getMessage("ALT_LOGIN"));
- new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- regFindTool.addAuthenticationProperties((RegistryElement)element_);
- regPublishTool_.addAuthenticationProperties((RegistryElement)element_);
- }
-
- public final RegistryDetailsTool getRegDetailsTool()
- {
- return regDetailsTool_;
- }
-
- public final RegPublishTool getRegPublishTool()
- {
- return regPublishTool_;
- }
-
- public final LoginTool getLoginTool()
- {
- return loginTool_;
- }
-
- private final void addDiscoveredNodes(Vector allNodes,Node queryParentNode,int queryType)
- {
- Vector queryNodes = queryParentNode.getChildNodes();
- for (int i=0;i<queryNodes.size();i++)
- {
- QueryNode queryNode = (QueryNode)queryNodes.elementAt(i);
- QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
- if (queryType == UDDIActionInputs.QUERY_ITEM_QUERIES)
- allNodes.addElement(queryNode);
- else if (queryElement.getQueryType() == queryType)
- {
- Vector discoveredNodes = queryNode.getChildNodes();
- for (int j=0;j<discoveredNodes.size();j++)
- allNodes.addElement(discoveredNodes.elementAt(j));
- }
- }
- }
-
- private final void addPublishedNodes(Vector allNodes,Node publishedItemsNode)
- {
- Vector itemNodes = publishedItemsNode.getChildNodes();
- for (int i=0;i<itemNodes.size();i++)
- allNodes.addElement(itemNodes.elementAt(i));
- }
-
- public final void getAllBusinessNodes(Vector allBusinessNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- addDiscoveredNodes(allBusinessNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- addPublishedNodes(allBusinessNodes,publishedBusinessesNode);
- }
-
- public final void getAllServiceNodes(Vector allServicesNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- addDiscoveredNodes(allServicesNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICES);
- addPublishedNodes(allServicesNodes,publishedServicesNode);
- }
-
- public final void getAllServiceInterfaceNodes(Vector allServiceInterfaceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- addDiscoveredNodes(allServiceInterfaceNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- addPublishedNodes(allServiceInterfaceNodes,publishedServiceInterfacesNode);
- }
-
- public final void getPublishedBusinessNodes(Vector publishedBusinessNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- addPublishedNodes(publishedBusinessNodes,publishedBusinessesNode);
- }
-
- public final void getPublishedServiceNodes(Vector publishedServiceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- addPublishedNodes(publishedServiceNodes,publishedServicesNode);
- }
-
- public final void getPublishedServiceInterfaceNodes(Vector publishedServiceInterfaceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- addPublishedNodes(publishedServiceInterfaceNodes,publishedServiceInterfacesNode);
- }
-
- public final void getDiscoveredNodes(Vector discoveredNodes,int queryItem)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- addDiscoveredNodes(discoveredNodes,queryParentNode,queryItem);
- }
-
- private final boolean hasQueryResults(Node queryParentNode,int queryType)
- {
- Vector queries = queryParentNode.getChildNodes();
- for (int i=0;i<queries.size();i++)
- {
- QueryNode queryNode = (QueryNode)queries.elementAt(i);
- if (queryNode.getChildNodes().size() > 0)
- {
- QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
- if (queryElement.getQueryType() == queryType)
- return true;
- }
- }
- return false;
- }
-
- public final boolean hasBusiness()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- if (publishedBusinessesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- }
-
- public final boolean hasService()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- if (publishedServicesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICES);
- }
-
- public final boolean hasServiceInterface()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- if (publishedServiceInterfacesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
deleted file mode 100644
index e257f6c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class ResultsTool extends FormTool
-{
- private String formLink_;
-
- public ResultsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
- formLink_ = ProxyLoadPageAction.getActionLink("uddi/forms/ResultsForm.jsp");
- }
-
- public final void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
deleted file mode 100644
index fb1c0ce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class RootCategoryNode extends Node
-{
- public RootCategoryNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- setVisibilityOfChildren(true);
- }
-
- public final void createChildren()
- {
- Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (children != null)
- {
- while (children.hasMoreElements())
- {
- CategoryElement categoryElement = (CategoryElement)children.nextElement();
- CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
- addChild(categoryNode);
- categoryNode.createChildren();
- }
- }
- }
-
- // Root node: no need for toggle action.
- protected final String getToggleNodeActionHref()
- {
- return null;
- }
-
- // Text only node.
- protected final String getLinkActionHref()
- {
- return null;
- }
-
- protected final void initTools()
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
deleted file mode 100644
index f506bde..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.CategoryBag;
-
-public class ServiceDetailsTool extends DetailsTool
-{
- public ServiceDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- ServiceElement serviceElement = (ServiceElement)(toolManager_.getNode().getTreeElement());
- BusinessService busService = serviceElement.getBusinessService();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,busService.getServiceKey());
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busService.getBusinessKey());
-
- Vector nameVector = new Vector();
- copyIndexVector(busService.getNameVector(),nameVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(busService.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-
- CategoryBag catBag = busService.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catVector);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
deleted file mode 100644
index c7c9847..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-
-public class ServiceInterfaceDetailsTool extends DetailsTool
-{
- public ServiceInterfaceDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceInterfaceDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)(toolManager_.getNode().getTreeElement());
- TModel tModel = siElement.getTModel();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,tModel.getTModelKey());
- ListElement nameListElement = new ListElement(tModel.getNameString());
- nameListElement.setTargetViewToolInfo(-1,-1,0);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(tModel.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-
- IdentifierBag idBag = tModel.getIdentifierBag();
- if (idBag != null)
- {
- Vector idVector = new Vector();
- copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idVector);
- }
-
- CategoryBag catBag = tModel.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catVector);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
deleted file mode 100644
index c8938f8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetBusinessesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceInterfaceNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private UnpublishTool unpublishTool_;
- public ServiceInterfaceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/service_interface_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new ServiceInterfaceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS"));
- new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),ServiceInterfaceGetServicesAction.getActionLink(nodeId_));
- new GetBusinessesTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESSES"),ServiceInterfaceGetBusinessesAction.getActionLink(nodeId_));
- new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_interface_enabled.gif","uddi/images/unpublish_service_interface_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE_INTERFACE"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-
- public String getWSDLURLFromDetailsTool()
- {
- ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- if (wsdlURLListElement != null)
- return (String)wsdlURLListElement.getObject();
- else
- return "temp.wsdl";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
deleted file mode 100644
index bbeac5f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetBusinessAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetServiceInterfacesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private UnpublishTool unpublishTool_;
- public ServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/service_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new ServiceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_DETAILS"));
- new GetBusinessesTool(toolManager_,"uddi/images/business_enabled.gif","uddi/images/business_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESS"),ServiceGetBusinessAction.getActionLink(nodeId_));
- new GetServiceInterfacesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICE_INTERFACES"),ServiceGetServiceInterfacesAction.getActionLink(nodeId_));
- new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new UDDIAddToWSDLPerspectiveTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_WSDL_PERSPECTIVE"));
- new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_enabled.gif","uddi/images/unpublish_service_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-
- public String getWSDLURLFromDetailsTool()
- {
- ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- if (wsdlURLListElement != null)
- return (String)wsdlURLListElement.getObject();
- else
- return "temp.wsdl";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
deleted file mode 100644
index bca7dd1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-public class SubQueryKeyProperty
-{
- private String subQueryKey_;
-
- public SubQueryKeyProperty()
- {
- subQueryKey_ = "";
- }
-
- public final void setSubQueryKey(String subQueryKey)
- {
- subQueryKey_ = subQueryKey;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
deleted file mode 100644
index 819e619..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public class SubQueryTransferTarget
-{
- private int nodeId_;
- private int toolId_;
- private int viewId_;
- private int viewToolId_;
- private String subQueryKey_;
- private NodeManager nodeManager_;
- Hashtable parentQueryData_;
-
- public SubQueryTransferTarget(Node node,String subQueryKey,Hashtable parentQueryData)
- {
- nodeId_ = node.getNodeId();
- toolId_ = node.getToolManager().getSelectedToolId();
- viewId_ = node.getViewId();
- viewToolId_ = node.getViewToolId();
- subQueryKey_ = subQueryKey;
- nodeManager_ = node.getNodeManager();
- parentQueryData_ = parentQueryData;
- }
-
- public final int getNodeId()
- {
- return nodeId_;
- }
-
- public final int getToolId()
- {
- return toolId_;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final int getViewToolId()
- {
- return viewToolId_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final FormTool getTargetFormTool()
- {
- Node node = nodeManager_.getNode(nodeId_);
- if (node == null)
- return null;
-
- Tool tool = node.getToolManager().getTool(toolId_);
-
- if (viewId_ != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)tool;
- ToolManager viewToolManager = viewTool.getToolManager(viewId_);
- if (viewToolManager != null)
- tool = viewToolManager.getTool(viewToolId_);
- else
- tool = null;
- }
- return (FormTool)tool;
- }
-
- public final Hashtable getParentQueryData()
- {
- return parentQueryData_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
deleted file mode 100644
index a9e2b6e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction;
-
-public class UDDIAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
- public UDDIAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return UDDIAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
deleted file mode 100644
index 7d85a02..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIImportWSDLToFileSystemAction;
-
-public class UDDIImportWSDLToFileSystemTool extends ImportToFileSystemTool
-{
- public UDDIImportWSDLToFileSystemTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public final String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getActionLink()
- {
- Node node = toolManager_.getNode();
- return UDDIImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 16c3621..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDIImportWSDLToWorkbenchTool extends ImportToWorkbenchTool
-{
- public UDDIImportWSDLToWorkbenchTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink()
- {
- return "uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
deleted file mode 100644
index 3d7e36f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDILaunchWebServiceWizardTool extends LaunchWebServiceWizardTool
-{
- public UDDILaunchWebServiceWizardTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink()
- {
- return "uddi/forms/UDDILaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
deleted file mode 100644
index 6c9000d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-
-// Root node for the UDDI Navigator Tree View
-public class UDDIMainNode extends UDDINavigatorNode
-{
- public UDDIMainNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_REGISTRIES))
- {
- RegistryElement registryElement = (RegistryElement)event.getParentElement();
- UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
- uddiMainElement.addRegistryName(registryElement.getName());
- createChildNode(registryElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- RegistryElement childElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
- childElement = (RegistryElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
- childElement = (RegistryElement)event.getOutBoundElement();
-
- if (childElement != null)
- {
- UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
- uddiMainElement.removeRegistryName(childElement.getName());
- removeChildNode(childElement);
- }
- }
- });
- }
-
- private final void createChildNode(TreeElement element)
- {
- RegistryElement regElement = (RegistryElement)element;
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- String imagePath;
- if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
- imagePath = RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES;
- else
- imagePath = RegistryNode.IMAGE_PATH_STANDARD;
-
- RegistryNode regNode = new RegistryNode(element,nodeManager_,nodeDepth_+1,imagePath);
- addChild(regNode);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- new OpenRegistryTool(toolManager_,uddiPerspective.getMessage("ALT_OPEN_REGISTRY"));
- }
-
- // Given a node under a particular registry node, obtain the registry node.
- public final RegistryNode getRegistryNode(Node currentNode)
- {
- RegistryNode regNode = null;
- if (currentNode instanceof RegistryNode)
- {
- regNode = (RegistryNode)currentNode;
- }
- else if (currentNode instanceof QueryNode)
- {
- // Query -> Query folder -> Registry
- regNode = (RegistryNode)(currentNode.getParent().getParent());
- }
- else if (currentNode instanceof QueryParentNode || currentNode instanceof PublishedItemsNode)
- {
- // Query folder -> Registry
- regNode = (RegistryNode)(currentNode.getParent());
- }
- else if (currentNode instanceof BusinessNode || currentNode instanceof ServiceNode || currentNode instanceof ServiceInterfaceNode)
- {
- // itemNode -> Published Items folder -> Registry
- // OR:
- // itemNode -> QueryNode -> Query folder -> Registry
- Node parentNode = currentNode.getParent();
- if (parentNode instanceof QueryNode)
- regNode = (RegistryNode)(parentNode.getParent().getParent());
- else
- regNode = (RegistryNode)parentNode.getParent();
- }
- return regNode;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
deleted file mode 100644
index 57c8cd3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-
-public abstract class UDDINavigatorFolderNode extends FolderNode
-{
- public UDDINavigatorFolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
deleted file mode 100644
index bde0728..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public abstract class UDDINavigatorNode extends Node
-{
- public UDDINavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
deleted file mode 100644
index 67cbdb6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
+++ /dev/null
@@ -1,499 +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
- * -------- -------- -----------------------------------------------------------
- * 20060224 122752 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SwitchPerspectiveFromUDDIAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIPerspective extends Perspective
-{
- private Hashtable knownRegistries_;
- private IFavoritesUDDIRegistry defaultUDDIRegistry_;
- private Model navigatorModel_;
- private NodeManager navigatorManager_;
- private int wsdlType_;
- private Hashtable categoryManagers_;
- String categoryTModelKey_;
-
- // Window sizes
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public UDDIPerspective(Controller controller)
- {
- super("uddi",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- String defaultFavorites = controller_.getDefaultFavoritesLocation();
- FavoritesRegistryTypeDefault favRegTypeDefault = new FavoritesRegistryTypeDefault(defaultFavorites);
- IFavoritesUDDIRegistry[] favRegistriesDefault = favRegTypeDefault.getFavoritesUDDIRegistries();
- knownRegistries_ = new Hashtable();
- for (int i=0;i<favRegistriesDefault.length;i++)
- {
- knownRegistries_.put(favRegistriesDefault[i].getInquiryURL(),favRegistriesDefault[i]);
- }
- if (favRegistriesDefault.length > 0)
- defaultUDDIRegistry_ = favRegistriesDefault[0];
-
- navigatorModel_ = new BasicModel("uddiModel");
- UDDIMainElement uddiMainElement = new UDDIMainElement(getMessage("NODE_NAME_UDDI_MAIN"),navigatorModel_);
- navigatorModel_.setRootElement(uddiMainElement);
- navigatorManager_ = new NodeManager(controller_);
- UDDIMainNode uddiMainNode = new UDDIMainNode(uddiMainElement,navigatorManager_);
- navigatorManager_.setRootNode(uddiMainNode);
-
- wsdlType_ = UDDIActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
- categoryManagers_ = new Hashtable();
-
- // Initialize the default category models.
- if (application.getAttribute("commonCategoryModels") == null)
- {
- synchronized (application)
- {
- if (application.getAttribute("commonCategoryModels") == null)
- {
- Hashtable commonCategoryModels = new Hashtable();
-
- CategoryModel naicsModel = new CategoryModel();
- naicsModel.setServletContext(application);
- naicsModel.setDefaultDataFile("/uddi/data/naics-data.txt");
- naicsModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_NAICS"));
- naicsModel.setTModelKey(TModel.NAICS_TMODEL_KEY);
- commonCategoryModels.put(TModel.NAICS_TMODEL_KEY,naicsModel);
-
- CategoryModel unspscModel = new CategoryModel();
- unspscModel.setServletContext(application);
- unspscModel.setDefaultDataFile("/uddi/data/unspsc-data.txt");
- unspscModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_UNSPSC_73"));
- unspscModel.setTModelKey(TModel.UNSPSC_73_TMODEL_KEY);
- commonCategoryModels.put(TModel.UNSPSC_73_TMODEL_KEY,unspscModel);
-
- CategoryModel geoModel = new CategoryModel();
- geoModel.setServletContext(application);
- geoModel.setDefaultDataFile("/uddi/data/geo-data.txt");
- geoModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_GEO"));
- geoModel.setTModelKey(TModel.ISO_CH_TMODEL_KEY);
- commonCategoryModels.put(TModel.ISO_CH_TMODEL_KEY,geoModel);
-
- application.setAttribute("commonCategoryModels",commonCategoryModels);
- }
- }
- }
- categoryTModelKey_ = null;
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public final Hashtable getKnownRegistries()
- {
- // We must always query the favorites to see if additional registries were added over time. This property cannot be cached.
- FavoritesMainElement favMainElement = (FavoritesMainElement)(controller_.getFavoritesPerspective().getNodeManager().getRootNode().getTreeElement());
- FavoritesUDDIRegistryFolderElement favRegFolderElement = favMainElement.getFavoritesUDDIRegistryFolderElement();
- Enumeration e = favRegFolderElement.getAllFavorites();
- while (e.hasMoreElements())
- {
- FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)e.nextElement();
- String inquiryURL = favRegElement.getInquiryURL();
- if (knownRegistries_.get(inquiryURL) == null)
- knownRegistries_.put(inquiryURL,favRegElement.getIFavoritesUDDIRegistryInterface());
- }
- return knownRegistries_;
- }
-
- public final String getKnownRegistryPublishURL(String inquiryURL)
- {
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
- if (knownRegistry != null)
- {
- String publishURL = knownRegistry.getPublishURL();
- if (Validator.validateURL(publishURL))
- return publishURL;
- }
- return null;
- }
-
- public final String getKnownRegistryRegistrationURL(String inquiryURL)
- {
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
- if (knownRegistry != null)
- {
- String registrationURL = knownRegistry.getRegistrationURL();
- if (Validator.validateURL(registrationURL))
- return registrationURL;
- }
- return null;
- }
-
- public final IFavoritesUDDIRegistry getDefaultUDDIRegistry()
- {
- return defaultUDDIRegistry_;
- }
-
- public final void preloadUDDIRegistries(String[] inquiryURLs, String[] publishURLs)
- {
- if (inquiryURLs != null)
- {
- Hashtable knownRegistries = getKnownRegistries();
- StringBuffer directoryBuffer = new StringBuffer();
- for (int i = 0; i < inquiryURLs.length; i++)
- {
- String inquiryURL = URLUtils.decode(inquiryURLs[i]);
- String publishURL = null;
- String regName = null;
- String registrationURL = null;
- // continue to the next registry if inquiryURL does not exist
- if (!Validator.validateURL(inquiryURL))
- continue;
- // populate and run an OpenRegistryAction
- OpenRegistryAction action = new OpenRegistryAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)knownRegistries.get(inquiryURL);
- boolean checkForUserDefinedCategories = false;
- File directoryFile = null;
- if (knownRegistry != null)
- {
- publishURL = knownRegistry.getPublishURL();
- regName = knownRegistry.getName();
- registrationURL = knownRegistry.getRegistrationURL();
- directoryBuffer.setLength(0);
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),regName);
- directoryFile = new File(directoryBuffer.toString());
- if (directoryFile.exists() && directoryFile.listFiles().length > 0)
- checkForUserDefinedCategories = true;
- }
- if (regName == null)
- regName = inquiryURL;
- if (publishURL == null && publishURLs != null && i < publishURLs.length && publishURLs[i] != null) {
- publishURL = URLUtils.decode(publishURLs[i]);
- }
- // populate the action
- propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryURL);
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME, regName);
- if (Validator.validateURL(publishURL))
- propertyTable.put(UDDIActionInputs.PUBLISH_URL, publishURL);
- if (Validator.validateURL(registrationURL))
- propertyTable.put(UDDIActionInputs.REGISTRATION_URL, registrationURL);
-
- // Check if private registry category information is available for this registry.
- directoryBuffer.setLength(0);
- String encodedInquiryURL = URLUtils.encode(inquiryURL);
- directoryBuffer.append(controller_.getServletEngineStateLocation()).append(encodedInquiryURL).append(".properties");
- directoryFile = new File(directoryBuffer.toString());
- if (directoryFile.exists())
- {
- try
- {
- Properties p = new Properties();
- FileInputStream fin = new FileInputStream(directoryFile);
- p.load(fin);
- fin.close();
- directoryFile.delete();
- String dataDirectory = p.getProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
- if (dataDirectory != null)
- propertyTable.put(UDDIActionInputs.CATEGORIES_DIRECTORY,dataDirectory);
- checkForUserDefinedCategories = true;
- }
- catch (IOException e)
- {
- checkForUserDefinedCategories = false;
- }
- }
-
- if (checkForUserDefinedCategories)
- propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
- else
- propertyTable.remove(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-
- // run the action
- action.run();
-
- RegistryElement regElement = (RegistryElement)(navigatorManager_.getSelectedNode().getTreeElement());
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
- {
- AddRegistryToUDDIPerspectiveAction action2 = new AddRegistryToUDDIPerspectiveAction(controller_);
- String categoriesDirectory = regElement.getCategoriesDirectory();
- if (categoriesDirectory != null)
- action2.linkCategoryModelsWithSavedData(userDefinedCategories,categoriesDirectory);
- else
- action2.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories);
- }
- }
- if (inquiryURLs.length > 0)
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_UDDI);
- }
- }
-
- // Preconditions:
- // serviceNames and serviceKeys have length >= 1.
- // regNode != null
- private final void preloadServicesForRegistry(RegistryNode regNode,String[] serviceNames,String[] serviceKeys)
- {
- int regNodeId = regNode.getNodeId();
- for (int i=0;i<serviceKeys.length;i++)
- {
- navigatorManager_.setSelectedNodeId(regNodeId);
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,serviceNames[i]);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceKeys[i]);
- action.run();
- navigatorManager_.makeSelectedNodeVisible();
- }
- }
-
- public final void preloadServices(String[] inquiryURLs,String[] serviceNames,String[] serviceKeys)
- {
- // The algorithm will search for each service key in each inquiry URL.
- if (serviceKeys != null && serviceNames != null && serviceNames.length == serviceKeys.length)
- {
- for (int i=0;i<serviceKeys.length;i++)
- {
- if (inquiryURLs != null)
- {
- // Eliminate duplicate inquiry URLs.
- Hashtable inquiryURLsHash = new Hashtable();
- for (int j=0;j<inquiryURLs.length;j++)
- inquiryURLsHash.put(inquiryURLs[j],Boolean.TRUE);
- // Loop through all the available registries and use them if possible.
- Node uddiMainNode = navigatorManager_.getRootNode();
- Vector registryNodes = uddiMainNode.getChildNodes();
- for (int k=0;k<registryNodes.size();k++)
- {
- RegistryNode regNode = (RegistryNode)registryNodes.elementAt(k);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- String existingRegistryInquiryURL = regElement.getInquiryURL();
- if (inquiryURLsHash.get(existingRegistryInquiryURL) != null)
- {
- preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
- inquiryURLsHash.remove(existingRegistryInquiryURL);
- }
- }
- Enumeration inquiryURLsEnum = inquiryURLsHash.keys();
- while (inquiryURLsEnum.hasMoreElements())
- {
- String inquiryURL = (String)inquiryURLsEnum.nextElement();
- preloadUDDIRegistries(new String[] {inquiryURL},null);
- RegistryNode regNode = (RegistryNode)navigatorManager_.getSelectedNode();
- preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
- }
- }
- }
- }
- }
-
- public final void setCategoryTModelKey(String categoryTModelKey)
- {
- categoryTModelKey_ = categoryTModelKey;
- }
-
- public final String getCategoryTModelKey()
- {
- return categoryTModelKey_;
- }
-
- private final void initCategoryBrowser(CategoryModel categoryModel,NodeManager nodeManager)
- {
- TreeElement categoryRootElement = (TreeElement)categoryModel.getRootElement();
- RootCategoryNode rootCategoryNode = new RootCategoryNode(categoryRootElement,nodeManager);
- nodeManager.setRootNode(rootCategoryNode);
- rootCategoryNode.createChildren();
- }
-
- public final NodeManager getCategoryManager()
- {
- return (NodeManager)categoryManagers_.get(categoryTModelKey_);
- }
-
- public final NodeManager getCategoryManager(CategoryModel categoryModel)
- {
- String tModelKey = categoryModel.getTModelKey();
- NodeManager categoryManager = (NodeManager)categoryManagers_.get(tModelKey);
- if (categoryManager == null)
- {
- categoryManager = new NodeManager(controller_);
- initCategoryBrowser(categoryModel,categoryManager);
- categoryManagers_.put(tModelKey,categoryManager);
- }
- return categoryManager;
- }
-
- public final NodeManager getNavigatorManager()
- {
- return navigatorManager_;
- }
-
- public final NodeManager getNodeManager()
- {
- return getNavigatorManager();
- }
-
- public final void setWSDLType(int wsdlType)
- {
- wsdlType_ = wsdlType;
- }
-
- public final int getWSDLType()
- {
- return wsdlType_;
- }
-
- public final String getPerspectiveContentPage()
- {
- return "uddi/uddi_perspective_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-
- public final String getFramesetsFile()
- {
- return "uddi/scripts/uddiframesets.jsp";
- }
-
- public final String getProcessFramesetsForm()
- {
- return "uddi/forms/ProcessUDDIFramesetsForm.jsp";
- }
-
- public final String getPanesFile()
- {
- return "uddi/scripts/uddipanes.jsp";
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-
- public final String getSavePerspectiveActionLink()
- {
- //return SaveUDDIPerspectiveAction.getActionLink();
- return "";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromUDDIAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
deleted file mode 100644
index 8722762..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class UnpublishTool extends FormTool
-{
- public UnpublishTool(ToolManager toolManager, String enableImage, String highlightImage, String alt)
- {
- super(toolManager, enableImage, highlightImage, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- public String getFormLink()
- {
- return "uddi/forms/UnpublishForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
deleted file mode 100644
index 8a7b2fe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
+++ /dev/null
@@ -1,423 +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
- * -------- -------- -----------------------------------------------------------
- * 20061004 148052 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-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.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.OverviewDoc;
-import org.uddi4j.datatype.OverviewURL;
-import org.uddi4j.datatype.binding.AccessPoint;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.InstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class Uddi4jHelper
-{
- public final KeyedReference getWSDLKeyedReference()
- {
- KeyedReference keyRef = new KeyedReference("types", "wsdlSpec");
- keyRef.setTModelKey("UUID:C1ACF26D-9672-4404-9D70-39B756E62AB4");
- return keyRef;
- }
-
- public final TModel newTModel(String wsdlUrl) throws WSDLException
- {
- return newTModel(wsdlUrl, getWSDLDefinition(wsdlUrl));
- }
-
- public final TModel newTModel(String wsdlUrl, Definition def) throws WSDLException
- {
- TModel tModel = new TModel();
- tModel.setTModelKey("");
- tModel.setName(def.getTargetNamespace());
- tModel.setDefaultDescriptionString("");
- OverviewDoc overviewDoc = new OverviewDoc();
- overviewDoc.setOverviewURL(wsdlUrl);
- tModel.setOverviewDoc(overviewDoc);
- CategoryBag catBag = new CategoryBag();
- Vector keyRefVector = new Vector();
- keyRefVector.add(getWSDLKeyedReference());
- catBag.setKeyedReferenceVector(keyRefVector);
- tModel.setCategoryBag(catBag);
- return tModel;
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Hashtable tModelsTable) throws WSDLException
- {
- return newBusinessService(wsdlUrl, getWSDLDefinition(wsdlUrl), tModelsTable);
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Definition def, Hashtable tModelsTable) throws WSDLException
- {
- BusinessService bs = new BusinessService();
- bs.setServiceKey("");
- BindingTemplates bindingTemplates = new BindingTemplates();
- Vector bindingTemplateVector = new Vector();
- Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
- if (services.length > 0)
- {
- Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
- for (int i = 0; i < ports.length; i++)
- {
- TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
- Vector tModelInfoVector = new Vector();
- TModel tModel = (TModel)tModelsTable.get(ports[i].getBinding().getPortType().getQName().getNamespaceURI());
- tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModel.getTModelKey()));
- tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
- bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
- bindingTemplate.setTModelInstanceDetails(tModelDetails);
- bindingTemplate.setBindingKey("");
- bindingTemplateVector.add(bindingTemplate);
- }
- }
- bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
- bs.setBindingTemplates(bindingTemplates);
- return bs;
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Definition def, TModel[] tModels) throws WSDLException
- {
- BusinessService bs = new BusinessService();
- bs.setServiceKey("");
- BindingTemplates bindingTemplates = new BindingTemplates();
- Vector bindingTemplateVector = new Vector();
- Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
- if (services.length > 0)
- {
- Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
- for (int i = 0; i < ports.length; i++)
- {
- for (int j = 0; j < tModels.length; j++)
- {
- TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
- Vector tModelInfoVector = new Vector();
- tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModels[j].getTModelKey()));
- tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
- bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
- bindingTemplate.setTModelInstanceDetails(tModelDetails);
- bindingTemplate.setBindingKey("");
- bindingTemplateVector.add(bindingTemplate);
- }
- }
- }
- bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
- bs.setBindingTemplates(bindingTemplates);
- return bs;
- }
-
- public Definition getWSDLDefinition(String wsdlUrl) throws WSDLException
- {
- try
- {
- WebServicesParserExt parser = new WebServicesParserExt();
- String proxySet = System.getProperty("http.proxySet");
- if (proxySet != null && proxySet.equals("true"))
- {
- parser.setHTTPBasicAuthUsername(System.getProperty("http.proxyUserName"));
- parser.setHTTPBasicAuthPassword(System.getProperty("http.proxyPassword"));
- }
- return parser.getWSDLDefinitionVerbose(wsdlUrl);
- }
- catch (Exception e)
- {
- throw new WSDLException(WSDLException.PARSER_ERROR, e.getMessage(), e);
- }
- }
-
- private final String createDescription(Port port)
- {
- String desc = null;
- Element e = port.getDocumentationElement();
- if (e != null)
- {
- Node node = e.getFirstChild();
- StringBuffer sb = new StringBuffer();
- while (node != null)
- {
- switch (node.getNodeType())
- {
- case Node.TEXT_NODE:
- case Node.CDATA_SECTION_NODE:
- sb.append(((CharacterData)node).getData());
- default:
- node = node.getNextSibling();
- break;
- }
- }
- desc = sb.toString();
- }
- return desc;
- }
-
- private final TModelInstanceInfo createTModelInstanceInfo(String wsdlUrl, Port port, String tModelKey)
- {
- InstanceDetails details = new InstanceDetails();
- OverviewDoc overviewDoc = new OverviewDoc();
- TModelInstanceInfo tModelInfo = new TModelInstanceInfo();
- StringBuffer overviewURLString = new StringBuffer(wsdlUrl);
- String portName = port.getName();
- if (portName != null)
- {
- overviewURLString.append("#");
- overviewURLString.append(portName);
- }
- overviewDoc.setOverviewURL(new OverviewURL(overviewURLString.toString()));
- details.setOverviewDoc(overviewDoc);
- tModelInfo.setInstanceDetails(details);
- if (tModelKey != null)
- tModelInfo.setTModelKey(tModelKey);
- return tModelInfo;
- }
-
- private final AccessPoint createAccessPoint(Port port)
- {
- AccessPoint accessPoint = null;
- List list = port.getExtensibilityElements();
- for (int j = 0; j < list.size(); j++)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)list.get(j);
- if (extElement instanceof SOAPAddress)
- {
- String locationURI = ((SOAPAddress)extElement).getLocationURI();
- accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
- break;
- }
- else if (extElement instanceof HTTPAddress)
- {
- String locationURI = ((HTTPAddress)extElement).getLocationURI();
- accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
- break;
- }
- }
- return accessPoint;
- }
-
- private final String URL_TYPE_OTHER = "other";
- private final String URL_TYPES = "http https mail ftp fax phone other";
-
- private final String getURLType(String url)
- {
- int i = url.indexOf(":");
- String type;
- if (i == -1)
- type = URL_TYPE_OTHER;
- else
- {
- type = url.substring(0, i);
- if (type.equals("") || URL_TYPES.indexOf(type) == -1)
- type = URL_TYPE_OTHER;
- }
- return type;
- }
-
- public boolean isMonolithicWSDL(Definition def)
- {
- return hasMessage(def) && hasPortType(def) && hasBinding(def) && hasService(def);
- }
-
- public boolean isServiceImplement(Definition def)
- {
- return hasImport(def) && hasService(def);
- }
-
- public boolean isServiceInterface(Definition def)
- {
- return hasMessage(def) && hasPortType(def) && hasBinding(def);
- }
-
- public boolean isServiceInterfaceWithBindingsOnly(Definition def)
- {
- return !hasService(def) && hasBinding(def);
- }
-
- private boolean hasMessage(Definition def)
- {
- for(Iterator it = def.getMessages().values().iterator(); it.hasNext();)
- if (!((Message)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasPortType(Definition def)
- {
- for(Iterator it = def.getPortTypes().values().iterator(); it.hasNext();)
- if (!((PortType)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasBinding(Definition def)
- {
- for(Iterator it = def.getBindings().values().iterator(); it.hasNext();)
- if (!((Binding)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasService(Definition def)
- {
- return !def.getServices().isEmpty();
- }
-
- private boolean hasImport(Definition def)
- {
- return !def.getImports().isEmpty();
- }
-
- public String[] getImports(Definition def, String wsdlUrl)
- {
-
-
- Map importsMap = def.getImports();
- Collection values = importsMap.values();
- Iterator it = values.iterator();
-
- Vector importsVec = new Vector();
- for(int i =0;it.hasNext();i++){
- ArrayList aList = (ArrayList)it.next();
- Iterator itImports = aList.iterator();
- while(itImports.hasNext()){
- importsVec.add(itImports.next());
- }
- }
- Import imports[] = new Import[importsVec.size()] ;
- Iterator itVec = importsVec.iterator();
- for(int j = 0;itVec.hasNext();j++){
- imports[j] = (Import)itVec.next();
- }
-
-
-
- String[] importStrings = new String[imports.length];
- String s;
- if (wsdlUrl != null && wsdlUrl.indexOf('/') != -1)
- s = wsdlUrl.substring(0, wsdlUrl.lastIndexOf('/')+1);
- else
- s = "";
- for (int i = 0; i < importStrings.length; i++)
- {
- StringBuffer sb = new StringBuffer();
- String locationURI = imports[i].getLocationURI();
- if (locationURI.indexOf(':') != -1)
- sb.append(locationURI);
- else
- sb.append(s).append(locationURI);
- importStrings[i] = sb.toString();
- }
- return importStrings;
- }
-
- public String getWSDL(BusinessService bs, UDDIProxy proxy)
- {
- Vector bindingTemplateVector = bs.getBindingTemplates().getBindingTemplateVector();
- if (bindingTemplateVector.size() > 0)
- {
- BindingTemplate bt = (BindingTemplate)bindingTemplateVector.get(0);
- TModelInstanceDetails tModelDetails = bt.getTModelInstanceDetails();
- if (tModelDetails != null)
- {
- Vector tModelInfoVector = tModelDetails.getTModelInstanceInfoVector();
- if (tModelInfoVector.size() > 0)
- {
- TModelInstanceInfo tModelInfo = (TModelInstanceInfo)tModelInfoVector.get(0);
- InstanceDetails details = tModelInfo.getInstanceDetails();
- if (details != null)
- {
- OverviewDoc overviewDoc = details.getOverviewDoc();
- if (overviewDoc != null)
- return parse(overviewDoc.getOverviewURLString());
- }
- else if (proxy != null)
- {
- String tModelKey = tModelInfo.getTModelKey();
- if (tModelKey != null)
- {
- try
- {
- TModelDetail t = proxy.get_tModelDetail(tModelKey);
- if (t != null)
- {
- Vector tModelVector = t.getTModelVector();
- if (tModelVector != null && tModelVector.size() > 0)
- return getWSDL((TModel)tModelVector.get(0));
- }
- }
- catch (UDDIException uddie)
- {
- }
- catch (TransportException te)
- {
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- public String getWSDL(TModel tModel)
- {
- OverviewDoc overviewDoc = tModel.getOverviewDoc();
- if (overviewDoc != null)
- return parse(overviewDoc.getOverviewURLString());
- else
- return null;
- }
-
- private String parse(String s)
- {
- if (s != null && s.length() > 0)
- {
- int index = s.indexOf('#');
- if (index != -1)
- return s.substring(0, index);
- }
- return s;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java
deleted file mode 100644
index cc20504..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java
+++ /dev/null
@@ -1,38 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Helper class used to detect the type of browser used.
- */
-public class BrowserDetect {
-
- /**
- * Determine if Microsoft Internet Explorer is used.
- *
- * @param request The HTTP request.
- * @return True if the client is a Microsoft Internet Explorer web browser, false otherwise.
- */
- public static final boolean isMicrosoftInternetExplorer(HttpServletRequest request) {
- String userAgent = request.getHeader("User-Agent");
-
- if (userAgent != null && userAgent.toLowerCase().indexOf("msie") != -1)
- return true;
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
deleted file mode 100644
index 08f0851..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.util;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-public class CharArrayWrapper extends HttpServletResponseWrapper
-{
- private CharArrayWriter charArrayWriter_;
-
- public CharArrayWrapper(HttpServletResponse response)
- {
- super(response);
- charArrayWriter_ = new CharArrayWriter();
- }
-
- public PrintWriter getWriter()
- {
- return new PrintWriter(charArrayWriter_);
- }
-
- public String toString()
- {
- return charArrayWriter_.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
deleted file mode 100644
index 2ba8bc5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.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.wst.ws.internal.explorer.platform.util;
-
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-
-public final class DirUtils
-{
- public static boolean isRTL()
- {
- return "rtl".equals(getDir());
- }
-
- public static String getDir()
- {
- String rtl = "rtl";
- String ltr = "ltr";
-
- // from system property
- String orientation = System.getProperty("eclipse.orientation"); //$NON-NLS-1$
- if (rtl.equals(orientation)) //$NON-NLS-1$
- return rtl;
- else if (ltr.equals(orientation)) //$NON-NLS-1$
- return ltr;
-
- // from command line
- String[] args = Platform.getCommandLineArgs();
- for (int i = 0; i < args.length; i++)
- {
- if ("-dir".equalsIgnoreCase(args[i])) //$NON-NLS-1$
- {
- if ((i + 1) < args.length && "rtl".equalsIgnoreCase(args[i + 1])) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
- }
-
- // Check if the user property is set. If not do not
- // rely on the vm.
- if (System.getProperty("osgi.nl.user") == null) //$NON-NLS-1$
- return ltr;
-
- // guess from default locale
- String locale = Platform.getNL();
- if (locale == null)
- {
- locale = Locale.getDefault().toString();
- }
- if (locale.startsWith("ar") || locale.startsWith("fa") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("ur")) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
deleted file mode 100644
index 8cf6f77..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- * 20080324 186456 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-
-public final class HTMLUtils
-{
- public static final String UTF8_ENCODING = "UTF-8";
- public static final String LINE_BREAK = "<br>";
- public static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
- /**
- * Get the HTML tag for an image.
- * @return String The HTML tag for this image.
- * @param HttpServletResponse To encode the src attribute.
- * @param String src attribute defining the path to the image file. This must include the context path.
- * @param String Optional alt text to be displayed with the image. Set this to null to disable the attribute.
- * @param String Optional width of the rendered image. Set this to null to disable the attribute.
- * @param String Optional height of the rendered imag. Set this to null to disable the attribute.
- * @param Hashtable Optional key-value pairs of additional strings to be added as-is to the tag. Set this to null to disable.
- * @return String The image tag.
- */
- public static final String getHTMLImageTag(HttpServletResponse response,String src,String alt,String width,String height,Hashtable additionalAttributes)
- {
- StringBuffer tag = new StringBuffer("<img src=\"");
- tag.append(response.encodeURL(src)).append('\"');
- if (alt == null)
- alt = "";
- tag.append(" alt=\"").append(alt).append('\"');
- tag.append(" title=\"").append(alt).append('\"');
- if (width != null)
- tag.append(" width=").append(width);
- if (height != null)
- tag.append(" height=").append(height);
- tag.append(" border=0");
- if (additionalAttributes != null)
- {
- Enumeration keys = additionalAttributes.keys();
- while (keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
- tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
- }
- }
- tag.append('>');
- return tag.toString();
- }
-
- /**
- * Get the HTML tag for this link. The complete tag consists of the open tag <a> followed by a subelement and, finally, by an end tag </a>.
- * @return String The HTML tag of the link.
- * @param HttpServletResponse To encode the href attribute.
- * @param String The href attribute of the link. This must include the context path.
- * @param String target Optional target attribute for the link. Set this to null to disable the attribute.
- * @param String Optional name for the link. Set this to null to disable the attribute.
- * @param String The label which acts as the subelement. i.e. <a>label</a>.
- * @param Hashtable Optional key-value pairs of additional string attributes to be added as-is to the open tag. Set this to null to disable.
- */
- public static final String getHTMLLinkTag(HttpServletResponse response,String href,String target,String name,String label,Hashtable additionalAttributes)
- {
- StringBuffer tag = new StringBuffer("<a href=\"");
- tag.append(response.encodeURL(href)).append('\"');
- if (target != null)
- tag.append(" target=\"").append(target).append('\"');
- if (name != null)
- tag.append(" name=\"").append(name).append('\"');
- if (additionalAttributes != null)
- {
- Enumeration keys = additionalAttributes.keys();
- while (keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
- tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
- }
- }
- tag.append('>');
- tag.append(label);
- tag.append("</a>");
- return tag.toString();
- }
-
- /**
- * Get the HTML tag for a red asterist.
- * @return String The HTML tag for the red asterisk.
- */
- public static final String redAsterisk()
- {
- return "<font color=\"#ff0000\">*</font>";
- }
-
- /**
- * Get the Javascript mangled version of a given input String.
- * @return String The Javascript mangled String.
- */
- public static final String JSMangle(String input)
- {
- if (input == null)
- return "";
-
- StringBuffer mangledOutput = new StringBuffer();
- for (int i=0;i<input.length();i++)
- {
- char c = input.charAt(i);
- switch (c)
- {
- case '\n':
- mangledOutput.append("\\n");
- break;
- case '\r':
- mangledOutput.append("\\r");
- break;
- case '\\':
- case '\"':
- case '\'':
- mangledOutput.append('\\');
- default:
- mangledOutput.append(c);
- }
- }
- return mangledOutput.toString();
- }
-
- private static final String LESS_THAN = "<";
- private static final String LESS_THAN_HTML_ENTITY = "<";
- private static final String GREATER_THAN = ">";
- private static final String GREATER_THAN_HTML_ENTITY = ">";
- private static final String SPACE = " ";
- private static final String SPACE_HTML_ENTITY = " ";
- private static final String AMPERSAND = "&";
- private static final String AMPERSAND_HTML_ENTITY = "&";
- private static final String QUOTATION = "\"";
- private static final String QUOTATION_HTML_ENTITY = """;
-
- /**
- * Replace special characters with HTML entities representing these characters.
- * Note that this will also convert normal spaces into non-breaking spaces, which may be good for
- * presentation but not for editing.
- *
- * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
- */
- public static final String charactersToHTMLEntities(String s) {
- s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
- s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
- s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
- s = stringReplace(s, SPACE, SPACE_HTML_ENTITY);
- s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
- return s;
- }
-
- /**
- * Replace special characters with HTML entities representing these characters
- * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
- */
- public static final String charactersToHTMLEntitiesStrict(String s) {
- s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
- s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
- s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
- s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
- return s;
- }
-
- /**
- * Replace HTML character entities with their associated characters.
- * @return String The converted String.
- */
- public static final String htmlEntitiesToCharacters(String s) {
- s = stringReplace(s, LESS_THAN_HTML_ENTITY, LESS_THAN);
- s = stringReplace(s, GREATER_THAN_HTML_ENTITY, GREATER_THAN);
- s = stringReplace(s, SPACE_HTML_ENTITY, SPACE);
- s = stringReplace(s, AMPERSAND_HTML_ENTITY, AMPERSAND);
- s = stringReplace(s, QUOTATION_HTML_ENTITY, QUOTATION);
- return s;
- }
-
- private static final String stringReplace(String s, String oldString, String newString) {
- String sCopy = s;
- int fromIndex = 0;
- int oldStringIndex = sCopy.indexOf(oldString, fromIndex);
- StringBuffer sb = new StringBuffer();
- while (oldStringIndex != -1) {
- sb.setLength(0);
- sb.append(sCopy.substring(0, oldStringIndex));
- sb.append(newString);
- sb.append(sCopy.substring(oldStringIndex + oldString.length(), sCopy.length()));
- sCopy = sb.toString();
- fromIndex = oldStringIndex + newString.length();
- oldStringIndex = sCopy.indexOf(oldString, fromIndex);
- }
- return sCopy;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
deleted file mode 100644
index 35b5958..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.util;
-
-public final class MultipartFormDataException extends Throwable
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257845472227110961L;
-
-public MultipartFormDataException(String message)
- {
- super(message);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
deleted file mode 100644
index 308edff..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
+++ /dev/null
@@ -1,247 +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.wst.ws.internal.explorer.platform.util;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-
-public final class MultipartFormDataParser
-{
- private Hashtable paramTable_;
-
- private static final String HEADER_CONTENT_TYPE = "Content-Type";
- private static final String HEADER_MULTIPART = "multipart";
- private static final String HEADER_BOUNDARY = "boundary=";
- private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition: form-data";
- private static final String HEADER_NAME = "name=\"";
-
- private static final byte PARSER_STATE_INITIAL = 0;
- private static final byte PARSER_STATE_BOUNDARY = 1;
- private static final byte PARSER_STATE_PARAMETER = 2;
- private static final byte PARSER_STATE_BLANK = 3;
- private static final byte PARSER_STATE_DATA = 4;
-
- private static String parserStates[] = {"initial","boundary","parameter name","blank line","data"};
-
- public MultipartFormDataParser()
- {
- }
-
- public MultipartFormDataParser(Hashtable parameters)
- {
- paramTable_ = new Hashtable();
- for (Iterator it = parameters.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Object value = parameters.get(key);
- if (value instanceof List)
- {
- List list = (List)value;
- for (Iterator it2 = list.iterator(); it2.hasNext();)
- saveData(key.toString(), it2.next().toString());
- }
- else if (value.getClass().isArray())
- {
- Object[] array = (Object[])value;
- for (int i = 0; i < array.length; i++)
- saveData(key.toString(), array[i].toString());
- }
- else
- {
- saveData(key.toString(), value.toString());
- }
- }
- }
-
- /**
- * Parse a multipart/form-data encoded post request with a given encoding.
- * If the encoding is null, use the system default encoding. utf-8 is not a
- * bad choice for the encoding.
- */
- public final void parseRequest(HttpServletRequest request,String encoding) throws MultipartFormDataException
- {
- // Content-Type header should have the form:
- // multipart/form-data; boundary=...
- //
- // RFC2046 5.1.1 page 19, paragraph 2:
- // The Content-Type field for multipart entities requires one parameter, "boundary" (no quotes)
- String contentType = request.getHeader(HEADER_CONTENT_TYPE);
- if (contentType == null || !contentType.startsWith(HEADER_MULTIPART) || contentType.indexOf(HEADER_BOUNDARY) == -1)
- throw new MultipartFormDataException("Content-Type is not multipart/form-data");
-
- // RFC2046 5.1.1 page 19, paragraph 4:
- // The boundary value may be enclosed in double quotes. Strip these if they are present.
- String boundary = contentType.substring(contentType.indexOf(HEADER_BOUNDARY)+HEADER_BOUNDARY.length(),contentType.length());
- if (boundary.charAt(0) == '\"' && boundary.charAt(boundary.length()-1) == '\"')
- boundary = boundary.substring(1,boundary.length()-1);
-
- // RFC2046 5.1.1 page 19, paragraph 2:
- // The boundary delimiter line is then defined as a line consisting entirely
- // of two hyphen characters.
- String delimiter = "--"+boundary;
-
- if (paramTable_ == null)
- paramTable_ = new Hashtable();
- else
- paramTable_.clear();
-
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),encoding));
- String line = null;
- String parameterName = null;
- StringBuffer parameterValue = new StringBuffer();
- byte currentParserState = PARSER_STATE_INITIAL;
- while ((line = br.readLine()) != null)
- {
- // Lines appear in the following sequence.
- // 1) boundary indicating the start of a new parameter and end of a data segment.
- // 2) Content-Disposition: form-data; name="..." - the name of a new parameter.
- // 3) a blank line
- // 4) data
- //
- // For each parameter, the sequence is repeated.
- if (line.startsWith(delimiter))
- {
- byte[] expectedParserStates = {PARSER_STATE_INITIAL,PARSER_STATE_DATA};
- if (isValidParserState(currentParserState,expectedParserStates))
- {
- // Save any current data and prepare for a new parameter name.
- if (parameterName != null)
- {
- saveData(parameterName,parameterValue.toString());
- parameterName = null;
- parameterValue.setLength(0);
- }
- currentParserState = PARSER_STATE_BOUNDARY;
- }
- else
- throw new MultipartFormDataException(getParserExceptionMessage(currentParserState,expectedParserStates));
- }
- else if (line.startsWith(HEADER_CONTENT_DISPOSITION))
- {
- byte[] expectedParserStates = {PARSER_STATE_BOUNDARY};
- if (isValidParserState(currentParserState,expectedParserStates))
- {
- // Obtain the parameter name without the surrounding double quotes. Accounts for RFC 1867 too.
- int parameterNameStartingPosition = line.indexOf(HEADER_NAME)+HEADER_NAME.length();
- parameterName = line.substring(parameterNameStartingPosition,+parameterNameStartingPosition+line.substring(parameterNameStartingPosition).indexOf('\"'));
- currentParserState = PARSER_STATE_PARAMETER;
- }
- }
- else if (currentParserState == PARSER_STATE_PARAMETER)
- {
- // A blank line should follow the PARAMETER. Discard the line and move on.
- currentParserState = PARSER_STATE_BLANK;
- }
- else
- {
- // Expect the line to contain data.
- if (parameterValue.length() > 0)
- parameterValue.append('\n');
- parameterValue.append(line);
- currentParserState = PARSER_STATE_DATA;
- }
- }
- }
- catch (Throwable t)
- {
- throw new MultipartFormDataException(t.getMessage());
- }
- //dumpParamTable();
- }
-
- /**
- * Returns the value of a request parameter as a String, or null if the parameter does not exist.
- * If the parameter has multiple values, only the first value is returned. Use getParameterValues()
- * for parameters with multiple values.
- */
- public final String getParameter(String parameter) throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
- Vector values = (Vector)paramTable_.get(parameter);
- return ((values != null)?((String)values.elementAt(0)):null);
- }
-
- public final String[] getParameterValues(String parameter) throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
- Vector valuesVector = (Vector)paramTable_.get(parameter);
- if (valuesVector == null)
- return null;
- String[] valuesArray = new String[valuesVector.size()];
- for (int i=0;i<valuesArray.length;i++)
- valuesArray[i] = (String)valuesVector.elementAt(i);
- return valuesArray;
- }
-
- public final String[] getParameterNames() throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
-
- int size = paramTable_.size();
- if (size == 0)
- return null;
- String[] names = new String[size];
- Enumeration keys = paramTable_.keys();
- for (int i=0;i<size;i++)
- names[i] = (String)keys.nextElement();
- return names;
- }
-
- private final void saveData(String parameterName,String parameterValue)
- {
- Vector values = (Vector)paramTable_.get(parameterName);
- if (values == null)
- values = new Vector();
- values.addElement(parameterValue);
- paramTable_.put(parameterName,values);
- }
-
- private final boolean isValidParserState(byte currentState,byte[] expectedStates)
- {
- boolean validity = false;
- for (int i=0;i<expectedStates.length;i++)
- {
- if (currentState == expectedStates[i])
- {
- validity = true;
- break;
- }
- }
- return validity;
- }
-
- private final String getParserExceptionMessage(byte currentState,byte[] expectedStates)
- {
- StringBuffer msg = new StringBuffer("Parser state inconsistency!");
- msg.append('\n');
- msg.append("Current state : ").append(parserStates[currentState]).append('\n');
- msg.append("Expected state(s): ");
- for (int i=0;i<expectedStates.length;i++)
- {
- msg.append(parserStates[expectedStates[i]]);
- if (i != expectedStates.length-1)
- msg.append(", ");
- }
- msg.append('\n');
- return msg.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
deleted file mode 100644
index d018ee4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
+++ /dev/null
@@ -1,85 +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
- * -------- -------- -----------------------------------------------------------
- * 20060217 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Vector;
-import com.ibm.icu.text.Collator;
-
-public class QuickSort
-{
- public static final void sort(Object[] a,int lo,int hi)
- {
- Object tmp;
- int i = lo;
- int j = hi;
- Object x = a[(lo+hi)/2];
- Collator collator = Collator.getInstance();
-
- do
- {
- while (collator.compare(a[i].toString(),x.toString()) < 0) i++;
- while (collator.compare(a[j].toString(),x.toString()) > 0) j--;
- if (i <= j)
- {
- tmp = a[i];
- a[i] = a[j];
- a[j] = tmp;
- i++;
- j--;
- }
- } while (i <= j);
-
- if (lo < j)
- sort(a,lo,j);
- if (i < hi)
- sort(a,i,hi);
- }
-
- /*
- * This method will use the same algorithm as above
- * with the exception that any nulls will be attached
- * at the end
- */
- public static final void sort(Vector v)
- {
- // do not sort if vector contains less than 2 elements
- if (v.size() < 2)
- return;
-
- // pulls out the nulls
- Vector nulls = new Vector();
- for (int i = 0; i < v.size(); i++) {
- Object obj = v.elementAt(i);
- if (obj == null || obj.toString() == null) {
- nulls.add(obj);
- v.remove(i);
- i--;
- }
- }
-
- // sort the not null objects
- Object[] objs = v.toArray();
- // do not sort if array contains less than 2 objects
- if (objs.length >= 2)
- sort(objs, 0, objs.length-1);
-
- // re-construct the vector from the sorted objects, then the nulls
- v.clear();
- for (int j = 0; j < objs.length; j++) {
- v.add(objs[j]);
- }
- v.addAll(nulls);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
deleted file mode 100644
index 6b84f9e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.util;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-public class TrimFilter implements Filter
-{
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
- */
- public void init(FilterConfig arg0) throws ServletException
- {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
- */
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException
- {
- // TODO Auto-generated method stub
- CharArrayWrapper responseWrapper = new CharArrayWrapper((HttpServletResponse)resp);
- // Hack for Tomcat performance problem with filters.
- OutputStreamWriter osw = new OutputStreamWriter(resp.getOutputStream(),HTMLUtils.UTF8_ENCODING);
- fc.doFilter(req,responseWrapper);
- String responseString = responseWrapper.toString();
- osw.write(responseString.trim());
- osw.close();
- }
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#destroy()
- */
- public void destroy()
- {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
deleted file mode 100644
index d35c649..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
+++ /dev/null
@@ -1,120 +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
- * -------- -------- -----------------------------------------------------------
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * This class contains utility methods for managing URLs
- * as used by the Web Services Explorer Web application.
- * @author cbrealey@ca.ibm.com
- */
-public final class URLUtils
-{
- /**
- * Objects of this class should not be constructed.
- */
- private URLUtils ()
- {
- }
-
- /**
- * UTF-8
- */
- public static final String UTF8 = "UTF-8";
-
- /**
- * Equivalent to {@link #encode(String,String)}
- * with second parameter set to the "UTF-8" encoding.
- * @param s The string to encode.
- * @return The encoded string.
- */
- public static String encode(String s)
- {
- return encode(s,UTF8);
- }
-
- /**
- * Equivalent to {@link URLEncoder#encode(String,String)},
- * only throws an unchecked {@link RuntimeException} wrapped
- * around an {@link UnsupportedEncodingException} instead of
- * an {@link UnsupportedEncodingException}.
- * @param s The string to encode.
- * @param enc The encoding to use.
- * @return The encoded string.
- */
- public static String encode(String s, String enc)
- {
- try
- {
- return URLEncoder.encode(s,enc);
- }
- catch (UnsupportedEncodingException e)
- {
- // TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
- throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
- }
- }
-
- /**
- * Equivalent to {@link #decode(String,String)}
- * with second parameter set to the "UTF-8" encoding.
- * @param s The string to decode.
- * @return The decoded string.
- */
- public static String decode(String s)
- {
- return decode(s,UTF8);
- }
-
- /**
- * Equivalent to {@link URLEncoder#decode(String,String)},
- * only throws an unchecked {@link RuntimeException} wrapped
- * around an {@link UnsupportedEncodingException} instead of
- * an {@link UnsupportedEncodingException}.
- * @param s The string to decode.
- * @param enc The encoding to use.
- * @return The decoded string.
- */
- public static String decode(String s, String enc)
- {
- try
- {
- return URLDecoder.decode(s,enc);
- }
- catch (UnsupportedEncodingException e)
- {
- // TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
- throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
- }
- }
-
- /**
- * Encodes non-ASCII characters in a URL string.
- * @param urlString The URL string to encode
- * @return The URL as an encoded string
- */
- public static String encodeURLString(String urlString) {
- try {
- URI uri = new URI(urlString);
- return uri.toASCIIString();
- } catch (Exception e) {
- //do nothing, we will just return the original string
- }
- return urlString;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
deleted file mode 100644
index 2638ea2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
+++ /dev/null
@@ -1,41 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612 142290 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public class Validator
-{
- public static final boolean validateString(String input)
- {
- return ((input != null) && (input.trim().length() > 0));
- }
-
- public static final boolean validateURL(String input)
- {
- return (input != null && input.matches("[a-zA-Z\\+\\-\\.]++:.*"));
- }
-
- public static final boolean validateInteger(String input)
- {
- try
- {
- Integer.parseInt(input);
- return true;
- }
- catch (NumberFormatException e)
- {
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
deleted file mode 100644
index 5bd5639..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
+++ /dev/null
@@ -1,148 +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.wst.ws.internal.explorer.platform.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-public final class XMLUtils
-{
- public static final String UTF8_ENCODING = "UTF-8";
-
- /**
- * Serialize an XML Element into a String.
- * @param e Element to be serialized.
- * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
- * @return String representation of the XML document fragment.
- */
- public static final String serialize(Element e,boolean omitXMLDeclaration)
- {
- if (e != null)
- {
- try
- {
- DOMSource domSource = new DOMSource(e);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, UTF8_ENCODING);
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.transform(domSource, new StreamResult(baos));
- baos.close();
- return new String(baos.toByteArray(), UTF8_ENCODING);
- }
- catch (Throwable t)
- {
- }
- }
- return null;
- }
-
- /**
- * Serialize an XML Element into a String.
- * @param df DocumentFragment to be serialized.
- * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
- * @return String representation of the XML document fragment.
- */
- public static final String serialize(DocumentFragment df,boolean omitXMLDeclaration)
- {
- if (df != null)
- {
- try
- {
- DOMSource domSource = new DOMSource(df);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, UTF8_ENCODING);
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.transform(domSource, new StreamResult(baos));
- baos.close();
- return new String(baos.toByteArray(), UTF8_ENCODING);
- }
- catch (Throwable t)
- {
- }
- }
- return null;
- }
-
- /**
- * Create a new XML Document.
- * @param docBuilder DocumentBuilder. Setting this to null will create a new DocumentBuilder.
- * @return Document
- */
- public static final Document createNewDocument(DocumentBuilder docBuilder) throws ParserConfigurationException
- {
- if (docBuilder == null)
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(false);
- factory.setValidating(false);
- docBuilder = factory.newDocumentBuilder();
- }
- Document doc = docBuilder.newDocument();
- return doc;
- }
-
- /**
- * Convert the String representation of an Element into an Element
- * @param String representation of an Element.
- * @return Element
- */
- public static Element stringToElement(String s) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException {
- return stringToElement(s, false);
- }
-
- /**
- * Convert the String representation of an Element into an Element
- * @param String representation of an Element.
- * @param boolean set whether the return Element should be namespace aware.
- * @return Element
- */
- public static Element stringToElement(String s, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
- {
- return byteArrayToElement(s.getBytes(UTF8_ENCODING), namespaceAware);
- }
-
- /**
- * Convert the byte array representation of an Element into an Element
- * @param byte[] representation of an Element.
- * @param boolean set whether the return Element should be namespace aware.
- * @return Element
- */
- public static Element byteArrayToElement(byte[] b, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- docBuilderFactory.setNamespaceAware(namespaceAware);
- docBuilderFactory.setValidating(false);
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(new ByteArrayInputStream(b));
- return doc.getDocumentElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
deleted file mode 100644
index 34814b4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
+++ /dev/null
@@ -1,96 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-
-public class ClearWSDLAction extends ClearNodeAction {
-
- public ClearWSDLAction(Controller controller) {
- super(controller, controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/ClearWSDLActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- int nodeID;
- try {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe) {
- nodeID = nodeManager_.getSelectedNodeId();
- }
- boolean paramValid = false;
- Node node = nodeManager_.getNode(nodeID);
- if (node instanceof WSDLMainNode)
- paramValid = true;
- else if (node instanceof WSDLNode)
- paramValid = true;
- else {
- while (node != null && !(node instanceof WSDLMainNode)) {
- node = node.getParent();
- if (node instanceof WSDLNode) {
- nodeID = node.getNodeId();
- paramValid = true;
- break;
- }
- }
- }
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(nodeID));
- return paramValid;
- }
-
- public boolean run() {
- if (super.run()) {
- nodeManager_.setSelectedNodeId(nodeManager_.getRootNode().getNodeId());
- return true;
- }
- else
- return false;
- }
-
- public String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsdlStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsdl/wsdl_status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
deleted file mode 100644
index 05a0770..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
+++ /dev/null
@@ -1,89 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class CreateInstanceAction extends WSDLPropertiesFormAction
-{
- public CreateInstanceAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- boolean resultsValid = true;
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- String fragmentID = parser.getParameter(FragmentConstants.FRAGMENT_ID);
- if (fragmentID != null && fragmentID.length() > 0)
- propertyTable_.put(FragmentConstants.FRAGMENT_ID, fragmentID);
- else
- {
- propertyTable_.remove(FragmentConstants.FRAGMENT_ID);
- resultsValid = false;
- }
- String nameAnchorID = parser.getParameter(FragmentConstants.NAME_ANCHOR_ID);
- invokeWSDLOperationTool.setFragmentNameAnchorID(nameAnchorID);
- return resultsValid;
- }
-
- public FormTool getSelectedFormTool()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- String fragmentID = (String)propertyTable_.get(FragmentConstants.FRAGMENT_ID);
- if (fragmentID != null && fragmentID.length() > 0)
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- IXSDFragment frag = operElement.getFragmentByID(fragmentID);
- if ((frag instanceof IXSDMapFragment) && ((IXSDMapFragment)frag).createInstance() != null)
- return true;
- else
- return false;
- }
- else
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
deleted file mode 100644
index f579f28..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
+++ /dev/null
@@ -1,55 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpGetOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
- public InvokeWSDLHttpGetOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean run()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- StringBuffer endPoint = new StringBuffer(getEndPoint());
- endPoint.append('?');
- addParameters(endPoint);
- String endPointString = endPoint.toString();
- boolean result = false;
- try
- {
- URLConnection conn = NetUtils.getURLConnection(endPointString);
- if (conn != null)
- {
- recordHttpResponse(conn,messageQueue);
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- result = true;
- }
- else
- throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString));
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
deleted file mode 100644
index 1b41854..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
+++ /dev/null
@@ -1,113 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URLConnection;
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.HTTPUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-
-public abstract class InvokeWSDLHttpOperationFormAction extends WSDLPropertiesFormAction
-{
- private static final String CONTENT_TYPE_CHARSETEQ = "charset=";
-
- public InvokeWSDLHttpOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
- Node selectedNode = getSelectedNavigatorNode();
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- invokeWSDLOperationTool.setEndPoint(endPoint);
- WSDLOperationElement operElement = (WSDLOperationElement)(selectedNode.getTreeElement());
- propertyTable_.put(WSDLActionInputs.OPERATION_ELEMENT,operElement);
- Iterator it = operElement.getOrderedBodyParts().iterator();
- boolean resultsValid = true;
- while (it.hasNext()) {
- Part part = (Part)it.next();
- IFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- return resultsValid;
- }
-
- protected String getEndPoint()
- {
- StringBuffer endPoint = new StringBuffer((String)propertyTable_.get(WSDLActionInputs.END_POINT));
- WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
- if (endPoint.charAt(endPoint.length()-1) != '/')
- endPoint.append('/');
- endPoint.append(operElement.getName());
- return endPoint.toString();
- }
-
- protected void addParameters(StringBuffer buffer)
- {
- WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- buffer.append(HTTPUtil.genURLEncodedParameters(frag));
- if (it.hasNext())
- buffer.append('&');
- }
- }
-
- protected void recordHttpResponse(URLConnection conn,MessageQueue messageQueue) throws IOException
- {
- BufferedReader br = null;
- try
- {
- InputStreamReader in = null;
- String contentType = conn.getContentType();
- if (contentType != null)
- {
- int charsetEqPos = contentType.indexOf(CONTENT_TYPE_CHARSETEQ);
- if (charsetEqPos != -1)
- in = new InputStreamReader(conn.getInputStream(),contentType.substring(charsetEqPos+CONTENT_TYPE_CHARSETEQ.length()));
- }
- if (in == null)
- in = new InputStreamReader(conn.getInputStream());
- br = new BufferedReader(in);
- String s;
- while ((s = br.readLine()) != null)
- messageQueue.addMessage(s);
- br.close();
- br = null;
- }
- catch (IOException e)
- {
- if (br != null)
- br.close();
- throw e;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
deleted file mode 100644
index e7113f7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
+++ /dev/null
@@ -1,67 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpPostOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-
- public InvokeWSDLHttpPostOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean run()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- boolean result = false;
- String endPointString = getEndPoint();
- URLConnection conn = NetUtils.getURLConnection(endPointString);
- if (conn != null)
- {
- StringBuffer parameters = new StringBuffer();
- addParameters(parameters);
- conn.setDoOutput(true);
- PrintWriter out = null;
- try
- {
- out = new PrintWriter(conn.getOutputStream());
- out.print(parameters);
- out.close();
- out = null;
- recordHttpResponse(conn,messageQueue);
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- result = true;
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- finally
- {
- if (out != null)
- out.close();
- }
- }
- else
- handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString)));
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
deleted file mode 100644
index 64ad3b9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
+++ /dev/null
@@ -1,195 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20070510 186375 makandre@ca.ibm.com - Andrew Mak, Compile errors in wst.ws.explorer
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.Endpoint;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SOAPMessageUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-
-public abstract class InvokeWSDLSOAPOperationAction extends WSDLPropertiesFormAction
-{
- public InvokeWSDLSOAPOperationAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- invokeWSDLOperationTool.setEndPoint(endPoint);
- return true;
- }
-
- /**
- * Returns an ISOAPMessage to use for the current SOAP operation invocation.
- *
- * @param operElement The operation element from the WSDL model.
- *
- * @return An ISOAPMessage, or null if a message cannot be constructed.
- */
- protected ISOAPMessage getSOAPRequestMessage(WSDLOperationElement operElement) {
- ISOAPTransportProvider provider = operElement.getSOAPTransportProvider();
- if (provider == null)
- return null;
- return provider.newTransport().newMessage(operElement.getMessageContext());
- }
-
- /**
- * Populate the given ISOAPMessage's header using the inputs from WSE
- *
- * @param soapEnvelopeNamespaceTable Hashtable containing a map of the namespace URIs to prefixes.
- * @param operElement WSDLOperationElement encapsulating the WSDL operation.
- * @param soapMessage The ISOAPMessage to populate
- */
- protected void setHeaderContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
- SOAPMessageUtils.setHeaderContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
- }
-
- /**
- * Populate the given ISOAPMessage's body using the inputs from WSE
- *
- * @param soapEnvelopeNamespaceTable Hashtable containing a map of the namespace URIs to prefixes.
- * @param operElement WSDLOperationElement encapsulating the WSDL operation.
- * @param soapMessage The ISOAPMessage to populate
- */
- protected void setBodyContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
- SOAPMessageUtils.setBodyContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
- }
-
- public boolean run()
- {
- String soapAddressLocation = (String)propertyTable_.get(WSDLActionInputs.END_POINT);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
- WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
- operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(false));
- try
- {
- // Generate the SOAP envelope and its children. We need to create a DOM element version to display and the object version to execute.
- // <SOAP-ENV:Envelope
- // xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
- // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- // xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- // ...
-
- ISOAPMessage soapMessage = getSOAPRequestMessage(operElement);
- if (soapMessage == null)
- throw new TransportException(wsdlPerspective.getMessage("MSG_ERROR_NO_SUITABLE_TRANSPORT"));
-
- Hashtable namespaceTable = new Hashtable(soapMessage.getNamespaceTable());
- setHeaderContent(namespaceTable, operElement, soapMessage);
- setBodyContent(namespaceTable, operElement, soapMessage);
- soapMessage.setNamespaceTable(namespaceTable);
-
- // store the request
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST, soapMessage);
-
- // Execute the SOAP operation.
- if (soapAddressLocation != null)
- {
- soapMessage.setProperty(ISOAPMessage.PROP_SOAP_ACTION, operElement.getSoapAction());
- String[] authParams = retrieveAuthParams(bindingElement, soapAddressLocation);
-
- // invoke!
- ISOAPMessage soapResponse = operElement.getSOAPTransportProvider().newTransport()
- .send(soapAddressLocation, authParams[0], authParams[1], soapMessage);
-
- // store the response
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_RESPONSE, soapResponse);
-
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- return true;
- }
- throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",soapAddressLocation));
- }
- catch (HTTPTransportException e) {
- throwHTTPTransportException(bindingElement, soapAddressLocation, e);
- }
- catch (Exception e) {
- Throwable t = e;
- if (e instanceof TransportException && e.getCause() != null)
- t = e.getCause();
- handleUnexpectedException(wsdlPerspective, messageQueue, t.getClass().getName(), t);
- }
- return false;
- }
-
- private void throwHTTPTransportException(WSDLBindingElement bindingElement, String endpointString, HTTPTransportException httpTransportException) throws HTTPTransportException
- {
- if (httpTransportException.getStatusCode() == HttpServletResponse.SC_UNAUTHORIZED)
- {
- Endpoint endpoint = bindingElement.getEndpoint(endpointString);
- if (endpoint != null)
- {
- endpoint.setRequireHTTPBasicAuth(true);
- endpoint.setHttpBasicAuthUsername(null);
- endpoint.setHttpBasicAuthPassword(null);
- }
- }
- throw httpTransportException;
- }
-
- private String[] retrieveAuthParams(WSDLBindingElement bindingElement, String endpointString)
- {
- String[] authParams = new String[] { null, null };
- Endpoint endpoint = bindingElement.getEndpoint(endpointString);
- if (endpoint != null)
- {
- if (endpoint.isRequireHTTPBasicAuth())
- {
- String httpBasicAuthUsername = endpoint.getHttpBasicAuthUsername();
- String httpBasicAuthPassword = endpoint.getHttpBasicAuthPassword();
- if (httpBasicAuthUsername == null || httpBasicAuthPassword == null)
- {
- httpBasicAuthUsername = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME);
- httpBasicAuthPassword = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD);
- endpoint.setHttpBasicAuthUsername(httpBasicAuthUsername);
- endpoint.setHttpBasicAuthPassword(httpBasicAuthPassword);
- }
- if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
- {
- authParams[0] = httpBasicAuthUsername;
- authParams[1] = httpBasicAuthPassword;
- }
- }
- }
- return authParams;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
deleted file mode 100644
index e6bb6d0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
+++ /dev/null
@@ -1,88 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer.FragmentTransformer;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-
-public class InvokeWSDLSOAPOperationFormAction extends InvokeWSDLSOAPOperationAction
-{
- public InvokeWSDLSOAPOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- boolean resultsValid = true;
- super.processParsedResults(parser);
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContent == null)
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- WSDLOperationElement operElement = (WSDLOperationElement) getSelectedNavigatorNode().getTreeElement();
-
- // validate headers
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext())
- {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IFragment frag = operElement.getHeaderFragment(soapHeader);
- if (!frag.processParameterValues(parser))
- {
- Message message = soapHeader.getEMessage();
- Part part = soapHeader.getEPart();
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", message.getQName() + " " + part.getName()));
- resultsValid = false;
- }
- }
-
- // validate body
- it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part) it.next();
- IFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", part.getName()));
- resultsValid = false;
- }
- }
- }
- return resultsValid;
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new FragmentTransformer(controller_);
- return transformers;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
deleted file mode 100644
index 58670a8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
+++ /dev/null
@@ -1,167 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Hashtable;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-
-public class InvokeWSDLSOAPOperationSourceAction extends InvokeWSDLSOAPOperationAction
-{
- private boolean newFileSelected_;
- private boolean saveAsSelected_;
- private boolean isHeader_;
-
- public InvokeWSDLSOAPOperationSourceAction(Controller controller)
- {
- super(controller);
- newFileSelected_ = false;
- saveAsSelected_ = false;
- isHeader_ = false;
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
- newFileSelected_ = false;
- saveAsSelected_ = false;
- isHeader_ = false;
- /* try and catch is needed if we are doing fragmentization.
- try
- {
- */
- String submissionAction = parser.getParameter(WSDLActionInputs.SUBMISSION_ACTION);
- String sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT_HEADER);
- if (sourceContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,sourceContents);
- sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,sourceContents);
- if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE_HEADER.equals(submissionAction))
- {
- newFileSelected_ = true;
- String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE_HEADER);
- if (fileContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,fileContents);
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE.equals(submissionAction))
- {
- newFileSelected_ = true;
- String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE);
- if (fileContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,fileContents);
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS_HEADER.equals(submissionAction))
- {
- saveAsSelected_ = true;
- isHeader_ = true;
- return true;
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS.equals(submissionAction))
- {
- // Save As... action
- saveAsSelected_ = true;
- return true;
- }
-
- String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations != null)
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-
- return true;
- /*
- }
- catch (ParserConfigurationException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
- }
- catch (SAXException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"SAXException",e);
- }
- catch (UnsupportedEncodingException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"UnsupportedEncodingException",e);
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- return false;
- */
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#getSOAPRequestMessage(org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement)
- */
- protected ISOAPMessage getSOAPRequestMessage(WSDLOperationElement operElement) {
- return (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#setHeaderContent(java.util.Hashtable, org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- protected void setHeaderContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage) {
- String headerContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER);
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.HEADER_CONTENT, headerContent, soapMessage);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#setBodyContent(java.util.Hashtable, org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- protected void setBodyContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage) {
- String bodyContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT);
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.BODY_CONTENT, bodyContent, soapMessage);
- }
-
- public final boolean wasNewFileSelected()
- {
- return newFileSelected_;
- }
-
- public final boolean wasSaveAsSelected()
- {
- return saveAsSelected_;
- }
-
- public final String getDefaultSaveAsFileName()
- {
- WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
- return (new StringBuffer(operElement.getOperation().getName())).append(".txt").toString();
- }
-
- public final void writeSourceContent(OutputStream os)
- {
- WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
- PrintWriter pw = new PrintWriter(os);
- if (isHeader_)
- pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER));
- else
- pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
- pw.close();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
deleted file mode 100644
index 19422e2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class OpenWSDLAction extends WSDLPropertiesFormAction {
-
- public OpenWSDLAction(Controller controller) {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
- String wsdlUrl = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- FormTool formTool = getSelectedFormTool();
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- formTool.updatePropertyTable(propertyTable_);
- return true;
- }
-
- public boolean run() {
- String wsdlUrl = (String)propertyTable_.get(ActionInputs.QUERY_INPUT_WSDL_URL);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement rootElement = rootNode.getTreeElement();
-
- // create a WSDLElement representing the WSDL
- WSDLElement wsdlElement = new WSDLElement(wsdlUrl, rootElement.getModel(), wsdlUrl);
- try
- {
- // open WSDL
- Vector errorMessages = wsdlElement.loadWSDL();
- if (errorMessages.size() > 0)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
- for (int i=0;i<errorMessages.size();i++)
- messageQueue.addMessage((String)errorMessages.elementAt(i));
- }
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlUrl));
- handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
- return false;
- }
- rootElement.connect(wsdlElement,WSDLModelConstants.REL_WSDL, ModelConstants.REL_OWNER);
-
- // build the datamodel for this WSDLElement
- wsdlElement.buildModel();
-
- // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
- // If there is just the one service and binding node, select the binding node.
- // select the new WSDL node
- Node wsdlNode = rootNode.getChildNode(wsdlElement);
- Vector serviceNodes = wsdlNode.getChildNodes();
- int newSelectedNodeId = wsdlNode.getNodeId();
- if (serviceNodes.size() == 1)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(0);
- Vector bindingNodes = serviceNode.getChildNodes();
- if (bindingNodes.size() == 1)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(0);
- newSelectedNodeId = bindingNode.getNodeId();
- }
- else
- newSelectedNodeId = serviceNode.getNodeId();
- }
- nodeManager.setSelectedNodeId(newSelectedNodeId);
- nodeManager.makeNodeVisible(nodeManager.getNode(newSelectedNodeId));
- addToHistory(ActionInputs.PERSPECTIVE_WSDL,SelectWSDLPropertiesToolAction.getActionLink(newSelectedNodeId, 0, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_OPEN_WSDL_SUCCESSFUL", wsdlUrl));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
deleted file mode 100644
index 5bdd841..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-
-public class OpenXSDInfoDialogAction extends Action
-{
- public OpenXSDInfoDialogAction()
- {
- }
-
- public static final String getActionLink(String sessionId,int nodeId,String fragId)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/fragment/XSDInfoDialog.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragId);
- return actionLink.toString();
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
deleted file mode 100644
index e828d8c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class RefreshWSDLAction extends LinkAction {
-
- public RefreshWSDLAction(Controller controller) {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLRefreshActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- NodeManager nodeManager = controller_.getWSDLPerspective().getNodeManager();
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- int nodeID;
- try {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe) {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node node = nodeManager.getNode(nodeID);
- while (node != null && !(node instanceof WSDLMainNode)) {
- if (node instanceof WSDLNode) {
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
- return true;
- }
- node = node.getParent();
- }
- return false;
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node wsdlNode = nodeManager.getNode(nodeID);
- WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
- Definition definitionCopy = wsdlElement.getDefinition();
- Vector schemaListCopy = wsdlElement.getSchemaList();
- wsdlElement.setDefinition(null);
- wsdlElement.setSchemaList(new Vector());
- int selectedNodeID = nodeManager.getSelectedNode().getNodeId();
-
- try {
- // open WSDL
- Vector errorMessages = wsdlElement.loadWSDL();
- if (errorMessages.size() > 0) {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
- for (int i=0;i<errorMessages.size();i++)
- messageQueue.addMessage((String)errorMessages.elementAt(i));
- }
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlElement.getWsdlUrl()));
- handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
- wsdlElement.setDefinition(definitionCopy);
- wsdlElement.setSchemaList(schemaListCopy);
- return false;
- }
-
- // build the datamodel for this WSDLElement
- wsdlElement.buildModel();
-
- // Select a new node if the previous selected node no longer exists
- // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
- // If there is just the one service and binding node, select the binding node.
- Node node = nodeManager.getNode(selectedNodeID);
- if (node == null) {
- selectedNodeID = wsdlNode.getNodeId();
- Vector serviceNodes = wsdlNode.getChildNodes();
- if (serviceNodes.size() == 1)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(0);
- Vector bindingNodes = serviceNode.getChildNodes();
- if (bindingNodes.size() == 1)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(0);
- selectedNodeID = bindingNode.getNodeId();
- }
- else
- selectedNodeID = serviceNode.getNodeId();
- }
- nodeManager.setSelectedNodeId(selectedNodeID);
- nodeManager.makeNodeVisible(nodeManager.getNode(selectedNodeID));
- }
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_REFRESH_WSDL_SUCCESSFUL", wsdlElement.getWsdlUrl()));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
deleted file mode 100644
index c4ca154..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class ResizeWSDLFramesAction extends ResizeFramesAction
-{
- public ResizeWSDLFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER))
- {
- wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(WSDLFrameNames.WSDL_STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
deleted file mode 100644
index c875f15..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectWSDLNavigatorNodeAction extends SelectNodeAction
-{
-
- public SelectWSDLNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeID);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- ToolManager toolManager = selectedNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = selectedNode_.getNodeId();
-
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return selectedTool.getSelectToolActionHref(true);
- else
- return getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
deleted file mode 100644
index 1156089..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectWSDLPropertiesToolAction extends SelectNodeToolAction
-{
-
- public SelectWSDLPropertiesToolAction(Controller controller)
- {
- super(controller, controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT) {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public final String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final String getPropertiesContentVar() {
- return "wsdlPropertiesContent";
- }
-
- public final String getPropertiesContentPage() {
- return "wsdl/wsdl_properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
deleted file mode 100644
index 9e5bc3b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public final class SwitchPerspectiveFromWSDLAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromWSDLAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- wsdlPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
deleted file mode 100644
index 8d33e91..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
+++ /dev/null
@@ -1,198 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Part;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPHeaderWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SOAPMessageUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.w3c.dom.Element;
-
-public class SynchronizeFragmentViewsAction extends WSDLPropertiesFormAction
-{
- public SynchronizeFragmentViewsAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- Node selectedNode = getSelectedNavigatorNode();
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String viewID = parser.getParameter(FragmentConstants.FRAGMENT_VIEW_ID);
- propertyTable_.put(FragmentConstants.FRAGMENT_VIEW_ID, viewID);
- if (viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- {
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE, null);
-
- return processFormViewParsedResultsHeader(parser, operElement) & // need to process both header and body
- processFormViewParsedResults(parser, operElement);
- }
- else
- {
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
- String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations != null)
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-
- ISOAPMessage soapMessage = (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP);
- boolean rc = processSourceViewParsedResultsHeader(parser, operElement, soapMessage) & // need to process both header and body
- processSourceViewParsedResults(parser, operElement, soapMessage);
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP, null);
-
- return rc;
- }
- }
-
- private boolean processFormViewParsedResultsHeader(MultipartFormDataParser parser, WSDLOperationElement operElement) throws MultipartFormDataException
- {
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER, null);
- boolean resultsValid = true;
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext())
- {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IXSDFragment frag = operElement.getHeaderFragment(soapHeader);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- if (resultsValid)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,null);
- return resultsValid;
- }
-
- private boolean processFormViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement) throws MultipartFormDataException
- {
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT, null);
- boolean resultsValid = true;
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- if (resultsValid)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,null);
- return resultsValid;
- }
-
- private boolean processSourceViewParsedResultsHeader(MultipartFormDataParser parser, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws MultipartFormDataException {
-
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT_HEADER);
- if (sourceContent != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER, sourceContent);
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- if (!it.hasNext())
- return true;
-
- try
- {
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.HEADER_CONTENT, sourceContent, soapMessage);
-
- Element[] instanceDocuments = soapMessage.getHeaderContent();
- Map namespaceTable = soapMessage.getNamespaceTable();
-
- boolean sourceElementsValid = true;
- int start = 0;
- while (it.hasNext() && start < instanceDocuments.length)
- {
- SOAPHeader soapHeader = (SOAPHeader)it.next();
- SOAPHeaderWrapperFragment frag = (SOAPHeaderWrapperFragment) operElement.getHeaderFragment(soapHeader);
-
- int pos = SOAPMessageUtils.findFirstMatchingElement(
- soapHeader.getEPart(),
- instanceDocuments,
- namespaceTable,
- frag.getName(),
- start);
-
- if (pos == -1)
- continue;
-
- Element element = instanceDocuments[pos];
- start = pos + 1;
-
- if (!frag.setParameterValuesFromInstanceDocument(element, namespaceTable))
- sourceElementsValid = false;
- }
- return sourceElementsValid;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- private boolean processSourceViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws MultipartFormDataException {
-
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContent != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT, sourceContent);
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
-
- try
- {
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.BODY_CONTENT, sourceContent, soapMessage);
-
- Element[] instanceDocuments = soapMessage.getBodyContent();
-
- boolean sourceElementsValid = true;
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.setParameterValuesFromInstanceDocuments(instanceDocuments))
- sourceElementsValid = false;
- }
- return sourceElementsValid;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- public boolean run() {
- return true;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
deleted file mode 100644
index 748cd92..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleWSDLNavigatorNodeAction extends ToggleNodeAction
-{
- public ToggleWSDLNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getWSDLPerspective().getNodeManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
- public static String getActionLink(int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- // This should be called only to select the toggled node when, at the time of
- // the collapse event, a descendant node was selected.
- public final String getActionLinkForHistory()
- {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSDLPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- else
- return SelectWSDLNavigatorNodeAction.getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
deleted file mode 100644
index 8ee6656..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLBindingNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class UpdateWSDLBindingAction extends WSDLPropertiesFormAction
-{
- public UpdateWSDLBindingAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] nodeIds = parser.getParameterValues(ActionInputs.NODEID);
- if (nodeIds == null)
- nodeIds = new String[0];
- propertyTable_.put(ActionInputs.NODEID, nodeIds);
- String[] endpoints = parser.getParameterValues(WSDLActionInputs.END_POINT);
- if (endpoints == null)
- endpoints = new String[0];
- propertyTable_.put(WSDLActionInputs.END_POINT, endpoints);
- return true;
- }
-
- public boolean run()
- {
- String[] nodeIds = getPropertyAsStringArray(ActionInputs.NODEID);
- String[] endpoints = getPropertyAsStringArray(WSDLActionInputs.END_POINT);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- for (int i = 0; i < nodeIds.length; i++)
- {
- try
- {
- Node bindingNode = nodeManager.getNode(Integer.parseInt(nodeIds[i]));
- if (bindingNode instanceof WSDLBindingNode)
- {
- WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- String[] endpointsCopy = endpoints;
- bindingElement.setEndPoints(endpointsCopy);
- if (endpointsCopy.length <= 0)
- endpointsCopy = bindingElement.getEndPoints();
- if (endpointsCopy.length > 0)
- {
- Vector operationNodes = bindingNode.getChildNodes();
- for (Iterator it = operationNodes.iterator(); it.hasNext();)
- {
- Node operationNode = (Node)it.next();
- List tools = operationNode.getCurrentToolManager().getTools();
- for (Iterator toolsIterator = tools.iterator(); toolsIterator.hasNext();)
- {
- Tool tool = (Tool)toolsIterator.next();
- if (tool instanceof InvokeWSDLOperationTool)
- ((InvokeWSDLOperationTool)tool).setEndPoint(endpointsCopy[0]);
- }
- }
- }
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL"));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
deleted file mode 100644
index 022cbaf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLAddToFavoritesAction extends LinkAction {
- public WSDLAddToFavoritesAction(Controller controller) {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- try {
- Integer.parseInt(nodeID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- return true;
- }
- catch (Throwable t) {
- return false;
- }
- }
-
- public static String getActionLink(int nodeID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- public boolean favoriteExists() {
- String wsdlUrl = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
- FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public boolean run() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- String wsdlUrl = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
- FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
- if (favFolderElement.addFavorite(table)) {
- wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlUrl));
- return true;
- }
- else {
- wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlUrl));
- return false;
- }
- }
-
- private String getWsdlUrl() {
- String nodeID = (String)propertyTable_.get(ActionInputs.NODEID);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager wsdlNodeManager = wsdlPerspective.getNodeManager();
- WSDLElement selectedElement = (WSDLElement)wsdlNodeManager.getNode(Integer.parseInt(nodeID)).getTreeElement();
- return selectedElement.getWsdlUrl();
- }
-
- private FavoritesFolderElement getFavWSDLFolderElement() {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- return (FavoritesFolderElement)e.nextElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
deleted file mode 100644
index 6f7ce38..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToFileSystemAction extends ImportToFileSystemAction {
- private Definition definition_;
- private String defaultWSDLFileName_;
-
- public WSDLImportWSDLToFileSystemAction(Controller controller) {
- super(controller);
- definition_ = null;
- defaultWSDLFileName_ = "temp.wsdl";
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId) {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public final boolean write(OutputStream os) {
- return writeWSDLDefinition(os, definition_);
- }
-
- public final String getDefaultFileName() {
- return defaultWSDLFileName_;
- }
-
- public final boolean run() {
- int nodeID;
- try {
- nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- }
- catch (NumberFormatException nfe) {
- return false;
- }
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node node = nodeManager.getNode(nodeID);
- WSDLElement wsdlElement = (WSDLElement)node.getTreeElement();
- definition_ = wsdlElement.getDefinition();
- defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlElement.getWsdlUrl());
- return (definition_ != null);
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 2652c46..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
- public WSDLImportWSDLToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- return action;
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
deleted file mode 100644
index 5a95eee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
- public WSDLLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public boolean run() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node node = nodeManager.getSelectedNode();
- WSDLElement element = (WSDLElement)node.getTreeElement();
- return launchWizard(element.getWsdlUrl());
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
deleted file mode 100644
index 648081d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class WSDLPropertiesFormAction extends FormAction
-{
- protected NodeManager navigatorManager_;
- public WSDLPropertiesFormAction(Controller controller)
- {
- super(controller);
- navigatorManager_ = controller.getWSDLPerspective().getNodeManager();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] keys = parser.getParameterNames();
- for (int i = 0; i < keys.length; i++)
- {
- String[] values = parser.getParameterValues(keys[i]);
- if (values != null)
- {
- if (values.length == 1)
- propertyTable_.put(keys[i], values[0]);
- else if (values.length > 1)
- propertyTable_.put(keys[i], values);
- }
- }
- return true;
- }
-
- public Node getSelectedNavigatorNode()
- {
- return navigatorManager_.getSelectedNode();
- }
-
- public FormTool getSelectedFormTool()
- {
- return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
deleted file mode 100644
index f9dda3f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class BindingTypes
-{
- public static final int UNSUPPORTED = -1;
- public static final int SOAP = 0;
- public static final int HTTP_GET = 1;
- public static final int HTTP_POST = 2;
-
- public static final String HTTP_VERB_GET = "GET";
- public static final String HTTP_VERB_POST = "POST";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
deleted file mode 100644
index 802c20a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
+++ /dev/null
@@ -1,97 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class FragmentConstants
-{
- // XSD minOccurs and maxOccurs
- public static final int DEFAULT_MIN_OCCURS = 1;
- public static final int DEFAULT_MAX_OCCURS = 1;
- public static final int UNBOUNDED = -1;
-
- // WSDL style
- public static final int STYLE_DOCUMENT = 0;
- public static final int STYLE_RPC = 1;
-
- // WSDL Encoding styles
- public static final int ENCODING_LITERAL = 0;
- public static final int ENCODING_SOAP = 1;
- public static final int ENCODING_URL = 2; // HTTP Get/Post
-
- // IDs used by the fragment model
- public static final String ID_SEPERATOR = "::";
- public static final String INPUT_ID = "::input";
- public static final String OUTPUT_ID = "::output";
- public static final String TABLE_ID = "::tableID";
- public static final String FRAGMENT_ID = "::fragmentID";
- public static final String NAME_ANCHOR_ID = "::nameAnchorID";
- public static final String FRAGMENT_VIEW_ID = "::fragmentViewID";
- public static final String XSD_ATOMIC_ENUM_ID = "::xsdAtomicEnumID";
- public static final String XSD_ALL_GROUP_ID = "::xsdAllGroupID";
- public static final String PART_TOKEN = "^";
-
- // Fragment view IDs
- public static final String FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE = "::fragmentViewSwitchFormToSource";
- public static final String FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM = "::fragmentViewSwitchSourceToForm";
- public static final String SOURCE_CONTENT_HEADER = "::sourceContentHeader";
- public static final String SOURCE_CONTENT = "::sourceContent";
- public static final String SOURCE_CONTENT_NAMESPACE = "::sourceContentNS";
-
- // Action input constants
- public static final String NAME_ANCHOR = "nameAnchor";
-
- // Namespaces contants
- public static final String URI_XSD = "http://www.w3.org/2001/XMLSchema";
- public static final String URI_SOAP = "http://schemas.xmlsoap.org/soap/encoding/";
- public static final String URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
- public static final String URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- public static final String URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
- public static final String SOAP_ENC_ARRAY_TYPE = "arrayType";
- public static final String XSI_TYPE = "type";
- public static final String QNAME_PREFIX = "q";
- public static final String QNAME_LOCAL_NAME_ARRAY_TYPE = "arrayType";
- public static final String QNAME_LOCAL_NAME_ARRAY = "Array";
- public static final String COLON = ":";
- public static final String QNAME_LOCAL_NAME_HEADER = "Header";
- public static final String QNAME_LOCAL_NAME_BODY = "Body";
- public static final String QNAME_LOCAL_NAME_FAULT = "Fault";
-
- // List
- public static final String LIST_SEPERATOR = " ";
-
- // SOAP-ENC:Array
- public static final String LEFT_SQUARE_BRACKET = "[";
- public static final String RIGHT_SQUARE_BRACKET = "]";
-
- // XSDDefaultFragment
- public static final String ROOT_ELEMENT_START_TAG = "<root>";
- public static final String ROOT_ELEMENT_END_TAG = "</root>";
-
- // Namespace URIs.
- public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
- public static final String NS_URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
- public static final String NS_URI_SOAP_ENC = "http://schemas.xmlsoap.org/soap/encoding/";
- public static final String NS_URI_1999_SCHEMA_XSI = "http://www.w3.org/1999/XMLSchema-instance";
- public static final String NS_URI_1999_SCHEMA_XSD = "http://www.w3.org/1999/XMLSchema";
- public static final String NS_URI_2000_SCHEMA_XSI = "http://www.w3.org/2000/10/XMLSchema-instance";
- public static final String NS_URI_2000_SCHEMA_XSD = "http://www.w3.org/2000/10/XMLSchema";
- public static final String NS_URI_2001_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance";
- public static final String NS_URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
- public static final String NS_URI_CURRENT_SCHEMA_XSI = NS_URI_2001_SCHEMA_XSI;
- public static final String NS_URI_CURRENT_SCHEMA_XSD = NS_URI_2001_SCHEMA_XSD;
- public static final String NS_URI_XML_SOAP = "http://xml.apache.org/xml-soap";
- public static final String NS_URI_XML_SOAP_DEPLOYMENT = "http://xml.apache.org/xml-soap/deployment";
- public static final String NS_URI_LITERAL_XML = "http://xml.apache.org/xml-soap/literalxml";
- public static final String NS_URI_XMI_ENC = "http://www.ibm.com/namespaces/xmi";
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
deleted file mode 100644
index d354b8d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
+++ /dev/null
@@ -1,42 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLActionInputs
-{
- public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-
- public static final String SESSION_ID = "sessionID";
- public static final String FRAGMENT_ID = "fragmentID";
-
- public static final String SOAP_ENVELOPE_TYPE = "soapEnvelopeType";
- public static final int SOAP_ENVELOPE_TYPE_REQUEST = 0;
- public static final int SOAP_ENVELOPE_TYPE_RESPONSE = 1;
- public static final String SOAP_RESPONSE_CACHED = "soapResponseCached";
-
- public static final String SUBMISSION_ACTION = "submissionAction";
- public static final String SUBMISSION_ACTION_FORM = "submissionActionForm";
- public static final String SUBMISSION_ACTION_BROWSE_FILE_HEADER = "submissionActionBrowseFileHeader";
- public static final String SUBMISSION_ACTION_BROWSE_FILE = "submissionActionBrowseFile";
- public static final String SUBMISSION_ACTION_SAVE_AS_HEADER = "submissionActionSaveAsHeader";
- public static final String SUBMISSION_ACTION_SAVE_AS = "submissionActionSaveAs";
- public static final String SELECTED_FILE_HEADER = "selectedFileHeader";
- public static final String SELECTED_FILE = "selectedFile";
- public static final String OPERATION_ELEMENT = "operationElement";
-
- public static final String END_POINT = "::endPoint";
- public static final String HTTP_BASIC_AUTH_USERNAME = "httpBasicAuthUsername";
- public static final String HTTP_BASIC_AUTH_PASSWORD = "httpBasicAuthPassword";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
deleted file mode 100644
index cc960c7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLFrameNames
-{
- public final static String WSDL_NAVIGATOR_CONTAINER = "wsdl_navigator_container";
- public final static String WSDL_NAVIGATOR_TOOLBAR = "wsdl_navigator_toolbar";
- public final static String WSDL_NAVIGATOR_CONTENT = "wsdl_navigator_content";
- public final static String WSDL_ACTIONS_CONTAINER = "wsdl_actions_container";
- public final static String WSDL_PROPERTIES_CONTAINER = "wsdl_properties_container";
- public final static String WSDL_PROPERTIES_TOOLBAR = "wsdl_properties_toolbar";
- public final static String WSDL_PROPERTIES_CONTENT = "wsdl_properties_content";
- public final static String WSDL_STATUS_CONTAINER = "wsdl_status_container";
- public final static String WSDL_STATUS_TOOLBAR = "wsdl_status_toolbar";
- public final static String WSDL_STATUS_CONTENT = "wsdl_status_content";
-
- // XSD Info Dialog
- public final static String XSD_INFO_TOOLBAR = "xsd_info_toolbar";
- public final static String XSD_INFO_CONTENT = "xsd_info_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
deleted file mode 100644
index 39b9fba..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLModelConstants
-{
- // Relation
- public final static String REL_WSDL = "relWSDL";
- public final static String REL_WSDL_SERVICE = "relWSDLService";
- public final static String REL_WSDL_BINDING = "relWSDLBinding";
- public final static String REL_WSDL_OPERATION = "relWSDLOperation";
-
- // Documentation
- public final static String PROP_DOCUMENTATION = "propDocumentation";
-
- // Source Content
- public final static String PROP_SOURCE_CONTENT_HEADER = "propSourceContentHeader";
- public final static String PROP_SOURCE_CONTENT = "propSourceContent";
- public final static String PROP_SOURCE_CONTENT_NAMESPACE = "propSourceContentNS";
-
- // Transport
- public final static String PROP_SOAP_REQUEST_TMP = "propSOAPRequestTmp";
- public final static String PROP_SOAP_REQUEST = "propSOAPRequest";
- public final static String PROP_SOAP_RESPONSE = "propSOAPResponse";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
deleted file mode 100644
index 8ed7d15..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
+++ /dev/null
@@ -1,67 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-public class Endpoint
-{
- private String endpoint;
- private boolean requireHTTPBasicAuth;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
-
- public Endpoint()
- {
- endpoint = null;
- requireHTTPBasicAuth = false;
- httpBasicAuthUsername = null;
- httpBasicAuthPassword = null;
- }
-
- public String getEndpoint()
- {
- return endpoint;
- }
-
- public void setEndpoint(String endpoint)
- {
- this.endpoint = endpoint;
- }
-
- public boolean isRequireHTTPBasicAuth()
- {
- return requireHTTPBasicAuth;
- }
-
- public void setRequireHTTPBasicAuth(boolean requireHTTPBasicAuth)
- {
- this.requireHTTPBasicAuth = requireHTTPBasicAuth;
- }
-
- public String getHttpBasicAuthUsername()
- {
- return httpBasicAuthUsername;
- }
-
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
- {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return httpBasicAuthPassword;
- }
-
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
- {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
deleted file mode 100644
index 0597888..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
+++ /dev/null
@@ -1,233 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLBindingElement extends WSDLCommonElement
-{
- private int bindingType_;
- private Binding binding_;
- private ExtensibilityElement bindingExtensibilityElement_;
- private Vector endPoints_;
-
- private final void setBindingExtensibilityElement()
- {
- bindingExtensibilityElement_ = null;
- bindingType_ = BindingTypes.UNSUPPORTED;
- List extensibilityElements = binding_.getExtensibilityElements();
- for (Iterator i = extensibilityElements.iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof HTTPBinding)
- {
- HTTPBinding binding = (HTTPBinding)e;
- String verb = binding.getVerb();
- if (BindingTypes.HTTP_VERB_GET.equals(verb))
- bindingType_ = BindingTypes.HTTP_GET;
- else if (BindingTypes.HTTP_VERB_POST.equals(verb))
- bindingType_ = BindingTypes.HTTP_POST;
- }
- else if (e instanceof SOAPBinding)
- bindingType_ = BindingTypes.SOAP;
- if (bindingType_ != BindingTypes.UNSUPPORTED)
- {
- bindingExtensibilityElement_ = e;
- break;
- }
- }
- }
-
- public WSDLBindingElement(String name, Model model, Binding binding)
- {
- super(name, model);
- setBinding(binding);
- endPoints_ = new Vector();
- }
-
- public void setBinding(Binding binding) {
- binding_ = binding;
- setDocumentation(binding.getDocumentationElement());
- setBindingExtensibilityElement();
- }
-
- public Binding getBinding() {
- return binding_;
- }
-
- public ExtensibilityElement getBindingExtensibilityElement()
- {
- return bindingExtensibilityElement_;
- }
-
- public int getBindingType()
- {
- return bindingType_;
- }
-
- private void resetEndPoints()
- {
- WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
- String fixedEndpointString = serviceElement.getAddressLocation(binding_);
- Endpoint fixedEndpoint = getEndpoint(fixedEndpointString);
- if (fixedEndpoint == null)
- {
- fixedEndpoint = new Endpoint();
- fixedEndpoint.setEndpoint(fixedEndpointString);
- }
- endPoints_.clear();
- endPoints_.add(fixedEndpoint);
- }
-
- public String[] getEndPoints()
- {
- String[] endPoints = new String[endPoints_.size()];
- for (int i = 0; i < endPoints.length; i++)
- endPoints[i] = ((Endpoint)endPoints_.get(i)).getEndpoint();
- return endPoints;
- }
-
- public Endpoint getEndpoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- for (Iterator it = endPoints_.iterator(); it.hasNext();)
- {
- Endpoint endpoint = (Endpoint)it.next();
- if (endpointString.equals(endpoint.getEndpoint()))
- return endpoint;
- }
- }
- return null;
- }
-
- public void setEndPoints(String[] endpoints)
- {
- Vector endpointVector = new Vector();
- for (int i = 0; i < endpoints.length; i++)
- {
- Endpoint endpoint = getEndpoint(endpoints[i]);
- if (endpoint == null)
- {
- endpoint = new Endpoint();
- endpoint.setEndpoint(endpoints[i]);
- }
- endpointVector.add(endpoint);
- }
- resetEndPoints();
- endPoints_.addAll(endpointVector);
- }
-
- public void addEndPoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- Endpoint endpoint = new Endpoint();
- endpoint.setEndpoint(endpointString);
- endPoints_.add(endpoint);
- }
- }
-
- public void removeEndPoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
- String fixedEndpointString = serviceElement.getAddressLocation(binding_);
- if (fixedEndpointString == null || !fixedEndpointString.equals(endpointString))
- {
- for (int i = 0; i < endPoints_.size(); i++)
- {
- if (endpointString.equals(((Endpoint)endPoints_.get(i)).getEndpoint()))
- {
- endPoints_.remove(i);
- break;
- }
- }
- }
- }
- }
-
- public void buildModel() {
- resetEndPoints();
- if (binding_ != null) {
- PortType pt = binding_.getPortType();
- if (pt != null) {
- List operations = pt.getOperations();
- HashMap operationsMap = new HashMap();
- for (Iterator it = operations.iterator();it.hasNext();) {
- Operation operation = (Operation)it.next();
- operationsMap.put(createOperationUniqueName(operation), operation);
- }
- WSDLOperationElement[] wsdlOperationElements = new WSDLOperationElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_OPERATION)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_OPERATION);
- for (int i = 0; i < wsdlOperationElements.length; i++) {
- wsdlOperationElements[i] = (WSDLOperationElement)e.nextElement();
- }
- for (int j = 0; j < wsdlOperationElements.length; j++) {
- String operationName = createOperationUniqueName(wsdlOperationElements[j].getOperation());
- Operation operation = (Operation)operationsMap.get(operationName);
- if (operation != null) {
- operationsMap.remove(operationName);
- wsdlOperationElements[j].setOperation(this, operation);
- }
- else
- disconnect(wsdlOperationElements[j], WSDLModelConstants.REL_WSDL_OPERATION);
- }
- for (Iterator it = operationsMap.values().iterator();it.hasNext();) {
- Operation oper = (Operation)it.next();
- WSDLOperationElement wsdlOperationElement = new WSDLOperationElement(oper.getName(), this, oper);
- connect(wsdlOperationElement,WSDLModelConstants.REL_WSDL_OPERATION,ModelConstants.REL_OWNER);
- }
- }
- }
- }
-
- private String createOperationUniqueName(Operation operation)
- {
- StringBuffer name = new StringBuffer();
- name.append(operation.getName());
- Input inputMsg = operation.getInput();
- if (inputMsg != null)
- {
- QName qname = inputMsg.getMessage().getQName();
- name.append(qname.getNamespaceURI());
- name.append(":");
- name.append(qname.getLocalPart());
- }
- Output outputMsg = operation.getOutput();
- if (outputMsg != null)
- {
- QName qname = outputMsg.getMessage().getQName();
- name.append(qname.getNamespaceURI());
- name.append(":");
- name.append(qname.getLocalPart());
- }
- return name.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
deleted file mode 100644
index e58ca3b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
+++ /dev/null
@@ -1,55 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class WSDLCommonElement extends TreeElement
-{
-
- public WSDLCommonElement(String name, Model model) {
- super(name, model);
- }
-
- public final TreeElement getParentElement() {
- return (TreeElement)getElements(ModelConstants.REL_OWNER).nextElement();
- }
-
- protected final void setDocumentation(Node documentationElement)
- {
- String documentation = "";
- try
- {
- if (documentationElement != null)
- {
- Document doc = XMLUtils.createNewDocument(null);
- DocumentFragment df = doc.createDocumentFragment();
- NodeList documentationNodes = documentationElement.getChildNodes();
- for (int i=0;i<documentationNodes.getLength();i++)
- df.appendChild(doc.importNode(documentationNodes.item(i),true));
- documentation = XMLUtils.serialize(df,true);
- }
- }
- catch (ParserConfigurationException e)
- {
- }
- setPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION,documentation);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
deleted file mode 100644
index e435612..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
+++ /dev/null
@@ -1,427 +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
- * -------- -------- -----------------------------------------------------------
- * 20060717 146707 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070124 167487 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080115 214955 gilberta@ca.ibm.com - Gilbert Andrews
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson, WSE does not handle utf-8 characters in URLs
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-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.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.xsd.XSDDiagnostic;
-import org.eclipse.xsd.XSDDiagnosticSeverity;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLElement extends WSDLCommonElement
-{
-
- private String wsdlUrl_;
- private Definition definition_;
- private Vector schemaList_;
- private Vector schemaURI_;
-
- private static Vector w3SchemaQNameList_;
- private static Vector constantSchemaList_;
-
- //A ResourceSet for all schemas in this WSDL
- private ResourceSet resourceSet;
-
- static
- {
- // w3 schema URI list:
- // http://www.w3.org/2001/XMLSchema
- // http://www.w3.org/2000/10/XMLSchema
- // http://www.w3.org/1999/XMLSchema
- w3SchemaQNameList_ = new Vector();
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD,"schema"));
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_2000_SCHEMA_XSD,"schema"));
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_1999_SCHEMA_XSD,"schema"));
-
- // Constant schema URI list:
- // http://www.w3.org/2001/XMLSchema
- // http://www.w3.org/2000/10/XMLSchema
- // http://www.w3.org/1999/XMLSchema
- // http://schemas.xmlsoap.org/soap/encoding/
- // http://schemas.xmlsoap.org/wsdl/
- constantSchemaList_ = new Vector();
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_2000_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_1999_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_SOAP_ENC));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.URI_WSDL));
- }
-
- public WSDLElement(String name, Model model, String wsdlUrl)
- {
- super(name, model);
- setWsdlUrl(wsdlUrl);
- definition_ = null;
- schemaList_ = new Vector();
- schemaURI_ = new Vector();
- }
-
- public void setWsdlUrl(String wsdlUrl) {
- HTTPUtility http = new HTTPUtility();
- wsdlUrl_ = http.handleRedirect(URLUtils.encodeURLString(wsdlUrl));
- }
-
- public String getWsdlUrl() {
- return wsdlUrl_;
- }
-
- public void setSchemaList(Vector schemaList)
- {
- schemaList_ = schemaList;
- }
-
- public Vector getSchemaList()
- {
- return schemaList_;
- }
-
- private final Definition loadWSDL(String wsdlURL) throws WSDLException
- {
- WebServicesParser parser = new WebServicesParserExt();
- try
- {
- return parser.getWSDLDefinitionVerbose(wsdlURL);
- }
- catch (WSDLException wsdle)
- {
- throw wsdle;
- }
- catch (Throwable t)
- {
- throw new WSDLException(WSDLException.OTHER_ERROR , t.getMessage(), t);
- }
- }
-
- public Vector loadWSDL() throws WSDLException
- {
-
- // Register the appropriate resource factory to handle all file extentions.
- resourceSet = new ResourceSetImpl();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,new XSDResourceFactoryImpl());
- //Register the package to ensure it is available during loading.
- resourceSet.getPackageRegistry().put(XSDPackage.eNS_URI,XSDPackage.eINSTANCE);
-
-
- Vector errorMessages = new Vector();
- definition_ = loadWSDL(wsdlUrl_);
-
-
- if (definition_ != null)
- {
- setDocumentation(definition_.getDocumentationElement());
- gatherSchemas(definition_, wsdlUrl_);
- // Validate the schemas.
- for (int i=0;i<schemaList_.size();i++)
- {
- XSDSchema xsdSchema = (XSDSchema)schemaList_.elementAt(i);
- xsdSchema.validate();
- EList errors = xsdSchema.getAllDiagnostics();
- if (!errors.isEmpty())
- {
- for (ListIterator li = errors.listIterator();li.hasNext();)
- {
- XSDDiagnostic xd = (XSDDiagnostic)li.next();
- String msg = xd.getMessage();
- // do not report low severity diagnostics or erroneous array reference errors.
- if (xd.getSeverity().getValue() == XSDDiagnosticSeverity.FATAL_LITERAL.getValue() || (msg != null && msg.length() > 0 && msg.toLowerCase().indexOf("#array") != -1))
- li.remove();
- else
- {
- if (msg != null && msg.length() > 0)
- errorMessages.addElement(xd.getMessage());
- }
- }
- }
- }
-
- for (int i=0;i<constantSchemaList_.size();i++)
- schemaList_.addElement(constantSchemaList_.elementAt(i));
-
- }
- return errorMessages;
- }
-
- private final void gatherSchemas(Definition definition, String definitionURL)
- {
- Types types = definition.getTypes();
- if (types != null)
- {
- List extTypes = types.getExtensibilityElements();
- if (extTypes != null)
- {
- for (int i=0;i<extTypes.size();i++)
- {
- XSDSchema xsdSchema = null;
- Object obj = extTypes.get(i);
- if (obj instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)obj;
- if (isW3SchemaElementType(schemaElement.getElementType()))
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- if(!checkSchemaURI(definitionURL)){
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, definitionURL);
- }
- //We need to add the schema to a Resource in a Resource set for proper validation
- org.eclipse.emf.common.util.URI uri = org.eclipse.emf.common.util.URI.createURI(definitionURL);
- Resource resource = resourceSet.createResource(uri);
- //Add the Schema to the resource
- resource.getContents().add(xsdSchema);
- }
- }
- else if (obj instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)obj;
- xsdSchema = schemaElement.getSchema();
- if(!schemaList_.contains(xsdSchema)){
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, definitionURL);
- }
- }
- }
- }
- }
- Map imports = definition.getImports();
- if (imports != null)
- gatherImportedSchemas(definition,imports);
- }
-
- private final void gatherSchemaDirective(XSDSchema xsdSchema, String xsdSchemaURL)
- {
- if (xsdSchema != null)
- {
- EList xsdSchemaContents = xsdSchema.getContents();
- for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
- {
- Object content = it.next();
- if (content instanceof XSDSchemaDirective)
- {
- XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
- StringBuffer xsdSchemaDirectiveURL = new StringBuffer();
- String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
- if (xsdSchemaDirectiveLocation != null && xsdSchemaDirectiveLocation.indexOf(':') == -1 && xsdSchemaURL != null && xsdSchemaURL.indexOf(':') != -1)
- {
- // relative URL
- int index = xsdSchemaURL.lastIndexOf('/');
- if (index != -1)
- xsdSchemaDirectiveURL.append(xsdSchemaURL.substring(0, index+1));
- else
- {
- xsdSchemaDirectiveURL.append(xsdSchemaURL);
- xsdSchemaDirectiveURL.append('/');
- }
- }
- xsdSchemaDirectiveURL.append(xsdSchemaDirectiveLocation);
-
- //encode the URL so that Schemas with non-ASCII filenames can be resolved
- String xsdSchemaDirectiveURLString = URLUtils.encodeURLString(xsdSchemaDirectiveURL.toString());
- // resolve schema directive
- XSDSchema resolvedSchema = xsdSchemaDirective.getResolvedSchema();
- if (resolvedSchema == null && xsdSchemaDirectiveURLString.length() > 0)
- resolvedSchema = getSchema(xsdSchemaDirectiveURLString);
- if (resolvedSchema != null)
- {
- if(!checkSchemaURI(xsdSchemaDirectiveURLString)){
- schemaList_.addElement(resolvedSchema);
- gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURLString);
- }
- }
- }
- }
- }
- }
-
- private boolean checkSchemaURI(String schemaURI){
- boolean found = false;
-
-
- schemaURI = normalize(schemaURI);
- if(schemaURI.equals(normalize(wsdlUrl_)))return false;
- Enumeration e = schemaURI_.elements();
- while(e.hasMoreElements()){
- String uri = (String)e.nextElement();
- if(schemaURI.equals(uri)){
- found = true;
- break;
- }
- }
-
- if (!found){
- schemaURI_.addElement(schemaURI);
- }
- return found;
-
- }
-
- private String normalize(String uri )
- {
- try {
- String encodedURI = URIEncoder.encode(uri,"UTF-8");
- URI normalizedURI = new URI(encodedURI);
- normalizedURI = normalizedURI.normalize();
- return normalizedURI.toString();
- } catch (URISyntaxException e) {
- return uri;
- } catch (UnsupportedEncodingException e) {
- return uri;
- }
- }
-
- private final boolean isW3SchemaElementType(QName qname)
- {
- for (int i=0;i<w3SchemaQNameList_.size();i++)
- {
- QName w3SchemaQName = (QName)w3SchemaQNameList_.elementAt(i);
- if (w3SchemaQName.equals(qname))
- return true;
- }
- return false;
- }
-
- private final void gatherImportedSchemas(Definition definition,Map imports)
- {
- for (Iterator iterator = imports.keySet().iterator();iterator.hasNext();)
- {
- List importList = (List)imports.get(iterator.next());
- for (int i=0;i<importList.size();i++)
- {
- Import imp = (Import)importList.get(i);
- StringBuffer locURI = new StringBuffer(imp.getLocationURI());
- if (!Validator.validateURL(locURI.toString()))
- {
- String base = definition.getDocumentBaseURI();
- locURI.insert(0,base.substring(0,base.lastIndexOf('/')+1));
- }
- try
- {
- Definition importDef = loadWSDL(locURI.toString());
- gatherSchemas(importDef, locURI.toString());
- }
- catch (WSDLException e)
- {
- // May be an XSD file.
- gatherSchema(locURI.toString());
- }
- }
- }
- }
-
- private final void gatherSchema(String locURI)
- {
- XSDSchema xsdSchema = getSchema(locURI);
- if (xsdSchema != null)
- {
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, locURI);
- }
- }
-
- private final XSDSchema getSchema(String locURI)
- {
- locURI = URLUtils.encodeURLString(locURI);
- XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(locURI);
- if (xsdSchema == null)
- {
- XSDParser p = new XSDParser();
- InputStream is = NetUtils.getURLInputStream(locURI);
- if (is != null)
- {
- p.parse(is);
- xsdSchema = p.getSchema();
- }
- }
- return xsdSchema;
- }
-
- public void setDefinition(Definition definition)
- {
- definition_ = definition;
- }
-
- public Definition getDefinition()
- {
- return definition_;
- }
-
- public void buildModel() {
- if (definition_ != null) {
- Map services = new HashMap(definition_.getServices());
- WSDLServiceElement[] wsdlServiceElements = new WSDLServiceElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_SERVICE)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_SERVICE);
- for (int i = 0; i < wsdlServiceElements.length; i++) {
- wsdlServiceElements[i] = (WSDLServiceElement)e.nextElement();
- }
- for (int j = 0; j < wsdlServiceElements.length; j++) {
- QName qname = wsdlServiceElements[j].getService().getQName();
- Service service = (Service)services.get(qname);
- if (service != null) {
- services.remove(qname);
- wsdlServiceElements[j].setService(service);
- wsdlServiceElements[j].buildModel();
- }
- else
- disconnect(wsdlServiceElements[j], WSDLModelConstants.REL_WSDL_SERVICE);
- }
- for (Iterator it = services.values().iterator();it.hasNext();) {
- Service service = (Service)it.next();
- WSDLServiceElement wsdlServiceElement = new WSDLServiceElement(service.getQName().getLocalPart(), getModel(), service);
- connect(wsdlServiceElement,WSDLModelConstants.REL_WSDL_SERVICE,ModelConstants.REL_OWNER);
- wsdlServiceElement.buildModel();
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
deleted file mode 100644
index 8665190..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20071024 206556 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080905 246265 mahutch@ca.ibm.com - Mark Hutchinson
- * 20080911 247096 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.TransportProviderRegistry;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPHeaderWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class WSDLOperationElement extends WSDLCommonElement
-{
- public static final int OPERATION_TYPE_SOAP = 0;
- public static final int OPERATION_TYPE_HTTP_GET = 1;
- public static final int OPERATION_TYPE_HTTP_POST = 2;
-
- private int operationType_;
- private Operation operation_;
- private WSDLPartsToXSDTypeMapper wsdlPartsToXsdTypeMapper_;
- private XSDToFragmentController fragController_;
- private boolean isDocumentStyle_;
- private boolean isUseLiteral_;
- private String soapAction_;
- private String encodingStyle_;
- private String encodingNamespace_;
-
- private Map headerCache;
-
- private MessageContext messageContext = null;
- private ISOAPTransportProvider soapTransportProvider = null;
-
- private final void gatherSoapInformation(WSDLBindingElement bindingElement,SOAPBinding soapBinding)
- {
- // Initialize defaults.
- isDocumentStyle_ = true;
- soapAction_ = "";
- isUseLiteral_ = true;
- encodingStyle_ = null;
- encodingNamespace_ = null;
-
- if (soapBinding != null)
- isDocumentStyle_ = "document".equals(soapBinding.getStyle());
- BindingOperation bindingOperation = getBindingOperation(bindingElement);
- SOAPOperation soapOperation = null;
-
- for (Iterator i = bindingOperation.getExtensibilityElements().iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof SOAPOperation)
- {
- soapOperation = (SOAPOperation)e;
- soapAction_ = soapOperation.getSoapActionURI();
- if(soapAction_ == null) soapAction_ = "";
-
- String style = soapOperation.getStyle();
- if (style != null)
- isDocumentStyle_ = style.equals("document");
- break;
- }
- }
-
- BindingInput bindingInput = bindingOperation.getBindingInput();
- SOAPBody soapBody = null;
- for (Iterator i = bindingInput.getExtensibilityElements().iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof SOAPBody)
- {
- soapBody = (SOAPBody)e;
- isUseLiteral_ = "literal".equals(soapBody.getUse());
- if (!isUseLiteral_)
- {
- // Encoded.
- for (Iterator j = soapBody.getEncodingStyles().iterator();j.hasNext();)
- {
- encodingStyle_ = (String)j.next();
- encodingNamespace_ = soapBody.getNamespaceURI();
- break;
- }
- }
- break;
- }
- }
- }
-
- public WSDLOperationElement(String name,WSDLBindingElement bindingElement,Operation operation)
- {
- super(name, bindingElement.getModel());
- // Set the default operation type to be SOAP.
- setOperation(bindingElement,operation);
- }
-
- private Definition getDefinition(WSDLBindingElement bindingElement) {
- WSDLServiceElement serviceElement = (WSDLServiceElement) bindingElement.getParentElement();
- WSDLElement wsdlElement = (WSDLElement) serviceElement.getParentElement();
- return wsdlElement.getDefinition();
- }
-
- private void setMessageContext(WSDLBindingElement bindingElement) {
- messageContext = new MessageContext();
- messageContext.setDefinition(getDefinition(bindingElement));
- messageContext.setBindingOperation(getBindingOperation(bindingElement));
- messageContext.setBindingProtocol(bindingElement.getBindingExtensibilityElement());
- messageContext.setDocumentStyle(isDocumentStyle_);
- }
-
- public MessageContext getMessageContext() {
- return messageContext;
- }
-
- private void setSOAPTransportProvider(SOAPBinding soapBinding) {
-
- String namespaceURI = soapBinding.getElementType().getNamespaceURI();
- String transportURI = soapBinding.getTransportURI();
-
- soapTransportProvider = TransportProviderRegistry.getInstance()
- .getSOAPTransportProvider(namespaceURI, transportURI);
- }
-
- public ISOAPTransportProvider getSOAPTransportProvider() {
- return soapTransportProvider;
- }
-
- public void setOperation(WSDLBindingElement bindingElement,Operation operation) {
- operation_ = operation;
- setDocumentation(operation.getDocumentationElement());
- fragController_ = null;
- wsdlPartsToXsdTypeMapper_ = null;
- operationType_ = bindingElement.getBindingType();
- ExtensibilityElement bindingExtensibilityElement = bindingElement.getBindingExtensibilityElement();
- switch (operationType_)
- {
- case BindingTypes.SOAP:
- gatherSoapInformation(bindingElement,(SOAPBinding)bindingExtensibilityElement);
- setMessageContext(bindingElement);
- setSOAPTransportProvider((SOAPBinding) bindingExtensibilityElement);
- headerCache = new Hashtable();
- case BindingTypes.HTTP_GET:
- case BindingTypes.HTTP_POST:
- default:
- break;
- }
- }
-
- public Operation getOperation() {
- return operation_;
- }
-
- public BindingOperation getBindingOperation()
- {
- return getBindingOperation((WSDLBindingElement)getParentElement());
- }
-
- private BindingOperation getBindingOperation(WSDLBindingElement bindingElement)
- {
- Binding binding = bindingElement.getBinding();
- String operationInputName = null;
- String operationOutputName = null;
- Input operationInput = operation_.getInput();
- Output operationOutput = operation_.getOutput();
- if (operationInput != null)
- operationInputName = operationInput.getName();
- if (operationOutput != null)
- operationOutputName = operationOutput.getName();
- BindingOperation bindingOperation = binding.getBindingOperation(operation_.getName(),operationInputName,operationOutputName);
- if (bindingOperation == null)
- bindingOperation = binding.getBindingOperation(operation_.getName(),null,null);
- return bindingOperation;
- }
-
- /**
- * Return a list of input headers.
- *
- * @return A List
- */
- public List getSOAPHeaders() {
- return getSOAPHeaders(true);
- }
-
- /**
- * Return a list of headers.
- *
- * @param isInput If true, returns the input headers. If false, returns the output headers.
- * @return A List
- */
- public List getSOAPHeaders(boolean isInput) {
- List headers = new Vector();
-
- BindingOperation bindingOperation = getBindingOperation();
- List extensibilityElements = isInput ?
- bindingOperation.getBindingInput().getExtensibilityElements() :
- bindingOperation.getBindingOutput().getExtensibilityElements();
-
- for (Iterator it = extensibilityElements.iterator(); it.hasNext();) {
-
- ExtensibilityElement e = (ExtensibilityElement) it.next();
-
- if (e instanceof SOAPHeader && !headers.contains(e))
- headers.add(e);
- }
-
- return headers;
- }
-
- public List getOrderedBodyParts()
- {
- List parts = new Vector(operation_.getInput().getMessage().getOrderedParts(operation_.getParameterOrdering()));
- BindingOperation bindingOperation = getBindingOperation();
- BindingInput bindingInput = bindingOperation.getBindingInput();
- for (Iterator it = bindingInput.getExtensibilityElements().iterator(); it.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)it.next();
- if (e instanceof SOAPBody)
- {
- SOAPBody soapBody = (SOAPBody)e;
- List bodyParts = soapBody.getParts();
- if (bodyParts != null)
- {
- for (int i = 0; i < parts.size(); i++)
- {
- Part part = (Part)parts.get(i);
- if (!bodyParts.contains(part) && !bodyParts.contains(part.getName()))
- {
- parts.remove(i);
- i--;
- }
- }
- }
- break;
- }
- }
- return parts;
- }
-
- private XSDToFragmentController getXSDToFragmentController() {
- if (fragController_ == null) {
- fragController_ = new XSDToFragmentController();
- fragController_.setWSDLPartsToXSDTypeMapper(wsdlPartsToXsdTypeMapper_);
- }
- return fragController_;
- }
-
- private XSDNamedComponent getSchema(Part part, String id) {
- if (wsdlPartsToXsdTypeMapper_ == null) {
- wsdlPartsToXsdTypeMapper_ = new WSDLPartsToXSDTypeMapper();
- WSDLBindingElement bindingElement = (WSDLBindingElement)getParentElement();
- WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
- WSDLElement wsdlElement = (WSDLElement)serviceElement.getParentElement();
- wsdlPartsToXsdTypeMapper_.addSchemas(wsdlElement.getSchemaList());
- }
- return wsdlPartsToXsdTypeMapper_.getXSDType(part, id);
- }
-
- public IXSDFragment getHeaderFragment(SOAPHeader soapHeader) {
- return getHeaderFragment(soapHeader, true);
- }
-
- public IXSDFragment getHeaderFragment(SOAPHeader soapHeader, boolean isInput) {
- StringBuffer id = new StringBuffer();
- Part part = soapHeader.getEPart();
- if (isInput)
- id.append(FragmentConstants.INPUT_ID).append(soapHeader.getMessage()).append(FragmentConstants.PART_TOKEN);
- else
- id.append(FragmentConstants.OUTPUT_ID).append(soapHeader.getMessage()).append(FragmentConstants.PART_TOKEN);
-
- return getFragment(part, id, true, isInput); // only wrap input header fragments
- }
-
- public IXSDFragment getFragment(Part part) {
- return getFragment(part, true);
- }
-
- public IXSDFragment getFragment(Part part, boolean isInput) {
- StringBuffer id = new StringBuffer();
- if (isInput)
- id.append(FragmentConstants.INPUT_ID);
- else
- id.append(FragmentConstants.OUTPUT_ID);
-
- return getFragment(part, id, false, false);
- }
-
- private IXSDFragment getFragment(Part part, StringBuffer id, boolean isHeader, boolean useSOAPHeaderWrapper) {
- String partName = part.getName();
- id.append(partName);
- XSDToFragmentConfiguration config = new XSDToFragmentConfiguration();
- config.setIsWSDLPart(true);
- config.setWSDLPartName(partName);
- config.setXSDComponent(getSchema(part, id.toString()));
- if (isDocumentStyle() || isHeader)
- config.setStyle(FragmentConstants.STYLE_DOCUMENT);
- else
- config.setStyle(FragmentConstants.STYLE_RPC);
- if (operationType_ == BindingTypes.SOAP)
- {
- if (!isUseLiteral_)
- config.setPartEncoding(FragmentConstants.ENCODING_SOAP);
- }
- else
- config.setPartEncoding(FragmentConstants.ENCODING_URL);
-
- //bug 246265: for usability, if the type is a soap encoded string then we do not want to display or send the optional "id" or "href" attributes
- QName typeName = part.getTypeName();
- if (typeName != null) {
- String localPart = typeName.getLocalPart();
- String namespaceURI = typeName.getNamespaceURI();
-
- if ("string".equals(localPart) && "http://schemas.xmlsoap.org/soap/encoding/".equals(namespaceURI) ) {
- if (config.getXSDComponent() instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition xsd = (XSDComplexTypeDefinition)config.getXSDComponent();
- xsd.getAttributeUses().clear();
- xsd.getAttributeContents().clear();
- }
- }
- }
-
- IXSDFragment fragment = getXSDToFragmentController().getFragment(config, id.toString(), part.getName());
-
- // let's see if there's a corresponding wrapper for this fragment
- if (useSOAPHeaderWrapper && !(fragment instanceof SOAPHeaderWrapperFragment)) {
- SOAPHeaderWrapperFragment wrapper = (SOAPHeaderWrapperFragment) headerCache.get(fragment.getID());
-
- // no wrapper, let's wrap it
- if (wrapper == null) {
- wrapper = new SOAPHeaderWrapperFragment(fragment);
- headerCache.put(fragment.getID(), wrapper);
-
- // also put this wrapper fragment in the master cache
- getXSDToFragmentController().addToCache(wrapper.getID(), wrapper);
- }
-
- return wrapper;
- }
-
- return fragment;
- }
-
- public IXSDFragment getFragmentByID(String id) {
- return getXSDToFragmentController().getCachedFragment(id);
- }
-
- public void removeAllFragment() {
- getXSDToFragmentController().emptyCache();
- }
-
- public boolean isDocumentStyle()
- {
- return isDocumentStyle_;
- }
-
- public String getSoapAction()
- {
- return soapAction_;
- }
-
- public boolean isUseLiteral()
- {
- return isUseLiteral_;
- }
-
- public String getEncodingStyle()
- {
- return encodingStyle_;
- }
-
- public String getEncodingNamespace()
- {
- return encodingNamespace_;
- }
-
- public int getOperationType()
- {
- return operationType_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
deleted file mode 100644
index 1b9ad8a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
+++ /dev/null
@@ -1,113 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLServiceElement extends WSDLCommonElement
-{
-
- private Service service_;
-
- public WSDLServiceElement(String name, Model model, Service service)
- {
- super(name, model);
- setService(service);
- }
-
- public void setService(Service service) {
- service_ = service;
- setDocumentation(service.getDocumentationElement());
- }
-
- public Service getService() {
- return service_;
- }
-
- public String getAddressLocation(Binding binding)
- {
- Map ports = service_.getPorts();
- for (Iterator i = ports.values().iterator();i.hasNext();)
- {
- Port port = (Port)i.next();
- if (port.getBinding().getQName().equals(binding.getQName()))
- {
- List extensibilityElements = port.getExtensibilityElements();
- for (Iterator j = extensibilityElements.iterator();j.hasNext();)
- {
- ExtensibilityElement element = (ExtensibilityElement)j.next();
- if (element instanceof SOAPAddress)
- {
- SOAPAddress soapAddress = (SOAPAddress)element;
- return soapAddress.getLocationURI();
- }
- else if (element instanceof HTTPAddress)
- {
- HTTPAddress httpAddress = (HTTPAddress)element;
- return httpAddress.getLocationURI();
- }
- }
- }
- }
- return null;
- }
-
- public void buildModel() {
- if (service_ != null) {
- Map ports = service_.getPorts();
- Map bindings = new HashMap();
- for (Iterator it = ports.values().iterator();it.hasNext();) {
- Port port = (Port)it.next();
- Binding binding = port.getBinding();
- if (binding.getPortType() == null)
- continue;
- else
- bindings.put(binding.getQName(), binding);
- }
- WSDLBindingElement[] wsdlBindingElements = new WSDLBindingElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_BINDING)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_BINDING);
- for (int i = 0; i < wsdlBindingElements.length; i++) {
- wsdlBindingElements[i] = (WSDLBindingElement)e.nextElement();
- }
- for (int j = 0; j < wsdlBindingElements.length; j++) {
- QName qname = wsdlBindingElements[j].getBinding().getQName();
- Binding binding = (Binding)bindings.get(qname);
- if (binding != null) {
- bindings.remove(qname);
- wsdlBindingElements[j].setBinding(binding);
- wsdlBindingElements[j].buildModel();
- }
- else
- disconnect(wsdlBindingElements[j], WSDLModelConstants.REL_WSDL_BINDING);
- }
- for (Iterator it = bindings.values().iterator();it.hasNext();) {
- Binding binding = (Binding)it.next();
- WSDLBindingElement wsdlBindingElement = new WSDLBindingElement(binding.getQName().getLocalPart(), getModel(), binding);
- connect(wsdlBindingElement,WSDLModelConstants.REL_WSDL_BINDING,ModelConstants.REL_OWNER);
- wsdlBindingElement.buildModel();
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
deleted file mode 100644
index ede280c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public interface IFragment {
- public void setID(String id);
- public String getID();
-
- public void setName(String name);
- public String getName();
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public void setParameterValues(String paramKey, String[] params);
- public void setParameterValues(String paramKey, Vector params);
- public String[] getParameterValues(String paramKey);
- public String getParameterValue(String paramKey, int paramIndex);
-
- public boolean validateAllParameterValues();
- public boolean validateParameterValues(String paramKey);
- public boolean validateParameterValue(String paramKey, int paramIndex);
-
- public String getInformationFragment();
- public String getWriteFragment();
- public String getReadFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
deleted file mode 100644
index 1efa6df..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface ISOAPEncArrayFragment extends IXSDGroupSeqFragment {
- public String createSOAPEncArrayInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
deleted file mode 100644
index 58650ce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,18 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-
-public interface ISOAPEncodingWrapperFragment extends IXSDDelegationFragment
-{
- public void setURIReferences(Hashtable uriReferences);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java
deleted file mode 100644
index 88f23ce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/IXSDElementFragment.java, wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 1
-* Version 1.1 03/02/28 15:26:05
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDAttributeFragment extends IXSDDelegationFragment {
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
deleted file mode 100644
index 261ffc3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
+++ /dev/null
@@ -1,16 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDComplexFragment extends IXSDMapFragment {
- public String createComplexInstance();
- public IXSDAttributeFragment[] getAllAttributeFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
deleted file mode 100644
index 6355355..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
+++ /dev/null
@@ -1,16 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDDelegationFragment extends IXSDFragment {
- public void setXSDDelegationFragment(IXSDFragment xsdFragment);
- public IXSDFragment getXSDDelegationFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
deleted file mode 100644
index e8cae7f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
+++ /dev/null
@@ -1,24 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDElementFragment extends IXSDDelegationFragment {
- public static String NIL = "nilValue";
- public static String NIL_VALUE = "nil";
-
- public int getMinOccurs();
- public int getMaxOccurs();
- public boolean isNillable();
- public String getNilID();
- public boolean isNil();
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
deleted file mode 100644
index e8a5553..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
+++ /dev/null
@@ -1,32 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-
-public interface IXSDFragment extends IFragment {
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config);
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration();
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef);
- public XSDTypeDefinition getXSDTypeDefinition();
- public Element setAttributesOnInstanceDocuments(Element instanceDocument,String name);
- public boolean setAttributeParamsFromInstanceDocuments (Node attribute);
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments);
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc);
-
- public String genID();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
deleted file mode 100644
index f2aee58..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupAllFragment extends IXSDGroupFragment {
- public String getGroupAllInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
deleted file mode 100644
index e410929..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,20 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDParticle;
-
-public interface IXSDGroupChoiceFragment extends IXSDGroupFragment {
- public XSDParticle[] getChoices();
- public String createGroupChoiceInstance(int choiceIndex);
- public int getChoiceIndex(String groupID);
- public void setChoiceIndex(String groupID, int choiceIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
deleted file mode 100644
index 4444838..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
+++ /dev/null
@@ -1,22 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDModelGroup;
-
-public interface IXSDGroupFragment extends IXSDMapFragment {
- public void setXSDModelGroup(XSDModelGroup xsdModelGroup);
- public XSDModelGroup getXSDModelGroup();
-
- public String[] getGroupIDs();
- public String[] getGroupMemberIDs(String groupID);
- public IXSDFragment[] getGroupMemberFragments(String groupID);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
deleted file mode 100644
index df58faa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupSeqFragment extends IXSDGroupFragment {
- public String createGroupSeqInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
deleted file mode 100644
index 551e401..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
+++ /dev/null
@@ -1,23 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDMapFragment extends IXSDFragment {
- public void setXSDToFragmentController(XSDToFragmentController controller);
- public XSDToFragmentController getXSDToFragmentController();
-
- public String createInstance();
-
- public String[] getFragmentsOrder();
- public IXSDFragment getFragment(String id);
- public IXSDFragment[] getFragments(String[] ids);
- public IXSDFragment[] getAllFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
deleted file mode 100644
index c658d5d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,14 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleAtomicFragment extends IXSDFragment {
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
deleted file mode 100644
index 2ab3808..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleListFragment extends IXSDMapFragment {
- public String createListInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
deleted file mode 100644
index c7dcad9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,18 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public interface IXSDSimpleUnionFragment extends IXSDMapFragment {
- public XSDSimpleTypeDefinition[] getMemberTypeDefinitions();
- public String createUnionInstance(int memberTypeIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java
deleted file mode 100644
index abe10ed..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java, wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 2
-* Version 1.2 03/06/05 14:17:44
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDAttributeUseToFragmentMapper extends XSDToFragmentMapper {
- public XSDAttributeUseToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDAttributeUse attribute = (XSDAttributeUse)config.getXSDComponent();
- if (attribute != null && attribute.getAttributeDeclaration() != null) {
- XSDAttributeDeclaration resolvedAttribute = resolveXSDAttributeDeclaration(attribute.getAttributeDeclaration());
- XSDTypeDefinition typeDef = getXSDTypeDefinition(resolvedAttribute);
- IXSDAttributeFragment attributeFrag = new XSDAttributeFragment(id, resolvedAttribute.getName(), config);
- attributeFrag.setXSDTypeDefinition(typeDef);
- XSDToFragmentConfiguration attributeTypeConfig = new XSDToFragmentConfiguration();
- attributeTypeConfig.setXSDComponent(typeDef);
- attributeTypeConfig.setStyle(config.getStyle());
- attributeTypeConfig.setPartEncoding(config.getPartEncoding());
- attributeTypeConfig.setWSDLPartName(config.getWSDLPartName());
- IXSDFragment xsdFragment = getController().getFragment(attributeTypeConfig, attributeFrag.genID(), resolvedAttribute.getName());
- attributeFrag.setXSDDelegationFragment(xsdFragment);
- return attributeFrag;
- }
- return getXSDDefaultFragment(config, id, name);
- }
-
- private XSDAttributeDeclaration resolveXSDAttributeDeclaration(XSDAttributeDeclaration attribute) {
- // port to org.eclipse.xsd
- if (attribute.getResolvedAttributeDeclaration() != null)
- {
- XSDAttributeDeclaration resolvedAttribute = attribute.getResolvedAttributeDeclaration();
- if (!isComponentResolvable(resolvedAttribute))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedAttribute);
- if (resolvedComponent != null && (resolvedComponent instanceof XSDAttributeDeclaration))
- resolvedAttribute = (XSDAttributeDeclaration)resolvedComponent;
- }
- return resolvedAttribute;
- }
- else
- return attribute;
- }
-
- private XSDTypeDefinition getXSDTypeDefinition(XSDAttributeDeclaration attribute) {
- // port to org.eclipse.xsd
- if (attribute.getTypeDefinition() != null)
- return attribute.getTypeDefinition();
- // port to org.eclipse.xsd
- else if (attribute.getAnonymousTypeDefinition() != null)
- return attribute.getAnonymousTypeDefinition();
- else
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
deleted file mode 100644
index 4d89a28..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
+++ /dev/null
@@ -1,56 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexSimpleContentFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexSimpleContentRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDContentTypeCategory;
-
-public class XSDComplexTypeToFragmentMapper extends XSDToFragmentMapper {
- public XSDComplexTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)config.getXSDComponent();
- int category = complexType.getContentTypeCategory().getValue();
- if (complexType != null && complexType.isMixed())
- return getXSDDefaultFragment(config, id, name);
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent != null)
- return getXSDComplexFragment(category,config, id, name);
- else
- return getXSDEmptyFragment(config, id, name);
- }
-
- private IXSDFragment getXSDComplexFragment(int category,XSDToFragmentConfiguration config, String id, String name) {
- int minOccurs = config.getMinOccurs();
- int maxOccurs = config.getMaxOccurs();
- if (minOccurs == maxOccurs)
- if(category == XSDContentTypeCategory.SIMPLE){
- return new XSDComplexSimpleContentFixFragment(id, name, config, getController());
-
- }
- else
- return new XSDComplexFixFragment(id, name, config, getController());
- else
- if(category == XSDContentTypeCategory.SIMPLE)
- return new XSDComplexSimpleContentRangeFragment(id, name, config, getController());
- else
- return new XSDComplexRangeFragment(id, name, config, getController());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
deleted file mode 100644
index 7f4d6a0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070404 181065 makandre@ca.ibm.com - Andrew Mak, WSE does not handle types referenced across inline schemas
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class XSDElementDeclarationToFragmentMapper extends XSDToFragmentMapper {
- public XSDElementDeclarationToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDElementDeclaration element = (XSDElementDeclaration)config.getXSDComponent();
- if (element != null) {
- XSDElementDeclaration resolvedElement = resolveXSDElementDeclaration(element);
- XSDTypeDefinition typeDef = resolveXSDTypeDefinition(getXSDTypeDefinition(resolvedElement));
- if (typeDef != null) {
- int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
- int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
- XSDConcreteComponent concreteComponent = element.getContainer();
- if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
- XSDParticle particle = (XSDParticle)concreteComponent;
- if (particle.isSetMinOccurs())
- minOccurs = particle.getMinOccurs();
- if (particle.isSetMaxOccurs())
- maxOccurs = particle.getMaxOccurs();
- }
- config.setMinOccurs(minOccurs);
- config.setMaxOccurs(maxOccurs);
- IXSDElementFragment elementFrag = new XSDElementFragment(id, resolvedElement.getName(), config);
- elementFrag.setXSDTypeDefinition(typeDef);
- XSDToFragmentConfiguration elementTypeConfig = new XSDToFragmentConfiguration();
- elementTypeConfig.setXSDComponent(typeDef);
- elementTypeConfig.setMinOccurs(minOccurs);
- elementTypeConfig.setMaxOccurs(maxOccurs);
- elementTypeConfig.setStyle(config.getStyle());
- elementTypeConfig.setPartEncoding(config.getPartEncoding());
- elementTypeConfig.setWSDLPartName(config.getWSDLPartName());
- IXSDFragment xsdFragment = getController().getFragment(elementTypeConfig, elementFrag.genID(), resolvedElement.getName());
- elementFrag.setXSDDelegationFragment(xsdFragment);
- return elementFrag;
- }
- }
- return getXSDDefaultFragment(config, id, name);
- }
-
- private XSDElementDeclaration resolveXSDElementDeclaration(XSDElementDeclaration element) {
- // port to org.eclipse.xsd
- if (element.getResolvedElementDeclaration() != null)
- {
- XSDElementDeclaration resolvedElement = element.getResolvedElementDeclaration();
- if (!isComponentResolvable(resolvedElement))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedElement);
- if (resolvedComponent != null && (resolvedComponent instanceof XSDElementDeclaration))
- resolvedElement = (XSDElementDeclaration)resolvedComponent;
- }
- return resolvedElement;
- }
- else
- return element;
- }
-
- private XSDTypeDefinition resolveXSDTypeDefinition(XSDTypeDefinition typeDef) {
-
- if (!isComponentResolvable(typeDef)) {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(typeDef);
- if (resolvedComponent instanceof XSDTypeDefinition)
- return (XSDTypeDefinition) resolvedComponent;
- }
-
- return typeDef;
- }
-
- private XSDTypeDefinition getXSDTypeDefinition(XSDElementDeclaration element) {
- // port to org.eclipse.xsd
- if (element.getTypeDefinition() != null)
- return element.getTypeDefinition();
- // port to org.eclipse.xsd
- else if (element.getAnonymousTypeDefinition() != null)
- return element.getAnonymousTypeDefinition();
- else
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
deleted file mode 100644
index 6402d9c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,88 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDLiteralXMLEncodingToFragmentMapper extends XSDToFragmentMapper {
- private XSDSimpleTypeToFragmentMapper xsdSimpleMapper_;
- private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
- private XSDElementDeclarationToFragmentMapper xsdElementMapper_;
- private XSDAttributeUseToFragmentMapper xsdAttributeMapper_;
- private XSDParticleToFragmentMapper xsdParticleMapper_;
-
- public XSDLiteralXMLEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- xsdSimpleMapper_ = null;
- xsdComplexMapper_ = null;
- xsdElementMapper_ = null;
- xsdAttributeMapper_ = null;
- xsdParticleMapper_= null;
- }
-
- private XSDSimpleTypeToFragmentMapper getXSDSimpleMapper() {
- if (xsdSimpleMapper_ == null)
- xsdSimpleMapper_ = new XSDSimpleTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdSimpleMapper_;
- }
-
- private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
- if (xsdComplexMapper_ == null)
- xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdComplexMapper_;
- }
-
- private XSDElementDeclarationToFragmentMapper getXSDElementMapper() {
- if (xsdElementMapper_ == null)
- xsdElementMapper_ = new XSDElementDeclarationToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdElementMapper_;
- }
-
- private XSDAttributeUseToFragmentMapper getXSDAttributeMapper() {
- if (xsdAttributeMapper_ == null)
- xsdAttributeMapper_ = new XSDAttributeUseToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdAttributeMapper_;
- }
-
- private XSDParticleToFragmentMapper getXSDParticleMapper() {
- if (xsdParticleMapper_ == null)
- xsdParticleMapper_ = new XSDParticleToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdParticleMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- config = resolveXSDComponent(config);
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component))
- return getXSDDefaultFragment(config, id, name);
- else if (component instanceof XSDElementDeclaration)
- return getXSDElementMapper().getFragment(config, id, name);
- else if (component instanceof XSDSimpleTypeDefinition)
- return getXSDSimpleMapper().getFragment(config, id, name);
- else if (component instanceof XSDComplexTypeDefinition)
- return getXSDComplexMapper().getFragment(config, id, name);
- else if (component instanceof XSDParticle)
- return getXSDParticleMapper().getFragment(config, id, name);
- else if (component instanceof XSDParticleContent)
- return getXSDParticleMapper().getFragment(config, id, name);
- else if (component instanceof XSDAttributeUse)
- return getXSDAttributeMapper().getFragment(config, id, name);
- else
- return getXSDDefaultFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
deleted file mode 100644
index 64c6794..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
+++ /dev/null
@@ -1,104 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-
-
-public class XSDParticleToFragmentMapper extends XSDToFragmentMapper {
- public XSDParticleToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDComponent component = config.getXSDComponent();
- XSDParticleContent xsdParticleContent;
- if (component instanceof XSDParticle)
- xsdParticleContent = ((XSDParticle)component).getContent();
- else if (component instanceof XSDParticleContent)
- xsdParticleContent = (XSDParticleContent)component;
- else
- xsdParticleContent = null;
- if (xsdParticleContent != null) {
- if (xsdParticleContent instanceof XSDModelGroupDefinition)
- return getXSDModelGroupDefFragment(config, id, name, (XSDModelGroupDefinition)xsdParticleContent);
- else if (xsdParticleContent instanceof XSDModelGroup)
- return getXSDModelGroupFragment(config, id, name, (XSDModelGroup)xsdParticleContent);
- else if (xsdParticleContent instanceof XSDWildcard)
- return getXSDWildcardFragment(config, id, name, (XSDWildcard)xsdParticleContent);
- else
- return getXSDDefaultFragment(config, id, name);
- }
- else
- return getXSDDefaultFragment(config, id, name);
- }
-
- private IXSDFragment getXSDModelGroupDefFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroupDefinition xsdModelGroupDef) {
- XSDModelGroupDefinition resolvedXSDModelGroupDef = xsdModelGroupDef;
- if (xsdModelGroupDef.isModelGroupDefinitionReference())
- resolvedXSDModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
- XSDModelGroup xsdModelGroup = resolvedXSDModelGroupDef.getModelGroup();
- if (xsdModelGroup == null)
- return getXSDDefaultFragment(config, id, name);
- else
- return getXSDModelGroupFragment(config, id, name, xsdModelGroup);
- }
-
- private IXSDFragment getXSDModelGroupFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroup xsdModelGroup) {
- int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
- int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
- XSDConcreteComponent concreteComponent = xsdModelGroup.getContainer();
- if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
- XSDParticle particle = (XSDParticle)concreteComponent;
- if (particle.isSetMinOccurs())
- minOccurs = particle.getMinOccurs();
- if (particle.isSetMaxOccurs())
- maxOccurs = particle.getMaxOccurs();
- }
- config.setMinOccurs(minOccurs);
- config.setMaxOccurs(maxOccurs);
-
- switch (xsdModelGroup.getCompositor().getValue()) {
- case XSDCompositor.SEQUENCE:
- if (minOccurs == maxOccurs)
- return new XSDGroupSeqFixFragment(id, name, config, getController(), xsdModelGroup);
- else
- return new XSDGroupSeqRangeFragment(id, name, config, getController(), xsdModelGroup);
- case XSDCompositor.CHOICE:
- if (minOccurs == maxOccurs)
- return new XSDGroupChoiceFixFragment(id, name, config, getController(), xsdModelGroup);
- else
- return new XSDGroupChoiceRangeFragment(id, name, config, getController(), xsdModelGroup);
- case XSDCompositor.ALL:
- return new XSDGroupAllFragment(id, name, config, getController(), xsdModelGroup);
- default:
- return getXSDDefaultFragment(config, id, name);
- }
- }
-
- private IXSDFragment getXSDWildcardFragment(XSDToFragmentConfiguration config, String id, String name, XSDWildcard xsdParticleContent) {
- return getXSDDefaultFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
deleted file mode 100644
index e91d194..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,130 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-public class XSDSOAPEncodingToFragmentMapper extends XSDToFragmentMapper {
- private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
- private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-
- public XSDSOAPEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- xsdLiteralMapper_ = null;
- xsdComplexMapper_ = null;
- }
-
- private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
- if (xsdLiteralMapper_ == null)
- xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdLiteralMapper_;
- }
-
- private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
- if (xsdComplexMapper_ == null)
- xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdComplexMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- if (config.getIsWSDLPart()) {
- ISOAPEncodingWrapperFragment wrapperFragment = new SOAPEncodingWrapperFragment(id, name, null);
- String delegationFragId = wrapperFragment.genID();
- IXSDFragment delegationFragment = getFragmentDelegate(config, delegationFragId, name);
- wrapperFragment.setXSDDelegationFragment(delegationFragment);
- getController().addToCache(delegationFragId, delegationFragment);
- return wrapperFragment;
- }
- else
- return getFragmentDelegate(config, id, name);
- }
-
- public IXSDFragment getFragmentDelegate(XSDToFragmentConfiguration config, String id, String name) {
- config = resolveXSDComponent(config);
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component))
- return getXSDDefaultFragment(config, id, name);
- else if (component instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)component;
- if (XSDTypeDefinitionUtil.isSoapEncArray(complexType))
- return getSOAPEncArrayFragment(config, id, name, complexType);
- else
- return getXSDComplexMapper().getFragment(config, id, name);
- }
- else
- return getXSDLiteralMapper().getFragment(config, id, name);
- }
-
- private IXSDFragment getSOAPEncArrayFragment(XSDToFragmentConfiguration config, String id, String name, XSDComplexTypeDefinition complexType) {
- EList xsdAttrContents = complexType.getAttributeContents();
- for (int i = 0; i < xsdAttrContents.size(); i++) {
- String soapEncArrayTypeNamespaceURI = null;
- String soapEncArrayTypeLocalName = null;
- int soapEncArrayDimension = 0;
- XSDAttributeGroupContent xsdAttrContent = (XSDAttributeGroupContent)xsdAttrContents.get(i);
- Element element = xsdAttrContent.getElement();
- String arrayTypeAttr = element.getAttributeNS(FragmentConstants.URI_WSDL, FragmentConstants.QNAME_LOCAL_NAME_ARRAY_TYPE);
- if (arrayTypeAttr != null && arrayTypeAttr.length() > 0) {
- int colon = arrayTypeAttr.indexOf(FragmentConstants.COLON);
- String nsPrefix = (colon > 0) ? arrayTypeAttr.substring(0, colon) : null;
- soapEncArrayTypeNamespaceURI = (String)xsdAttrContent.getSchema().getQNamePrefixToNamespaceMap().get(nsPrefix);
- int dimensionIndex = arrayTypeAttr.indexOf(FragmentConstants.LEFT_SQUARE_BRACKET);
- soapEncArrayTypeLocalName = arrayTypeAttr.substring(colon + 1, dimensionIndex);
- String dimensionString = arrayTypeAttr.substring(dimensionIndex, arrayTypeAttr.length());
- for (int j = 0; j < dimensionString.length() - 1; j++) {
- if (dimensionString.charAt(j) == FragmentConstants.LEFT_SQUARE_BRACKET.charAt(0) && dimensionString.charAt(j + 1) == FragmentConstants.RIGHT_SQUARE_BRACKET.charAt(0)) {
- soapEncArrayDimension++;
- j++;
- }
- else {
- soapEncArrayDimension = 0;
- break;
- }
- }
- }
- if (soapEncArrayTypeNamespaceURI != null && soapEncArrayTypeLocalName != null && soapEncArrayDimension == 1) {
- XSDComponent soapEncArrayType = getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(soapEncArrayTypeNamespaceURI, soapEncArrayTypeLocalName, false);
- if (soapEncArrayType != null && soapEncArrayType instanceof XSDTypeDefinition) {
- XSDModelGroup sequence = null;
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent != null && (complexTypeContent instanceof XSDParticle)) {
- XSDParticleContent xsdParticleContent = ((XSDParticle)complexTypeContent).getContent();
- if (xsdParticleContent instanceof XSDModelGroup)
- sequence = (XSDModelGroup)xsdParticleContent;
- }
- ISOAPEncArrayFragment frag;
- if (config.getMinOccurs() == config.getMaxOccurs())
- frag = new SOAPEncArrayFixFragment(id, name, config, getController(), sequence);
- else
- frag = new SOAPEncArrayRangeFragment(id, name, config, getController(), sequence);
- frag.setXSDTypeDefinition((XSDTypeDefinition)soapEncArrayType);
- return frag;
- }
- }
- }
- return getXSDComplexMapper().getFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
deleted file mode 100644
index ea97f24..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
+++ /dev/null
@@ -1,174 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-
-public class XSDSimpleTypeToFragmentMapper extends XSDToFragmentMapper {
- public XSDSimpleTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)config.getXSDComponent();
- if (simpleType != null && simpleType.getVariety() != null) {
- switch (simpleType.getVariety().getValue()) {
- case XSDVariety.ATOMIC:
- return getXSDSimpleAtomicFragment(config, id, name);
- case XSDVariety.LIST:
- return getXSDSimpleListFragment(config, id, name);
- case XSDVariety.UNION:
- return getXSDSimpleUnionFragment(config, id, name);
- default:
- return getXSDDefaultFragment(config, id, name);
- }
- }
- else
- return getXSDDefaultFragment(config, id, name);
- }
-
- private IXSDFragment getXSDSimpleAtomicFragment(XSDToFragmentConfiguration config, String id, String name) {
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- XSDSimpleTypeDefinition xsdSimpleTypeDef = (XSDSimpleTypeDefinition)config.getXSDComponent();
- XSDSimpleTypeDefinition xsdBaseSimpleTypeDef = (XSDSimpleTypeDefinition)XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(xsdSimpleTypeDef);
- String baseSimpleTypeDefNS = null;
- String baseSimpleTypeDefName = null;
- if (xsdBaseSimpleTypeDef != null)
- {
- baseSimpleTypeDefNS = xsdBaseSimpleTypeDef.getTargetNamespace();
- baseSimpleTypeDefName = xsdBaseSimpleTypeDef.getName();
- }
- boolean isEnum = isSimpleTypeEnumeration(xsdSimpleTypeDef);
- if (FragmentConstants.URI_XSD.equals(baseSimpleTypeDefNS))
- {
- if (baseSimpleTypeDefName.equals("date"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATE,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("dateTime"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATETIME,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gYearMonth"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GYEARMONTH,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gMonthDay"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GMONTHDAY,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gDay"))
- return getXSDSimpleGDayFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("boolean"))
- return getXSDSimpleBooleanFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
- }
-
- if (isEnum)
- {
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
- }
- else
- {
- if (isFixed)
- return new XSDSimpleAtomicFixFragment(id, name, config);
- else
- return new XSDSimpleAtomicRangeFragment(id, name, config);
- }
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleDateTimeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType,XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- {
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
- }
- else
- {
- if (isFixed)
- return new XSDSimpleAtomicDateTimeFixFragment(id, name, config, calendarType);
- else
- return new XSDSimpleAtomicDateTimeRangeFragment(id, name, config, calendarType);
- }
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleGDayFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- return null;
- OptionVector optionVector = new OptionVector();
- StringBuffer value = new StringBuffer();
- for (int i=1;i<=31;i++)
- {
- value.setLength(0);
- value.append("---");
- if (i<10)
- value.append(0);
- value.append(i);
- optionVector.addOption(String.valueOf(i),value.toString());
- }
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleBooleanFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdBooleanType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- return null;
- OptionVector optionVector = new OptionVector();
- optionVector.addOption("true","true");
- optionVector.addOption("false","false");
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
- }
-
- private IXSDFragment getXSDSimpleListFragment(XSDToFragmentConfiguration config, String id, String name) {
-
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- if (isFixed)
- return new XSDSimpleListFixFragment(id, name, config, getController());
- else
- return new XSDSimpleListRangeFragment(id, name, config, getController());
- }
-
- private IXSDFragment getXSDSimpleUnionFragment(XSDToFragmentConfiguration config, String id, String name) {
-
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- if (isFixed)
- return new XSDSimpleUnionFixFragment(id, name, config, getController());
- else
- return new XSDSimpleUnionRangeFragment(id, name, config, getController());
- }
-
- private boolean isSimpleTypeEnumeration(XSDSimpleTypeDefinition simpleType) {
- EList e = simpleType.getEnumerationFacets();
- return (e != null && e.size() > 0);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
deleted file mode 100644
index dc3250d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComponent;
-
-public class XSDToFragmentConfiguration {
- private XSDComponent component_;
- private int minOccurs_;
- private int maxOccurs_;
- private int style_;
- private int partEncoding_;
- private boolean isWSDLPart_;
- private String wsdlPartName_;
-
- public XSDToFragmentConfiguration() {
- component_ = null;
- minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
- maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
- style_ = FragmentConstants.STYLE_DOCUMENT;
- partEncoding_ = FragmentConstants.ENCODING_LITERAL;
- isWSDLPart_ = false;
- wsdlPartName_ = null;
- }
-
- public void setXSDComponent(XSDComponent component) {
- component_ = component;
- }
-
- public XSDComponent getXSDComponent() {
- return component_;
- }
-
- public void setMinOccurs(int minOccurs) {
- minOccurs_ = minOccurs;
- }
-
- public int getMinOccurs() {
- return minOccurs_;
- }
-
- public void setMaxOccurs(int maxOccurs) {
- maxOccurs_ = maxOccurs;
- }
-
- public int getMaxOccurs() {
- return maxOccurs_;
- }
-
- public void setStyle(int style) {
- style_ = style;
- }
-
- public int getStyle() {
- return style_;
- }
-
- public void setPartEncoding(int partEncoding) {
- partEncoding_ = partEncoding;
- }
-
- public int getPartEncoding() {
- return partEncoding_;
- }
-
- public void setIsWSDLPart(boolean isWSDLPart) {
- isWSDLPart_ = isWSDLPart;
- }
-
- public boolean getIsWSDLPart() {
- return isWSDLPart_;
- }
-
- public void setWSDLPartName(String wsdlPartName) {
- wsdlPartName_ = wsdlPartName;
- }
-
- public String getWSDLPartName() {
- return wsdlPartName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
deleted file mode 100644
index 20c57d6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
+++ /dev/null
@@ -1,87 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-
-public class XSDToFragmentController {
- private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
- private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
- private XSDSOAPEncodingToFragmentMapper xsdSoapMapper_;
- private Hashtable xsdToFragmentCache_;
-
- public XSDToFragmentController() {
- wsdlToXSDMapper_ = null;
- xsdLiteralMapper_ = null;
- xsdSoapMapper_ = null;
- xsdToFragmentCache_ = new Hashtable();
- }
-
- public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
- return wsdlToXSDMapper_;
- }
-
- private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
- if (xsdLiteralMapper_ == null)
- xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(this, wsdlToXSDMapper_);
- return xsdLiteralMapper_;
- }
-
- private XSDSOAPEncodingToFragmentMapper getXSDSOAPMapper() {
- if (xsdSoapMapper_ == null)
- xsdSoapMapper_ = new XSDSOAPEncodingToFragmentMapper(this, wsdlToXSDMapper_);
- return xsdSoapMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- IXSDFragment frag = getCachedFragment(id);
- if (frag != null)
- return frag;
- frag = getNewFragment(config, id, name);
- if (frag != null)
- addToCache(id, frag);
- return frag;
- }
-
- public IXSDFragment getCachedFragment(String id) {
- return (IXSDFragment)xsdToFragmentCache_.get(id);
- }
-
- public IXSDFragment getNewFragment(XSDToFragmentConfiguration config, String id, String name) {
- switch (config.getPartEncoding())
- {
- case FragmentConstants.ENCODING_SOAP:
- return getXSDSOAPMapper().getFragment(config,id,name);
- case FragmentConstants.ENCODING_LITERAL:
- case FragmentConstants.ENCODING_URL:
- default:
- return getXSDLiteralMapper().getFragment(config,id,name);
- }
- }
-
- public void addToCache(String id, IXSDFragment frag) {
- xsdToFragmentCache_.put(id, frag);
- }
-
- public void removeFromCache(String id) {
- xsdToFragmentCache_.remove(id);
- }
-
- public void emptyCache() {
- xsdToFragmentCache_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
deleted file mode 100644
index 1c64f6e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
+++ /dev/null
@@ -1,78 +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.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDefaultFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDEmptyFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class XSDToFragmentMapper {
- private XSDToFragmentController controller_;
- private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-
- public XSDToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- controller_ = controller;
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public void setController(XSDToFragmentController controller) {
- controller_ = controller;
- }
-
- public XSDToFragmentController getController() {
- return controller_;
- }
-
- public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
- return wsdlToXSDMapper_;
- }
-
- protected IXSDFragment getXSDDefaultFragment(XSDToFragmentConfiguration config, String id, String name) {
- return new XSDDefaultFragment(id, name, config);
- }
-
- protected IXSDFragment getXSDEmptyFragment(XSDToFragmentConfiguration config, String id, String name) {
- return new XSDEmptyFragment(id, name, config);
- }
-
- public abstract IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name);
-
- protected XSDToFragmentConfiguration resolveXSDComponent(XSDToFragmentConfiguration config)
- {
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component) && (component instanceof XSDNamedComponent))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent((XSDNamedComponent)component);
- if (resolvedComponent != null)
- config.setXSDComponent(resolvedComponent);
- }
- return config;
- }
-
- protected boolean isComponentResolvable(XSDComponent component)
- {
- if (component == null)
- return false;
- XSDSchema schema = component.getSchema();
- if (schema == null)
- return false;
- if (schema.getTargetNamespace() == null)
- return false;
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
deleted file mode 100644
index fd5e328..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
+++ /dev/null
@@ -1,102 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-
-public abstract class Fragment implements IFragment {
- private String id_;
- private String name_;
- private Hashtable params_;
-
- public Fragment(String id, String name) {
- id_ = id;
- name_ = name;
- params_ = new Hashtable();
- }
-
- public void setID(String id) {
- id_ = id;
- }
-
- public String getID() {
- return id_;
- }
-
- public void setName(String name) {
- name_ = name;
- }
-
- public String getName() {
- return name_;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String[] params = parser.getParameterValues(getID());
- setParameterValues(getID(), params);
- return validateAllParameterValues();
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- if (params == null)
- params_.remove(paramKey);
- else
- params_.put(paramKey, params);
- }
-
- public void setParameterValues(String paramKey, Vector params) {
- if (params == null)
- params_.remove(paramKey);
- else {
- String[] paramsArray = new String[params.size()];
- for (int i = 0; i < paramsArray.length; i++) {
- paramsArray[i] = params.get(i).toString();
- }
- setParameterValues(paramKey, paramsArray);
- }
- }
-
- public String[] getParameterValues(String paramKey) {
- return (String[])params_.get(paramKey);
- }
-
- public String getParameterValue(String paramKey, int paramIndex) {
- String[] params = getParameterValues(paramKey);
- if (params != null && paramIndex < params.length)
- return params[paramIndex];
- else
- return null;
- }
-
- public boolean validateAllParameterValues() {
- Enumeration paramKeys = params_.keys();
- while (paramKeys != null && paramKeys.hasMoreElements()) {
- if (!validateParameterValues((String)paramKeys.nextElement()))
- return false;
- }
- return true;
- }
-
- public boolean validateParameterValues(String paramKey) {
- String[] params = getParameterValues(paramKey);
- for (int i = 0; params != null && i < params.length; i++) {
- if (!validateParameterValue(paramKey, i))
- return false;
- }
- return true;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
deleted file mode 100644
index 061fe81..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayFixFragment extends SOAPEncArrayFragment {
- public SOAPEncArrayFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
deleted file mode 100644
index ff03dd2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
+++ /dev/null
@@ -1,188 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncArrayFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class SOAPEncArrayFragment extends XSDGroupSeqFragment implements ISOAPEncArrayFragment
-{
- public SOAPEncArrayFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup)
- {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- removeGroupIDs();
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- IXSDFragment soapEncArrayTypeFrag = (getGroupMemberFragments(createSOAPEncArrayInstance()))[0];
- Vector instancesVector = new Vector();
- NodeList nl = instanceDocumentsCopy[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++)
- {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!soapEncArrayTypeFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, soapEncArrayTypeFrag.getName())))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- String[] groupIDs = getGroupIDs();
- Element[] instanceDocument = new Element[groupIDs.length];
- StringBuffer attrName = new StringBuffer();
- StringBuffer attrValue = new StringBuffer();
-// StringBuffer attrArrayTypeName = new StringBuffer();
-// StringBuffer attrArrayTypeValue = new StringBuffer();
- for (int i = 0; i < instanceDocument.length; i++)
- {
- int numInstances = 0;
- instanceDocument[i] = doc.createElement(getInstanceDocumentTagName(namespaceTable));
- IXSDFragment fragment = (getGroupMemberFragments(groupIDs[i]))[0];
- Element[] fragmentInstanceDocuments = fragment.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < fragmentInstanceDocuments.length; j++)
- {
- if (fragmentInstanceDocuments[j] != null)
- instanceDocument[i].appendChild(fragmentInstanceDocuments[j]);
- numInstances++;
- }
- String soapURI = FragmentConstants.URI_SOAP;
- String soapPrefix = getPrefixFromNamespaceURI(soapURI, namespaceTable);
- String soapEncArrayTypeURI = getXSDTypeDefinition().getTargetNamespace();
- String soapEncArrayTypePrefix = getPrefixFromNamespaceURI(soapEncArrayTypeURI, namespaceTable);
- // Set the arrayType attribute
- attrName.setLength(0);
- attrName.setLength(0);
- attrName.append(soapPrefix);
- attrName.append(FragmentConstants.COLON);
- attrName.append(FragmentConstants.SOAP_ENC_ARRAY_TYPE);
- attrValue.setLength(0);
- attrValue.append(soapEncArrayTypePrefix);
- attrValue.append(FragmentConstants.COLON);
- attrValue.append(getXSDTypeDefinition().getName());
- attrValue.append(FragmentConstants.LEFT_SQUARE_BRACKET);
- attrValue.append(numInstances);
- attrValue.append(FragmentConstants.RIGHT_SQUARE_BRACKET);
- instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- if (genXSIType)
- {
-// TODO: Used to call the plugin's ignoreSchemaForSOAPArrays()method.
- boolean ignoreSchemaForSOAPArrays = true;
- if (ignoreSchemaForSOAPArrays)
- {
- for (int i = 0; i < instanceDocument.length; i++)
- {
- String xsiURI = FragmentConstants.URI_XSI;
- String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
- String xsiTypeURI = FragmentConstants.URI_SOAP;
- String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
- attrName.setLength(0);
- attrName.append(xsiPrefix).append(FragmentConstants.COLON).append(FragmentConstants.XSI_TYPE);
- attrValue.setLength(0);
- attrValue.append(xsiTypePrefix).append(FragmentConstants.COLON);
- attrValue.append(FragmentConstants.QNAME_LOCAL_NAME_ARRAY);
- instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- }
- else
- return addXSIType(instanceDocument, namespaceTable);
- }
- return instanceDocument;
- }
-
- public String createSOAPEncArrayInstance()
- {
- if (getXSDTypeDefinition() != null)
- {
- String groupID = genID();
- String[] groupMemberID = {genID()};
- int minOccurs = 0;
- int maxOccurs = FragmentConstants.UNBOUNDED;
- XSDElementDeclaration elementDecl = null;
- if (getXSDModelGroup() != null)
- {
- XSDParticle groupOwner = (XSDParticle)getXSDModelGroup().getContainer();
- int groupMin = groupOwner.getMinOccurs();
- int groupMax = groupOwner.getMaxOccurs();
- int elementMin = 0;
- int elementMax = FragmentConstants.UNBOUNDED;
- EList xsdParticles = getXSDModelGroup().getParticles();
- if (xsdParticles.size() > 0)
- {
- XSDParticleContent xsdParticleContent = ((XSDParticle)xsdParticles.get(0)).getContent();
- if (xsdParticleContent instanceof XSDElementDeclaration)
- {
- elementDecl = (XSDElementDeclaration)xsdParticleContent;
- XSDParticle elementOwner = (XSDParticle)elementDecl.getContainer();
- elementMin = elementOwner.getMinOccurs();
- elementMax = elementOwner.getMaxOccurs();
- }
- }
- if (groupMin >= 0 && elementMin >= 0)
- minOccurs = groupMin * elementMin;
- if (groupMax >= 0 && groupMax != FragmentConstants.UNBOUNDED && elementMax >= 0 && elementMax != FragmentConstants.UNBOUNDED)
- maxOccurs = groupMax * elementMax;
- }
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(getXSDTypeDefinition());
- xsdConfig.setMinOccurs(minOccurs);
- xsdConfig.setMaxOccurs(maxOccurs);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String name = (elementDecl != null) ? elementDecl.getName() : getXSDTypeDefinition().getName();
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, groupMemberID[0], name);
- addFragment(groupMemberID[0], frag);
- setGroupMemberIDs(groupID, groupMemberID);
- return groupID;
- }
- else
- return null;
- }
-
- public String createGroupSeqInstance()
- {
- return createSOAPEncArrayInstance();
- }
-
- public String createInstance()
- {
- return createSOAPEncArrayInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
deleted file mode 100644
index 76567ee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayRangeFragment extends SOAPEncArrayFragment {
- public SOAPEncArrayRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
deleted file mode 100644
index fd93e27..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,189 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class SOAPEncodingWrapperFragment extends XSDDelegationFragment implements ISOAPEncodingWrapperFragment
-{
- private static final String ID = "id";
- private static final String HREF = "href";
- private static final String POUND = "#";
-
- private Hashtable uriReferenceTable_;
-
- public SOAPEncodingWrapperFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, null);
- uriReferenceTable_ = null;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- getXSDDelegationFragment().setXSDToFragmentConfiguration(config);
- }
-
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
- {
- return getXSDDelegationFragment().getXSDToFragmentConfiguration();
- }
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
- {
- getXSDDelegationFragment().setXSDTypeDefinition(typeDef);
- }
-
- public XSDTypeDefinition getXSDTypeDefinition()
- {
- return getXSDDelegationFragment().getXSDTypeDefinition();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- for (int i = 0; i < instanceDocuments.length; i++)
- instanceDocuments[i] = resolveURIReferences(uriReferenceTable_, instanceDocuments[i]);
- return getXSDDelegationFragment().setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- public void setURIReferences(Hashtable uriReferences)
- {
- uriReferenceTable_ = uriReferences;
- }
-
- public static Hashtable parseURIReferences(Element element, boolean overwrites)
- {
- Hashtable uriReferences = new Hashtable();
- parseURIReferences(uriReferences, element, overwrites);
- return uriReferences;
- }
-
- private static boolean parseURIReferences(Hashtable uriReferences, Element element, boolean overwrites)
- {
- boolean resolved = true;
- if (element != null)
- {
- URIReference ref = null;
- String id = element.getAttribute(ID);
- resolved = !element.hasAttribute(HREF);
- if (id != null && id.length() > 0 && (overwrites || !uriReferences.contains(id)))
- {
- ref = new URIReference(element, true);
- uriReferences.put(id, ref);
- }
- NodeList nl = element.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node instanceof Element)
- resolved = parseURIReferences(uriReferences, (Element)node, overwrites) && resolved;
- }
- if (ref != null)
- ref.setResolved(resolved);
- }
- return resolved;
- }
-
- public static Element resolveURIReferences(Hashtable uriReferences, Element element)
- {
- if (uriReferences != null && !uriReferences.isEmpty())
- return resolveURIReferences(uriReferences, element.getOwnerDocument(), element, new Vector());
- else
- return element;
- }
-
- private static Element resolveURIReferences(Hashtable uriReferences, Document doc, Element element, Vector usedIds)
- {
- String href = element.getAttribute(HREF);
- Element resolvedElement = element;
- boolean resolved = false;
- if (href != null && href.length() > 0)
- {
- URIReference ref = null;
- if (href.indexOf(POUND) != -1)
- href = href.substring(1, href.length());
- if (!usedIds.contains(href))
- {
- ref = (URIReference)uriReferences.get(href);
- if (ref != null)
- {
- usedIds.add(href);
- Element elementRef = ref.getRefElement();
- resolved = ref.getResolved();
- resolvedElement = doc.createElement(element.getTagName());
- NodeList nl = elementRef.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node != null)
- resolvedElement.appendChild(doc.importNode(node, true));
- }
- }
- }
- }
- if (!resolved)
- {
- NodeList nl = resolvedElement.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node instanceof Element)
- {
- Element child = resolveURIReferences(uriReferences, resolvedElement.getOwnerDocument(), (Element)node, usedIds);
- if (child != node)
- resolvedElement.replaceChild(child, node);
- }
- }
- }
- if (href != null)
- usedIds.remove(href);
- return resolvedElement;
- }
-
- private static class URIReference
- {
- private Element ref_;
- private boolean resolved_;
-
- public URIReference(Element ref, boolean resolved)
- {
- ref_ = ref;
- resolved_ = resolved;
- }
-
- public Element getRefElement()
- {
- return ref_;
- }
-
- public void setRefElement(Element ref)
- {
- ref_ = ref;
- }
-
- public boolean getResolved()
- {
- return resolved_;
- }
-
- public void setResolved(boolean resolved)
- {
- resolved_ = resolved;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
deleted file mode 100644
index 1d0ea5d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
+++ /dev/null
@@ -1,289 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20081114 254672 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A SOAP header fragment, which is a wrapper around the fragment that represents the SOAP header content.
- */
-public class SOAPHeaderWrapperFragment extends XSDDelegationFragment {
-
- private static final String MUST_UNDERSTAND = "mustUnderstand";
- private static final String ACTOR = "actor";
-
- private boolean mustUnderstand = false;
- private String actor = "";
- private boolean validActor = true;
-
- /**
- * Constructor.
- *
- * @param fragment The fragment that this SOAP header fragment wraps around.
- */
- public SOAPHeaderWrapperFragment(IXSDFragment fragment) {
- super(fragment.genID(), fragment.getName(), null);
- setXSDDelegationFragment(fragment);
- }
-
- /*
- * Retrieves the first element from a string array.
- */
- private String getFirstElement(String[] stringArray) {
- if (stringArray == null || stringArray.length == 0)
- return null;
- return stringArray[0];
- }
-
- /*
- * Retrieves the first element from a vector.
- */
- private String getFirstElement(Vector vector) {
- if (vector == null || vector.isEmpty())
- return null;
-
- Object obj = vector.firstElement();
- if (!(obj instanceof String))
- return null;
-
- return (String) obj;
- }
-
- /*
- * Sets the mustUnderstand value. Any non-empty string (except "0")
- * translates to a mustUnderstand value of true.
- */
- private void setMustUnderstand(String param) {
- mustUnderstand = (param != null && !param.equals("0"));
- }
-
- /*
- * Sets the actor value. Also sets the flag for validActor.
- */
- private void setActor(String param) {
- if (param == null || param.length() == 0)
- actor = "";
- else {
- actor = param;
- try {
- new URI(actor);
- }
- catch (URISyntaxException e) {
- validActor = false;
- return;
- }
- }
-
- validActor = true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#processParameterValues(org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser)
- */
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-
- setMustUnderstand(parser.getParameter(getMustUnderstandID()));
- setActor(parser.getParameter(getActorID()));
-
- // mustUnderstand is either set or unset, no further validation necessary
- // only need to validate actor URI
- return super.processParameterValues(parser) && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#setParameterValues(java.lang.String, java.lang.String[])
- */
- public void setParameterValues(String paramKey, String[] params) {
- if (getMustUnderstandID().equals(paramKey))
- setMustUnderstand(getFirstElement(params));
- else if (getActorID().equals(paramKey))
- setActor(getFirstElement(params));
- else
- super.setParameterValues(paramKey, params);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#setParameterValues(java.lang.String, java.util.Vector)
- */
- public void setParameterValues(String paramKey, Vector params) {
- if (getMustUnderstandID().equals(paramKey))
- setMustUnderstand(getFirstElement(params));
- else if (getActorID().equals(paramKey))
- setActor(getFirstElement(params));
- else
- super.setParameterValues(paramKey, params);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getParameterValues(java.lang.String)
- */
- public String[] getParameterValues(String paramKey) {
- if (getMustUnderstandID().equals(paramKey))
- return new String[] { mustUnderstand ? "1" : "0" };
- else if (getActorID().equals(paramKey))
- return new String[] { actor };
- else
- return super.getParameterValues(paramKey);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getParameterValue(java.lang.String, int)
- */
- public String getParameterValue(String paramKey, int paramIndex) {
- return getParameterValues(paramKey)[paramIndex];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateAllParameterValues()
- */
- public boolean validateAllParameterValues() {
- return super.validateAllParameterValues() && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateParameterValues(java.lang.String)
- */
- public boolean validateParameterValues(String paramKey) {
- if (getMustUnderstandID().equals(paramKey))
- return true;
- else if (getActorID().equals(paramKey))
- return validateActor();
- else
- return super.validateParameterValues(paramKey);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateParameterValue(java.lang.String, int)
- */
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- if (getMustUnderstandID().equals(paramKey))
- return true;
- else if (getActorID().equals(paramKey))
- return validateActor();
- else
- return super.validateParameterValue(paramKey, paramIndex);
- }
-
- /**
- * Sets the values for this SOAP header given an instance document and a namespace table.
- *
- * @param instanceDocument The instance document.
- * @param namespaceTable The namespace table.
- *
- * @return True if all values extracted from the instance document are valid.
- */
- public boolean setParameterValuesFromInstanceDocument(Element instanceDocument, Map namespaceTable) {
-
- boolean valid = setParameterValuesFromInstanceDocuments(new Element[] { instanceDocument });
-
- String prefix = namespaceTable.get(FragmentConstants.NS_URI_SOAP_ENV) + FragmentConstants.COLON;
-
- String mustUnderstandValue = instanceDocument.getAttribute(prefix + MUST_UNDERSTAND);
- if ("".equals(mustUnderstandValue))
- mustUnderstand = false;
- else if ("0".equals(mustUnderstandValue) || "1".equals(mustUnderstandValue))
- setMustUnderstand(mustUnderstandValue);
- else
- valid = false;
-
- setActor(instanceDocument.getAttribute(prefix + ACTOR));
-
- return valid && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#genInstanceDocumentsFromParameterValues(boolean, java.util.Hashtable, org.w3c.dom.Document)
- */
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- Element[] elements = super.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-
- if (elements.length == 0)
- return elements;
-
- String prefix = getPrefixFromNamespaceURI(FragmentConstants.NS_URI_SOAP_ENV, namespaceTable) + FragmentConstants.COLON;
-
- for (int i = 0; i < elements.length; i++) {
-
- if (mustUnderstand){
- elements[i].setAttributeNS(FragmentConstants.NS_URI_SOAP_ENV, prefix + MUST_UNDERSTAND, "1");
- }
- if (actor.length() > 0){
- elements[i].setAttributeNS(FragmentConstants.NS_URI_SOAP_ENV,prefix + ACTOR, actor);
- }
- }
-
- return elements;
- }
-
- /**
- * Convenience method for getting for the mustUnderstand value
- * @return The mustUnderstand value, true if mustUnderstand="1", false otherwise.
- */
- public boolean isMustUnderstand() {
- return mustUnderstand;
- }
-
- /**
- * Convenience method for getting the actor value
- * @return The actor value
- */
- public String getActor() {
- return actor;
- }
-
- /**
- * Determines if the actor value is a valid URI.
- * @return True if the actor value is valid, false otherwise.
- */
- public boolean validateActor() {
- return validActor;
- }
-
- /**
- * Returns the ID of the mustUnderstand input element
- * @return The ID of the mustUnderstand input element
- */
- public String getMustUnderstandID() {
- return getID() + FragmentConstants.ID_SEPERATOR + MUST_UNDERSTAND;
- }
-
- /**
- * Returns the ID of the actor input element
- * @return The ID of the actor input element
- */
- public String getActorID() {
- return getID() + FragmentConstants.ID_SEPERATOR + ACTOR;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getWriteFragment()
- */
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java
deleted file mode 100644
index 0e539a2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * <copyright>
- *
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2002 - All Rights
- * Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- *
- * </copyright>
- *
- * File
- * plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDElementFragment.java,
- * wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 5 Version 1.5 03/09/24
- * 14:30:38
- */
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDAttributeFragment extends XSDDelegationFragment implements IXSDAttributeFragment
-{
-
-
- public XSDAttributeFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
-
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
-
- if (!attributeTypeFragment.processParameterValues(parser))
- return false;
- return true;
- }
-
- public boolean validateAllParameterValues()
- {
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
- if (!attributeTypeFragment.validateAllParameterValues())
- return false;
- return true;
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- String[] params = getParameterValues(paramKey);
- if (params != null)
- return false;
- if (!getXSDDelegationFragment().validateParameterValues(paramKey))
- return false;
- return true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
- return false;
- return true;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- super.setXSDToFragmentConfiguration(config);
-
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-
-
-
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
- {
- Vector childElements = new Vector();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE){
- childElements.add(node);
- }
- }
- instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
- }
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
- instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
- return attributeTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, attributeTypeFragment.getName()));
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
- {
- XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)config.getXSDComponent();
- XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration)xsdAttributeUse.getAttributeDeclaration();
- if (xsdAttribute.isGlobal())
- return true;
- else
- {
- if (xsdAttribute.isSetForm())
- return (xsdAttribute.getForm().getValue() == XSDForm.QUALIFIED);
- else
- return (xsdAttribute.getSchema().getAttributeFormDefault().getValue() == XSDForm.QUALIFIED);
- }
- }
- else
- return false;
- }
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable)
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)config.getXSDComponent();
- XSDAttributeDeclaration xsdAttribute = xsdAttributeUse.getAttributeDeclaration();
-
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = null;
- // port to org.eclipse.xsd
- if (xsdAttribute.getResolvedAttributeDeclaration() != null)
- nsURI = xsdAttribute.getResolvedAttributeDeclaration().getTargetNamespace();
- else
- nsURI = xsdAttribute.getTargetNamespace();
- if (nsURI != null && nsURI.length() > 0)
- {
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- }
- String xsdAttributeName = xsdAttribute.getName();
- if (xsdAttributeName == null || xsdAttributeName.length() <= 0)
- {
- // port to org.eclipse.xsd
- if (xsdAttribute.getResolvedAttributeDeclaration() != null)
- xsdAttributeName = xsdAttribute.getResolvedAttributeDeclaration().getName();
- else
- xsdAttributeName = getName();
- }
- tagName.append(xsdAttributeName);
- return tagName.toString();
- }
-
-
-
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDDelegateFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDDelegateFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
deleted file mode 100644
index 02cf5d1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexFixFragment extends XSDComplexFragment {
- public XSDComplexFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
deleted file mode 100644
index 45facb7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070516 185596 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer misinterprets response message
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDComplexFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexFinal;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDComplexFragment extends XSDMapFragment implements IXSDComplexFragment
-{
- public XSDComplexFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
- {
- super(id, name, config, controller);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- setParamsForXSDTypeDef(instanceDocumentsCopy);
- else
- setParamsForXSDParticle(instanceDocumentsCopy);
- return setParamsForAttributes(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element[] instanceDocuments){
- boolean paramsValid = true;
-
- String[] fragmentsOrder = getFragmentsOrder();
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++){
-
- if (i >= fragmentsOrder.length) break;
- String fragmentID = fragmentsOrder[i];
-
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragmentID)){
- NamedNodeMap nodeMap = instanceDocuments[i].getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[k].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++)
- {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- instanceDocuments = addAttributes(instanceDocuments);
- return instanceDocuments;
- }
-
- private Element[] addAttributes(Element[] instanceDocuments){
-
- String[] fragmentsOrder = getFragmentsOrder();
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0;i< instanceDocuments.length;i++){
-
- if (i >= fragmentsOrder.length) break;
- String fragmentID = fragmentsOrder[i];
-
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragmentID)){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocuments[i],name);
- }
- }
- }
- return instanceDocuments;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++)
- {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if (fragmentInstances.length > 0)
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
- {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++)
- {
- if (childInstances[j] != null)
- instanceDocument.appendChild(childInstances[j]);
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
- private XSDModelGroup getXSDModelGroup(XSDParticle xsdParticle)
- {
- if (xsdParticle != null)
- {
- XSDParticleContent xsdParticleContent = xsdParticle.getContent();
- if (xsdParticleContent != null)
- {
- if (xsdParticleContent instanceof XSDModelGroupDefinition)
- {
- XSDModelGroupDefinition xsdModelGroupDef = (XSDModelGroupDefinition)xsdParticleContent;
- if (xsdModelGroupDef.isModelGroupDefinitionReference())
- xsdModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
- return xsdModelGroupDef.getModelGroup();
- }
- else if (xsdParticleContent instanceof XSDModelGroup)
- return (XSDModelGroup)xsdParticleContent;
- }
- }
- return null;
- }
-
- private List getInheritedParticles(XSDComplexTypeDefinition complexType)
- {
- Vector v = new Vector();
- if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
- {
- XSDTypeDefinition extType = complexType.getBaseType();
- if (extType != null && !(extType instanceof XSDComplexTypeDefinition))
- {
- String namespace = extType.getTargetNamespace();
- String localname = extType.getName();
- if (namespace != null && localname != null)
- {
- XSDNamedComponent xsdNamedComp = getXSDToFragmentController().getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(namespace, localname, false);
- if (xsdNamedComp instanceof XSDComplexTypeDefinition)
- {
- extType = (XSDComplexTypeDefinition)xsdNamedComp;
- }
- }
- }
- if (extType != null && extType != complexType && extType instanceof XSDComplexTypeDefinition)
- {
- XSDComplexTypeContent extTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent((XSDComplexTypeDefinition)extType);
- if (extTypeContent instanceof XSDParticle)
- {
- XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)extTypeContent);
- if (xsdModelGroup != null)
- {
- v.addAll(getInheritedParticles((XSDComplexTypeDefinition)extType));
- v.addAll(xsdModelGroup.getParticles());
- }
- }
- }
- }
- return v;
- }
-
- private void gatherInheritedParticles(XSDComplexTypeDefinition complexType)
- {
- if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
- {
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDParticle)
- {
- XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)complexTypeContent);
- if (xsdModelGroup != null)
- {
- List inheritedParticles = getInheritedParticles(complexType);
- List particles = xsdModelGroup.getParticles();
- particles.addAll(0, inheritedParticles);
- }
- }
- }
- }
-
-
-
- public IXSDAttributeFragment[] getAllAttributeFragments()
- {
- return super.getAllAttributeFragments();
-
- }
-
- public void createAttributeFragments(String complexChildID)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- EList atContentList = complexType.getAttributeContents();
- Iterator iterator = atContentList.iterator();
- while(iterator.hasNext()){
- Object object = (Object)iterator.next();
- if(object instanceof XSDAttributeGroupDefinition){
- XSDAttributeGroupDefinition xsdAGD = (XSDAttributeGroupDefinition)object;
- XSDAttributeGroupDefinition resolved = xsdAGD.getResolvedAttributeGroupDefinition();
- EList aList = resolved.getContents();
- Iterator iterator2 = aList.iterator();
- while(iterator2.hasNext()){
- createAttributeHelper((XSDAttributeUse)iterator2.next(),complexChildID);
- }
- }
- else{
- XSDAttributeUse attUse = (XSDAttributeUse)object;
- createAttributeHelper(attUse,complexChildID);
- }
-
- }
- }
-
- private void createAttributeHelper(XSDAttributeUse attUse,String complexChildID){
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(attUse);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String newID = genID();
- addAttributeFragment(complexChildID + newID, getXSDToFragmentController().getFragment(xsdConfig,complexChildID + newID, complexChildID + newID));
-
- }
-
-
- public String createComplexInstance()
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- gatherInheritedParticles(complexType);
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(complexTypeContent);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String newID = genID();
- addFragment(newID, getXSDToFragmentController().getFragment(xsdConfig, newID, getName()));
- createAttributeFragments(newID);
- return newID;
- }
-
- public String createInstance()
- {
- return createComplexInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
deleted file mode 100644
index 869bd8e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexRangeFragment extends XSDComplexFragment {
- public XSDComplexRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java
deleted file mode 100644
index bc5a332..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDComplexFixFragment.java, wsa.etools.ws.explorer, lunar-5.1.2 1
-* Version 1.1 03/02/28 15:25:15
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDComplexSimpleContentFixFragment extends XSDComplexFragment {
- public XSDComplexSimpleContentFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
-
-
-
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
- else
- return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element instanceDocument,IXSDFragment frag){
- boolean paramsValid = true;
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < attributeFragments.length; i++){
- if(attributeFragments[i].getID().startsWith(frag.getID())){
- NamedNodeMap nodeMap = instanceDocument.getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[i].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[i].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[0],childFrag);
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments) {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
-
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[i],childFrag);
-
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName,doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName,doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- return instanceDocuments;
- }
-
- private Element addAttributes(Element instanceDocument, IXSDFragment fragment, Hashtable namespaceTable ){
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragment.getID())){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocument,name);
- }
- }
-
- return instanceDocument;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
- if (fragmentInstances.length > 0){
- fragmentInstances[0] = addAttributes(fragmentInstances[0],fragments[i],namespaceTable);
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc) {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
-
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++) {
- if (childInstances[j] != null){
- addAttributes(childInstances[j],childFrags[i],namespaceTable);
- instanceDocument.appendChild(doc.importNode(childInstances[j], true));
- }
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java
deleted file mode 100644
index 109bb89..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDComplexRangeFragment.java, wsa.etools.ws.explorer, lunar-5.1.2 1
-* Version 1.1 03/02/28 15:25:18
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDComplexSimpleContentRangeFragment extends XSDComplexSimpleContentFixFragment {
- public XSDComplexSimpleContentRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
- else
- return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element instanceDocument,IXSDFragment frag){
- boolean paramsValid = true;
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < attributeFragments.length; i++){
- if(attributeFragments[i].getID().startsWith(frag.getID())){
- NamedNodeMap nodeMap = instanceDocument.getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[i].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[i].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[0],childFrag);
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments) {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
-
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[i],childFrag);
-
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- return instanceDocuments;
- }
-
- private Element addAttributes(Element instanceDocument, IXSDFragment fragment, Hashtable namespaceTable ){
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragment.getID())){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocument,name);
- }
- }
-
- return instanceDocument;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
- if (fragmentInstances.length > 0){
- fragmentInstances[0] = addAttributes(fragmentInstances[0],fragments[i],namespaceTable);
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc) {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
-
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++) {
- if (childInstances[j] != null){
- addAttributes(childInstances[j],childFrags[i],namespaceTable);
- instanceDocument.appendChild(doc.importNode(childInstances[j], true));
- }
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
-
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
deleted file mode 100644
index 959bd0b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
+++ /dev/null
@@ -1,120 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDDefaultFragment extends XSDFragment {
- public XSDDefaultFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String[] param = new String[1];
- param[0] = parser.getParameter(getID());
- setParameterValues(getID(), param);
- return isElement(addRootElement(param[0]));
- }
-
- private String addRootElement(String element) {
- StringBuffer sb = new StringBuffer();
- sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
- sb.append(element);
- sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
- return sb.toString();
- }
-
- private boolean isElement(String elementString) {
- try {
- return (XMLUtils.stringToElement(elementString) != null);
- }
- catch (Throwable t) {
- return false;
- }
- }
-
- public boolean validateAllParameterValues() {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean validateParameterValues(String paramKey) {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- StringBuffer sb = new StringBuffer();
- boolean paramValid = true;
- for (int i = 0; i < instanceDocuments.length; i++) {
- String instanceString = XMLUtils.serialize(instanceDocuments[i], true);
- if (instanceString != null && instanceString.length() > 0)
- sb.append(instanceString);
- else
- paramValid = false;
- }
- String[] param = {sb.toString()};
- setParameterValues(getID(), param);
- return paramValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- String param = getParameterValue(getID(), 0);
- if (param == null)
- return new Element[0];
- Element root;
- try {
- root = (Element)doc.importNode(XMLUtils.stringToElement(addRootElement(param)), true);
- }
- catch (Throwable t) {
- return new Element[0];
- }
- NodeList nl = root.getChildNodes();
- Vector instanceDocumentVector = new Vector();
- for (int i = 0; i < nl.getLength(); i++) {
- Node node = nl.item(i);
- if (node instanceof Element)
- instanceDocumentVector.add(node);
- }
- Element[] instanceDocuments = new Element[instanceDocumentVector.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentVector.get(i);
- }
- return instanceDocuments;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDDefaultRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDDefaultWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
deleted file mode 100644
index 4b632a8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
+++ /dev/null
@@ -1,113 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDDelegationFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class XSDDelegationFragment extends XSDFragment implements IXSDDelegationFragment
-{
- private IXSDFragment xsdFragment_;
-
- public XSDDelegationFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
- xsdFragment_ = null;
- }
-
- public void setName(String name) {
- super.setName(name);
- if (xsdFragment_ != null)
- xsdFragment_.setName(name);
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- return xsdFragment_.processParameterValues(parser);
- }
-
- public void setParameterValues(String paramKey, String[] params)
- {
- xsdFragment_.setParameterValues(paramKey, params);
- }
-
- public void setParameterValues(String paramKey, Vector params)
- {
- xsdFragment_.setParameterValues(paramKey, params);
- }
-
- public String[] getParameterValues(String paramKey)
- {
- return xsdFragment_.getParameterValues(paramKey);
- }
-
- public String getParameterValue(String paramKey, int paramIndex)
- {
- return xsdFragment_.getParameterValue(paramKey, paramIndex);
- }
-
- public boolean validateAllParameterValues()
- {
- return xsdFragment_.validateAllParameterValues();
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- return xsdFragment_.validateParameterValues(paramKey);
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- return xsdFragment_.validateParameterValue(paramKey, paramIndex);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- return xsdFragment_.setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- return xsdFragment_.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- }
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDDelegationRFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDDelegationWFragmentJSP.jsp";
- }
-
- public void setXSDDelegationFragment(IXSDFragment xsdFragment)
- {
- xsdFragment_ = xsdFragment;
- }
-
- public IXSDFragment getXSDDelegationFragment()
- {
- return xsdFragment_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
deleted file mode 100644
index ad7a56d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
+++ /dev/null
@@ -1,297 +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
- * -------- -------- -----------------------------------------------------------
- * 20060119 123539 jesper@selskabet.org - Jesper Møller
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDElementFragment extends XSDDelegationFragment implements IXSDElementFragment
-{
- private int minOccurs_;
- private int maxOccurs_;
- private boolean isNil_;
-
-
- public XSDElementFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
- if (config != null)
- {
- minOccurs_ = config.getMinOccurs();
- maxOccurs_ = config.getMaxOccurs();
- }
- else
- {
- minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
- maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
- }
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- setIsNil(parser);
- if(isNil_)return true;
-
- if (!elementTypeFragment.processParameterValues(parser))
- return false;
- String[] params = getParameterValues(elementTypeFragment.getID());
- if (params != null && !withinRange(params.length))
- return false;
- return true;
- }
-
- public boolean setIsNil(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String nil = parser.getParameter(getNilID());
- if(nil != null) isNil_ = true;
- else isNil_ = false;
- return isNil_;
- }
-
- public boolean validateAllParameterValues()
- {
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- String[] params = getParameterValues(elementTypeFragment.getID());
- if (params != null && !withinRange(params.length))
- return false;
- if (!elementTypeFragment.validateAllParameterValues())
- return false;
- return true;
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- String[] params = getParameterValues(paramKey);
- if (params != null && !withinRange(params.length))
- return false;
- if (!getXSDDelegationFragment().validateParameterValues(paramKey))
- return false;
- return true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- if (!withinRange(paramIndex + 1))
- return false;
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)getXSDToFragmentConfiguration().getXSDComponent();
- String param = getParameterValue(paramKey, paramIndex);
- if (param != null && param.length() <= 0 && !xsdElement.isNillable())
- return false;
- if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
- return false;
- return true;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- super.setXSDToFragmentConfiguration(config);
- minOccurs_ = config.getMinOccurs();
- maxOccurs_ = config.getMaxOccurs();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-
- if(instanceDocumentsCopy[0].hasAttribute(XSI_NIL_ATTRIBUTE)){
- String nil = instanceDocumentsCopy[0].getAttribute(XSI_NIL_ATTRIBUTE);
- if(nil.equals(TRUE)) isNil_ = true;
- }
-
-
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
- {
- Vector childElements = new Vector();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE)
- childElements.add(node);
- }
- instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
- }
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
- return elementTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, elementTypeFragment.getName()));
- }
-
- public static String XSI_NIL_ATTRIBUTE = "xsi:nil";
- public static String TRUE = "true";
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
-
- Element[] instanceDocuments = getXSDDelegationFragment().genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if(isNil_){
- for(int j=0;j < instanceDocuments.length;j++){
- instanceDocuments[j].setAttribute(XSI_NIL_ATTRIBUTE,TRUE);
- NodeList nodeList = instanceDocuments[j].getChildNodes();
- int length = nodeList.getLength();
- for(int i =0;i < length;i++){
- instanceDocuments[j].removeChild(nodeList.item(0));
- }
- }
- }
- instanceDocuments = setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- instanceDocuments = new Element[1];
- instanceDocuments[0] = doc.createElement(wsdlPartName);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- if (instanceDocumentsCopy[i] != null)
- instanceDocuments[0].appendChild(instanceDocumentsCopy[i]);
- }
- }
- return instanceDocuments;
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
- {
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
- // Try to resolve the element, since an element with a ref can never be global
- if (xsdElement.getResolvedElementDeclaration() != null)
- xsdElement = xsdElement.getResolvedElementDeclaration();
-
- if (xsdElement.isGlobal())
- return true;
- else
- {
- if (xsdElement.isSetForm())
- return (xsdElement.getForm().getValue() == XSDForm.QUALIFIED);
- else
- return (xsdElement.getSchema().getElementFormDefault().getValue() == XSDForm.QUALIFIED);
- }
- }
- else
- return false;
- }
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable)
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = null;
- // port to org.eclipse.xsd
- if (xsdElement.getResolvedElementDeclaration() != null)
- nsURI = xsdElement.getResolvedElementDeclaration().getTargetNamespace();
- else
- nsURI = xsdElement.getTargetNamespace();
- if (nsURI != null && nsURI.length() > 0)
- {
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- }
- String xsdElementName = xsdElement.getName();
- if (xsdElementName == null || xsdElementName.length() <= 0)
- {
- // port to org.eclipse.xsd
- if (xsdElement.getResolvedElementDeclaration() != null)
- xsdElementName = xsdElement.getResolvedElementDeclaration().getName();
- else
- xsdElementName = getName();
- }
- tagName.append(xsdElementName);
- return tagName.toString();
- }
-
- private boolean withinRange(int size)
- {
- if (size < minOccurs_)
- return false;
- if (maxOccurs_ != FragmentConstants.UNBOUNDED && size > maxOccurs_)
- return false;
- return true;
- }
-
- public void setMinOccurs(int minOccurs)
- {
- minOccurs_ = minOccurs;
- }
-
- public int getMinOccurs()
- {
- return minOccurs_;
- }
-
- public void setMaxOccurs(int maxOccurs)
- {
- maxOccurs_ = maxOccurs;
- }
-
- public int getMaxOccurs()
- {
- return maxOccurs_;
- }
-
- public boolean isNillable()
- {
- if(getXSDToFragmentConfiguration().getXSDComponent().getElement().getAttribute("nillable").equals("true"))
- return true;
- return false;
- }
-
- public boolean isNil()
- {
- return isNil_;
- }
-
-
- public String getNilID()
- {
- return getID() + IXSDElementFragment.NIL;
- }
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDElementRFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDElementWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
deleted file mode 100644
index ea2258d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
+++ /dev/null
@@ -1,119 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDEmptyFragment extends XSDFragment {
- private int occurance_;
-
- public XSDEmptyFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- occurance_ = 0;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String occurance = parser.getParameter(getID());
- try {
- occurance_ = Integer.parseInt(occurance);
- return validateAllParameterValues();
- }
- catch (Throwable t) {
- occurance_ = -1;
- return false;
- }
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- }
-
- public void setParameterValues(String paramKey, Vector params) {
- }
-
- public String[] getParameterValues(String paramKey) {
- if (occurance_ < 0)
- return null;
- else {
- String[] params = new String[occurance_];
- for (int i = 0; i < params.length; i++) {
- params[i] = "";
- }
- return params;
- }
- }
-
- public String getParameterValue(String paramKey, int paramIndex) {
- if (paramIndex >= 0 && paramIndex < occurance_)
- return "";
- else
- return null;
- }
-
- public boolean validateAllParameterValues() {
- XSDToFragmentConfiguration xsdConfig = getXSDToFragmentConfiguration();
- int min = xsdConfig.getMinOccurs();
- int max = xsdConfig.getMaxOccurs();
- return (occurance_ >= 0 && occurance_ >= min && (max == FragmentConstants.UNBOUNDED || occurance_ <= max));
- }
-
- public boolean validateParameterValues(String paramKey) {
- return validateAllParameterValues();
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- return validateAllParameterValues();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = true;
- for (int i = 0; i < instanceDocumentsCopy.length; i++) {
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 1)
- paramsValid = false;
- else if (nodeList.getLength() != 0) {
- Node node = nodeList.item(0);
- if (node.getNodeType() != Node.TEXT_NODE || !isWhitespace(node.getNodeValue()))
- paramsValid = false;
- }
- }
- occurance_ = instanceDocumentsCopy.length;
- return paramsValid && validateAllParameterValues();
- }
-
- private boolean isWhitespace(String s) {
- char[] chars = s.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (!Character.isWhitespace(chars[i]) || !Character.isSpaceChar(chars[i]))
- return false;
- }
- return true;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDEmptyWFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDEmptyRFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
deleted file mode 100644
index ab18a99..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDFragment extends Fragment implements IXSDFragment
-{
- private XSDToFragmentConfiguration config_;
- private XSDTypeDefinition typeDef_;
- private int seed_;
-
- public XSDFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name);
- config_ = config;
- if (config_ != null)
- {
- XSDComponent component = config.getXSDComponent();
- if (component instanceof XSDTypeDefinition)
- typeDef_ = (XSDTypeDefinition)component;
- else
- typeDef_ = null;
- }
- seed_ = 0;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- config_ = config;
- if (config_ != null)
- {
- XSDComponent component = config.getXSDComponent();
- if (component instanceof XSDTypeDefinition)
- setXSDTypeDefinition((XSDTypeDefinition)component);
- }
- }
-
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
- {
- return config_;
- }
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
- {
- typeDef_ = typeDef;
- }
-
- public XSDTypeDefinition getXSDTypeDefinition()
- {
- return typeDef_;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- String[] params = new String[instanceDocumentsCopy.length];
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- params[i] = "";
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 0)
- {
- Node node = nodeList.item(0);
- if (nodeList.getLength() > 1)
- paramsValid = false;
- if (node.getNodeType() != Node.TEXT_NODE)
- paramsValid = false;
- else
- params[i] = node.getNodeValue();
- }
- else
- paramsValid = false;
- }
- setParameterValues(getID(), params);
- return paramsValid && validateAllParameterValues();
- }
-
- protected Element[] getInstanceDocumentsByTagName(Element[] instanceDocuments, String tagName)
- {
- if (instanceDocuments == null)
- return new Element[0];
- Vector instancesCopy = new Vector();
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- if (instanceDocuments[i] == null)
- continue;
- String instanceTagName = trimPrefix(instanceDocuments[i].getTagName());
- if (instanceTagName.equals(tagName))
- instancesCopy.add(instanceDocuments[i]);
- }
- Element[] instances = new Element[instancesCopy.size()];
- instancesCopy.copyInto(instances);
- return instances;
- }
-
- protected String trimPrefix(String s)
- {
- String sCopy = new String(s);
- int colonIndex = sCopy.indexOf(FragmentConstants.COLON);
- if (colonIndex != -1 && colonIndex + 1 < sCopy.length() && !((String.valueOf(sCopy.charAt(colonIndex + 1))).equals(FragmentConstants.COLON)))
- sCopy = sCopy.substring(colonIndex + 1, sCopy.length());
- return sCopy;
- }
-
- public Element[] genInstanceDocumentsForNil(boolean genXSIType, Hashtable namespaceTable,Document doc){
- Element[] instanceDocuments = new Element[1];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element instanceDocument = doc.createElement(tagName);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- String[] params = getParameterValues(getID());
- if (params == null)
- return new Element[0];
- Element[] instanceDocuments = new Element[params.length];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- Element instanceDocument = doc.createElement(tagName);
- Node textNode = doc.createTextNode(params[i]);
- instanceDocument.appendChild(textNode);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
- }
-
- public Element setAttributesOnInstanceDocuments(Element instanceDocument,String attName){
- String[] params = getParameterValues(getID());
- if (params == null)
- return instanceDocument;
- if (isAttributeInstanceNamespaceQualified()){
- instanceDocument.setAttributeNS(config_.getXSDComponent().getSchema().getTargetNamespace(),attName,params[0]);
-
- }
- else instanceDocument.setAttribute(attName,params[0]);
-
- return instanceDocument;
- }
-
- public boolean setAttributeParamsFromInstanceDocuments(Node attribute){
- String[] params = new String[1];
- params[0] = attribute.getNodeValue();
- setParameterValues(getID(), params);
- return validateAllParameterValues();
- }
-
- public String genID()
- {
- StringBuffer newID = new StringBuffer();
- newID.append(getID());
- newID.append(FragmentConstants.ID_SEPERATOR);
- newID.append(seed_++);
- return newID.toString();
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
- return (!config_.getIsWSDLPart() && config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL && xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
- }
-
- protected boolean isAttributeInstanceNamespaceQualified() {
- XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
-
- return (!config_.getIsWSDLPart() &&
- config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL &&
- xsdSchema.getAttributeFormDefault().getValue() == XSDForm.QUALIFIED);
-
- }
-
-
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable) {
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = config_.getXSDComponent().getSchema().getTargetNamespace();
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- tagName.append(getName());
- return tagName.toString();
- }
-
- protected Element[] addXSIType(Element[] instanceDocuments, Hashtable namespaceTable)
- {
- XSDComponent xsdComponent = config_.getXSDComponent();
- if (instanceDocuments != null && (xsdComponent instanceof XSDNamedComponent))
- {
- String xsdComponentName = ((XSDNamedComponent)xsdComponent).getName();
- if (xsdComponentName != null && xsdComponentName.length() > 0)
- {
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- if (instanceDocuments[i] == null)
- continue;
- String xsiURI = FragmentConstants.URI_XSI;
- String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
- String xsiTypeURI = xsdComponent.getSchema().getTargetNamespace();
- String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
- ;
- StringBuffer attrName = new StringBuffer();
- attrName.append(xsiPrefix);
- attrName.append(FragmentConstants.COLON);
- attrName.append(FragmentConstants.XSI_TYPE);
- StringBuffer attrValue = new StringBuffer();
- attrValue.append(xsiTypePrefix);
- attrValue.append(FragmentConstants.COLON);
- attrValue.append(xsdComponentName);
- instanceDocuments[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- }
- }
- return instanceDocuments;
- }
-
- public boolean validateAllParameterValues()
- {
- if (!super.validateAllParameterValues())
- return false;
- String[] params = getParameterValues(getID());
- int length = (params != null) ? params.length : 0;
- int min = config_.getMinOccurs();
- int max = config_.getMaxOccurs();
- return (length >= min && (max == FragmentConstants.UNBOUNDED || length <= max));
- }
-
- protected String getPrefixFromNamespaceURI(String nsURI, Hashtable namespaceTable)
- {
- String prefix = (String)namespaceTable.get(nsURI);
- int i = 0;
- while (prefix == null || prefix.length() <= 0)
- {
- StringBuffer prefixCopy = new StringBuffer();
- prefixCopy.append(FragmentConstants.QNAME_PREFIX);
- prefixCopy.append(String.valueOf(i));
- i++;
- if (!namespaceTable.contains(prefixCopy.toString()))
- {
- namespaceTable.put(nsURI, prefixCopy.toString());
- prefix = prefixCopy.toString();
- }
- }
- return prefix;
- }
-
- protected Element setElementTagName(Element e, String tagName)
- {
- if (!e.getTagName().equals(tagName))
- {
- try
- {
- Document doc = e.getOwnerDocument();
- NodeList children = e.getChildNodes();
- NamedNodeMap attributes = e.getAttributes();
- Element eCopy = doc.createElement(tagName);
- for (int i = 0; i < children.getLength(); i++)
- {
- Node child = children.item(i);
- if (child != null)
- {
- eCopy.appendChild(child.cloneNode(true));
- }
- }
- for (int j = 0; j < attributes.getLength(); j++)
- {
- Node attr = attributes.item(j);
- if (attr != null && (attr instanceof Attr))
- {
- Attr attribute = (Attr)attr;
- eCopy.setAttribute(attribute.getName(), attribute.getValue());
- }
- }
- return eCopy;
- }
- catch (Exception exception)
- {
- }
- }
- return e;
- }
-
- protected Element[] setElementsTagName(Element[] e, String tagName)
- {
- Element[] eCopy = new Element[e.length];
- for (int i = 0; i < eCopy.length; i++)
- {
- eCopy[i] = setElementTagName(e[i], tagName);
- }
- return eCopy;
- }
-
- protected boolean internalEquals(Element[] instanceDocumentsCopy, Element[] instanceDocuments)
- {
- if (!config_.getIsWSDLPart())
- {
- int length = (instanceDocuments != null) ? instanceDocuments.length : 0;
- int lengthCopy = (instanceDocumentsCopy != null) ? instanceDocumentsCopy.length : 0;
- return (length == lengthCopy);
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
deleted file mode 100644
index 66dd896..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
+++ /dev/null
@@ -1,167 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.w3c.dom.Element;
-
-public class XSDGroupAllFragment extends XSDGroupFragment implements IXSDGroupAllFragment {
- private String groupID_;
-
- public XSDGroupAllFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- groupID_ = null;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String groupID = parser.getParameter(getID());
- if (groupID_ != null && groupID != null && groupID_.equals(groupID)) {
- setGroupMemberIDsOrdering(parser.getParameterValues(groupID_));
- boolean valuesValid = true;
- IXSDFragment[] groupMemberFragments = getGroupMemberFragments(groupID_);
- for (int i = 0; i < groupMemberFragments.length; i++) {
- if (groupMemberFragments[i] != null && !groupMemberFragments[i].processParameterValues(parser))
- valuesValid = false;
- }
- return valuesValid;
- }
- else {
- groupID_ = null;
- removeGroupIDs();
- return true;
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- boolean paramsValid = true;
- if (instanceDocuments != null && instanceDocuments.length > 0) {
- groupID_ = createInstance();
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(groupID_);
- String[] groupMemberIDsOrder = new String[groupMemberFrags.length];
- int orderIndex = 0;
- for (int i = 0; i < instanceDocuments.length; i++) {
- boolean paramsAssigned = false;
- for (int j = 0; j < groupMemberFrags.length; j++) {
- if (groupMemberFrags[j] != null && groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- Element[] childInstance = {instanceDocuments[i]};
- if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(childInstance))
- paramsValid = false;
- groupMemberIDsOrder[orderIndex] = groupMemberFrags[j].getID();
- orderIndex++;
- paramsAssigned = true;
- groupMemberFrags[j] = null;
- break;
- }
- }
- if (!paramsAssigned)
- paramsValid = false;
- }
- for (int k = 0; k < groupMemberFrags.length; k++) {
- if (groupMemberFrags[k] != null) {
- groupMemberIDsOrder[orderIndex] = groupMemberFrags[k].getID();
- orderIndex++;
- }
- }
- setGroupMemberIDsOrdering(groupMemberIDsOrder);
- }
- return paramsValid;
- }
-
- public String getGroupAllInstance() {
- if (groupID_ == null)
- groupID_ = createGroupInstance();
- return groupID_;
- }
-
- public String createInstance() {
- return getGroupAllInstance();
- }
-
- public boolean setGroupMemberIDsOrdering(String[] groupMemberIDs) {
- if (groupMemberIDs == null)
- return false;
- String[] existingGroupMemberIDs = getGroupMemberIDs(groupID_);
- if (existingGroupMemberIDs.length != groupMemberIDs.length)
- return false;
- Vector existingGroupMemberIDsVector = new Vector();
- for (int i = 0; i < existingGroupMemberIDs.length; i++) {
- existingGroupMemberIDsVector.add(existingGroupMemberIDs[i]);
- }
- for (int j = 0; j < groupMemberIDs.length; j++) {
- if (!existingGroupMemberIDsVector.remove(groupMemberIDs[j]))
- return false;
- }
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
-
- public boolean moveUpGroupMemberID(String groupMemberID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID_);
- if (groupMemberID.equals(groupMemberIDs[0]))
- return false;
- for (int i = 1; i < groupMemberIDs.length; i++) {
- if (groupMemberID.equals(groupMemberIDs[i])) {
- groupMemberIDs[i] = groupMemberIDs[i - 1];
- groupMemberIDs[i - 1] = groupMemberID;
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
- }
- return false;
- }
-
- public boolean moveDownGroupMemberID(String groupMemberID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID_);
- if (groupMemberID.equals(groupMemberIDs[groupMemberIDs.length - 1]))
- return false;
- for (int i = 0; i < groupMemberIDs.length - 1; i++) {
- if (groupMemberID.equals(groupMemberIDs[i])) {
- groupMemberIDs[i] = groupMemberIDs[i + 1];
- groupMemberIDs[i + 1] = groupMemberID;
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
- }
- return false;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
deleted file mode 100644
index cc24e30..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceFixFragment extends XSDGroupChoiceFragment {
- public XSDGroupChoiceFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
deleted file mode 100644
index f3adf08..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,168 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupChoiceFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupChoiceFragment extends XSDGroupFragment implements IXSDGroupChoiceFragment {
- private XSDParticle[] choices_;
- private Hashtable choiceIndexes_;
-
- public XSDGroupChoiceFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- choices_ = null;
- choiceIndexes_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- super.processParameterValues(parser);
- String[] groupIDs = getGroupIDs();
- choiceIndexes_.clear();
- boolean paramsValid = true;
- for (int i = 0; i < groupIDs.length; i++) {
- String selectedChoiceFragID = parser.getParameter(groupIDs[i]);
- int choiceIndex = 0;
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
- for (int j = 0; j < choiceFrags.length; j++) {
- if (choiceFrags[j].getID().equals(selectedChoiceFragID)) {
- choiceIndex = j;
- paramsValid = (paramsValid && choiceFrags[j].validateAllParameterValues());
- break;
- }
- }
- setChoiceIndex(groupIDs[i], choiceIndex);
- }
- return paramsValid;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- choiceIndexes_.clear();
- boolean paramsValid = true;
- if (instanceDocuments != null) {
- for (int i = 0; i < instanceDocuments.length; i++) {
- String groupID = createGroupChoiceInstance(0);
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupID);
- for (int j = 0; j < choiceFrags.length; j++) {
- if (choiceFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- XSDToFragmentConfiguration xsdConfig = choiceFrags[j].getXSDToFragmentConfiguration();
- Element[] childInstances = getInstanceDocumentPartition(instanceDocuments, i, xsdConfig.getMinOccurs(), xsdConfig.getMaxOccurs());
- if (!choiceFrags[j].setParameterValuesFromInstanceDocuments(childInstances))
- paramsValid = false;
- setChoiceIndex(groupID, j);
- if (childInstances.length > 0)
- i = i + childInstances.length - 1; // minus 1 because there's an i++ in the outer for loop
- break;
- }
- }
- }
- }
- return paramsValid;
- }
-
- private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int minSize, int maxSize) {
- String tagName = instanceDocuments[start].getTagName();
- int size = 1;
- for (int i = start + 1; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i].getTagName().equals(tagName))
- size++;
- else
- break;
- }
- if (maxSize != FragmentConstants.UNBOUNDED && size > maxSize) {
- size = size - minSize;
- if (size > maxSize)
- size = maxSize;
- }
- Element[] subset = new Element[size];
- for (int j = 0; j < subset.length; j++) {
- subset[j] = instanceDocuments[start + j];
- }
- return subset;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- Vector instanceDocumentsCopy = new Vector();
- String[] groupIDs = getGroupIDs();
- for (int i = 0; i < groupIDs.length; i++) {
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
- int choiceIndex = getChoiceIndex(groupIDs[i]);
- Element[] choiceFragInstances = choiceFrags[choiceIndex].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < choiceFragInstances.length; j++) {
- instanceDocumentsCopy.add(choiceFragInstances[j]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- instanceDocumentsCopy.copyInto(instanceDocuments);
- return instanceDocuments;
- }
-
- public XSDParticle[] getChoices() {
- if (choices_ == null) {
- EList particles = getXSDModelGroup().getParticles();
- choices_ = new XSDParticle[particles.size()];
- for (int i = 0; i < choices_.length; i++) {
- choices_[i] = (XSDParticle)particles.get(i);
- }
- }
- return choices_;
- }
-
- public String createGroupChoiceInstance(int choiceIndex) {
- getChoices();
- if (choiceIndex < 0 || choiceIndex > choices_.length - 1)
- return null;
- String groupID = createGroupInstance();
- setChoiceIndex(groupID, choiceIndex);
- return groupID;
- }
-
- public String createInstance() {
- return createGroupChoiceInstance(0);
- }
-
- public int getChoiceIndex(String groupID) {
- Integer index = (Integer)choiceIndexes_.get(groupID);
- if (index != null)
- return index.intValue();
- else
- return 0;
- }
-
- public void setChoiceIndex(String groupID, int choiceIndex) {
- choiceIndexes_.put(groupID, new Integer(choiceIndex));
- }
-
- public boolean validateAllParameterValues()
- {
- String[] groupIDs = getGroupIDs();
- for (int i = 0; i < groupIDs.length; i++)
- {
- int selectionIndex = getChoiceIndex(groupIDs[i]);
- if (!getGroupMemberFragments(groupIDs[i])[selectionIndex].validateAllParameterValues())
- return false;
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
deleted file mode 100644
index 240e14d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceRangeFragment extends XSDGroupChoiceFragment {
- public XSDGroupChoiceRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
deleted file mode 100644
index fda4133..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupFragment extends XSDMapFragment implements IXSDGroupFragment {
- private XSDModelGroup xsdModelGroup_;
- private Vector groupIDsOrder_;
- private Hashtable groupIDs_;
-
- public XSDGroupFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller);
- xsdModelGroup_ = xsdModelGroup;
- groupIDsOrder_ = new Vector();
- groupIDs_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- boolean valuesValid = true;
- String[] params = parser.getParameterValues(getID());
- Vector frags = new Vector();
- Vector groupIDsOrderCopy = new Vector();
- Hashtable groupIDsCopy = new Hashtable();
- for (int i = 0; params != null && i < params.length; i++) {
- if (params[i] != null) {
- groupIDsOrderCopy.add(params[i]);
- groupIDsCopy.put(params[i], getGroupMemberIDs(params[i]));
- IXSDFragment[] groupMemberFragments = getGroupMemberFragments(params[i]);
- for (int j = 0; j < groupMemberFragments.length; j++) {
- if (groupMemberFragments[j] != null) {
- frags.add(groupMemberFragments[j]);
- if (!groupMemberFragments[j].processParameterValues(parser))
- valuesValid = false;
- }
- }
- }
- }
- groupIDsOrder_ = groupIDsOrderCopy;
- groupIDs_ = groupIDsCopy;
- removeAllFragments();
- addFragments(frags);
- return valuesValid;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- boolean paramsValid = true;
- String prevGroupID = null;
- String currGroupID = null;
- int groupMemberIndex = 0;
- for (int i = 0; i < instanceDocuments.length; ) {
- if (currGroupID == null) {
- String newGroupID = createInstance();
- prevGroupID = currGroupID;
- currGroupID = newGroupID;
- }
- Element[] instancePartition = null;
- int j = groupMemberIndex;
- boolean paramsAssigned = false;
- int wildcardFragIndex = -1;
- do {
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
- XSDComponent xsdComponent = groupMemberFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
- if (xsdComponent instanceof XSDWildcard) {
- if (wildcardFragIndex < 0)
- wildcardFragIndex = j;
- }
- else if (groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- instancePartition = getInstanceDocumentPartition(instanceDocuments, i, groupMemberFrags[j].getXSDToFragmentConfiguration().getMaxOccurs());
- if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instancePartition))
- paramsValid = false;
- paramsAssigned = true;
- }
- else if(groupMemberFrags[j] instanceof XSDGroupFragment) {
- groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- if (j == groupMemberFrags.length - 1) {
- j = 0;
- String newGroupID;
- if (!paramsAssigned)
- newGroupID = createInstance();
- else
- newGroupID = null;
- prevGroupID = currGroupID;
- currGroupID = newGroupID;
- }
- else
- j++;
- } while (!paramsAssigned && j != groupMemberIndex);
- groupMemberIndex = j;
- if (!paramsAssigned) {
- instancePartition = getInstanceDocumentPartition(instanceDocuments, i, FragmentConstants.UNBOUNDED);
- if (wildcardFragIndex >= 0) {
- if (wildcardFragIndex >= groupMemberIndex) {
- removeGroupID(currGroupID);
- currGroupID = prevGroupID;
- }
- groupMemberIndex = wildcardFragIndex;
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
- if (!groupMemberFrags[wildcardFragIndex].setParameterValuesFromInstanceDocuments(instancePartition))
- paramsValid = false;
- paramsAssigned = true;
- }
- else if (currGroupID != null && (prevGroupID == null || !currGroupID.equals(prevGroupID))) {
- paramsValid = false;
- removeGroupID(currGroupID);
- currGroupID = prevGroupID;
- }
- }
- i = i + instancePartition.length;
- }
- return paramsValid;
- }
-
- private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int maxSize) {
- String tagName = instanceDocuments[start].getTagName();
- int size = 1;
- for (int i = start + 1; i < instanceDocuments.length; i++) {
- if (maxSize != FragmentConstants.UNBOUNDED && size >= maxSize)
- break;
- else if (instanceDocuments[i].getTagName().equals(tagName))
- size++;
- else
- break;
- }
- Element[] subset = new Element[size];
- for (int j = 0; j < subset.length; j++) {
- subset[j] = instanceDocuments[start + j];
- }
- return subset;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- IXSDFragment[] groupMemberFragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < groupMemberFragments.length; i++) {
- Element[] fragmentInstances = groupMemberFragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < fragmentInstances.length; j++) {
- instanceDocumentsCopy.add(fragmentInstances[j]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int k = 0; k < instanceDocuments.length; k++) {
- instanceDocuments[k] = (Element)instanceDocumentsCopy.get(k);
- }
- return instanceDocuments;
- }
-
- public void setXSDModelGroup(XSDModelGroup xsdModelGroup) {
- xsdModelGroup_ = xsdModelGroup;
- }
-
- public XSDModelGroup getXSDModelGroup() {
- return xsdModelGroup_;
- }
-
- public String[] getGroupIDs() {
- String[] groupIDs = new String[groupIDsOrder_.size()];
- for (int i = 0; i < groupIDs.length; i++) {
- groupIDs[i] = (String)groupIDsOrder_.get(i);
- }
- return groupIDs;
- }
-
- protected void removeGroupIDs() {
- removeAllFragments();
- groupIDsOrder_.clear();
- groupIDs_.clear();
- }
-
- protected void removeGroupID(String groupID) {
- String[] memberFragIDs = getGroupMemberIDs(groupID);
- removeFragments(memberFragIDs);
- groupIDsOrder_.remove(groupID);
- groupIDs_.remove(groupID);
- }
-
- protected void setGroupMemberIDs(String groupID, String[] groupMemberIDs) {
- if (groupID != null) {
- if (!groupIDsOrder_.contains(groupID))
- groupIDsOrder_.add(groupID);
- if (groupMemberIDs != null)
- groupIDs_.put(groupID, groupMemberIDs);
- else
- groupIDs_.put(groupID, new String[0]);
- }
- }
-
- protected void setGroupMemberFragments(String groupID, IXSDFragment[] groupMemberFragments) {
- addFragments(groupMemberFragments);
- String[] ids = new String[groupMemberFragments.length];
- for (int i = 0; i < ids.length; i++) {
- ids[i] = groupMemberFragments[i].getID();
- }
- setGroupMemberIDs(groupID, ids);
- }
-
- public String[] getGroupMemberIDs(String groupID) {
- if (groupID != null) {
- String[] groupMemberIDs = (String[])groupIDs_.get(groupID);
- if (groupMemberIDs != null)
- return groupMemberIDs;
- }
- return new String[0];
- }
-
- public IXSDFragment[] getGroupMemberFragments(String groupID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID);
- IXSDFragment[] groupMemberFragments = new IXSDFragment[groupMemberIDs.length];
- for (int i = 0; i < groupMemberFragments.length; i++) {
- groupMemberFragments[i] = getFragment(groupMemberIDs[i]);
- }
- return groupMemberFragments;
- }
-
- protected String createGroupInstance() {
- String groupID = genID();
- EList particles = getXSDModelGroup().getParticles();
- String[] groupMemberIDs = new String[particles.size()];
- for (int i = 0; i < particles.size(); i++) {
- XSDParticle xsdParticle = (XSDParticle)particles.get(i);
- XSDParticleContent xsdParticleContent = xsdParticle.getContent();
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- if (xsdParticleContent instanceof XSDComponent)
- xsdConfig.setXSDComponent((XSDComponent)xsdParticleContent);
- else
- xsdConfig.setXSDComponent(null);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- groupMemberIDs[i] = genID();
- addFragment(groupMemberIDs[i], getXSDToFragmentController().getFragment(xsdConfig, groupMemberIDs[i], groupMemberIDs[i]));
- }
- setGroupMemberIDs(groupID, groupMemberIDs);
- return groupID;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
deleted file mode 100644
index 7b07984..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqFixFragment extends XSDGroupSeqFragment {
- public XSDGroupSeqFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
deleted file mode 100644
index c49b661..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
+++ /dev/null
@@ -1,30 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupSeqFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public abstract class XSDGroupSeqFragment extends XSDGroupFragment implements IXSDGroupSeqFragment {
- public XSDGroupSeqFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String createGroupSeqInstance() {
- return createGroupInstance();
- }
-
- public String createInstance() {
- return createGroupSeqInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
deleted file mode 100644
index e32d972..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqRangeFragment extends XSDGroupSeqFragment {
- public XSDGroupSeqRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
deleted file mode 100644
index 9c3a08d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
+++ /dev/null
@@ -1,289 +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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public abstract class XSDMapFragment extends XSDFragment implements IXSDMapFragment {
- private XSDToFragmentController controller_;
- private Vector fragmentsOrder_;
- private Hashtable fragments_;
- private Hashtable attributeFragments_;
-
- public XSDMapFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config);
- controller_ = controller;
- fragmentsOrder_ = new Vector();
- fragments_ = new Hashtable();
- attributeFragments_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- boolean valuesValid = true;
- String[] params = parser.getParameterValues(getID());
- Vector frags = new Vector();
- Vector attfrags = new Vector();
- if (params != null) {
- for (int i = 0; i < params.length; i++) {
- if (params[i] != null) {
- IXSDFragment frag = getFragment(params[i]);
- if (frag != null) {
- frags.add(frag);
- if (!frag.processParameterValues(parser))
- valuesValid = false;
- }
- else {
- IXSDAttributeFragment afrag = getAttributeFragment(params[i]);
- if (afrag != null) {
- attfrags.add(afrag);
- if (!afrag.processParameterValues(parser))
- valuesValid = false;
- }
-
- }
-
- }
- }
- }
- removeAllFragments();
- removeAllAttributeFragments();
- addAttributeFragments(attfrags);
- addFragments(frags);
- return valuesValid;
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- IXSDFragment frag = getFragment(paramKey);
- if (frag != null)
- frag.setParameterValues(paramKey, params);
- }
-
- public String[] getParameterValues(String paramKey) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.getParameterValues(paramKey) : null;
- }
-
- public boolean validateAllParameterValues() {
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++) {
- if (!fragments[i].validateAllParameterValues())
- return false;
- }
- return true;
- }
-
- public boolean validateParameterValues(String paramKey) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.validateParameterValues(paramKey) : true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.validateParameterValue(paramKey, paramIndex) : true;
- }
-
- public void setXSDToFragmentController(XSDToFragmentController controller) {
- controller_ = controller;
- }
-
- public XSDToFragmentController getXSDToFragmentController() {
- return controller_;
- }
-
- protected void addFragment(String id, IXSDFragment frag) {
- addFragment(id, frag, true);
- }
-
- protected void addFragments(String[] id, IXSDFragment[] frags) {
- addFragments(id, frags, true);
- }
-
- protected void addFragment(IXSDFragment frag) {
- addFragment(frag, true);
- }
-
- protected void addFragments(IXSDFragment[] frags) {
- addFragments(frags, true);
- }
-
- protected void addFragments(Vector frags) {
- addFragments(frags, true);
- }
-
- protected void addFragment(String id, IXSDFragment frag, boolean addToController) {
- fragmentsOrder_.add(id);
- fragments_.put(id, frag);
- controller_.addToCache(id, frag);
- }
-
- protected void addAttributeFragment(String id, IXSDFragment frag) {
- attributeFragments_.put(id, frag);
- controller_.addToCache(id, frag);
- }
-
- public IXSDAttributeFragment[] getAllAttributeFragments() {
- IXSDAttributeFragment[] fragments = new XSDAttributeFragment[attributeFragments_.size()];
- Iterator it = attributeFragments_.values().iterator();
- int i = 0;
- while(it.hasNext()){
- fragments[i] = (IXSDAttributeFragment)it.next();
- i++;
- }
- return fragments;
- }
-
- protected void addFragments(String[] id, IXSDFragment[] frags, boolean addToController) {
- for (int i = 0; i < id.length && i < frags.length; i++) {
- addFragment(id[i], frags[i], addToController);
- }
- }
-
- protected void addFragment(IXSDFragment frag, boolean addToController) {
- addFragment(frag.getID(), frag, addToController);
- }
-
- protected void addFragments(IXSDFragment[] frags, boolean addToController) {
- for (int i = 0; i < frags.length; i++) {
- addFragment(frags[i].getID(), frags[i], addToController);
- }
- }
-
- protected void addFragments(Vector frags, boolean addToController) {
- Iterator it = frags.iterator();
- while (it.hasNext()) {
- Object obj = it.next();
- if (obj instanceof IXSDFragment) {
- IXSDFragment frag = (IXSDFragment)obj;
- addFragment(frag.getID(), frag, addToController);
- }
- }
- }
-
- protected void addAttributeFragments(Vector frags) {
- Iterator it = frags.iterator();
- while (it.hasNext()) {
- Object obj = it.next();
- if (obj instanceof IXSDAttributeFragment) {
- IXSDAttributeFragment frag = (IXSDAttributeFragment)obj;
- addAttributeFragment(frag.getID(), frag);
- }
- }
- }
-
- public String[] getFragmentsOrder() {
- String[] fragmentsOrder = new String[fragmentsOrder_.size()];
- for (int i = 0; i < fragmentsOrder.length; i++) {
- fragmentsOrder[i] = (String)fragmentsOrder_.get(i);
- }
- return fragmentsOrder;
- }
-
- protected boolean setFragmentsOrder(String[] fragmentsOrder) {
- if (fragmentsOrder.length != fragmentsOrder_.size())
- return false;
- Vector fragmentsOrderCopy = new Vector(fragmentsOrder_);
- for (int i = 0; i < fragmentsOrder.length; i++) {
- if (!fragmentsOrderCopy.remove(fragmentsOrder[i]))
- return false;
- }
- fragmentsOrder_.clear();
- for (int j = 0; j < fragmentsOrder.length; j++) {
- fragmentsOrder_.add(fragmentsOrder[j]);
- }
- return true;
- }
-
- public IXSDAttributeFragment getAttributeFragment(String id) {
- return (IXSDAttributeFragment)attributeFragments_.get(id);
- }
-
- public IXSDFragment getFragment(String id) {
- return (IXSDFragment)fragments_.get(id);
- }
-
- public IXSDFragment[] getFragments(String[] ids) {
- IXSDFragment[] frags = new IXSDFragment[ids.length];
- for (int i = 0; i < frags.length; i++) {
- frags[i] = getFragment(ids[i]);
- }
- return frags;
- }
-
- public IXSDFragment[] getAllFragments() {
- IXSDFragment[] fragments = new IXSDFragment[fragmentsOrder_.size()];
- for (int i = 0; i < fragmentsOrder_.size(); i++) {
- fragments[i] = getFragment((String)fragmentsOrder_.get(i));
- }
- return fragments;
- }
-
- protected void removeFragment(String id) {
- removeFragment(id, true);
- }
-
- protected void removeFragments(String[] ids) {
- removeFragments(ids, true);
- }
-
- protected void removeAllFragments() {
- removeAllFragments(true);
- }
-
- protected void removeFragment(String id, boolean removeFromController) {
- fragmentsOrder_.remove(id);
- fragments_.remove(id);
- if (removeFromController)
- controller_.removeFromCache(id);
- }
-
- protected void removeFragments(String[] ids, boolean removeFromController) {
- for (int i = 0; i < ids.length; i++) {
- removeFragment(ids[i], removeFromController);
- }
- }
-
- protected void removeAllFragments(boolean removeFromController) {
- if (removeFromController)
- {
- Enumeration ids = fragments_.keys();
- while (ids.hasMoreElements())
- {
- String id = (String)ids.nextElement();
- controller_.removeFromCache(id);
- }
- }
- fragmentsOrder_.clear();
- fragments_.clear();
- }
-
- protected void removeAllAttributeFragments() {
- Enumeration ids = attributeFragments_.keys();
- while (ids.hasMoreElements())
- {
- String id = (String)ids.nextElement();
- controller_.removeFromCache(id);
- }
-
- attributeFragments_.clear();
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
deleted file mode 100644
index 1579c6a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
+++ /dev/null
@@ -1,28 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeFixFragment extends XSDSimpleAtomicFixFragment {
- private int calendarType_;
- public XSDSimpleAtomicDateTimeFixFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
- super(id, name, config);
- calendarType_ = calendarType;
- }
-
- public String getWriteFragment() {
- StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp?");
- fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
- return fragmentLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
deleted file mode 100644
index a7ce22d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
+++ /dev/null
@@ -1,28 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeRangeFragment extends XSDSimpleAtomicRangeFragment {
- private int calendarType_;
- public XSDSimpleAtomicDateTimeRangeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
- super(id, name, config);
- calendarType_ = calendarType;
- }
-
- public String getWriteFragment() {
- StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp?");
- fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
- return fragmentLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
deleted file mode 100644
index 6ba3e92..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumFixFragment extends XSDSimpleAtomicEnumFragment {
- public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config, elist);
- }
-
- public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config, v);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
deleted file mode 100644
index 0de9e8e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
+++ /dev/null
@@ -1,42 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.xsd.XSDEnumerationFacet;
-
-public abstract class XSDSimpleAtomicEnumFragment extends XSDSimpleAtomicFragment {
- private OptionVector optionVector_;
- public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config);
- optionVector_ = new OptionVector();
- for (int i=0;i<elist.size();i++)
- {
- String enumValue = ((XSDEnumerationFacet)elist.get(i)).getLexicalValue();
- optionVector_.addOption(enumValue,enumValue);
- }
- }
-
- public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config);
- optionVector_ = new OptionVector();
- for (int i=0;i<v.size();i++)
- optionVector_.addOption(v.getDisplayValue(i),v.getValue(i));
- }
-
- public final OptionVector getOptionVector()
- {
- return optionVector_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
deleted file mode 100644
index 8de58f3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumRangeFragment extends XSDSimpleAtomicEnumFragment {
- public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config, elist);
- }
-
- public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config, v);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
deleted file mode 100644
index 328568c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicFixFragment extends XSDSimpleAtomicFragment {
- public XSDSimpleAtomicFixFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
deleted file mode 100644
index daa410f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,29 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public abstract class XSDSimpleAtomicFragment extends XSDFragment implements IXSDSimpleAtomicFragment {
- public XSDSimpleAtomicFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- String param = getParameterValue(paramKey, paramIndex);
- if (param != null && !((XSDSimpleTypeDefinition)getXSDTypeDefinition()).isValidLiteral(param))
- return false;
- else
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
deleted file mode 100644
index e575802..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicRangeFragment extends XSDSimpleAtomicFragment {
- public XSDSimpleAtomicRangeFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
deleted file mode 100644
index aa3366f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListFixFragment extends XSDSimpleListFragment {
- public XSDSimpleListFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
deleted file mode 100644
index a6c6661..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
+++ /dev/null
@@ -1,152 +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
- * -------- -------- -----------------------------------------------------------
- * 20060217 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import com.ibm.icu.util.StringTokenizer;
-
-public abstract class XSDSimpleListFragment extends XSDMapFragment implements IXSDSimpleListFragment
-{
- public XSDSimpleListFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
- {
- super(id, name, config, controller);
- }
-
- public void setName(String name)
- {
- super.setName(name);
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++)
- {
- fragments[i].setName(name);
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- String[] params = new String[instanceDocumentsCopy.length];
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- params[i] = "";
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 0)
- {
- Node node = nodeList.item(0);
- if (nodeList.getLength() > 1)
- paramsValid = false;
- if (node.getNodeType() != Node.TEXT_NODE)
- paramsValid = false;
- else
- params[i] = node.getNodeValue();
- }
- else
- paramsValid = false;
- }
- removeAllFragments();
- for (int i = 0; i < params.length; i++)
- {
- IXSDFragment childFrag = getFragment(createListInstance());
- StringTokenizer st = new StringTokenizer(params[i].trim());
- String[] childParams = new String[st.countTokens()];
- for (int j = 0; j < childParams.length; j++)
- {
- childParams[j] = st.nextToken();
- }
- childFrag.setParameterValues(childFrag.getID(), childParams);
- paramsValid = paramsValid && childFrag.validateAllParameterValues();
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Element[] instanceDocuments = new Element[fragments.length];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < fragments.length; i++)
- {
- Element instanceDocument = doc.createElement(tagName);
- StringBuffer listValue = new StringBuffer();
- String[] params = fragments[i].getParameterValues(fragments[i].getID());
- for (int j = 0; params != null && j < params.length; j++)
- {
- if (j != 0)
- listValue.append(FragmentConstants.LIST_SEPERATOR);
- listValue.append(params[j]);
- }
- Node textNode = doc.createTextNode(listValue.toString());
- instanceDocument.appendChild(textNode);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
- }
-
- public String createListInstance()
- {
- String newID = genID();
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)getXSDTypeDefinition();
- int min = 0;
- int max = FragmentConstants.UNBOUNDED;
- XSDLengthFacet xsdLengthFacet = simpleType.getLengthFacet();
- // port to org.eclipse.xsd
- if (xsdLengthFacet != null)
- {
- min = xsdLengthFacet.getValue();
- max = xsdLengthFacet.getValue();
- }
- else
- {
- XSDMinLengthFacet xsdMinLengthFacet = simpleType.getMinLengthFacet();
- XSDMaxLengthFacet xsdMaxLengthFacet = simpleType.getMaxLengthFacet();
- // port to org.eclipse.xsd
- if (xsdMinLengthFacet != null)
- min = xsdMinLengthFacet.getValue();
- if (xsdMaxLengthFacet != null)
- max = xsdMaxLengthFacet.getValue();
- }
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(simpleType.getItemTypeDefinition());
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- xsdConfig.setMinOccurs(min);
- xsdConfig.setMaxOccurs(max);
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
- frag.setID(newID);
- frag.setName(getName());
- addFragment(newID, frag);
- return newID;
- }
-
- public String createInstance()
- {
- return createListInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
deleted file mode 100644
index 518584f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
+++ /dev/null
@@ -1,33 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListRangeFragment extends XSDSimpleListFragment {
- public XSDSimpleListRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
deleted file mode 100644
index 732c93b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionFixFragment extends XSDSimpleUnionFragment {
- public XSDSimpleUnionFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
deleted file mode 100644
index e6fc815..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,119 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleUnionFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDSimpleUnionFragment extends XSDMapFragment implements IXSDSimpleUnionFragment {
- private XSDSimpleTypeDefinition[] memberTypes_;
-
- public XSDSimpleUnionFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- memberTypes_ = null;
- }
-
- public void setName(String name) {
- super.setName(name);
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++) {
- fragments[i].setName(name);
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- int numTypes = getMemberTypeDefinitions().length;
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- Vector memberFragments = new Vector();
- for (int i = 0; i < instanceDocumentsCopy.length; i++) {
- IXSDFragment compatibleFrag = null;
- for (int j = 0; j < numTypes; j++) {
- IXSDFragment memberFrag = getFragment(createUnionInstance(j));
- Element[] memberInstanceDocument = new Element[1];
- memberInstanceDocument[0] = setElementTagName(instanceDocumentsCopy[i], memberFrag.getName());
- if (memberFrag.setParameterValuesFromInstanceDocuments(memberInstanceDocument)) {
- if (memberFrag.validateAllParameterValues()) {
- compatibleFrag = memberFrag;
- break;
- }
- else if (compatibleFrag == null)
- compatibleFrag = memberFrag;
- }
- }
- if (compatibleFrag != null)
- memberFragments.add(compatibleFrag);
- else
- paramsValid = false;
- }
- removeAllFragments();
- addFragments(memberFragments);
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if (fragmentInstances.length > 0)
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
- }
-
- public XSDSimpleTypeDefinition[] getMemberTypeDefinitions() {
- if (memberTypes_ == null) {
- EList memberTypes = ((XSDSimpleTypeDefinition)getXSDTypeDefinition()).getMemberTypeDefinitions();
- memberTypes_ = new XSDSimpleTypeDefinition[memberTypes.size()];
- for (int i = 0; i < memberTypes_.length; i++) {
- memberTypes_[i] = (XSDSimpleTypeDefinition)memberTypes.get(i);
- }
- }
- return memberTypes_;
- }
-
- public String createUnionInstance(int memberTypeIndex) {
- getMemberTypeDefinitions();
- if (memberTypeIndex < 0 || memberTypeIndex > memberTypes_.length - 1)
- return null;
- String newID = genID();
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(memberTypes_[memberTypeIndex]);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
- frag.setID(newID);
- frag.setName(getName());
- addFragment(newID, frag);
- return newID;
- }
-
- public String createInstance() {
- return createUnionInstance(0);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
deleted file mode 100644
index fd84b6d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionRangeFragment extends XSDSimpleUnionFragment {
- public XSDSimpleUnionRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
deleted file mode 100644
index 3965c8b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
+++ /dev/null
@@ -1,103 +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.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Hashtable;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.w3c.dom.Element;
-
-public class HTTPUtil
-{
- private HTTPUtil()
- {
- }
-
- public static String genURLEncodedParameters(IXSDFragment fragment)
- {
- if (fragment instanceof IXSDSimpleListFragment)
- return genURLEncodedParamsFromListFragment((IXSDSimpleListFragment)fragment);
- else if (fragment instanceof IXSDSimpleAtomicFragment)
- return genURLEncodedParamsFromAtomicFragment((IXSDSimpleAtomicFragment)fragment);
- else
- return genURLEncodedXMLParameters(fragment);
- }
-
- private static String genURLEncodedParamsFromAtomicFragment(IXSDSimpleAtomicFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- String[] params = fragment.getParameterValues(fragment.getID());
- for (int i = 0; i < params.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- urlEncodedParam.append(URLUtils.encode(params[i]));
- if (i < params.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-
- private static String genURLEncodedParamsFromListFragment(IXSDSimpleListFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- IXSDFragment[] childFrags = fragment.getAllFragments();
- for (int i = 0; i < childFrags.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- String[] params = childFrags[i].getParameterValues(childFrags[i].getID());
- StringBuffer paramBuffer = new StringBuffer();
- for (int j = 0; j < params.length; j++)
- {
- paramBuffer.append(params[j]);
- if (j < params.length - 1)
- paramBuffer.append(FragmentConstants.LIST_SEPERATOR);
- }
- urlEncodedParam.append(URLUtils.encode(paramBuffer.toString()));
- if (i < childFrags.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-
- private static String genURLEncodedXMLParameters(IXSDFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- Hashtable soapEnvelopeNamespaceTable = new Hashtable();
- soapEnvelopeNamespaceTable.put(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV);
- soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSI, Constants.NS_PREFIX_SCHEMA_XSI);
- soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSD, Constants.NS_PREFIX_SCHEMA_XSD);
- Element[] instanceDocuments = new Element[0];
- try
- {
- instanceDocuments = fragment.genInstanceDocumentsFromParameterValues(true, soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
- }
- catch (ParserConfigurationException pce)
- {
- }
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- urlEncodedParam.append(URLUtils.encode(XMLUtils.serialize(instanceDocuments[i], true)));
- if (i < instanceDocuments.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
deleted file mode 100644
index f7ae5b1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Vector;
-
-public class OptionVector
-{
- private Vector options_;
-
- public OptionVector()
- {
- options_ = new Vector();
- }
-
- public void addOption(String displayValue,String value)
- {
- options_.addElement(new Option(displayValue,value));
- }
-
- public String getDisplayValue(int position)
- {
- Option option = (Option)options_.elementAt(position);
- return option.getDisplayValue();
- }
-
- public String getValue(int position)
- {
- Option option = (Option)options_.elementAt(position);
- return option.getValue();
- }
-
- public int size()
- {
- return options_.size();
- }
-
- private final class Option
- {
- private String displayValue_;
- private String value_;
- public Option(String displayValue,String value)
- {
- displayValue_ = displayValue;
- value_ = value;
- }
-
- public final String getDisplayValue()
- {
- return displayValue_;
- }
-
- public final String getValue()
- {
- return value_;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
deleted file mode 100644
index ac59e19..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
+++ /dev/null
@@ -1,114 +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.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDTypeDefinitionUtil {
- private XSDTypeDefinitionUtil() {
- }
-
- public static boolean isXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return false;
- String ns = type.getTargetNamespace();
- return (ns != null && ns.equals(FragmentConstants.URI_XSD));
- }
-
- public static boolean isRootTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return true;
- XSDTypeDefinition baseType = type.getBaseType();
- if (baseType == null)
- return true;
- String typeNS = type.getTargetNamespace();
- String baseTypeNS = baseType.getTargetNamespace();
- String typeName = type.getName();
- String baseTypeName = baseType.getName();
- boolean sameNS;
- boolean sameName;
- if (typeNS == null && baseTypeNS == null)
- sameNS = true;
- else if (typeNS != null && baseTypeNS != null && typeNS.equals(baseTypeNS))
- sameNS = true;
- else
- sameNS = false;
- if (typeName == null && baseTypeName == null)
- sameName = true;
- else if (typeName != null && baseTypeName != null && typeName.equals(baseTypeName))
- sameName = true;
- else
- sameName = false;
- return (sameNS && sameName);
- }
-
- public static XSDTypeDefinition resolveToXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return null;
- XSDTypeDefinition currType = type;
- while (!isXSDBuiltInTypeDefinition(currType)) {
- if (isRootTypeDefinition(currType))
- return null;
- currType = currType.getBaseType();
- }
- return currType;
- }
-
- public static boolean isSoapEncArray(XSDTypeDefinition type) {
- XSDTypeDefinition currType = type;
- if (currType != null)
- while(currType != null) {
- String ns = currType.getTargetNamespace();
- String name = currType.getName();
- if (FragmentConstants.URI_SOAP.equals(ns) && FragmentConstants.QNAME_LOCAL_NAME_ARRAY.equals(name))
- return true;
- else if (isRootTypeDefinition(currType))
- return false;
- else
- currType = currType.getBaseType();
- }
- return false;
- }
-
- /**
- * Returns the complex type content given a complex type.
- * If complexType is a user defined type:
- * This method will return the user defined complex content of this type or the content of the extended
- * or derived type iff the extended or derived type is not a built-in XSD type (for example, xsd:anyType).
- * If complexType is a built-in XSD type:
- * It will return the complex content of this built-in XSD complex type. It will not return the
- * complex content of its extended or derived type.
- * @param complexType XSDComplexTypeDefinition complex type.
- * @return XSDComplexTypeContent XSDComplexTypeContent the resolved complex type content.
- **/
- public static XSDComplexTypeContent getXSDComplexTypeContent(XSDComplexTypeDefinition complexType)
- {
- if (!isXSDBuiltInTypeDefinition(complexType))
- {
- XSDTypeDefinition type = complexType;
- while (!isXSDBuiltInTypeDefinition(type) && (type instanceof XSDComplexTypeDefinition))
- {
- XSDComplexTypeContent complexTypeContent = ((XSDComplexTypeDefinition)type).getContent();
- if (complexTypeContent != null)
- return complexTypeContent;
- if (isRootTypeDefinition(type))
- return null;
- type = type.getBaseType();
- }
- return null;
- }
- else
- return complexType.getContent();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
deleted file mode 100644
index f0f38ee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public abstract class DetailsTool extends FormTool {
-
- public String formLink_;
-
- public DetailsTool(ToolManager toolManager, String alt, String formLink) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- formLink_ = formLink;
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
deleted file mode 100644
index cf94698..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-
-public class InvokeWSDLOperationTool extends FormTool {
-
- private String fragmentViewID_;
- private String fragmentNameAnchorID_;
- private String endPoint_;
-
- public InvokeWSDLOperationTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsdl/images/invoke_wsdl_operation_enabled.gif", "wsdl/images/invoke_wsdl_operation_highlighted.gif", alt);
- fragmentViewID_ = FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM;
- fragmentNameAnchorID_ = null;
- endPoint_ = null;
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- StringBuffer formLink = new StringBuffer();
- formLink.append("wsdl/forms/InvokeWSDLOperationForm.jsp");
- String nameAnchorID = getFragmentNameAnchorID();
- if (nameAnchorID != null && nameAnchorID.length() > 0) {
- formLink.append("#");
- formLink.append(nameAnchorID);
- setFragmentNameAnchorID(null);
- }
- return formLink.toString();
- }
-
- public String getFormActionLink(int operationType,String fragmentViewID)
- {
- switch (operationType)
- {
- case WSDLOperationElement.OPERATION_TYPE_SOAP:
- if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- return "wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp";
- else
- return "wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp";
- case WSDLOperationElement.OPERATION_TYPE_HTTP_GET:
- return "wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp";
- case WSDLOperationElement.OPERATION_TYPE_HTTP_POST:
- default:
- return "wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp";
- }
- }
-
- public String getFragmentViewID() {
- return fragmentViewID_;
- }
-
- public void setFragmentViewID(String fragmentViewID) {
- fragmentViewID_ = fragmentViewID;
- }
-
- public String getFragmentNameAnchorID() {
- return fragmentNameAnchorID_;
- }
-
- public void setFragmentNameAnchorID(String fragmentNameAnchorID) {
- fragmentNameAnchorID_ = fragmentNameAnchorID;
- }
-
- public String getEndPoint()
- {
- return endPoint_;
- }
-
- public void setEndPoint(String endPoint)
- {
- endPoint_ = endPoint;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
deleted file mode 100644
index 768c1fe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
+++ /dev/null
@@ -1,37 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class OpenWSDLTool extends FormTool {
-
- public OpenWSDLTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsdl/images/open_wsdl_enabled.gif", "wsdl/images/open_wsdl_highlighted.gif", alt);
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsdl/forms/OpenWSDLForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
deleted file mode 100644
index 34f0afa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-
-public class SOAPMessageQueue extends MessageQueue
-{
- private Vector cachedMessageList_;
-
- public SOAPMessageQueue()
- {
- super();
- cachedMessageList_ = new Vector();
- }
-
- public void clear()
- {
- cachedMessageList_.removeAllElements();
- messageList_.removeAllElements();
- }
-
- public String getMessagesFromList()
- {
- if (messageList_.size() == 0)
- copyMessages(cachedMessageList_,messageList_);
- else
- copyMessages(messageList_,cachedMessageList_);
- return super.getMessagesFromList();
- }
-
- private final void copyMessages(Vector sourceList,Vector destList)
- {
- for (int i=0;i<sourceList.size();i++)
- destList.addElement(sourceList.elementAt(i));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
deleted file mode 100644
index ce9b000..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction;
-
-public class WSDLAddToFavoritesTool extends ActionTool {
- public WSDLAddToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return WSDLAddToFavoritesAction.getActionLink(selectedNode.getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
deleted file mode 100644
index a904796..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLBindingDetailsTool extends DetailsTool {
-
- public WSDLBindingDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLBindingDetailsForm.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
deleted file mode 100644
index 92fc093..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL binding node for the WSDL Navigator Tree View
-public class WSDLBindingNode extends WSDLNavigatorNode
-{
- public WSDLBindingNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_binding_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- WSDLOperationNode wsdlOperationNode = new WSDLOperationNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlOperationNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLBindingDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
deleted file mode 100644
index faa8100..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLDetailsTool extends DetailsTool {
-
- public static final int FORM_VIEW_ID = 0;
- public static final int SOURCE_VIEW_ID = 1;
-
- private int viewId_;
-
- public WSDLDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLDetailsForm.jsp");
- viewId_ = FORM_VIEW_ID;
- }
-
- public int getViewId() {
- return viewId_;
- }
-
- public void setViewId(int viewId) {
- if (viewId == FORM_VIEW_ID || viewId == SOURCE_VIEW_ID)
- viewId_ = viewId;
- }
-
- public void toggleViewId() {
- if (viewId_ == FORM_VIEW_ID)
- viewId_ = SOURCE_VIEW_ID;
- else
- viewId_ = FORM_VIEW_ID;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
deleted file mode 100644
index eb37d91..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction;
-
-public class WSDLImportWSDLToFileSystemTool extends ImportToFileSystemTool {
- public WSDLImportWSDLToFileSystemTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public final String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getActionLink() {
- Node node = toolManager_.getNode();
- return WSDLImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
deleted file mode 100644
index d385240..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
- public WSDLImportWSDLToWorkbenchTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink() {
- return "wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
deleted file mode 100644
index 5f3e3be..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
- public WSDLLaunchWebServiceWizardTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink() {
- return "wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
deleted file mode 100644
index 78773f2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// Root node for the WSDL Navigator Tree View
-public class WSDLMainNode extends WSDLNavigatorNode
-{
- public WSDLMainNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL)) {
- WSDLNode wsdlNode = new WSDLNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new OpenWSDLTool(toolManager_, wsdlPerspective.getMessage("ALT_OPEN_WSDL"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
deleted file mode 100644
index 5b7580f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ToggleWSDLNavigatorNodeAction;
-
-public abstract class WSDLNavigatorNode extends Node
-{
- public WSDLNavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- }
-
- // wsdl/actions/ToggleWSDLNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleWSDLNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // wsdl/actions/SelectWSDLNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectWSDLNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
deleted file mode 100644
index 5f1274c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL node for the WSDL Navigator Tree View
-public class WSDLNode extends WSDLNavigatorNode
-{
- public WSDLNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"images/wsdl.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- WSDLServiceNode wsdlServiceNode = new WSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_DETAILS"));
- new WSDLImportWSDLToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new WSDLImportWSDLToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WSDLLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new WSDLAddToFavoritesTool(toolManager_, wsdlPerspective.getMessage("ALT_ADD_WSDL_TO_FAVORITES"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
deleted file mode 100644
index 7c8e3c0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-// WSDL operation node for the WSDL Navigator Tree View
-public class WSDLOperationNode extends WSDLNavigatorNode
-{
- public WSDLOperationNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_operation_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- }
- });
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new InvokeWSDLOperationTool(toolManager_, wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
deleted file mode 100644
index 361bd85..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
+++ /dev/null
@@ -1,370 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import javax.wsdl.Service;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SwitchPerspectiveFromWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLPerspective extends Perspective
-{
- public static final int STATUS_CONTENT_DEFAULT = 0;
- public static final int STATUS_CONTENT_RESULT_FORM = 1;
- public static final int STATUS_CONTENT_RESULT_SOURCE = 2;
-
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
- private int statusContentType_;
-
- private SOAPMessageQueue soapRequestQueue_;
- private SOAPMessageQueue soapResponseQueue_;
- private Node operationNode_;
-
- static
- {
- // Initialize the XSD subsystem.
- (new ResourceFactoryRegistryImpl()).getExtensionToFactoryMap().put("xsd",new XSDResourceFactoryImpl());
- // port to org.eclipse.xsd
- // Init.init();
- EcorePackageImpl.init();
- XSDPackageImpl.init();
- }
-
- public WSDLPerspective(Controller controller)
- {
- super("wsdl",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("wsdlModel");
- TreeElement treeElement = new TreeElement(getMessage("NODE_NAME_WSDL_MAIN"), model_);
- model_.setRootElement(treeElement);
- nodeManager_ = new NodeManager(controller_);
- WSDLMainNode wsdlMainNode = new WSDLMainNode(treeElement, nodeManager_);
- nodeManager_.setRootNode(wsdlMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-
- // Message status pane
- statusContentType_ = STATUS_CONTENT_DEFAULT;
- soapRequestQueue_ = new SOAPMessageQueue();
- soapResponseQueue_ = new SOAPMessageQueue();
- operationNode_ = null;
- }
-
- public final void preloadWSDL(String[] wsdlURLs) {
- if (wsdlURLs != null) {
- for (int i = 0; i < wsdlURLs.length; i++) {
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- String decodedWSDLURL = URLUtils.decode(wsdlURLs[i]);
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, decodedWSDLURL);
- openWSDLAction.run();
- }
- if (wsdlURLs.length > 0)
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- }
- }
-
- public final void preloadEndpoints(String[] wsdlURLs, String[] endpoints)
- {
- if (wsdlURLs != null && wsdlURLs.length > 0 && endpoints != null && endpoints.length > 0)
- {
- String wsdlURL = wsdlURLs[0];
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (Iterator wsdlNodesIterator = wsdlNodes.iterator(); wsdlNodesIterator.hasNext();)
- {
- Node wsdlNode = (Node)wsdlNodesIterator.next();
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (Iterator serviceNodesIterator = serviceNodes.iterator(); serviceNodesIterator.hasNext();)
- {
- Node serviceNode = (Node)serviceNodesIterator.next();
- Vector bindingNodes = serviceNode.getChildNodes();
- String[] nodeIds = new String[bindingNodes.size()];
- for (int i = 0; i < nodeIds.length; i++)
- nodeIds[i] = String.valueOf(((Node)bindingNodes.get(i)).getNodeId());
- UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller_);
- Hashtable propertyTable = new Hashtable();
- propertyTable.put(ActionInputs.NODEID, nodeIds);
- propertyTable.put(WSDLActionInputs.END_POINT, endpoints);
- action.setPropertyTable(propertyTable);
- action.execute(false);
- }
- return;
- }
- }
- }
- }
-
- public final void preselectServiceOrBinding(String[] wsdlURLs,String[] serviceQNameStrings,String[] bindingNameStrings)
- {
- if (wsdlURLs != null && wsdlURLs.length > 0)
- {
- String wsdlURL = wsdlURLs[0];
- if (serviceQNameStrings != null && serviceQNameStrings.length > 0)
- preselectService(wsdlURL,serviceQNameStrings[0]);
- else
- {
- if (bindingNameStrings != null && bindingNameStrings.length > 0)
- preselectBinding(wsdlURL,bindingNameStrings[0]);
- }
- }
- }
-
- private final void preselectService(String wsdlURL,String serviceQNameString)
- {
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (int i=0;i<wsdlNodes.size();i++)
- {
- Node wsdlNode = (Node)wsdlNodes.elementAt(i);
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (int j=0;j<serviceNodes.size();j++)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(j);
- WSDLServiceElement serviceElement = (WSDLServiceElement)serviceNode.getTreeElement();
- Service service = serviceElement.getService();
- if (service.getQName().toString().equals(serviceQNameString))
- {
- nodeManager_.setSelectedNodeId(serviceNode.getNodeId());
- nodeManager_.makeSelectedNodeVisible();
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- return;
- }
- }
- }
- }
- }
-
- private final void preselectBinding(String wsdlURL,String bindingNameString)
- {
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (int i=0;i<wsdlNodes.size();i++)
- {
- Node wsdlNode = (Node)wsdlNodes.elementAt(i);
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (int j=0;j<serviceNodes.size();j++)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(j);
- Vector bindingNodes = serviceNode.getChildNodes();
- for (int k=0;k<bindingNodes.size();k++)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(k);
- WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- if (bindingElement.getBinding().getQName().toString().equals(bindingNameString))
- {
- nodeManager_.setSelectedNodeId(bindingNode.getNodeId());
- nodeManager_.makeSelectedNodeVisible();
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- return;
- }
- }
- }
- }
- }
- }
-
- public NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "wsdl/wsdl_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-
- public String getPanesFile()
- {
- return "wsdl/scripts/wsdlpanes.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "wsdl/scripts/wsdlframesets.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "wsdl/forms/ProcessWSDLFramesetsForm.jsp";
- }
-
- public String getTreeContentVar()
- {
- return "wsdlNavigatorContent";
- }
-
- public String getTreeContentPage()
- {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar()
- {
- return "wsdlPropertiesContainer";
- }
-
- public String getPropertiesContainerPage()
- {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public String getStatusContentVar()
- {
- return "wsdlStatusContent";
- }
-
- public String getStatusContentPage()
- {
- return "wsdl/wsdl_status_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromWSDLAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-
- public final int getStatusContentType()
- {
- return statusContentType_;
- }
-
- public final void setStatusContentType(int statusContentType)
- {
- statusContentType_ = statusContentType;
- }
-
- public final SOAPMessageQueue getSOAPRequestQueue()
- {
- return soapRequestQueue_;
- }
-
- public final SOAPMessageQueue getSOAPResponseQueue()
- {
- return soapResponseQueue_;
- }
-
- public final Node getOperationNode()
- {
- return operationNode_;
- }
-
- public final void setOperationNode(Node operationNode)
- {
- operationNode_ = operationNode;
- }
-
- public final String getSOAPEnvelopeXMLLink(int soapEnvelopeType)
- {
- StringBuffer link = new StringBuffer("wsdl/soap_envelope_xml.jsp?");
- link.append(WSDLActionInputs.SOAP_ENVELOPE_TYPE).append('=').append(soapEnvelopeType);
- return link.toString();
- }
-
- public final String getBindingTypeString(int bindingType)
- {
- switch (bindingType)
- {
- case BindingTypes.SOAP:
- return getMessage("FORM_LABEL_BINDING_TYPE_SOAP");
- case BindingTypes.HTTP_GET:
- return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_GET");
- case BindingTypes.HTTP_POST:
- return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_POST");
- default:
- return getMessage("FORM_LABEL_BINDING_TYPE_UNSUPPORTED");
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
deleted file mode 100644
index ec1fef2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLServiceDetailsTool extends DetailsTool {
-
- public WSDLServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLServiceDetailsForm.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
deleted file mode 100644
index e562300..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL service node for the WSDL Navigator Tree View
-public class WSDLServiceNode extends WSDLNavigatorNode
-{
- public WSDLServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_service_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- WSDLBindingNode wsdlBindingNode = new WSDLBindingNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlBindingNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLServiceDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
deleted file mode 100644
index 13de699..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
+++ /dev/null
@@ -1,98 +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.wst.ws.internal.explorer.platform.wsdl.transformer;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class FragmentTransformer implements ITransformer
-{
- protected Controller controller;
-
- public FragmentTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- StringBuffer sb = new StringBuffer();
- sb.append("<root>");
- WSDLOperationElement operElement = (WSDLOperationElement)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
- Element[] elements = new Element[0];
- try
- {
- elements = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), new Hashtable(), XMLUtils.createNewDocument(null));
- }
- catch (ParserConfigurationException pce)
- {
- }
- for (int i = 0; i < elements.length; i++)
- sb.append(XMLUtils.serialize(elements[i], true));
- }
- sb.append("</root>");
- properties.put(FragmentConstants.SOURCE_CONTENT, sb.toString());
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- String source = (String) properties.get(FragmentConstants.SOURCE_CONTENT);
- if (source != null)
- {
- try
- {
- Element root = XMLUtils.stringToElement(source);
- if (root != null)
- {
- NodeList childNodes = root.getChildNodes();
- Vector childrenVector = new Vector();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node child = childNodes.item(i);
- if (child instanceof Element)
- childrenVector.add(child);
- }
- Element[] children = (Element[])childrenVector.toArray(new Element[0]);
- WSDLOperationElement operElement = (WSDLOperationElement) controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
- frag.setParameterValuesFromInstanceDocuments(children);
- }
- }
- }
- catch (Throwable t)
- {
- }
- }
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
deleted file mode 100644
index 1ea28a1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ChunkedInputStream extends FilterInputStream
-{
- protected long chunkSize = 0l;
- protected volatile boolean closed = false;
- private static final int maxCharLong = (Long.toHexString(Long.MAX_VALUE)).toString().length();
-
- private ChunkedInputStream()
- {
- super(null);
- }
-
- public ChunkedInputStream(InputStream is)
- {
- super(is);
- }
-
- public int read() throws IOException
- {
- byte[] d = new byte[1];
- int rc = read(d, 0, 1);
- return rc > 0 ? (d[0] & 0xFF) : rc;
- }
-
- public int read(byte[] b) throws IOException
- {
- return read(b, 0, b.length);
- }
-
- public synchronized int read(byte[] b, int off, int len) throws IOException
- {
- if (closed)
- return -1;
-
- int totalread = 0;
- int bytesread = 0;
- try
- {
- do
- {
- if (chunkSize < 1L)
- {
- if (0l == getChunked())
- {
- if (totalread == 0)
- return -1;
- else
- return totalread;
- }
- }
- bytesread = in.read(b, off + totalread, Math.min(len - totalread, (int) Math.min(chunkSize, Integer.MAX_VALUE)));
- if (bytesread > 0)
- {
- totalread += bytesread;
- chunkSize -= bytesread;
- }
- }
- while (len - totalread > 0 && bytesread > -1);
- }
- catch (IOException e)
- {
- closed = true;
- throw e;
- }
- return totalread;
- }
-
- public long skip(final long n) throws IOException
- {
- if (closed)
- return 0;
- long skipped = 0l;
- byte[] b = new byte[1024];
- int bread = -1;
- do
- {
- bread = read(b, 0, b.length);
- if (bread > 0)
- skipped += bread;
- }
- while (bread != -1 && skipped < n);
- return skipped;
- }
-
- public int available() throws IOException
- {
- if (closed)
- return 0;
- int rc = (int) Math.min(chunkSize, Integer.MAX_VALUE);
- return Math.min(rc, in.available());
- }
-
- protected long getChunked() throws IOException
- {
- //StringBuffer buf= new StringBuffer(1024);
- byte[] buf = new byte[maxCharLong + 2];
- int bufsz = 0;
- chunkSize = -1L;
- int c = -1;
- do
- {
- c = in.read();
- if (c > -1)
- {
- if (c != '\r' && c != '\n' && c != ' ' && c != '\t')
- {
- buf[bufsz++] = ((byte) c);
- }
- }
- }
- while (c > -1 && (c != '\n' || bufsz == 0) && bufsz < buf.length);
- if (c < 0)
- {
- closed = true;
- }
- String sbuf = new String(buf, 0, bufsz);
- if (bufsz > maxCharLong)
- {
- closed = true;
- throw new IOException("Chunked input stream failed to receive valid chunk size:" + sbuf);
- }
- try
- {
- chunkSize = Long.parseLong(sbuf, 16);
- }
- catch (NumberFormatException ne)
- {
- closed = true;
- throw new IOException("'" + sbuf + "' " + ne.getMessage());
- }
- if (chunkSize < 1L)
- closed = true;
- if (chunkSize != 0L && c < 0)
- {
- //If chunk size is zero try and be tolerant that there maybe no cr or lf
- // at the end.
- throw new IOException("HTTP Chunked stream closed in middle of chunk.");
- }
- if (chunkSize < 0L)
- throw new IOException("HTTP Chunk size received " + chunkSize + " is less than zero.");
- return chunkSize;
- }
-
- public void close() throws IOException
- {
- synchronized (this)
- {
- if (closed)
- return;
- closed = true;
- }
- byte[] b = new byte[1024];
- int bread = -1;
- do
- {
- bread = read(b, 0, b.length);
- }
- while (bread != -1);
- }
-
- /*
- * public void mark(int readlimit)
- * {
- * }
- */
-
- public void reset() throws IOException
- {
- throw new IOException("Don't support marked streams");
- }
-
- public boolean markSupported()
- {
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
deleted file mode 100644
index 5cfe0ca..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-public class HTTPResponse
-{
- private boolean statusSet;
- private int statusCode;
- private String statusMessage;
- private Hashtable headers;
- private byte[] payload;
-
- public HTTPResponse()
- {
- reset();
- }
-
- public void reset()
- {
- statusSet = false;
- statusCode = -1;
- statusMessage = null;
- if (headers != null)
- headers.clear();
- else
- headers = new Hashtable();
- payload = new byte[0];
- }
-
- public boolean isStatusSet()
- {
- return statusSet;
- }
-
- public int getStatusCode()
- {
- return statusCode;
- }
-
- public void setStatusCode(int statusCode)
- {
- statusSet = true;
- this.statusCode = statusCode;
- }
-
- public String getStatusMessage()
- {
- return statusMessage;
- }
-
- public void setStatusMessage(String statusMessage)
- {
- this.statusMessage = statusMessage;
- }
-
- public void addHeader(String key, String value)
- {
- headers.put(key, value);
- }
-
- public String getHeader(String key)
- {
- return (String) headers.get(key);
- }
-
- public Map getHeaders()
- {
- return headers;
- }
-
- public byte[] getPayload()
- {
- return payload;
- }
-
- public void setPayload(byte[] payload)
- {
- this.payload = payload;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
deleted file mode 100644
index fd92431..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
+++ /dev/null
@@ -1,645 +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
- * -------- -------- -----------------------------------------------------------
- * 20060131 125777 jesper@selskabet.org - Jesper S Moller
- * 20060222 118019 andyzhai@ca.ibm.com - Andy Zhai
- * 20060222 128564 jesper@selskabet.org - Jesper S Moller
- * 20060823 99034 makandre@ca.ibm.com - Andrew Mak, WSE support for basic-authenticating firewalls
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20080728 242091 makandre@ca.ibm.com - Andrew Mak, Web services explorer inserts spurious CRLF in a long authentication header
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException;
-import org.w3c.dom.Element;
-import sun.misc.BASE64Encoder;
-
-public class HTTPTransport
-{
- private final String SYS_PROP_HTTPS_PROXY_HOST = "https.proxyHost";
- private final String SYS_PROP_HTTPS_PROXY_PORT = "https.proxyPort";
- private final String SYS_PROP_HTTPS_NON_PROXY_HOSTS = "https.nonProxyHosts";
- private final String SYS_PROP_HTTP_PROXY_HOST = "http.proxyHost";
- private final String SYS_PROP_HTTP_PROXY_PORT = "http.proxyPort";
- private final String SYS_PROP_HTTP_PROXY_USER_NAME = "http.proxyUserName";
- private final String SYS_PROP_HTTP_PROXY_PASSWORD = "http.proxyPassword";
- private final String SYS_PROP_HTTP_NON_PROXY_HOSTS = "http.nonProxyHosts";
-
- private final String HTTP_METHOD = "POST";
- private final String HTTP_CONNECT = "CONNECT";
- private final String HTTP_VERSION_1_0 = "HTTP/1.0";
- private final String HTTP_VERSION = "HTTP/1.1";
- private final String HTTP_HEADER_SOAP_ACTION = "SOAPAction";
- public static final String HTTP_HEADER_AUTH = "Authorization";
- public static final String HTTP_HEADER_WWW_AUTH = "WWW-Authenticate";
- private final String HTTP_HEADER_PROXY_AUTH = "Proxy-authorization";
- private final String HTTP_HEADER_COOKIE = "Cookie";
- private final String HTTP_HEADER_COOKIE2 = "Cookie2";
- private final String HTTP_HEADER_HOST = "Host";
- private final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
- public static final String HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
- private final String HTTP_HEADER_ACCEPT = "Accept";
- private final String HTTP_HEADER_USER_AGENT = "User-Agent";
- private final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control";
- private final String HTTP_HEADER_PRAGMA = "Pragma";
- private final String HTTP_HEADER_TRANSFER_ENCODEING = "Transfer-Encoding";
- private final String HTTP_HEADER_CONNECTION = "Connection";
-
- private final int HTTP_CODE_CONTINUE = 100;
- private final int HTTP_CODE_OK = 200;
- private final int HTTP_CODE_EXCEPTION = 300;
-
- private final String IBM_WEB_SERVICES_EXPLORER = "IBM Web Services Explorer";
- private final String TEXT_XML = "text/xml";
- private final String CONTENT_TYPE_VALUE = "text/xml; charset=utf-8";
- private final String ACCEPT_VALUE = "application/soap+xml, application/dime, multipart/related, text/*";
- public static final String BASIC = "Basic";
- private final String NO_CACHE = "no-cache";
- private final String CHUNKED = "chunked";
- private final String CLOSE = "close";
- private final String HTTPS = "https";
- private final char QUOTE = '\"';
- public static final char COLON = ':';
- private final char SPACE = ' ';
- private final char TAB = '\t';
- private final char R = '\r';
- private final char N = '\n';
- private final char ROOT = '/';
- private final String NEW_LINE = "\r\n";
- private final String EMPTY_STRING = "";
-
- private final int DEFAULT_HTTP_PORT = 80;
- private final int DEFAULT_HTTPS_PORT = 443;
- private final String DEFAULT_SOAP_ENCODING = "UTF-8";
- private final String DEFAULT_HTTP_HEADER_ENCODING = "iso-8859-1";
- private final boolean DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME = false;
-
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private boolean maintainSession = false;
- private String cookie;
- private String cookie2;
- private HTTPResponse httpResponse;
-
- public String getHttpBasicAuthUsername()
- {
- return httpBasicAuthUsername;
- }
-
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
- {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return httpBasicAuthPassword;
- }
-
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
- {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- private String getMethod(URL url)
- {
- StringBuffer sb = new StringBuffer(HTTP_METHOD);
- sb.append(SPACE);
- String protocol = url.getProtocol();
- String httpProxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
- String httpsProxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
- if (protocol.equalsIgnoreCase("http") && httpProxyHost != null && httpProxyHost.length() > 0)
- {
- sb.append(url.toString());
- }
- else if (protocol.equalsIgnoreCase("https") && httpsProxyHost != null && httpsProxyHost.length() > 0)
- {
- sb.append(url.toString());
- }
- else
- {
- String file = url.getFile();
- if (file != null && file.length() > 0)
- sb.append(file);
- else
- sb.append(ROOT);
- }
- sb.append(SPACE);
- sb.append(HTTP_VERSION);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getHost(URL url)
- {
- StringBuffer sb = new StringBuffer(HTTP_HEADER_HOST);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(url.getHost());
- sb.append(COLON);
- int port = url.getPort();
- if (port > 0)
- sb.append(String.valueOf(port));
- else if (url.getProtocol().equalsIgnoreCase(HTTPS))
- sb.append(DEFAULT_HTTPS_PORT);
- else
- sb.append(DEFAULT_HTTP_PORT);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getContentType()
- {
- return getHTTPHeader(HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_VALUE);
- }
-
- private String getContentLength(byte[] payloadAsBytes)
- {
- return getHTTPHeader(HTTP_HEADER_CONTENT_LENGTH, String.valueOf(payloadAsBytes.length));
- }
-
- private String getSOAPAction(String soapAction)
- {
- StringBuffer sb = new StringBuffer(HTTP_HEADER_SOAP_ACTION);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(QUOTE);
- if (soapAction != null)
- sb.append(soapAction);
- sb.append(QUOTE);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getCookie()
- {
- if (maintainSession)
- return getHTTPHeader(HTTP_HEADER_COOKIE, cookie);
- else
- return EMPTY_STRING;
- }
-
- private String getCookie2()
- {
- if (maintainSession)
- return getHTTPHeader(HTTP_HEADER_COOKIE2, cookie2);
- else
- return EMPTY_STRING;
- }
-
- private String stripNewLine(String input) {
- return input.replaceAll(System.getProperty("line.separator"), "");
- }
-
- private String getWWWAuthentication()
- {
- if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
- {
- StringBuffer sb = new StringBuffer(httpBasicAuthUsername);
- sb.append(COLON);
- sb.append(httpBasicAuthPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
- sb.setLength(0);
- sb.append(HTTP_HEADER_AUTH);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(BASIC);
- sb.append(SPACE);
- sb.append(stripNewLine(encodedUserNamePassword));
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- private String getProxyAuthentication()
- {
- String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
- String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
- if (proxyUserName != null && proxyPassword != null)
- {
- StringBuffer sb = new StringBuffer(proxyUserName);
- sb.append(COLON);
- sb.append(proxyPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
- sb.setLength(0);
- sb.append(HTTP_HEADER_PROXY_AUTH);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(BASIC);
- sb.append(SPACE);
- sb.append(stripNewLine(encodedUserNamePassword));
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- private String getAccept()
- {
- return getHTTPHeader(HTTP_HEADER_ACCEPT, ACCEPT_VALUE);
- }
-
- private String getUserAgent()
- {
- return getHTTPHeader(HTTP_HEADER_USER_AGENT, IBM_WEB_SERVICES_EXPLORER);
- }
-
- private String getCacheControl()
- {
- return getHTTPHeader(HTTP_HEADER_CACHE_CONTROL, NO_CACHE);
- }
-
- private String getPragma()
- {
- return getHTTPHeader(HTTP_HEADER_PRAGMA, NO_CACHE);
- }
-
- private String getConnection()
- {
- return getHTTPHeader(HTTP_HEADER_CONNECTION, CLOSE);
- }
-
- private String getHTTPHeader(String key, String value)
- {
- if (value != null)
- {
- StringBuffer sb = new StringBuffer(key);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(value);
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- public void send(URL url, String soapAction, String payload) throws UnknownHostException, IOException
- {
- byte[] payloadAsUTF8 = payload.getBytes(DEFAULT_SOAP_ENCODING);
-
- StringBuffer httpHeader = new StringBuffer();
- httpHeader.append(getMethod(url));
- httpHeader.append(getHost(url));
- httpHeader.append(getContentType());
- httpHeader.append(getContentLength(payloadAsUTF8));
- httpHeader.append(getAccept());
- httpHeader.append(getUserAgent());
- httpHeader.append(getCacheControl());
- httpHeader.append(getPragma());
- httpHeader.append(getSOAPAction(soapAction));
- httpHeader.append(getWWWAuthentication());
- httpHeader.append(getProxyAuthentication());
- httpHeader.append(getCookie());
- httpHeader.append(getCookie2());
- httpHeader.append(getConnection());
- httpHeader.append(NEW_LINE); // new line between the HTTP header and the payload
- Socket socket = buildSocket(url);
- InputStream is = socket.getInputStream();
- OutputStream os = socket.getOutputStream();
- os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
- os.write(payloadAsUTF8);
- os.flush();
- httpResponse = new HTTPResponse();
- readHTTPResponseHeader(is, httpResponse);
- int code = httpResponse.getStatusCode();
- if (code == HTTP_CODE_CONTINUE)
- {
- httpResponse.reset();
- readHTTPResponseHeader(is, httpResponse);
- }
- readHTTPResponsePayload(is, httpResponse);
- os.close();
- is.close();
- socket.close();
- code = httpResponse.getStatusCode();
- String contentType = httpResponse.getHeader(HTTP_HEADER_CONTENT_TYPE.toLowerCase());
- if (code >= HTTP_CODE_EXCEPTION && (contentType == null || contentType.toLowerCase().indexOf(TEXT_XML.toLowerCase()) == -1))
- throw new HTTPTransportException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
- }
-
- private void readHTTPResponseHeader(InputStream is, HTTPResponse resp) throws IOException
- {
- byte b = 0;
- int len = 0;
- int colonIndex = -1;
- String key;
- String value;
- boolean readTooMuch = false;
- ByteArrayOutputStream baos;
- for (baos = new ByteArrayOutputStream(4096);;)
- {
- if (!readTooMuch)
- b = (byte)is.read();
- if (b == -1)
- break;
- readTooMuch = false;
- if ((b != R) && (b != N))
- {
- if ((b == COLON) && (colonIndex == -1))
- colonIndex = len;
- len++;
- baos.write(b);
- }
- else if (b == R)
- continue;
- else // b == N
- {
- if (len == 0)
- break;
- b = (byte)is.read();
- readTooMuch = true;
- // A space or tab at the begining of a line means the header continues.
- if ((b == SPACE) || (b == TAB))
- continue;
- baos.close();
- byte[] bArray = baos.toByteArray();
- baos.reset();
- if (colonIndex != -1)
- {
- key = new String(bArray, 0, colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
- value = new String(bArray, colonIndex + 1, len - 1 - colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
- colonIndex = -1;
- }
- else
- {
- key = new String(bArray, 0, len, DEFAULT_HTTP_HEADER_ENCODING);
- value = EMPTY_STRING;
- }
- if (!resp.isStatusSet())
- {
- // Reader status code
- int start = key.indexOf(SPACE) + 1;
- String s = key.substring(start).trim();
- int end = s.indexOf(SPACE);
- if (end != -1)
- s = s.substring(0, end);
- try
- {
- resp.setStatusCode(Integer.parseInt(s));
- }
- catch (NumberFormatException nfe)
- {
- resp.setStatusCode(-1);
- }
- resp.setStatusMessage(key.substring(start + end + 1));
- }
- else
- resp.addHeader(key.toLowerCase().trim(), value.trim());
- len = 0;
- }
- }
- baos.close();
- }
-
- private void readHTTPResponsePayload(InputStream is, HTTPResponse resp) throws IOException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
- {
- byte b = (byte)is.read();
- while (b != -1)
- {
- baos.write(b);
- b = (byte)is.read();
- }
- }
- catch (SocketTimeoutException ste)
- {
- }
- baos.close();
- resp.setPayload(baos.toByteArray());
- }
-
- /**
- * Receives the bytes from the last web service invocation. This is used by WSE's default
- * SOAP transport.
- *
- * @return A byte array.
- * @throws IOException
- */
- byte[] receiveBytes() throws IOException
- {
- if (httpResponse != null)
- {
- byte[] payload = httpResponse.getPayload();
- if (CHUNKED.equalsIgnoreCase(httpResponse.getHeader(HTTP_HEADER_TRANSFER_ENCODEING.toLowerCase())))
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(payload);
- ChunkedInputStream cis = new ChunkedInputStream(bais);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte b;
- while ((b = (byte)cis.read()) != -1)
- baos.write(b);
- baos.close();
- cis.close();
- bais.close();
- return baos.toByteArray();
- }
- else
- {
- return payload;
- }
- }
- return null;
- }
-
- /**
- * This method is deprecated after WSE swtiches to using a pluggable transport via enhancement 176493.
- * The core functionality of this method is refactored to the receiveBytes() method.
- *
- * @deprecated
- */
- public BufferedReader receive()
- {
- try
- {
- byte[] payload = receiveBytes();
- if (payload != null) {
- Element soapEnvelope = XMLUtils.byteArrayToElement(payload, false);
- // remove XML namespace declaration
- if (soapEnvelope != null)
- return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(XMLUtils.serialize(soapEnvelope, true).getBytes(DEFAULT_SOAP_ENCODING)), DEFAULT_SOAP_ENCODING));
- }
- }
- catch (Throwable t)
- {
- }
- return null;
- }
-
- public Hashtable getHeaders()
- {
- Hashtable headers = new Hashtable();
- if (httpResponse != null)
- headers.putAll(httpResponse.getHeaders());
- return headers;
- }
-
- /**
- * Builds the first line of a connection request to the proxy server
- *
- * @param url The URL that we want to ultimately connect to.
- * @return A string of the form "CONNECT <hostname>:<port> HTTP/1.0".
- */
- private StringBuffer getConnectMethod(URL url) {
-
- StringBuffer sb = new StringBuffer(HTTP_CONNECT);
- sb.append(SPACE);
- sb.append(url.getHost());
- sb.append(COLON);
- sb.append(url.getPort());
- sb.append(SPACE);
- sb.append(HTTP_VERSION_1_0);
- sb.append(NEW_LINE);
- return sb;
- }
-
- /**
- * Construct a socket to the proxy server which be used to tunnel through.
- *
- * @param url The URL that we want to ultimately connect to.
- * @param proxyHost The proxy host.
- * @param proxyPort The proxy port.
- * @return A connected socket to the proxy server.
- * @throws IOException
- */
- private Socket buildTunnelSocket(URL url, String proxyHost, int proxyPort) throws IOException {
-
- StringBuffer httpHeader = new StringBuffer();
- httpHeader.append(getConnectMethod(url));
- httpHeader.append(getProxyAuthentication());
- httpHeader.append(NEW_LINE);
-
- Socket tunnel = new Socket(proxyHost, proxyPort);
-
- InputStream is = tunnel.getInputStream();
- OutputStream os = tunnel.getOutputStream();
-
- os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
- os.flush();
-
- HTTPResponse httpResponse = new HTTPResponse();
- readHTTPResponseHeader(is, httpResponse);
-
- int code = httpResponse.getStatusCode();
-
- // ensure we are successfully connected to the proxy
- if (code != HTTP_CODE_OK)
- throw new HTTPTransportException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
-
- return tunnel;
- }
-
- private Socket buildSocket(URL url) throws UnknownHostException, IOException
- {
- Socket s = null;
- String host = url.getHost();
- int port = url.getPort();
- String proxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
- int proxyPort = Integer.getInteger(SYS_PROP_HTTP_PROXY_PORT, DEFAULT_HTTP_PORT).intValue();
-
- String nonProxyHosts = System.getProperty(SYS_PROP_HTTP_NON_PROXY_HOSTS);
-
- // String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
- // String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
- if (url.getProtocol().equalsIgnoreCase(HTTPS))
- {
- proxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
- proxyPort = Integer.getInteger(SYS_PROP_HTTPS_PROXY_PORT, DEFAULT_HTTPS_PORT).intValue();
- nonProxyHosts = System.getProperty(SYS_PROP_HTTPS_NON_PROXY_HOSTS);
-
- if (proxyHost != null && proxyHost.length() > 0 && !isHostInNonProxyHosts(host, nonProxyHosts, DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME))
- {
- // SSL with proxy server
- Socket tunnel = buildTunnelSocket(url, proxyHost, proxyPort);
- s = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(tunnel, host, port, true);
- }
- else
- s = SSLSocketFactory.getDefault().createSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT));
- // Removing dependency on soap.jar
- // s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort);
- // TODO:
- // Build an SSL socket that supports proxyUser and proxyPassword,
- // as demonstrated in the following (original) line of code:
- // s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort, proxyUserName, proxyPassword);
- }
- else if (proxyHost != null && proxyHost.length() > 0 && !isHostInNonProxyHosts(host, nonProxyHosts, DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME))
- s = new Socket(proxyHost, proxyPort);
- else
- s = new Socket(host, (port > 0 ? port : DEFAULT_HTTP_PORT));
- return s;
- }
-
- private boolean isHostInNonProxyHosts(String host, String nonProxyHosts, boolean caseSensitive)
- {
- if (caseSensitive) return host.matches(createPatternFromString(nonProxyHosts));
- else return host.toLowerCase().matches(createPatternFromString(nonProxyHosts.toLowerCase()));
- }
-
- /*
- * This method is used to generate a valid regular expression for a
- * normal java String used in the proxy mechanism.
- * For example, the http.nonProxyHosts contains following String:
- * "192.168.2.*|localhost|*.ibm.com" . It would be
- * transformed into: "192\.168\.2\.\w*|localhost|\w*\.ibm\.com"
- * Thus, following host string would match above pattern:
- * 192.168.2.5 192.168.2. 192.168.2.666 192.168.2.w
- * localhost
- * torolab.ibm.com .ibm.com 123.ibm.com
- *
- * Two transformations are done:
- * 1. replace all "." into "\." As in regular expression, '.' represents
- * any charater. "\.' represents the real character '.'
- * 2. In order to get the real meaning of "*" used in property
- * http.nonProxyHosts, "\w*" is used to replace "*"
- * "\w" represent a word character: [a-zA-Z_0-9]
- *
- * Restriction:
- * The validity of address is not checked.
- * (192.168.2.555 and 192.168.2.com are OK)
- *
- * TODO check whether * occurs in address or hostname.
- * if it occuus in address representation, replace "*" with "\d*"
- * and check: value < 256 ?
- */
- private String createPatternFromString(String str)
- {
- /* This is the same as following more understandable way:
- * return str.replace(".", "\\.").replace("*", "\\w*");
- * But, replace(CharSequence target, CharSequence replacement) can only be
- * supported after j2se 1.5, on the other hand,
- * replaceAll(String regex, String replacement) can be supported before
- * j2se 1.5.
- */
- return str == null ? null : str.replaceAll("\\.", "\\.").replaceAll("\\*", "\\w*");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
deleted file mode 100644
index af763ee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20081020 251269 mahutch@ca.ibm.com - Mark Hutchinson, WSE Sends Wrong Namespace for child elements of the SOAP body
- * 20091104 294260 mahutch@ca.ibm.com - Mark Hutchinson, WSE source view missing some namespace prefixes in SOAP response message
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper;
-import org.eclipse.wst.ws.internal.explorer.transport.IDeserializer;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISerializer;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This class provides implementation for WSE default SOAP transport's ISerializer and IDeserializer.
- */
-public class SOAPMessageProcessor implements ISerializer, IDeserializer {
-
- private static final String LITERAL = "literal";
- private static final String DEFAULT_SOAP_ENCODING = "UTF-8";
- private static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
- /*
- * Constructor.
- */
- SOAPMessageProcessor() {}
-
- /*
- * Join the encodingStyles into a space separated string
- */
- private String joinEncodingStyles(List list) {
-
- if (list.isEmpty())
- return null;
-
- StringBuffer sb = new StringBuffer();
-
- Iterator iter = list.iterator();
- while (iter.hasNext())
- sb.append(" ").append(iter.next());
-
- return sb.substring(1).toString();
- }
-
- /*
- * Retrieves the encoding information from the binding for the selected operation.
- * This method is called only for RPC style bindings. Two pieces of information are returned:
- * This method returns the encoding namespace in element [0]
- * If the use is encoded then the encoding style(s) is returned in element [1]. If the use is literal,
- * then element[1] is returned null.
- */
- private String[] getEncodingInfo(MessageContext context) {
-
- String[] info = new String[] { null, null };
-
- Iterator iter = context.getBindingOperation().getBindingInput()
- .getExtensibilityElements().iterator();
-
- // look for the soapbind:body extensilibity element
- while (iter.hasNext()) {
- ExtensibilityElement e = (ExtensibilityElement) iter.next();
- if (!(e instanceof SOAPBody))
- continue;
-
- SOAPBody soapBody = (SOAPBody) e;
-
- info[0] = soapBody.getNamespaceURI();
- // use="encoded"
- if (!LITERAL.equals(soapBody.getUse())) {
- info[1] = joinEncodingStyles(soapBody.getEncodingStyles());
- }
-
- break;
- }
-
- // namespace not specified on the soapbind:body element, use the definition's
- if (info[0] == null)
- info[0] = context.getDefinition().getTargetNamespace();
-
- return info;
- }
-
- /*
- * WS-I: In a rpc-literal SOAP binding, the serialized child element of the
- * soap:Body element consists of a wrapper element, whose namespace is the value
- * of the namespace attribute of the soapbind:body element and whose local name is
- * either the name of the operation or the name of the operation suffixed
- * with "Response". The namespace attribute is required, as opposed to being
- * optional, to ensure that the children of the soap:Body element are namespace-
- * qualified.
- */
- private Element createRPCWrapper(Document document, MessageContext context, Hashtable namespaceTable) {
-
- String encodingNamespaceURI = getEncodingInfo(context)[0];
-
- return SoapHelper.createRPCWrapperElement(
- document,
- namespaceTable,
- encodingNamespaceURI,
- context.getBindingOperation().getOperation().getName(),
- null);
- }
-
- /*
- * Initializes the contents of new ISOAPMessage.
- */
- void initMessage(ISOAPMessage message) throws TransportException {
-
- try {
- Document document = XMLUtils.createNewDocument(null);
-
- Hashtable namespaceTable = new Hashtable();
- SoapHelper.addDefaultSoapEnvelopeNamespaces(namespaceTable);
-
- message.setEnvelope(SoapHelper.createSoapEnvelopeElement(document, namespaceTable));
- message.setHeader(SoapHelper.createSoapHeaderElement(document));
-
- Element body = SoapHelper.createSoapBodyElement(document);
- if (!message.getMessageContext().isDocumentStyle()) {
- Element rpcWrapper = createRPCWrapper(document, message.getMessageContext(), namespaceTable);
- body.appendChild(rpcWrapper);
- }
- message.setBody(body);
-
- message.setNamespaceTable(namespaceTable);
- }
- catch (ParserConfigurationException e) {
- throw new TransportException(e);
- }
- }
-
- /*
- * Returns the first element with the given local name from the soap envelope namespace
- * This method can be used on elements that are not namespace aware, but we have to give
- * it a namespace table to look up prefixes.
- */
- private Element getSOAPElement(Element root, String localName, Map namespaceTable) {
- String prefix = (String) namespaceTable.get(Constants.URI_SOAP11_ENV);
- if (prefix == null)
- return null;
-
- NodeList list = root.getElementsByTagName(prefix + ":" + localName);
- if (list.getLength() == 0)
- return null;
-
- return (Element) list.item(0);
- }
-
- /*
- * Returns the first element with the given local name from the soap envelope namespace.
- * This version assume the elements are namespace aware.
- */
- private Element getSOAPElementNS(Element root, String localName) {
- NodeList list = root.getElementsByTagNameNS(Constants.URI_SOAP11_ENV, localName);
- if (list.getLength() == 0)
- return null;
-
- return (Element) list.item(0);
- }
-
- /*
- * Convert a NodeList to a vector of elements, nodes which are not elements are skipped.
- */
- private Vector toElementVector(NodeList nodes) {
-
- Vector vector = new Vector();
-
- for (int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
- if (node instanceof Element)
- vector.add(node);
- }
-
- return vector;
- }
-
- /*
- * Convert a NodeList to an array of elements, nodes which are not elements are skipped.
- */
- private Element[] toElementArray(NodeList nodes) {
- Vector vector = toElementVector(nodes);
- Element[] elements = new Element[vector.size()];
- vector.copyInto(elements);
- return elements;
- }
-
- // Serialize ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- /*
- * adds the encoding style attribute to the each element in the given array.
- * noop if encodingStyle is null
- */
- private void addEncodingStyle(Element[] elements, String encodingStyle) {
-
- // encodingStyle is non-null only if use="encoded"
- if (elements == null || encodingStyle == null)
- return;
-
- for (int i=0; i < elements.length; i++) {
- if (elements[i] == null)
- continue;
- elements[i].setAttribute(
- Constants.NS_PREFIX_SOAP_ENV + ":" + Constants.ATTR_ENCODING_STYLE, encodingStyle);
- }
- }
-
- /*
- * Serialize an array of elements
- */
- private String serializeElements(Element[] elements) {
-
- StringBuffer buffer = new StringBuffer();
-
- for (int i = 0; i < elements.length; i++) {
-
- String serializedFragment = XMLUtils.serialize(elements[i], true);
- if (serializedFragment == null) {
- // On Some JRE's (Sun java 5) elements with an attribute with the xsi
- // prefix do not serialize properly because the namespace can not
- // be found so the string returned comes back as null. To workaround
- // this problem try adding in the namespace declaration attribute
- // and retry the serialization (bug 144824)
- elements[i].setAttribute("xmlns:xsi", Constants.URI_2001_SCHEMA_XSI);
- serializedFragment = XMLUtils.serialize(elements[i], true);
- }
-
- buffer.append(serializedFragment);
- buffer.append(LINE_SEPARATOR);
- }
-
- return buffer.toString();
- }
-
- /*
- * Determines if the given message is a request message using RPC style
- */
- private boolean isRPCRequest(ISOAPMessage message) {
- return
- !message.getMessageContext().isDocumentStyle() && // rpc style
- !Boolean.TRUE.equals(message.getProperty(SOAPTransport.PROP_READ_ONLY)); // not read-only
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISerializer#serialize(int, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public String serialize(int part, ISOAPMessage message) throws TransportException {
-
- switch (part) {
- case ISOAPMessage.ENVELOPE:
- Element envelope = message.getEnvelope(true);
-
- if (isRPCRequest(message)) {
- Element body = getSOAPElementNS(envelope, Constants.ELEM_BODY);
- if (body == null)
- body = getSOAPElement(envelope, Constants.ELEM_BODY, message.getNamespaceTable());
-
- if (body != null) {
- Element[] bodyContent = toElementArray(body.getFirstChild().getChildNodes());
- addEncodingStyle(bodyContent, getEncodingInfo(message.getMessageContext())[1]);
- }
- }
-
- String xml = XMLUtils.serialize(envelope, true);
- if (xml == null)
- xml = new String((byte[]) message.getProperty(SOAPTransport.PROP_RAW_BYTES));
-
- return xml;
-
- case ISOAPMessage.HEADER_CONTENT:
- return serializeElements(message.getHeaderContent());
-
- case ISOAPMessage.BODY_CONTENT:
- Element[] bodyContent = message.getBodyContent();
-
- if (isRPCRequest(message))
- addEncodingStyle(bodyContent, getEncodingInfo(message.getMessageContext())[1]);
-
- return serializeElements(bodyContent);
- }
-
- return "";
- }
-
- // Deserialize //////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- /*
- * Retrieve the soap header from the envelope and populate the given message
- */
- private void processHeader(Element envelope, ISOAPMessage message) {
-
- Element header = getSOAPElementNS(envelope, Constants.ELEM_HEADER);
- if (header == null)
- return;
-
- message.setHeader(header);
- message.setHeaderContent(toElementArray(header.getChildNodes()));
- }
-
- /*
- * HACK - The root element tag name of the instance document
- * is ambiguous. It lands on a very grey area between the SOAP
- * spec and the WSDL spec. The two specs do not explicitly define
- * that the root element tag name must match the name of the
- * WSDL part. The hack is to treat elements with different tag names
- * as instances of the WSDL part.
- */
- private Element[] fixSOAPResponse(NodeList instanceList, MessageContext context) {
-
- Vector instanceVector = toElementVector(instanceList);
- Element[] instanceDocuments = new Element[instanceVector.size()];
-
- Operation oper = context.getBindingOperation().getOperation();
- Map partsMap = oper.getOutput().getMessage().getParts();
-
- if (partsMap.size() == 1) {
- Iterator it = partsMap.values().iterator();
- Part part = (Part) it.next();
-
- String fragName;
- if (part.getElementName() != null)
- fragName = part.getElementName().getLocalPart();
- else
- fragName = part.getName();
-
- for (int i = 0; i < instanceVector.size(); i++) {
- Element element = (Element) instanceVector.get(i);
-
- if (!element.getLocalName().equals(fragName)) {
- Document doc = element.getOwnerDocument();
- NodeList children = element.getChildNodes();
- NamedNodeMap attributes = element.getAttributes();
- element = doc.createElement(fragName);
-
- for (int j = 0; j < children.getLength(); j++) {
- if (children.item(j) != null) {
- element.appendChild(children.item(j));
- // When you append a node from one element to another,
- // the original element will lose its reference to this node,
- // therefore, the size of the node list will decrease by 1.
- j--;
- }
- }
-
- for (int j = 0; j < attributes.getLength(); j++) {
- Object attr = attributes.item(j);
- if (attr != null && (attr instanceof Attr)) {
- Attr attribute = (Attr)attr;
- element.setAttribute(attribute.getName(), attribute.getValue());
- }
- }
- }
- instanceDocuments[i] = element;
- }
- }
- else
- instanceVector.copyInto(instanceDocuments);
-
- return instanceDocuments;
- }
-
- /*
- * Retrieve the soap header from the envelope and populate the given message
- */
- private void processBody(Element envelope, ISOAPMessage message) {
-
- Element body = getSOAPElementNS(envelope, Constants.ELEM_BODY);
- if (body == null)
- return;
-
- message.setBody(body);
-
- // check for soap fault
- Element fault = getSOAPElementNS(body, Constants.ELEM_FAULT);
- if (fault != null) {
- message.setFault(fault);
- return;
- }
-
- NodeList instanceList;
-
- if (message.getMessageContext().isDocumentStyle())
- instanceList = body.getChildNodes();
- else {
- NodeList rpcWrapper = body.getElementsByTagNameNS("*",
- message.getMessageContext().getBindingOperation().getOperation().getOutput().getMessage().getQName().getLocalPart());
-
- /*
- * HACK - Some of the web services out on the internet do not
- * set their RPC wrapper properly. It should be set to the output
- * message name of the selected operation. The hack is to
- * assume the first element inside the body element is the
- * RPC wrapper.
- */
- if (rpcWrapper.getLength() <= 0)
- rpcWrapper = body.getElementsByTagNameNS("*", "*");
-
- if (rpcWrapper.getLength() > 0)
- instanceList = rpcWrapper.item(0).getChildNodes();
- else
- return;
- }
-
- message.setBodyContent(fixSOAPResponse(instanceList, message.getMessageContext()));
- }
-
- /*
- * Deserialize the byte array into the given soap message. The part parameters tells
- * the method whether the input is the whole envelop or just the contents of the
- * header or body.
- */
- void deserialize(int part, byte[] xml, ISOAPMessage message) throws
- ParserConfigurationException,
- SAXException,
- IOException {
-
- Element root = XMLUtils.byteArrayToElement(xml, true);
-
- switch (part) {
- case ISOAPMessage.ENVELOPE:
- message.setEnvelope(root);
- processHeader(root, message);
- processBody(root, message);
- break;
- case ISOAPMessage.HEADER_CONTENT:
- message.setHeaderContent(toElementArray(root.getChildNodes()));
- break;
- case ISOAPMessage.BODY_CONTENT:
- message.setBodyContent(toElementArray(root.getChildNodes()));
- break;
- }
- }
-
- /*
- * Tack on a root element the string which represents a series of elements.
- * This is needed to deserialize the string.
- */
- private String addRootElement(String xml, Map namespaceTable) {
- StringBuffer sb = new StringBuffer();
- sb.append("<root");
-
- Iterator iter = namespaceTable.keySet().iterator();
- while (iter.hasNext()) {
- Object uri = iter.next();
- Object prefix = namespaceTable.get(uri);
- sb.append(" ").append("xmlns:").append(prefix).append("=\"").append(uri).append("\"");
- }
-
- sb.append(">").append(xml).append("</root>");
- return sb.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.IDeserializer#deserialize(int, java.lang.String, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public void deserialize(int part, String xml, ISOAPMessage message) throws TransportException {
-
- if (part != ISOAPMessage.ENVELOPE)
- xml = addRootElement(xml, message.getNamespaceTable());
-
- try {
- deserialize(part, xml.getBytes(DEFAULT_SOAP_ENCODING), message);
- }
- catch (Exception e) {
- throw new TransportException(e);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java
deleted file mode 100644
index 61492b4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java
+++ /dev/null
@@ -1,146 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.explorer.transport.IDeserializer;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport;
-import org.eclipse.wst.ws.internal.explorer.transport.ISerializer;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.ws.internal.explorer.transport.SOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-/**
- * WSE's default implementation of ISOAPTransport
- */
-public class SOAPTransport implements ISOAPTransport {
-
- static final String PROP_READ_ONLY = "prop_read_only";
- static final String PROP_RAW_BYTES = "prop_raw_bytes";
-
- /*
- * Constructor.
- */
- SOAPTransport() {}
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newSerializer()
- */
- public ISerializer newSerializer() {
- return new SOAPMessageProcessor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newDeserializer()
- */
- public IDeserializer newDeserializer() {
- return new SOAPMessageProcessor();
- }
-
- /*
- * Check if the binding is supported
- */
- private void checkBinding(ExtensibilityElement binding) throws TransportException {
-
- String bindingURI = binding.getElementType().getNamespaceURI();
-
- // looking for SOAP 1.1 binding
- if (!(binding instanceof SOAPBinding) ||
- !Constants.URI_WSDL11_SOAP.equals(bindingURI))
- throw new TransportException(ExplorerPlugin.getMessage("%MSG_ERROR_UNSUPPORTED_BINDING", new String[] { bindingURI }));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newMessage(org.eclipse.wst.ws.internal.explorer.transport.MessageContext)
- */
- public ISOAPMessage newMessage(MessageContext context) throws TransportException {
-
- checkBinding(context.getBindingProtocol());
-
- SOAPMessageProcessor processor = new SOAPMessageProcessor();
- ISOAPMessage message = new SOAPMessage(context, processor);
- processor.initMessage(message);
- return message;
- }
-
- /*
- * Check if the message uses a binding and transport that we support.
- */
- private void checkMessage(ISOAPMessage message) throws TransportException {
-
- ExtensibilityElement binding = message.getMessageContext().getBindingProtocol();
- checkBinding(binding);
-
- SOAPBinding soapBinding = (SOAPBinding) binding;
-
- if (!Constants.URI_SOAP11_HTTP.equals(soapBinding.getTransportURI()))
- throw new TransportException(ExplorerPlugin.getMessage("%MSG_ERROR_UNSUPPORTED_TRANSPORT", new String[] { soapBinding.getTransportURI() }));
- }
-
- /*
- * Create an HTTPTransport for internal use.
- */
- private HTTPTransport createInternalTransport(String username, String password) {
-
- HTTPTransport internalTransport = new HTTPTransport();
-
- if (username != null && password != null) {
- internalTransport.setHttpBasicAuthUsername(username);
- internalTransport.setHttpBasicAuthPassword(password);
- }
-
- return internalTransport;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#send(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public ISOAPMessage send(String url, String username, String password, ISOAPMessage message) throws TransportException {
-
- checkMessage(message);
-
- try {
- HTTPTransport internalTransport = createInternalTransport(username, password);
- internalTransport.send(NetUtils.createURL(url), (String) message.getProperty(ISOAPMessage.PROP_SOAP_ACTION), message.toXML());
-
- SOAPMessageProcessor processor = new SOAPMessageProcessor();
- ISOAPMessage reply = new SOAPMessage(message.getMessageContext(), processor);
- reply.setProperty(PROP_READ_ONLY, Boolean.TRUE);
-
- byte[] rawBytes = internalTransport.receiveBytes();
-
- try {
- processor.deserialize(ISOAPMessage.ENVELOPE, rawBytes, reply);
- }
- catch (Exception e) {
- // if error occurs during deserialization, we want to save a copy of the actual raw bytes
- reply.setProperty(PROP_RAW_BYTES, rawBytes);
- }
-
- return reply;
- }
- catch (TransportException e) {
- throw e;
- }
- catch (Exception e) {
- throw new TransportException(e);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java
deleted file mode 100644
index 873c520..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java
+++ /dev/null
@@ -1,30 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-
-/**
- * WSE's default implementation for ISOAPTransportProvider.
- */
-public class SOAPTransportProvider implements ISOAPTransportProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider#newTransport()
- */
- public ISOAPTransport newTransport() {
- return new SOAPTransport();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java
deleted file mode 100644
index 4b4ed7c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java
+++ /dev/null
@@ -1,202 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20070510 186375 makandre@ca.ibm.com - Andrew Mak, Compile errors in wst.ws.explorer
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * This class has some common routines used by the Web Services explorer to work with ISOAPMessages.
- */
-public class SOAPMessageUtils {
-
- /**
- * Decodes namespace declarations that have been encoded by WSE into the operation element of the WSDL model.
- * The decoded declarations will be added to the given namespace table.
- *
- * @param soapEnvelopeNamespaceTable The namespace table to populate.
- * @param operElement The operation element with the encoded namespace declarations.
- * @return True if new namespace declarations are found and added to the namespace table, false otherwise.
- */
- public static boolean decodeNamespaceTable(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement) {
-
- boolean updated = false;
-
- String[] nsDeclarations = (String[]) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations == null)
- return false;
-
- // each namespace declaration is decoded into 2 parts: the prefix
- // in element [0] and the namespace uri in element [1].
- for (int i = 0; i < nsDeclarations.length; i++) {
- String[] prefix_ns = SoapHelper.decodeNamespaceDeclaration(nsDeclarations[i]);
-
- // check if the namespace uri is already a key in the namespace table
- // if it is, don't add it
- if (!soapEnvelopeNamespaceTable.containsKey(prefix_ns[1])) {
- soapEnvelopeNamespaceTable.put(prefix_ns[1], prefix_ns[0]);
- updated = true;
- }
- }
-
- return updated;
- }
-
- /**
- * Populate the header content of the given ISOAPMessage using the values from WSE's fragment model
- *
- * @param soapEnvelopeNamespaceTable A namespace table to use during this operation.
- * @param operElement Access WSE's fragments via this operation element.
- * @param soapMessage The ISOAPMessage to populate.
- * @throws ParserConfigurationException
- */
- public static void setHeaderContentFromModel(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
-
- Vector headerEntries = new Vector();
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext()) {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- boolean isUseLiteral = "literal".equals(soapHeader.getUse());
- IXSDFragment frag = (IXSDFragment) operElement.getHeaderFragment(soapHeader);
- Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(
- !isUseLiteral, soapEnvelopeNamespaceTable, soapMessage.getEnvelope(false).getOwnerDocument());
- for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- headerEntries.addElement(instanceDocuments[i]);
- }
- }
-
- Element[] headerContent = new Element[headerEntries.size()];
- headerEntries.copyInto(headerContent);
-
- soapMessage.setHeaderContent(headerContent);
- }
-
- /**
- * Populate the body content of the given ISOAPMessage using the values from WSE's fragment model
- *
- * @param soapEnvelopeNamespaceTable A namespace table to use during this operation.
- * @param operElement Access WSE's fragments via this operation element.
- * @param soapMessage The ISOAPMessage to populate.
- * @throws ParserConfigurationException
- */
- public static void setBodyContentFromModel(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
-
- Vector bodyEntries = new Vector();
- boolean isUseLiteral = operElement.isUseLiteral();
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext()) {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment) operElement.getFragment(part);
- Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(
- !isUseLiteral, soapEnvelopeNamespaceTable, soapMessage.getEnvelope(false).getOwnerDocument());
- for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- bodyEntries.addElement(instanceDocuments[i]);
- }
- }
-
- Element[] bodyContent = new Element[bodyEntries.size()];
- bodyEntries.copyInto(bodyContent);
-
- soapMessage.setBodyContent(bodyContent);
- }
-
- /*
- * If the attribute is a namespace declaration, the namespace prefix is returned.
- * Otherwise null is returned.
- */
- private static String getNSPrefix(Attr attribute) {
- String name = attribute.getName();
- if (name.startsWith("xmlns:"))
- return name.substring(6);
- return null;
- }
-
- /*
- * lookup the prefix of the namespaceURI, assuming that it is declared on the element itself
- */
- private static String lookupPrefix(Element element, String namespaceURI) {
-
- NamedNodeMap attributes = element.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Attr attribute = (Attr) attributes.item(i);
- String prefix = getNSPrefix(attribute);
- if (prefix != null && attribute.getValue().equals(namespaceURI))
- return prefix;
- }
-
- return null;
- }
-
- /**
- * Given an array of elements, this method will return the index of the first element that matches
- * the given Part. A match is determined by comparing the fully qualified names of the Part and Elements.
- *
- * @param part The Part
- * @param elements The array of Elements
- * @param namespaceTable A namespace table for looking up namespace prefixes.
- * @param fragName Name of the Part's fragment (essentially the Part's local name).
- * @param start The index to begin the search.
- * @return The index of the first matching element, or -1 if no match is found.
- */
- public static int findFirstMatchingElement(Part part, Element[] elements, Map namespaceTable, String fragName, int start) {
-
- String namespaceURI = null;
- String prefix = null;
-
- // try to get the prefix
- if (part.getElementName() != null) {
- namespaceURI = part.getElementName().getNamespaceURI();
- prefix = (String) namespaceTable.get(namespaceURI);
- }
-
- for (int i = start; i < elements.length; i++) {
- Element element = elements[i];
- String name = element.getTagName();
-
- // try to get prefix again, the namespace declaration can be directly on the element
- if (prefix == null && namespaceURI != null && element.hasAttributes())
- prefix = lookupPrefix(element, namespaceURI);
-
- if (prefix == null && name.equals(fragName))
- return i;
- else if (prefix != null && name.equals(prefix + ":" + fragName))
- return i;
- }
-
- return -1;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
deleted file mode 100644
index fdd8671..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20090119 261397 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SoapHelper
-{
- private static Hashtable defaultSoapEnvelopeNamespaces_ = null;
-
- private static final void initDefaultSoapEnvelopeNamespaces()
- {
- defaultSoapEnvelopeNamespaces_ = new Hashtable();
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_SOAP11_ENV,Constants.NS_PREFIX_SOAP_ENV);
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSI,Constants.NS_PREFIX_SCHEMA_XSI);
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSD,Constants.NS_PREFIX_SCHEMA_XSD);
- }
-
- public static final void addDefaultSoapEnvelopeNamespaces(Hashtable soapEnvelopeNamespaces)
- {
- if (defaultSoapEnvelopeNamespaces_ == null)
- initDefaultSoapEnvelopeNamespaces();
- Enumeration defaultSoapEnvelopeNamespaceURIs = defaultSoapEnvelopeNamespaces_.keys();
- while (defaultSoapEnvelopeNamespaceURIs.hasMoreElements())
- {
- String defaultSoapEnvelopeNamespaceURI = (String)defaultSoapEnvelopeNamespaceURIs.nextElement();
- soapEnvelopeNamespaces.put(defaultSoapEnvelopeNamespaceURI,(String)defaultSoapEnvelopeNamespaces_.get(defaultSoapEnvelopeNamespaceURI));
- }
- }
-
- public static final boolean isDefaultSoapEnvelopeNamespace(String namespaceURI,String namespacePrefix)
- {
- if (defaultSoapEnvelopeNamespaces_ == null)
- initDefaultSoapEnvelopeNamespaces();
- if (defaultSoapEnvelopeNamespaces_.get(namespaceURI) != null)
- return true;
- return false;
- }
-
- public static final Element createSoapEnvelopeElement(Document doc,Hashtable soapEnvelopeNamespaceTable)
- {
- Element soapEnvelopeElement = doc.createElementNS(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV + ":Envelope");
- Enumeration e = soapEnvelopeNamespaceTable.keys();
- while (e.hasMoreElements())
- {
- String soapEnvelopeNamespaceURI = (String)e.nextElement();
- StringBuffer soapEnvelopeNamespaceAttr = new StringBuffer("xmlns:");
- soapEnvelopeNamespaceAttr.append((String)soapEnvelopeNamespaceTable.get(soapEnvelopeNamespaceURI));
- soapEnvelopeElement.setAttribute(soapEnvelopeNamespaceAttr.toString(),soapEnvelopeNamespaceURI);
- }
- return soapEnvelopeElement;
- }
-
- public static final Element createSoapHeaderElement(Document doc)
- {
- return doc.createElement("soapenv:Header");
- }
-
- public static final Element createSoapBodyElement(Document doc)
- {
- return doc.createElement("soapenv:Body");
- }
-
- public static final Element createRPCWrapperElement(Document doc,Hashtable soapEnvelopeNamespaceTable,String encodingNamespaceURI,String operationName, String encodingStyle)
- {
- int nsId = 0;
- StringBuffer wrapperElementName = new StringBuffer();
- String encodingNamespacePrefix = (String)soapEnvelopeNamespaceTable.get(encodingNamespaceURI);
- if (encodingNamespacePrefix != null)
- wrapperElementName.append(encodingNamespacePrefix);
- else
- {
- // Loop until we generate a unique prefix.
- do
- {
- wrapperElementName.setLength(0);
- wrapperElementName.append("ns").append(nsId);
- if (!soapEnvelopeNamespaceTable.containsValue(wrapperElementName.toString()))
- break;
- nsId++;
- } while (true);
-
- // need to ensure whatever prefix we choose is added to the namespace table
- // so that it will not be reused lated on
- soapEnvelopeNamespaceTable.put(encodingNamespaceURI, wrapperElementName.toString());
- }
- String wrapperElementNamePrefix = wrapperElementName.toString();
- wrapperElementName.append(':').append(operationName);
- Element wrapperElement = doc.createElement(wrapperElementName.toString());
- StringBuffer namespaceAttrName = new StringBuffer("xmlns:");
- namespaceAttrName.append(wrapperElementNamePrefix);
- wrapperElement.setAttribute(namespaceAttrName.toString(),encodingNamespaceURI);
- if (encodingStyle != null)
- wrapperElement.setAttribute("soapenv:encodingStyle",encodingStyle);
- return wrapperElement;
- }
-
- public static final String encodeNamespaceDeclaration(String prefix, String uri)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(prefix);
- sb.append(" ");
- sb.append(uri);
- String result = URLUtils.encode(sb.toString());
- return result;
- }
-
- public static final String[] decodeNamespaceDeclaration(String s)
- {
- String sCopy = URLUtils.decode(s);
- int index = sCopy.indexOf(" ");
- String[] nsDecl = new String[2];
- if (index != -1)
- {
- nsDecl[0] = sCopy.substring(0, index);
- nsDecl[1] = sCopy.substring(index+1, sCopy.length());
- }
- else
- {
- nsDecl[0] = null;
- nsDecl[1] = sCopy;
- }
- return nsDecl;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
deleted file mode 100644
index b39dc41..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
+++ /dev/null
@@ -1,143 +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.wst.ws.internal.explorer.platform.wsdl.xsd;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class WSDLPartsToXSDTypeMapper
-{
- private final char POUND = '#';
- private Vector xsdSchemaList_;
- private Hashtable partToXSDCache_;
-
- public WSDLPartsToXSDTypeMapper() {
- xsdSchemaList_ = new Vector();
- partToXSDCache_ = new Hashtable();
- }
-
- public void addSchemas(Vector schemaList) {
- for (int i=0;i<schemaList.size();i++) {
- Object schema = schemaList.elementAt(i);
- if (schema != null)
- xsdSchemaList_.addElement(schema);
- }
- }
-
- public XSDNamedComponent getXSDType(Part part, String id) {
- XSDNamedComponent component = getXSDTypeFromCache(id);
- if (component != null)
- return component;
- component = getXSDTypeFromSchema(part);
- if (component != null)
- addToCache(id, component);
- return component;
- }
-
- public XSDNamedComponent getXSDTypeFromCache(String id) {
- return (XSDNamedComponent)partToXSDCache_.get(id);
- }
-
- public XSDNamedComponent getXSDTypeFromSchema(Part part) {
- boolean isElementDeclaration = (part.getTypeName() == null);
- QName qName = isElementDeclaration ? part.getElementName() : part.getTypeName();
- return getXSDTypeFromSchema(qName.getNamespaceURI(), qName.getLocalPart(), isElementDeclaration);
- }
-
- public XSDNamedComponent getXSDTypeFromSchema(String namespaceURI, String localName, boolean isElementDeclaration) {
- for (int i = 0; i < xsdSchemaList_.size(); i++) {
- XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
- Vector components = new Vector();
- if (isElementDeclaration)
- components.addAll(xsdSchema.getElementDeclarations());
- else
- components.addAll(xsdSchema.getTypeDefinitions());
- for (Iterator it = components.iterator(); it.hasNext(); ) {
- XSDNamedComponent component = (XSDNamedComponent)it.next();
- String compNSURI = component.getTargetNamespace();
- String compLocalname = component.getName();
- if (compNSURI != null && compLocalname != null && compNSURI.equals(namespaceURI) && compLocalname.equals(localName))
- return component;
- }
- }
- return null;
- }
-
- public XSDNamedComponent resolveXSDNamedComponent(XSDNamedComponent component)
- {
- if (component != null)
- {
- String uri = component.getURI();
- String qname = component.getQName();
- for (int i = 0; i < xsdSchemaList_.size(); i++)
- {
- XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
- if (xsdSchema != null)
- {
- String targetNS = xsdSchema.getTargetNamespace();
- if (targetNS != null && targetNS.equals(trimQName(uri, qname)))
- {
- XSDNamedComponent resolvedComponent = null;
- if (component instanceof XSDTypeDefinition)
- resolvedComponent = xsdSchema.resolveTypeDefinition(qname);
- else if (component instanceof XSDElementDeclaration)
- resolvedComponent = xsdSchema.resolveElementDeclaration(qname);
- else if (component instanceof XSDModelGroupDefinition)
- resolvedComponent = xsdSchema.resolveModelGroupDefinition(qname);
- if (isComponentResolvable(resolvedComponent))
- return resolvedComponent;
- }
- }
- }
- }
- return null;
- }
-
- private String trimQName(String uri, String qname)
- {
- int index = uri.indexOf(qname);
- if (index != -1)
- {
- String ns = uri.substring(0, index);
- if (ns.charAt(index-1) == POUND)
- return ns.substring(0, index-1);
- else
- return ns;
- }
- else
- return uri;
- }
-
- private void addToCache(String id, XSDNamedComponent component) {
- partToXSDCache_.put(id,component);
- }
-
- protected boolean isComponentResolvable(XSDComponent component)
- {
- if (component == null)
- return false;
- XSDSchema schema = component.getSchema();
- if (schema == null)
- return false;
- if (schema.getTargetNamespace() == null)
- return false;
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
deleted file mode 100644
index 5b6d6f8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
+++ /dev/null
@@ -1,95 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToFavoritesAction extends AddToFavoritesAction
-{
- public AddBusinessToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
- String businessName = wsilUddiBusinessElement.getName();
- String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- if (businessName == null)
- businessName = businessKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
- String businessName = wsilUddiBusinessElement.getName();
- String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- if (businessName == null)
- businessName = businessKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", businessName));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", businessName));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", businessName));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 6855125..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddBusinessToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryURL = null;
- String businessKey = null;
- String businessName = null;
- if (selectedElement instanceof WsilElement)
- {
- ListElement le = ((WsilElement) selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) le.getObject();
- inquiryURL = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- businessName = wsilUddiBusinessElement.getName();
- if (businessName == null)
- businessName = businessKey;
- }
- else
- return false;
- // return false if unable to find or create a registry node/element in the
- // UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
- return false;
- }
- // prepare the action
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- // populate property table
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
- // run the action
- if (!action.run())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", businessName));
- return false;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
- return true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
deleted file mode 100644
index efe5f2a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
+++ /dev/null
@@ -1,95 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToFavoritesAction extends AddToFavoritesAction
-{
- public AddServiceToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
- String serviceName = wsilUddiServiceElement.getName();
- String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- if (serviceName == null)
- serviceName = serviceKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
- return favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
- String serviceName = wsilUddiServiceElement.getName();
- String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- if (serviceName == null)
- serviceName = serviceKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", serviceName));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", serviceName));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", serviceName));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index fb86dc9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryURL = null;
- String serviceKey = null;
- String serviceName = null;
- if (selectedElement instanceof WsilElement)
- {
- ListElement le = ((WsilElement) selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) le.getObject();
- inquiryURL = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- serviceName = wsilUddiServiceElement.getName();
- if (serviceName == null)
- serviceName = serviceKey;
- }
- else
- return false;
- // return false if unable to find or create a registry node/element in the
- // UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
- return false;
- }
- // prepare the action
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- // populate property table
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
- // run the action
- if (!action.run())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", serviceName));
- return false;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
- return true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
deleted file mode 100644
index a48b295..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,96 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-
-public abstract class AddToFavoritesAction extends MultipleLinkAction {
- protected NodeManager nodeManager_;
-
- public AddToFavoritesAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink() {
- return "wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp";
- }
-
- public static AddToFavoritesAction newAction(HttpServletRequest request, Controller controller) {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
- if (selectedTool instanceof ListWSDLServicesTool)
- return new AddWSDLServiceToFavoritesAction(controller);
- else if (selectedTool instanceof ListUDDIServicesTool)
- return new AddServiceToFavoritesAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- return new AddBusinessToFavoritesAction(controller);
- else
- return new AddWSILToFavoritesAction(controller);
- }
-
- protected boolean addToFavorites(Hashtable table, String rel) {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements()) return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.addFavorite(table);
- }
-
- protected boolean favoriteExists(Hashtable table, String rel) {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements()) return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public abstract boolean favoriteExists();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index c001711..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,128 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction
-{
- public AddToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp";
- }
-
- public static Action newAction(HttpServletRequest request, Controller controller)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
- if (selectedTool instanceof ListUDDIServicesTool)
- return new AddServiceToUDDIPerspectiveAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- return new AddBusinessToUDDIPerspectiveAction(controller);
- else
- return new NullAction();
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName)
- {
- Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
- if (registryNodes != null)
- {
- // Always attempt to use an existing registry.
- Node registryNode = (Node) registryNodes.elementAt(0);
- NodeManager nodeManager = registryNode.getNodeManager();
- nodeManager.setSelectedNodeId(registryNode.getNodeId());
- return true;
- }
- // open the registry if it is not already opened in the UDDI perspective
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
- // populate the property table
- Hashtable propertyTable = openRegAction.getPropertyTable();
- if (Validator.validateString(registryName))
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME, registryName);
- else
- return false;
- if (Validator.validateURL(inquiryAPI))
- propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryAPI);
- else
- return false;
- // run the action
- if (!openRegAction.run())
- return false;
- return true;
- }
-
- protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
- {
- Vector registryNodes = null;
- NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode) (navigatorManager.getRootNode());
- Vector childNodes = uddiMainNode.getChildNodes();
- for (int i = 0; i < childNodes.size(); i++)
- {
- Node childNode = (Node) childNodes.elementAt(i);
- if (childNode instanceof RegistryNode)
- {
- RegistryElement regElement = (RegistryElement) childNode.getTreeElement();
- if (regElement.getInquiryURL().equals(inquiryURL))
- {
- if (registryNodes == null)
- registryNodes = new Vector();
- registryNodes.addElement(childNode);
- }
- }
- }
- return registryNodes;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
deleted file mode 100644
index 56d1c8a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
+++ /dev/null
@@ -1,83 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddWSDLServiceToFavoritesAction extends AddToFavoritesAction
-{
- public AddWSDLServiceToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- String wsdlURL = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
- return favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- String wsdlURL = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsdlURL));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlURL));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlURL));
- return false;
- }
- }
-
- private String getWsdlUrl()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- WsilWsdlServiceElement wsilWsdlServiceElement;
- Object obj = selectedElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
- wsilWsdlServiceElement = (WsilWsdlServiceElement) obj;
- return wsilWsdlServiceElement.getWSDLServiceURL();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
deleted file mode 100644
index 3a9142e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class AddWSILToFavoritesAction extends AddToFavoritesAction
-{
- public AddWSILToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- String wsilURL = getWsilUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
- return favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
- }
-
- public boolean executeSingleLinkAction()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- String wsilURL = getWsilUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsilURL));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsilURL));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsilURL));
- return false;
- }
- }
-
- private String getWsilUrl()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- return selectedElement.getWsilUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
deleted file mode 100644
index 9eafa38..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
+++ /dev/null
@@ -1,58 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearWSILAction extends ClearNodeAction {
-
- public ClearWSILAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(controller.getWSILPerspective().getNodeManager().getSelectedNodeId()));
- }
-
- public static String getActionLink(int nodeID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/ClearWSILActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- public String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsilStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsil/wsil_status_content.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
deleted file mode 100644
index dcc0dc3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,155 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.uddi4j.client.UDDIProxy;
-
-public class ImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
- private Definition def_;
- private String wsdlFileName_;
- private NodeManager nodeManager_;
-
- public ImportWSDLToFileSystemAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static final String getActionLink(int nodeId, int toolId, int viewId, int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId, toolId, viewId, viewToolId, "wsil/actions/ImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os)
- {
- if (def_ != null)
- {
- return writeWSDLDefinition(os, def_);
- }
- else
- {
- return false;
- }
- }
-
- public String getDefaultFileName()
- {
- return wsdlFileName_;
- }
-
- private boolean getWSDLFromURL()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
- ListManager wsilServices = wsilElement.getAllWSDLServices();
- ListElement le = wsilServices.getElementWithViewId(viewID);
- WsilWsdlServiceElement service = (WsilWsdlServiceElement)le.getObject();
- String wsdlURL = service.getWSDLServiceURL();
- wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
- try
- {
- def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
- }
- catch (Exception e)
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- wsilPerspective.getMessageQueue().addMessage(e.getMessage());
- return false;
- }
- return true;
- }
-
- private boolean getWSDLFromUDDIRegistry()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
- ListManager wsilServices = wsilElement.getAllUDDIServices();
- ListElement le = wsilServices.getElementWithViewId(viewID);
- WsilUddiServiceElement service = (WsilUddiServiceElement)le.getObject();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- wsdlFileName_ = service.getName() + ".wsdl";
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- try
- {
- UDDIProxy proxy = null;
- String inquiryURL = service.getUDDIServiceInquiryAPI();
- if (inquiryURL != null)
- {
- proxy = new UDDIProxy();
- proxy.setInquiryURL(inquiryURL);
- }
- def_ = uddi4jHelper.getWSDLDefinition(uddi4jHelper.getWSDL(service.getServiceDefinition(), proxy));
- }
- catch (Exception e)
- {
- // the wsdl representing this service is unreachable through the UDDI
- // registry. We will try using the discovery URL instead.
- try
- {
- def_ = uddi4jHelper.getWSDLDefinition(service.getUDDIServiceDiscoveryURL());
- return true;
- }
- catch (Exception e2)
- {
- }
- // if the discoveryURL also fails, return an error
- wsilPerspective.getMessageQueue().addMessage(e.getMessage());
- return false;
- }
- return true;
- }
-
- public boolean run()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool instanceof ListWSDLServicesTool)
- return getWSDLFromURL();
- else if (selectedTool instanceof ListUDDIServicesTool)
- return getWSDLFromUDDIRegistry();
- else
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
deleted file mode 100644
index 4175bcb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-
-public class ImportWSILToFileSystemAction extends ImportToFileSystemAction {
- private WSILDocument wsilDoc_;
- private WsilElement wsilElement_;
- private NodeManager nodeManager_;
-
- public ImportWSILToFileSystemAction(Controller controller) {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsil/actions/ImportWSILToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os) {
- if (wsilDoc_ != null) {
- return writeWSILDocument(os, wsilDoc_);
- }
- else {
- return false;
- }
- }
-
- public String getDefaultFileName() {
- String wsilFileName = wsilElement_.getWsilUrl();
- return wsilFileName.substring(wsilFileName.lastIndexOf('/') + 1, wsilFileName.length());
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (selectedElement instanceof WsilElement) {
- wsilElement_ = (WsilElement)selectedElement;
- wsilDoc_ = ((WsilElement)selectedElement).getWSILDocument();
- return true;
- }
- else {
- return false;
- }
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
deleted file mode 100644
index b64c49a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,104 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
- public MultipleLinkAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String isMultipleLinkAction = request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION);
- if (isMultipleLinkAction != null)
- {
- propertyTable_.put(WsilActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
- return processMultipleLinkActionParameters(request);
- }
- else
- {
- propertyTable_.remove(WsilActionInputs.MULTIPLE_LINK_ACTION);
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String toolIDString = request.getParameter(ActionInputs.TOOLID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
- if (nodeIDString != null)
- propertyTable_.put(ActionInputs.NODEID, nodeIDString);
- if (toolIDString != null)
- propertyTable_.put(ActionInputs.TOOLID, toolIDString);
- if (viewIDString != null)
- propertyTable_.put(ActionInputs.VIEWID, viewIDString);
- if (viewToolIDString != null)
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
- return true;
- }
- }
-
- protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- String[] viewIDs = request.getParameterValues(ActionInputs.VIEWID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- propertyTable_.put(ActionInputs.VIEWID, viewIDs);
- if (viewIDs.length == 0)
- return false;
- else
- return true;
- }
-
- protected boolean isMultipleLinkAction()
- {
- return propertyTable_.containsKey(WsilActionInputs.MULTIPLE_LINK_ACTION);
- }
-
- protected String[] getViewIds()
- {
- Object object = propertyTable_.get(ActionInputs.VIEWID);
- if (object == null)
- return new String[0];
- else if (object.getClass().isArray())
- return (String[])object;
- else
- return new String[] {(String)object};
- }
-
- public boolean run()
- {
- return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- boolean result = false;
- String[] viewIds = getViewIds();
- if (viewIds != null && viewIds.length > 0)
- {
- for (int i = 0; i < viewIds.length; i++)
- {
- propertyTable_.put(ActionInputs.VIEWID, viewIds[i]);
- if (executeSingleLinkAction())
- result = true;
- }
- }
- propertyTable_.put(ActionInputs.VIEWID, viewIds);
- return result;
- }
-
- protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
deleted file mode 100644
index 38cf564..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-
-public class NullAction extends Action
-{
- public NullAction()
- {
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
deleted file mode 100644
index 505bd1e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20081119 255374 mahutch@ca.ibm.com - Mark Hutchinson, WSE does not handle utf-8 characters in URLs
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class OpenWSILAction extends FormAction
-{
-
- public OpenWSILAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String wsilURL = parser.getParameter(WsilActionInputs.WSIL_URL);
- String inspectionType = parser.getParameter(WsilActionInputs.WSIL_INSPECTION_TYPE);
- FormTool formTool = getSelectedFormTool();
- propertyTable_.put(WsilActionInputs.WSIL_URL, wsilURL);
- if (inspectionType != null && inspectionType.length() > 0)
- propertyTable_.put(WsilActionInputs.WSIL_INSPECTION_TYPE, inspectionType);
- formTool.updatePropertyTable(propertyTable_);
- return true;
- }
-
- public FormTool getSelectedFormTool()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- String wsilURL = (String)propertyTable_.get(WsilActionInputs.WSIL_URL);
- wsilURL = URLUtils.encodeURLString(wsilURL);
- int inspectionType = Integer.parseInt((String)propertyTable_.get(WsilActionInputs.WSIL_INSPECTION_TYPE));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
- if (wsilElement == null)
- {
- WebServicesParserExt parser = new WebServicesParserExt(wsilURL);
- try
- {
- parser.parse(WebServicesParser.PARSE_NONE);
- WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(wsilURL);
- int type = wsEntity.getType();
- if (type == WebServiceEntity.TYPE_HTML)
- return openHTML(wsEntity.getChildren(), inspectionType);
- else if (type == WebServiceEntity.TYPE_WSIL)
- return openWSIL(wsilURL, parser.getWSILDocument(wsilURL), inspectionType);
- else
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_INVALID_WSIL_URL", wsilURL));
- }
- catch (Throwable t)
- {
- msgQueue.addMessage(t.getMessage());
- }
- return false;
- }
- else
- {
- preselectWSILNode(nodeManager, rootNode.getChildNode(wsilElement).getNodeId(), inspectionType);
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
- return true;
- }
- }
-
- private boolean openHTML(List wsils, int inspectionType)
- {
- int nodeId = -1;
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- for (Iterator it = wsils.iterator(); it.hasNext();)
- {
- WebServiceEntity wsilEntity = (WebServiceEntity)it.next();
- String wsilURL = wsilEntity.getURI();
- WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
- if (wsilElement == null)
- {
- try
- {
- WSILDocument wsilDoc = WSILDocument.newInstance();
- wsilDoc.read(wsilURL);
- wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
- root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
- nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
- }
- catch (Throwable t)
- {
- msgQueue.addMessage(t.getMessage());
- }
- }
- else
- {
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
- nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- }
- }
- if (nodeId != -1)
- {
- preselectWSILNode(nodeManager, nodeId, inspectionType);
- return true;
- }
- else
- return false;
- }
-
- private boolean openWSIL(String wsilURL, WSILDocument wsilDoc, int inspectionType)
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- WsilElement wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
- root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
- int nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
- preselectWSILNode(nodeManager, nodeId, inspectionType);
- return true;
- }
-
- private void preselectWSILNode(NodeManager nodeManager, int nodeId, int inspectionType)
- {
- nodeManager.setSelectedNodeId(nodeId);
- Node selectedNode = nodeManager.getNode(nodeId);
- selectedNode.setViewId(ActionInputs.VIEWTOOLID_DEFAULT);
- ToolManager toolManager = selectedNode.getToolManager();
- toolManager.setSelectedToolId(inspectionType);
- addToHistory(ActionInputs.PERSPECTIVE_WSIL, SelectWSILToolAction.getActionLink(nodeId, inspectionType, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
- }
-
- private WsilElement getOpenedWSIL(TreeElement root, String wsilURL)
- {
- Enumeration e = root.getElements(WsilModelConstants.REL_WSIL);
- while (e.hasMoreElements())
- {
- WsilElement wsilElement = (WsilElement)e.nextElement();
- if (wsilElement.getWsilUrl().equals(wsilURL))
- return wsilElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
deleted file mode 100644
index 40db6eb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsilLinkElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class OpenWSILLinkAction extends MultipleLinkAction
-{
- public OpenWSILLinkAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/OpenWSILLinkActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/OpenWSILLinkActionJSP.jsp";
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSIL_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSIL_LINK);
- return transformers;
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (!(selectedElement instanceof WsilElement))
- return false;
- ListElement le = ((WsilElement) selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
- WsilWsilLinkElement link = (WsilWsilLinkElement) le.getObject();
- String wsilURL = link.getWSILLinkLocation();
- // populate and run the OpenWSILAction
- OpenWSILAction action = new OpenWSILAction(controller_);
- Hashtable table = action.getPropertyTable();
- table.put(WsilActionInputs.WSIL_URL, wsilURL);
- table.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
deleted file mode 100644
index 7b60ea4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilNode;
-
-public abstract class RefreshAction extends MultipleLinkAction
-{
- protected NodeManager nodeManager_;
-
- public RefreshAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static Action newAction(HttpServletRequest request, Controller controller)
- {
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- int nodeID;
- try
- {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe)
- {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node selectedNode = controller.getWSILPerspective().getNodeManager().getNode(nodeID);
- if (selectedNode == null || !(selectedNode instanceof WsilNode))
- return new NullAction();
- else
- {
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- RefreshAction action;
- if (viewIDString == null)
- action = new RefreshWSILAction(controller);
- else if (selectedTool instanceof ListUDDIServicesTool)
- action = new RefreshUDDIServiceAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- action = new RefreshUDDIBusinessAction(controller);
- else
- return new NullAction();
- action.getPropertyTable().put(ActionInputs.NODEID, String.valueOf(nodeID));
- return action;
- }
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/RefreshActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/RefreshActionJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
deleted file mode 100644
index fd8e3e1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIBusinessAction extends RefreshAction
-{
- public RefreshUDDIBusinessAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean run()
- {
- return executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- return executeSingleLinkAction();
- }
-
- public boolean executeSingleLinkAction()
- {
- boolean result = true;
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue messageQueue = wsilPerspective.getMessageQueue();
- if (selectedElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) selectedElement;
- ListManager lm = wsilElement.getAllUDDILinks();
- Vector uddiBusinessElements = new Vector();
- String[] viewIDs = getViewIds();
- for (int i = 0; i < viewIDs.length; i++)
- {
- int viewID = Integer.parseInt(viewIDs[i]);
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) lm.getElementWithViewId(viewID).getObject();
- uddiBusinessElements.add(uddiBusinessElement);
- }
- wsilElement.refreshServiceProvidersFromRegistry(uddiBusinessElements);
- for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) it.next();
- String name = uddiBusinessElement.getName();
- if (name == null || name.length() <= 0)
- name = uddiBusinessElement.getUDDILinkBusinessKey();
- if (uddiBusinessElement.getServiceProvider() != null)
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
- else
- {
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", name));
- result = false;
- }
- }
- }
- else
- result = false;
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
deleted file mode 100644
index 66377aa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIServiceAction extends RefreshAction
-{
- public RefreshUDDIServiceAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean run()
- {
- return executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- return executeSingleLinkAction();
- }
-
- public boolean executeSingleLinkAction()
- {
- boolean result = true;
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue messageQueue = wsilPerspective.getMessageQueue();
- if (selectedElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) selectedElement;
- ListManager lm = wsilElement.getAllUDDIServices();
- Vector uddiServiceElements = new Vector();
- String[] viewIDs = getViewIds();
- for (int i = 0; i < viewIDs.length; i++)
- {
- int viewID = Integer.parseInt(viewIDs[i]);
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) lm.getElementWithViewId(viewID).getObject();
- uddiServiceElements.add(uddiServiceElement);
- }
- wsilElement.refreshServiceDefinitionsFromRegistry(uddiServiceElements);
- for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) it.next();
- String name = uddiServiceElement.getName();
- if (name == null || name.length() <= 0)
- name = uddiServiceElement.getUDDIServiceKey();
- if (uddiServiceElement.getServiceDefinition() != null)
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
- else
- {
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", name));
- result = false;
- }
- }
- }
- else
- result = false;
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
deleted file mode 100644
index 3911bd8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
+++ /dev/null
@@ -1,46 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class RefreshWSILAction extends RefreshAction
-{
- public RefreshWSILAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- if (selectedElement instanceof WsilElement)
- {
- String wsilURL = ((WsilElement) selectedElement).getWsilUrl();
- if (((WsilElement) selectedElement).refresh())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", wsilURL));
- return true;
- }
- else
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_NOT_FOUND", wsilURL));
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
deleted file mode 100644
index 9e0dbf8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class ResizeWSILFramesAction extends ResizeFramesAction
-{
- public ResizeWSILFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER))
- {
- wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(WsilFrameNames.WSIL_PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(WsilFrameNames.WSIL_STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
deleted file mode 100644
index 1885886..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
+++ /dev/null
@@ -1,71 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectWSILNodeAction extends SelectNodeAction
-{
- public SelectWSILNodeAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- Node selectedNode = getSelectedNode();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- else
- return getActionLink(selectedNode.getNodeId(), true);
- }
-
- public final String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
deleted file mode 100644
index 447826f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
+++ /dev/null
@@ -1,130 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class SelectWSILToolAction extends SelectNodeToolAction
-{
- public SelectWSILToolAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new WSILViewSelectionTransformer(controller_);
- return transformers;
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory)
- {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- boolean keepHistory = false;
- Node selectedNode = getSelectedNode();
- Tool selectedTool = getSelectedTool();
- int toolType = getSelectedTool().getToolType();
- if (toolType == ToolTypes.FORM)
- keepHistory = true;
- else if (toolType == ToolTypes.VIEW)
- {
- int viewID = selectedNode.getViewId();
- if (viewID == ActionInputs.VIEWID_DEFAULT)
- keepHistory = true;
- else
- {
- if (((ViewTool) selectedTool).getToolManager(viewID).getTool(selectedNode.getViewToolId()).getToolType() != ToolTypes.ACTION)
- keepHistory = true;
- }
- }
- if (keepHistory)
- {
- return getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- }
- else
- return null;
- }
-
- public final String getTreeContentVar()
- {
- return "wsilNavigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "wsilPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public final String getPropertiesContentVar()
- {
- return "wsilPropertiesContent";
- }
-
- public final String getPropertiesContentPage()
- {
- return "wsil/wsil_properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
deleted file mode 100644
index 22b3098..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public final class SwitchPerspectiveFromWSILAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromWSILAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- wsilPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
deleted file mode 100644
index 7b9de30..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WSILImportWSILToWorkbenchAction extends ImportToWorkbenchAction
-{
- public WSILImportWSILToWorkbenchAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction()
- {
- ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 55ad489..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,86 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class WsilAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
- public WsilAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp";
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
- return transformers;
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- WsilElement wsilElement = (WsilElement) selectedNode.getTreeElement();
- WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement) wsilElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
- String wsdlUrl = wsilWsdlServiceElement.getWSDLServiceURL();
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- boolean actionResult = openWSDLAction.run();
- if (actionResult)
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
- else
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 01eaf94..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
- public WsilImportWSDLToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- table.put(ActionInputs.TOOLID, String.valueOf(selectedNode.getToolManager().getSelectedToolId()));
- table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
deleted file mode 100644
index 7ea1a73..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
- public WsilLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public static LaunchWebServiceWizardAction newAction(Controller controller) {
- return new WsilLaunchWebServiceWizardAction(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- int viewID = selectedNode.getViewId();
-
- ListElement le = null;
- String url = null;
- if (selectedTool instanceof ListWSDLServicesTool) {
- le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
- url = ((WsilWsdlServiceElement)le.getObject()).getWSDLServiceURL();
- }
- else if (selectedTool instanceof ListUDDIServicesTool) {
- le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
- url = ((WsilUddiServiceElement)le.getObject()).getWsdlUrl();
- }
- else
- return false;
- return launchWizard(url);
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
deleted file mode 100644
index d34d920..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WsilToggleNodeAction extends ToggleNodeAction {
- public WsilToggleNodeAction(Controller controller) {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeId, boolean open) {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilToggleNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.OPEN);
- actionLink.append('=');
- if (open)
- actionLink.append(ActionInputs.OPEN_NODE);
- else
- actionLink.append(ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory() {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSILToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
- else
- return SelectWSILNodeAction.getActionLink(nodeId, true);
- }
-
- public final String getTreeContentVar()
- {
- return controller_.getWSILPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage()
- {
- return controller_.getWSILPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar()
- {
- return controller_.getWSILPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage()
- {
- return controller_.getWSILPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
deleted file mode 100644
index af59916..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilActionInputs
-{
- // open WSIL form
- public final static String WSIL_URL = "wsilURL";
- public final static String WSIL_INSPECTION_TYPE = "wsilInspectionType";
- public final static int WSIL_DETAILS = 0;
- public final static int WSDL_SERVICES = 1;
- public final static int UDDI_SERVICES = 2;
- public final static int UDDI_BUSINESSES = 3;
- public final static int WSIL_LINKS = 4;
-
- // mass action
- public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-
- // resize WSIL frames action
- public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
deleted file mode 100644
index 3735a23..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilFrameNames
-{
- public final static String WSIL_NAVIGATOR_CONTAINER = "wsil_navigator_container";
- public final static String WSIL_NAVIGATOR_TOOLBAR = "wsil_navigator_toolbar";
- public final static String WSIL_NAVIGATOR_CONTENT = "wsil_navigator_content";
- public final static String WSIL_ACTIONS_CONTAINER = "wsil_actions_container";
- public final static String WSIL_PROPERTIES_CONTAINER = "wsil_properties_container";
- public final static String WSIL_PROPERTIES_TOOLBAR = "wsil_properties_toolbar";
- public final static String WSIL_PROPERTIES_CONTENT = "wsil_properties_content";
- public final static String WSIL_STATUS_CONTAINER = "wsil_status_container";
- public final static String WSIL_STATUS_TOOLBAR = "wsil_status_toolbar";
- public final static String WSIL_STATUS_CONTENT = "wsil_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
deleted file mode 100644
index 5aa8fa5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilModelConstants
-{
- // Relation
- public final static String REL_WSIL = "relWSIL";
-
- // List Managers for WsilElement
- public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
- public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
- public final static String LIST_MANAGER_UDDI_LINKS = "uddiLinks";
- public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
deleted file mode 100644
index 14e01aa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WsilCommonElement extends BasicElement
-{
- private String baseWsilURL;
- private String relativeURIBase;
-
- public WsilCommonElement(String name, Model model)
- {
- super(name, model);
- }
-
- public String getBaseWsilURL()
- {
- return baseWsilURL;
- }
-
- public void setBaseWsilURL(String baseWsilURL)
- {
- this.baseWsilURL = baseWsilURL;
- }
-
- private final char FWD_SLASH = '/';
- private final char BWD_SLASH = '\\';
- private final char PROTOCOL_INDICATOR = ':';
-
- public String makeAbsolute(String uri)
- {
- if (baseWsilURL != null && uri != null && uri.indexOf(PROTOCOL_INDICATOR) == -1)
- {
- if (relativeURIBase == null)
- {
- relativeURIBase = baseWsilURL.replace(BWD_SLASH, FWD_SLASH);
- int index = relativeURIBase.lastIndexOf(FWD_SLASH);
- relativeURIBase = baseWsilURL.substring(0, index + 1);
- }
- StringBuffer sb = new StringBuffer(relativeURIBase);
- sb.append(uri);
- return sb.toString();
- }
- return uri;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
deleted file mode 100644
index a747613..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
+++ /dev/null
@@ -1,460 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class WsilElement extends TreeElement
-{
- private WSILDocument wsilDoc_;
- private String thisWsilUrl_;
- /** ****************** Namespace ********** */
- private static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- private static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
- private static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
- //private static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
- private static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
- /** ****************** Rels **************** */
- // Relation for a WSIL doucment and its link nodes
- public static final String REL_WSIL_LINK = "wsil link nodes";
-
- public WsilElement(String name, Model model, WSILDocument wsilDocument, String wsilURL)
- {
- super(name, model);
- wsilDoc_ = wsilDocument;
- thisWsilUrl_ = wsilURL;
- ListManager wsdlServices_ = null;
- ListManager uddiServices_ = null;
- ListManager wsilLinks_ = null;
- ListManager uddiLinks_ = null;
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
- }
-
- /*
- * Refresh the WSIL document
- */
- public boolean refresh()
- {
- try
- {
- WSILDocument newWSILDoc = WSILDocument.newInstance();
- newWSILDoc.read(getWsilUrl());
- wsilDoc_ = newWSILDoc;
- ListManager wsdlServices_ = null;
- ListManager uddiServices_ = null;
- ListManager wsilLinks_ = null;
- ListManager uddiLinks_ = null;
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
- return true;
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
- /*
- * Returns the WSIL's URL
- */
- public String getWsilUrl()
- {
- return thisWsilUrl_;
- }
-
- /*
- * Returns the WSIL document
- */
- public WSILDocument getWSILDocument()
- {
- return wsilDoc_;
- }
-
- /*
- * Returns all abstract languages
- */
- public Vector getWSILAbstractLangs()
- {
- Vector v = new Vector();
- Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- /*
- * Returns all abstracts
- */
- public Vector getWSILAbstracts()
- {
- Vector v = new Vector();
- Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-
- public ListManager getAllWSDLServices()
- {
- ListManager wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
- if (wsdlServices_ == null)
- {
- initAllWSDLServices();
- wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
- }
- return wsdlServices_;
- }
-
- public ListManager getAllUDDIServices()
- {
- ListManager uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
- if (uddiServices_ == null)
- {
- initAllUDDIServices();
- uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
- }
- return uddiServices_;
- }
-
- private void initAllWSDLServices()
- {
- ListManager wsdlServices_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Service[] serviceList = inspection.getServices();
- for (int i = 0; i < serviceList.length; i++)
- {
- // skip any service without a wsdl namespace
- // and invalid descriptions
- Description[] descList = serviceList[i].getDescriptions();
- if (descList.length < 1)
- continue;
- String namespace = descList[0].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if (namespace.equals(NAMESPACE_WSDL))
- {
- WsilWsdlServiceElement wsdlServiceElement = new WsilWsdlServiceElement(namespace, getModel(), serviceList[i]);
- wsdlServiceElement.setBaseWsilURL(getWsilUrl());
- if (wsdlServiceElement.validateWSDLService())
- {
- wsdlServiceElement.setName(wsdlServiceElement.getWSDLServiceURL());
- wsdlServices_.add(new ListElement(wsdlServiceElement));
- }
- }
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- }
-
- private void initAllUDDIServices()
- {
- ListManager uddiServices_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Service[] serviceList = inspection.getServices();
- Vector uddiServiceElements = new Vector();
- for (int i = 0; i < serviceList.length; i++)
- {
- // skip any service without a wsdl namespace
- // and invalid descriptions
- Description[] descList = serviceList[i].getDescriptions();
- if (descList.length < 1)
- continue;
- String namespace = descList[0].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
- {
- WsilUddiServiceElement uddiServiceElement = new WsilUddiServiceElement(namespace, getModel(), serviceList[i]);
- uddiServiceElement.setBaseWsilURL(getWsilUrl());
- if (uddiServiceElement.validateUDDIService())
- {
- uddiServiceElement.setName(uddiServiceElement.getName());
- uddiServiceElements.add(uddiServiceElement);
- }
- }
- }
- refreshServiceDefinitionsFromRegistry(uddiServiceElements);
- for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
- {
- uddiServices_.add(new ListElement(it.next()));
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- }
-
- public void refreshServiceDefinitionsFromRegistry(Vector uddiServiceElements)
- {
- HashMap inquiryAPIToServices = new HashMap();
- for (int i = 0; i < uddiServiceElements.size(); i++)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) uddiServiceElements.get(i);
- String inquiryAPI = uddiServiceElement.getUDDIServiceInquiryAPI();
- if (Validator.validateURL(inquiryAPI))
- {
- Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
- if (services == null)
- {
- services = new Vector();
- inquiryAPIToServices.put(inquiryAPI, services);
- }
- services.add(uddiServiceElement);
- }
- else
- uddiServiceElement.setServiceDefinition(null);
- }
- for (Iterator it = inquiryAPIToServices.keySet().iterator(); it.hasNext();)
- {
- String inquiryAPI = (String) it.next();
- Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
- UDDIProxy proxy;
- try
- {
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryAPI));
- }
- catch (Throwable t)
- {
- for (int j = 0; j < services.size(); j++)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(j);
- uddiServiceElement.setServiceDefinition(null);
- }
- continue;
- }
- Vector serviceKeys = new Vector();
- for (int j = 0; j < services.size(); j++)
- {
- serviceKeys.add(((WsilUddiServiceElement) services.get(j)).getUDDIServiceKey());
- }
- Vector businessServices;
- try
- {
- businessServices = proxy.get_serviceDetail(serviceKeys).getBusinessServiceVector();
- }
- catch (Exception ex)
- {
- businessServices = new Vector();
- if (serviceKeys.size() > 1)
- {
- for (int k = 0; k < serviceKeys.size(); k++)
- {
- try
- {
- businessServices.add((BusinessService) proxy.get_serviceDetail((String) serviceKeys.get(k)).getBusinessServiceVector().get(0));
- }
- catch (Exception exception)
- {
- businessServices.add(null);
- }
- }
- }
- else
- businessServices.add(null);
- }
- for (int k = 0; k < services.size(); k++)
- {
- BusinessService bs = (BusinessService) businessServices.get(k);
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(k);
- uddiServiceElement.setServiceDefinition(bs);
- }
- }
- }
-
- public ListManager getAllWSILLinks()
- {
- ListManager wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
- if (wsilLinks_ == null)
- {
- initAllWSILLinks();
- wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
- }
- return wsilLinks_;
- }
-
- public ListManager getAllUDDILinks()
- {
- ListManager uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
- if (uddiLinks_ == null)
- {
- initAllUDDILinks();
- uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
- }
- return uddiLinks_;
- }
-
- private void initAllUDDILinks()
- {
- ListManager uddiLinks_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Link[] linkList = inspection.getLinks();
- Vector uddiBusinessElements = new Vector();
- for (int i = 0; i < linkList.length; i++)
- {
- // process any links with UDDI namespace
- String namespace = linkList[i].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
- {
- WsilUddiBusinessElement uddiBusinessElement = new WsilUddiBusinessElement(namespace, getModel(), linkList[i]);
- uddiBusinessElement.setBaseWsilURL(getWsilUrl());
- if (uddiBusinessElement.validateUDDILink())
- {
- uddiBusinessElement.setName(uddiBusinessElement.getName());
- uddiBusinessElements.add(uddiBusinessElement);
- }
- }
- }
- refreshServiceProvidersFromRegistry(uddiBusinessElements);
- for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
- {
- uddiLinks_.add(new ListElement(it.next()));
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, uddiLinks_);
- }
-
- public void refreshServiceProvidersFromRegistry(Vector uddiBusinessElements)
- {
- HashMap inquiryAPIToBusinesses = new HashMap();
- for (int i = 0; i < uddiBusinessElements.size(); i++)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) uddiBusinessElements.get(i);
- String inquiryAPI = uddiBusinessElement.getUDDILinkInquiryAPI();
- if (Validator.validateURL(inquiryAPI))
- {
- Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
- if (businesses == null)
- {
- businesses = new Vector();
- inquiryAPIToBusinesses.put(inquiryAPI, businesses);
- }
- businesses.add(uddiBusinessElement);
- }
- else
- uddiBusinessElement.setServiceProvider(null);
- }
- for (Iterator it = inquiryAPIToBusinesses.keySet().iterator(); it.hasNext();)
- {
- String inquiryAPI = (String) it.next();
- Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
- UDDIProxy proxy;
- try
- {
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryAPI));
- }
- catch (Exception e)
- {
- for (int j = 0; j < businesses.size(); j++)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(j);
- uddiBusinessElement.setServiceProvider(null);
- }
- continue;
- }
- Vector businessKeys = new Vector();
- for (int j = 0; j < businesses.size(); j++)
- {
- businessKeys.add(((WsilUddiBusinessElement) businesses.get(j)).getUDDILinkBusinessKey());
- }
- Vector businessEntities;
- try
- {
- businessEntities = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- }
- catch (Exception ex)
- {
- businessEntities = new Vector();
- if (businessKeys.size() > 1)
- {
- for (int k = 0; k < businessKeys.size(); k++)
- {
- try
- {
- businessEntities.add((BusinessEntity) proxy.get_businessDetail((String) businessKeys.get(k)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception)
- {
- businessEntities.add(null);
- }
- }
- }
- else
- businessEntities.add(null);
- }
- for (int k = 0; k < businesses.size(); k++)
- {
- BusinessEntity be = (BusinessEntity) businessEntities.get(k);
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(k);
- uddiBusinessElement.setServiceProvider(be);
- }
- }
- }
-
- private void initAllWSILLinks()
- {
- ListManager wsilLinks_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Link[] linkList = inspection.getLinks();
- for (int i = 0; i < linkList.length; i++)
- {
- // process any links with UDDI namespace
- String namespace = linkList[i].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if (namespace.equals(NAMESPACE_WSIL_INSPECTION))
- {
- WsilWsilLinkElement wsilLinkElement = new WsilWsilLinkElement(namespace, getModel(), linkList[i]);
- wsilLinkElement.setBaseWsilURL(getWsilUrl());
- if (wsilLinkElement.validateWSILLink())
- {
- wsilLinkElement.setName(wsilLinkElement.getWSILLinkLocation());
- wsilLinks_.add(new ListElement(wsilLinkElement));
- }
- }
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, wsilLinks_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
deleted file mode 100644
index 96b594e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
+++ /dev/null
@@ -1,53 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL Link
-*/
-public class WsilLinkElement extends WsilCommonElement
-{
- protected Link link_;
-
- public WsilLinkElement(String name, Model model, Link link)
- {
- super(name, model);
- link_ = link;
- }
-
- public Vector getLinkAbstractLangs()
- {
- Vector v = new Vector();
- Abstract[] abstracts = link_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- public Vector getLinkAbstracts()
- {
- Vector v = new Vector();
- Abstract[] abstracts = link_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
deleted file mode 100644
index b8935d3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
+++ /dev/null
@@ -1,67 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Service;
-import org.apache.wsil.ServiceName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL Service
-*/
-public class WsilServiceElement extends WsilCommonElement
-{
- protected Service service_;
-
- public WsilServiceElement(String name, Model model, Service service) {
- super(name, model);
- service_ = service;
- }
-
- public Vector getServiceNameLangs() {
- Vector v = new Vector();
- ServiceName[] serviceNames = service_.getServiceNames();
- for (int i = 0; i < serviceNames.length; i++) {
- v.add(serviceNames[i].getLang());
- }
- return v;
- }
-
- public Vector getServiceNames() {
- Vector v = new Vector();
- ServiceName[] serviceNames = service_.getServiceNames();
- for (int i = 0; i < serviceNames.length; i++) {
- v.add(serviceNames[i].getText());
- }
- return v;
- }
-
- public Vector getServiceAbstractLangs() {
- Vector v = new Vector();
- Abstract[] abstracts = service_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++) {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- public Vector getServiceAbstracts() {
- Vector v = new Vector();
- Abstract[] abstracts = service_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++) {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
deleted file mode 100644
index 23e5000..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiBusinessElement extends WsilLinkElement
-{
- private BusinessEntity busEntity_;
-
- public WsilUddiBusinessElement(String name, Model model, Link link) {
- super(name, model, link);
- busEntity_ = null;
- }
-
- public void setServiceProvider(BusinessEntity be) {
- busEntity_ = be;
- }
-
- public BusinessEntity getServiceProvider() {
- return busEntity_;
- }
-
- public String getName() {
- return (busEntity_ == null) ? null : busEntity_.getDefaultNameString();
- }
-
- public String getDescription() {
- return (busEntity_ == null) ? null : busEntity_.getDefaultDescriptionString();
- }
-
- public String getUDDILinkInquiryAPI() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd == null) ? null : bd.getLocation();
- }
-
- public String getUDDILinkBusinessKey() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd == null) ? null : bd.getBusinessKey().getText();
- }
-
- public String getUDDILinkDiscoveryURL() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- if (bd == null)
- return null;
- else {
- DiscoveryURL discoveryURL = bd.getDiscoveryURL();
- return (discoveryURL == null) ? null : discoveryURL.getText();
- }
- }
-
- public boolean validateUDDILink() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd != null);
- }
-
- private BusinessDescription getValidUDDIBusinessDescription() {
- ExtensionElement extElement = link_.getExtensionElement();
- // The extension element of a UDDI link
- // must be a BusinessDescription element
- if (!(extElement instanceof BusinessDescription))
- return null;
- // A valid BusinessDescription must have an inquiry API
- String inquiryAPI = ((BusinessDescription)extElement).getLocation();
- if (!Validator.validateURL(inquiryAPI))
- return null;
- // A valid BusinessDescription must have a business key
- String businessKey = ((BusinessDescription)extElement).getBusinessKey().getText();
- if (businessKey == null || businessKey.length() <= 0)
- return null;
- return (BusinessDescription)extElement;
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
deleted file mode 100644
index 2418dc9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiServiceElement extends WsilServiceElement
-{
- private BusinessService busService_;
-
- public WsilUddiServiceElement(String name, Model model, Service service) {
- super(name, model, service);
- busService_ = null;
- }
-
- public void setServiceDefinition(BusinessService busService) {
- busService_ = busService;
- }
-
- public BusinessService getServiceDefinition() {
- return busService_;
- }
-
- public String getName() {
- return (busService_ == null) ? null : busService_.getDefaultNameString();
- }
-
- public String getDescription() {
- return (busService_ == null) ? null : busService_.getDefaultDescriptionString();
- }
-
- public String getUDDIServiceInquiryAPI() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd == null) ? null : sd.getLocation();
- }
-
- public String getUDDIServiceKey() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd == null) ? null : sd.getServiceKey().getText();
- }
-
- public String getUDDIServiceDiscoveryURL() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- if (sd == null)
- return null;
- else {
- DiscoveryURL discoveryURL = sd.getDiscoveryURL();
- return (discoveryURL == null) ? null : discoveryURL.getText();
- }
- }
-
- private ServiceDescription getValidUDDIServiceDescription() {
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- ExtensionElement extElement = descList[i].getExtensionElement();
- // The extension element of a UDDI service description
- // must be a ServiceDescription element
- if (!(extElement instanceof ServiceDescription))
- continue;
- // A valid ServiceDescription must have an inquiry API
- if (!Validator.validateURL(((ServiceDescription)extElement).getLocation()))
- continue;
- // A valid ServiceDescription must have a service key
- String serviceKey = ((ServiceDescription)extElement).getServiceKey().getText();
- if (serviceKey == null || serviceKey.length() <= 0)
- continue;
- return (ServiceDescription)extElement;
- }
- return null;
- }
-
- public boolean validateUDDIService() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd != null);
- }
-
- public String getWsdlUrl() {
- return (new Uddi4jHelper()).getWSDL(getServiceDefinition(), null);
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
deleted file mode 100644
index d3bad33..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
+++ /dev/null
@@ -1,86 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.wsdl.ImplementedBinding;
-import org.apache.wsil.extension.wsdl.Reference;
-import org.apache.wsil.extension.wsdl.ReferencedService;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSDL service in a WSIL document
-*/
-public class WsilWsdlServiceElement extends WsilServiceElement
-{
- public WsilWsdlServiceElement(String name, Model model, Service service) {
- super(name, model, service);
- }
-
- public String getWSDLServiceURL() {
- Description desc = getValidWSDLDescription();
- return (desc == null) ? null : makeAbsolute(desc.getLocation());
- }
-
- public Vector getWSDLBinding() {
- Vector v = new Vector();
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- ExtensionElement extElement = descList[i].getExtensionElement();
- if (extElement != null && extElement instanceof Reference) {
- ReferencedService refService = ((Reference)extElement).getReferencedService();
- if (refService != null) {
- v.add(refService.getReferencedServiceName());
- }
- ImplementedBinding[] implBindingList = ((Reference)extElement).getImplementedBindings();
- for (int j = 0; j < implBindingList.length; j++) {
- v.add(implBindingList[j].getBindingName());
- }
- }
- }
- return v;
- }
-
- private Description getValidWSDLDescription() {
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- // skip this description if the locatioin attribute is a malformed URL
- String location = descList[i].getLocation();
- if (location == null || location.length() <= 0)
- continue;
- // skip this description if the extension element indicates
- // that the description's location contains only the wsdl binding
- ExtensionElement extElement = descList[i].getExtensionElement();
- if (extElement != null && extElement instanceof Reference) {
- Boolean endpointPresent = ((Reference)extElement).getEndpointPresent();
- if (endpointPresent != null && endpointPresent.booleanValue() == false)
- continue;
- }
- // a valid description is found
- return descList[i];
- }
- // no valid description is found for this service
- return null;
- }
-
- public boolean validateWSDLService() {
- Description desc = getValidWSDLDescription();
- return (desc != null);
- }
-
- public String toString() {
- return getWSDLServiceURL();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
deleted file mode 100644
index c94a573..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL link in a WSIL document
-*/
-public class WsilWsilLinkElement extends WsilLinkElement
-{
- public WsilWsilLinkElement(String name, Model model, Link link)
- {
- super(name, model, link);
- }
-
- public String getWSILLinkLocation()
- {
- return makeAbsolute(link_.getLocation());
- }
-
- public boolean validateWSILLink()
- {
- return (link_.getLocation() != null);
- }
-
- public String toString()
- {
- return getWSILLinkLocation();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
deleted file mode 100644
index a7b5329..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToFavoritesTool extends ActionTool {
- public AddBusinessToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
deleted file mode 100644
index b4f2d58..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToUDDIPerspectiveTool extends ActionTool {
- public AddBusinessToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddBusinessToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
deleted file mode 100644
index 299e3e5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToFavoritesTool extends ActionTool {
- public AddServiceToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
deleted file mode 100644
index e98beb0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToUDDIPerspectiveTool extends ActionTool {
- public AddServiceToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddServiceToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
deleted file mode 100644
index e9d0a47..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSDLServiceToFavoritesTool extends ActionTool {
- public AddWSDLServiceToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
deleted file mode 100644
index b180ad0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSILToFavoritesTool extends ActionTool {
- public AddWSILToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
deleted file mode 100644
index d3580ff..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ClearWSILTool extends ActionTool {
- public ClearWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return ClearWSILAction.getActionLink(toolManager_.getNode().getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
deleted file mode 100644
index 06f3866..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSDLToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSDLToFileSystemTool extends ImportToFileSystemTool {
- public ImportWSDLToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return ImportWSDLToFileSystemAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
deleted file mode 100644
index 8aca2d1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSILToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSILToFileSystemTool extends ImportToFileSystemTool {
- public ImportWSILToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return ImportWSILToFileSystemAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
deleted file mode 100644
index 2bee56d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIBusinessTool extends ViewTool {
- public ListUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_business_enabled.gif", "wsil/images/list_business_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- new UddiBusinessDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_UDDI_LINK_DETAILS"));
- new AddBusinessToUDDIPerspectiveTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE"));
- new AddBusinessToFavoritesTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_UDDI_BUSINESS_TO_FAVORITES"));
- new RefreshUDDIBusinessTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_REFRESH_UDDI_BUSINESS"));
- }
-
- public String getFormLink() {
- return ProxyLoadPageAction.getActionLink("wsil/views/UddiBusinessView.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
deleted file mode 100644
index 8bb0695..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIServicesTool extends ViewTool {
- public ListUDDIServicesTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_UDDI_service_enabled.gif", "wsil/images/list_UDDI_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- Controller controller = toolManager_.getNode().getNodeManager().getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new UddiServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
- new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new AddServiceToUDDIPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE"));
- new AddServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_FAVORITES"));
- new RefreshUDDIServiceTool(viewToolManager, wsilPerspective.getMessage("ALT_REFRESH_UDDI_SERVICE"));
- }
-
- public String getFormLink() {
- return ProxyLoadPageAction.getActionLink("wsil/views/UddiServicesView.jsp");
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
deleted file mode 100644
index 76b9ed6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSDLServicesTool extends ViewTool {
- public ListWSDLServicesTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_WSDL_service_enabled.gif", "wsil/images/list_WSDL_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- Controller controller = toolManager_.getNode().getNodeManager().getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new WsdlServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
- new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new WsilAddToWSDLPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
- new AddWSDLServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_SERVICE_TO_FAVORITES"));
- }
-
- public String getFormLink() {
- return "wsil/views/WsdlServicesView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
deleted file mode 100644
index c45b82f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSILLinksTool extends ViewTool {
- public ListWSILLinksTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_WSIL_enabled.gif", "wsil/images/list_WSIL_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- new WsilLinkDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_WSIL_LINK_DETAILS"));
- new OpenWSILLinkTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_OPEN_WSIL_LINK"));
- }
-
- public String getFormLink() {
- return "wsil/views/WsilLinksView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
deleted file mode 100644
index 5e51cee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILLinkTool extends ActionTool {
- public OpenWSILLinkTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return OpenWSILLinkAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
deleted file mode 100644
index 2191a47..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILTool extends FormTool {
- public OpenWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/OpenWSILForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
deleted file mode 100644
index c6f73b0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIBusinessTool extends ActionTool {
- public RefreshUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
deleted file mode 100644
index b8c82a7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIServiceTool extends ActionTool {
- public RefreshUDDIServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
deleted file mode 100644
index fce8a51..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshWSILTool extends ActionTool {
- public RefreshWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return RefreshAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
deleted file mode 100644
index 964611a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiBusinessDetailsTool extends FormTool {
- public UddiBusinessDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/UddiBusinessDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
deleted file mode 100644
index 8440032..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiServiceDetailsTool extends FormTool {
- public UddiServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/UddiServiceDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
deleted file mode 100644
index c977d0c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WSILImportWSILToWorkbenchTool extends ImportToWorkbenchTool
-{
- public WSILImportWSILToWorkbenchTool(ToolManager toolManager, String alt)
- {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WSILImportWSILToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
deleted file mode 100644
index 14321aa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20080506 202945 pmoogk@ca.ibm.com - Peter Moogk, Allow WSE to be launched from a WSIL file.
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import java.util.Hashtable;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SwitchPerspectiveFromWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public class WSILPerspective extends Perspective
-{
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public WSILPerspective(Controller controller)
- {
- super("wsil",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("WsilModel");
- TreeElement treeElement = new TreeElement(getMessage("WSIL_MAIN_NODE"), model_);
- model_.setRootElement(treeElement);
- nodeManager_ = new NodeManager(controller_);
- WsilMainNode wsilMainNode = new WsilMainNode(treeElement, nodeManager_);
- nodeManager_.setRootNode(wsilMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public final void preloadWSIL( String[] wsilURL )
- {
- if( wsilURL != null )
- {
- for( int index = 0; index < wsilURL.length; index++ )
- {
- OpenWSILAction action = new OpenWSILAction(controller_);
- Hashtable table = action.getPropertyTable();
- table.put(WsilActionInputs.WSIL_URL, wsilURL[index] );
- table.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
- action.run();
- }
-
- if( wsilURL.length >0 )
- {
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSIL);
- }
- }
- }
-
- public NodeManager getNodeManager() {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "wsil/wsil_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-
- public String getPanesFile() {
- return "wsil/scripts/wsilPanes.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "wsil/scripts/wsilframesets.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "wsil/forms/ProcessWSILFramesetsForm.jsp";
- }
-
- public String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsilStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsil/wsil_status_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromWSILAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
deleted file mode 100644
index a35922c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsdlServiceDetailsTool extends FormTool {
- public WsdlServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsdlServiceDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
deleted file mode 100644
index 4fa0fdc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction;
-
-public class WsilAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
- public WsilAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return WsilAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
deleted file mode 100644
index 7c4d409..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilDetailsTool extends FormTool {
- public WsilDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsilDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 8b1eda4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
- public WsilImportWSDLToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WsilImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
deleted file mode 100644
index 1c5d75d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
- public WsilLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WsilLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
deleted file mode 100644
index 3d78197..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLinkDetailsTool extends FormTool {
- public WsilLinkDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsilLinkDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
deleted file mode 100644
index d57d5c8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-
-public class WsilMainNode extends WsilNavigatorNode {
-
- public WsilMainNode(TreeElement treeElement, NodeManager nodeManager) {
- super(treeElement, nodeManager, 1, "images/root_main.gif");
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WsilModelConstants.REL_WSIL)) {
- WsilNode wsilNode = new WsilNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsilNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- WSILPerspective wsilPerspective = nodeManager_.getController().getWSILPerspective();
- new OpenWSILTool(toolManager_, wsilPerspective.getMessage("ALT_OPEN_WSIL"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
deleted file mode 100644
index 07c34d7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilToggleNodeAction;
-
-public abstract class WsilNavigatorNode extends Node {
-
- public WsilNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected String getToggleNodeActionHref() {
- return WsilToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectWSILNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
deleted file mode 100644
index 2f6459e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class WsilNode extends WsilNavigatorNode {
-
- public WsilNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "wsil/images/wsil_node.gif");
- }
-
- protected void initTools() {
- Controller controller = nodeManager_.getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new WsilDetailsTool(toolManager_, wsilPerspective.getMessage("ALT_WSIL_DETAILS"));
- new ListWSDLServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES"));
- new ListUDDIServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES"));
- new ListUDDIBusinessTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS"));
- new ListWSILLinksTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS"));
- new WSILImportWSILToWorkbenchTool(toolManager_, wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH"));
- new ImportWSILToFileSystemTool(toolManager_, controller.getMessage("ALT_WSIL_IMPORT_TO_FS"));
- new AddWSILToFavoritesTool(toolManager_, wsilPerspective.getMessage("ALT_ADD_WSIL_TO_FAVORITES"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
deleted file mode 100644
index d7c1130..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilSetDefaultViewTool extends SetDefaultViewTool {
- public WsilSetDefaultViewTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
deleted file mode 100644
index d25fa2e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.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.wst.ws.internal.explorer.platform.wsil.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ViewSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSILLinksTool;
-
-public class WSILViewSelectionTransformer extends ViewSelectionTransformer
-{
- public static final byte NONE = 0;
- public static final byte WSDL_SERVICE = 1;
- public static final byte UDDI_SERVICE = 2;
- public static final byte UDDI_BUSINESS = 3;
- public static final byte WSIL_LINK = 4;
- public static final byte FROM_TOOLID = 5;
- private byte type;
-
- public WSILViewSelectionTransformer(Controller controller)
- {
- this(controller, "", ActionInputs.VIEWID, FROM_TOOLID);
- }
-
- public WSILViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey, byte type)
- {
- super(controller, listManagerKey, viewKey);
- this.type = type;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- if (type == FROM_TOOLID)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- try
- {
- int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
- ToolManager toolManager = currNode.getToolManager();
- Tool tool = toolManager.getTool(toolId);
- if (tool instanceof ListWSDLServicesTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
- else if (tool instanceof ListUDDIServicesTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
- else if (tool instanceof ListUDDIBusinessTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
- else if (tool instanceof ListWSILLinksTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- }
- return super.normalize(properties);
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- TreeElement currElement = currNode.getTreeElement();
- if (currElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) currElement;
- switch (type)
- {
- case WSDL_SERVICE :
- wsilElement.getAllWSDLServices();
- break;
- case UDDI_SERVICE :
- wsilElement.getAllUDDIServices();
- break;
- case UDDI_BUSINESS :
- wsilElement.getAllUDDILinks();
- break;
- case WSIL_LINK :
- wsilElement.getAllWSILLinks();
- break;
- case FROM_TOOLID :
- try
- {
- int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
- ToolManager toolManager = currNode.getToolManager();
- Tool tool = toolManager.getTool(toolId);
- if (tool instanceof ListWSDLServicesTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
- wsilElement.getAllWSDLServices();
- }
- else if (tool instanceof ListUDDIServicesTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
- wsilElement.getAllUDDIServices();
- }
- else if (tool instanceof ListUDDIBusinessTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
- wsilElement.getAllUDDILinks();
- }
- else if (tool instanceof ListWSILLinksTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
- wsilElement.getAllWSILLinks();
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- break;
- default :
- break;
- }
- }
- }
- return super.deNormalize(properties);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
deleted file mode 100644
index 77c3e6e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
+++ /dev/null
@@ -1,194 +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.wst.ws.internal.explorer.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is the plugin class for the Web Services Explorer.
- */
-public class ExplorerPlugin extends AbstractUIPlugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.wst.ws.explorer";
- public static final String CHARSET = "UTF-8";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static ExplorerPlugin instance_;
- private BundleContext context;
- /**
- * Constructs a runtime plugin object for this plugin. The "plugin" element
- * in plugin.xml should include the attribute class =
- * "org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin".
- *
- * @param descriptor
- * The descriptor of this plugin.
- */
- public ExplorerPlugin()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (ExplorerPlugin)Platform.getPlugin("org.eclipse.wst.ws.explorer");
- *
- * @return The ExplorerPlugin singleton.
- */
- static public ExplorerPlugin getInstance()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- */
- public void start(BundleContext bundle) throws Exception
- {
- super.start(bundle);
- // init the shell of LaunchWizardTask
- this.context = bundle;
- LaunchWizardTask.getInstance();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- */
- public void stop(BundleContext bundle) throws Exception
- {
- super.stop(bundle);
- }
-
- /**
- * Returns the message string identified by the given key from the
- * plugin.properties file for the appropriate locale.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the
- * string passed in must be of the form "%KEY" where the
- * plugin.properties file contains a line of the form: "KEY =
- * value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key)
- {
- return Platform.getResourceString(instance_.getBundle(), key);
- }
-
- /**
- * Returns the message string identified by the given key from the
- * plugin.properties file for the appropriate locale. Substitution sequences
- * in the message string are replaced by the given array of substitution
- * objects (which are most frequently strings). See java.text.MessageFormat
- * for further details on substitution.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the
- * string passed in must be of the form "%KEY" where the
- * plugin.properties file contains a line of the form: "KEY =
- * value".
- * @param args
- * The substitution values for the message as required by the
- * message in plugin.properties and by the rules of class
- * java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args)
- {
- return MessageFormat.format(getMessage(key), args);
- }
-
- /**
- * 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 installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- /**
- * See IPluginHelper.
- */
- public void setMsgLoggerConfig(Hashtable msgLoggerConfig)
- {
- }
-
- /**
- * See IPluginHelper.
- */
- public Hashtable getMsgLoggerConfig(Plugin plugin)
- {
- return new Hashtable();
- }
-
- /**
- * See IPluginHelper.
- */
- public Hashtable getMsgLoggerConfig()
- {
- return getMsgLoggerConfig(this);
- }
-
- public String getPluginStateLocation()
- {
- return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
- }
-
- public String getDefaultFavoritesLocation()
- {
- // TODO: getPluginInstallLocation can return null and cause trouble for the WSE's favourites mechanism. 89101 should correct this.
- return getPluginInstallLocation()+FavoritesRegistryTypeDefault.FAVORITES_DEFAULT;
- }
-
- public String getPluginInstallLocation()
- {
- try
- {
- return Platform.resolve(instance_.getBundle().getEntry("/")).getFile();
- }
- catch (Exception e)
- {
- return null;
- }
- }
-
- public static BundleContext getBundleContext() {
- return getInstance().context;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
deleted file mode 100644
index f7973ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20060606 105069 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060803 152790 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080123 216372 kathy@ca.ibm.com - Kathy Chan
- * 20090122 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.wst.ws.internal.explorer.popup;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-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.monitor.GetMonitorCommand;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-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.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class PopupTestWSDL extends Action implements IActionDelegate
-{
- protected IStructuredSelection selection = null;
-
- public PopupTestWSDL()
- {
- super(ExplorerPlugin.getMessage("%POPUP_TEST_WSDL"));
- }
-
- public void run()
- {
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- WSExplorerLauncherCommand command = new WSExplorerLauncherCommand();
- command.setForceLaunchOutsideIDE(false);
- Vector launchOptions = new Vector();
- if (selection != null)
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- String wsdlURL = null;
- Object object = it.next();
- if (object instanceof IResource)
- {
- File wsdlFile = ((IResource)object).getLocation().toFile();
- try
- {
- wsdlURL = wsdlFile.toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- wsdlURL = wsdlFile.toString();
- }
- if (object instanceof IFile)
- wsdlURL = getConvertedURIFromIFile((IFile)object,wsdlURL);
- }
- else if (Platform.getAdapterManager().hasAdapter(object, WSDLURLStringWrapper.class.getName())) {
- Object adaptedObject = Platform.getAdapterManager().loadAdapter(object, WSDLURLStringWrapper.class.getName());
- WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
- wsdlURL =wrapper.getWSDLURLString();
- }
- else if (object instanceof ServiceImpl)
- {
- ServiceImpl serviceImpl = (ServiceImpl)object;
- Definition definition = serviceImpl.getEnclosingDefinition();
- wsdlURL = getConvertedURIFromURI(definition.getLocation());
- } else if (object instanceof WSDLResourceImpl)
- {
- WSDLResourceImpl WSDLRImpl = (WSDLResourceImpl)object;
- Definition definition = WSDLRImpl.getDefinition();
- wsdlURL = getConvertedURIFromURI(definition.getLocation());
- } else if (object instanceof String) {
- wsdlURL = (String) object;
- } else {
- // Object is not any types we recognized, wsdlURL is still null.
- // Try looking up an adapter for the object.
- // If found, update wsdlURL contains the adapted WSDL string.
- // If not found, wsdlURL would still be null.
- wsdlURL = AdapterUtils.getAdaptedWSDL(object);
- }
- if (wsdlURL != null)
- addLaunchOptions(launchOptions, wsdlURL, stateLocation, defaultFavoritesLocation);
- }
- }
- command.setLaunchOptions((LaunchOption[])launchOptions.toArray(new LaunchOption[0]));
- command.execute();
- }
-
- /**
- * Set and add the WEB_SERVICE_ENDPOINT, WSDL_URL, STATE_LOCATIION and
- * DEFAULT_FAVORITES_LOCATION LaunchOptions to the launchOptions vector
- *
- * @param launchOptions - vector of launchOptions to add to
- * @param wsdlURL
- * @param stateLocation
- * @param defaultFavoritesLocation
- */
- protected void addLaunchOptions(Vector launchOptions, String wsdlURL, String stateLocation, String defaultFavoritesLocation)
- {
- GetMonitorCommand getMonitorCmd = new GetMonitorCommand();
- getMonitorCmd.setMonitorService(true);
- getMonitorCmd.setCreate(false);
- getMonitorCmd.setWebServicesParser(new WebServicesParser());
- getMonitorCmd.setWsdlURI(wsdlURL);
- getMonitorCmd.execute(null, null);
- List endpoints = getMonitorCmd.getEndpoints();
- for (Iterator endpointsIt = endpoints.iterator(); endpointsIt.hasNext();)
- {
- launchOptions.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, (String)endpointsIt.next()));
- }
- launchOptions.add(new LaunchOption(LaunchOptions.WSDL_URL, wsdlURL));
- launchOptions.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptions.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- }
-
- public void run(IAction action)
- {
- run();
- }
-
- public void selectionChanged(IAction action, ISelection selection)
- {
- if (selection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection) selection;
- else
- this.selection = null;
- }
-
- private String getConvertedURIFromIFile(IFile file,String defaultURI)
- {
- String convertedLocation = null;
- boolean allowBaseConversionOnFailure = true;
- if (file != null && file.exists())
- {
- IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
- if (converter != null)
- {
- convertedLocation = converter.convert(file);
- allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
- }
- }
- if (convertedLocation == null && allowBaseConversionOnFailure)
- return defaultURI;
- return convertedLocation;
- }
-
- private String getConvertedURIFromURI(String originalURI)
- {
- IFile file = null;
- if (originalURI != null)
- {
- String platformResource = "platform:/resource";
- if (originalURI.startsWith(platformResource))
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(originalURI.substring(platformResource.length())));
- else if (originalURI.startsWith("file:"))
- {
- String filePath = convertToRelative(originalURI);
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- }
- }
- return getConvertedURIFromIFile(file,originalURI);
- }
-
- public static String convertToRelative(String uri)
- {
- //remove file:
- String file = "file:/";
- String fileL = "file:";
- String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- root = file + root;
- String rootL = fileL + root;
- if(uri.startsWith(root) || uri.startsWith(rootL)){
- return uri.substring(root.length());
- }
- return uri;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSIL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSIL.java
deleted file mode 100644
index 208a319..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSIL.java
+++ /dev/null
@@ -1,38 +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
- * -------- -------- -----------------------------------------------------------
- * 20080506 202945 pmoogk@ca.ibm.com - Peter Moogk, Allow WSE to launch on WSIL file.
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.popup;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-public class PopupTestWSIL extends PopupTestWSDL
-{
- protected IStructuredSelection selection = null;
-
- public PopupTestWSIL()
- {
- super();
- }
-
-
- protected void addLaunchOptions(Vector launchOptions, String wsdlURL, String stateLocation, String defaultFavoritesLocation)
- {
- launchOptions.add(new LaunchOption(LaunchOptions.WSIL_URL, wsdlURL));
- launchOptions.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptions.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java
deleted file mode 100644
index c424c35..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java
+++ /dev/null
@@ -1,65 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Map;
-
-/**
- * A type of TransportException that can be thrown when the transport protocol
- * is HTTP. The status code of the HTTP response is captured in this
- * exception and passed up to the Web Services Explorer.
- */
-public class HTTPTransportException extends TransportException {
-
- private static final long serialVersionUID = 8277180731798858877L;
-
- private int statusCode;
- private Map headers;
-
- /**
- * Constructor.
- *
- * @param statusCode The HTTP status code.
- * @param message A message about the problem that occurred.
- * @param headers A map of the HTTP headers.
- */
- public HTTPTransportException(int statusCode, String message, Map headers) {
- super(message);
- this.statusCode = statusCode;
- this.headers = headers;
- }
-
- /**
- * Returns the HTTP status code used to create this exception.
- *
- * @return The HTTP status code.
- */
- public int getStatusCode() {
- return statusCode;
- }
-
- /**
- * Retrieve the HTTP header for the given key
- *
- * @param key The key value.
- * @return The HTTP header value for key, or null if there is no such header.
- */
- public String getHeader(String key) {
- Object value = headers.get(key);
- if (value != null)
- return value.toString();
- else
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java
deleted file mode 100644
index 248a20a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java
+++ /dev/null
@@ -1,35 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The IDeserializer is responsible for taking an XML string and deserializing it
- * into values to populate an ISOAPMessage.
- */
-public interface IDeserializer {
-
- /**
- * Deserialize the XML string into the ISOAPMessage. The part parameter tells the method
- * which part of the message (the envelope or the contents of the header or body) the XML
- * string represents. Note that "contents" refers to the list of elements inside the header
- * or body, and not the header or body element itself.
- *
- * @param part One of {@link ISOAPMessage#ENVELOPE}, {@link ISOAPMessage#HEADER_CONTENT}, or
- * {@link ISOAPMessage#BODY_CONTENT}.
- * @param xml The XML string to deserialize.
- * @param message The ISOAPMessage to deserialize into.
- * @throws TransportException
- */
- public void deserialize(int part, String xml, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java
deleted file mode 100644
index 6cd0ad6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java
+++ /dev/null
@@ -1,220 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Map;
-
-import org.w3c.dom.Element;
-
-/**
- * The ISOAPMessage represents a SOAP message in a web service invocation made by the
- * Web Services Explorer's transport stack.
- * <br/>
- * <br/>
- * The setters of ISOAPMessage are called by Web Services Explorer to populate the
- * message before sending. WSE does not guarantee that all message elements it sets
- * will have the same owner document.
- */
-public interface ISOAPMessage {
-
- /**
- * ISOAPMessage defines this property for storing the SOAP action value in
- * a web service invocation. This property will be set by Web Services Explorer
- * prior to passing the message to {@link ISOAPTransport#send(String, String, String, ISOAPMessage)}
- */
- String PROP_SOAP_ACTION = "prop_soap_action";
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the entire SOAP envelope element.
- */
- int ENVELOPE = 0;
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the elements inside the SOAP header element.
- */
- int HEADER_CONTENT = 1;
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the elements inside the SOAP body element.
- */
- int BODY_CONTENT = 2;
-
- /**
- * Returns the MessageContext associated with this message. The MessageContext is created
- * by the Web Services Explorer and passed to the transport stack during message creation.
- * Implementers of ISOAPMessage should store a reference to the MessageContext.
- *
- * @return The MessageContext encasulating information about the web service operation.
- * @see ISOAPTransport#newMessage(MessageContext)
- */
- public MessageContext getMessageContext();
-
- /**
- * Sets a property in this ISOAPMessage.
- *
- * @param key The key (name) of the property
- * @param value The value of the property.
- */
- public void setProperty(String key, Object value);
-
- /**
- * Retrieves a property from this ISOAPMessage.
- *
- * @param key The key (name) of the property to retrieve.
- * @return The value assoicated with the given key, or null if there's no such property.
- */
- public Object getProperty(String key);
-
- /**
- * The namespace table holds the namespace declaraions that are on the envelope element
- * of the SOAP message. The table's keys are the namespace URIs and the values are the
- * associated namespace prefixes.
- * <br/>
- * <br/>
- * The effect of calling this method is that the declarations in the namespace table
- * argument should add to or replace the declarations on the envelope. This API does
- * not specify what happens to existing declarations on the envelope which are not
- * in the namespace table passed in.
- *
- * @param namespaceTable The namespace table
- */
- public void setNamespaceTable(Map namespaceTable);
-
- /**
- * Returns a table of the namespace declarations that are on the envelope element of the
- * SOAP message. The table's keys are the namespace URIs and the values are the
- * associated namespace prefixes.
- * <br/>
- * <br/>
- * The namespace table returned by this method may be modified by the Web Services
- * Explorer and later updated back to the message via the setNamesapceTable() method.
- *
- * @return A table of namespace URIs to prefixes on the SOAP envelope.
- */
- public Map getNamespaceTable();
-
- /**
- * Sets the envelope element of this message.
- *
- * @param envelope The envelope element.
- */
- public void setEnvelope(Element envelope);
-
- /**
- * Returns the envelope element of this message. The deep parameter dictates whether
- * the method returns the whole envelope with all its descendants or just the envelope
- * element itself.
- *
- * @param deep If true, the envelope and its descendants are returned, otherwise only
- * the envelope element itself is returned.
- * @return An element.
- */
- public Element getEnvelope(boolean deep);
-
- /**
- * Sets the header element of this message.
- *
- * @param header The header element.
- */
- public void setHeader(Element header);
-
- /**
- * Returns the header element of this message. The deep parameter dictates whether
- * the method returns the whole header with all its descendants or just the header
- * element itself.
- *
- * @param deep If true, the header and its descendants are returned, otherwise only
- * the header element itself is returned.
- * @return An element.
- */
- public Element getHeader(boolean deep);
-
- /**
- * Sets an array of elements that goes into the message's header.
- *
- * @param headerContent An array of elements.
- */
- public void setHeaderContent(Element[] headerContent);
-
- /**
- * Returns the array of elements that are inside the message's header.
- *
- * @return An array of elements.
- */
- public Element[] getHeaderContent();
-
- /**
- * Sets the body element of this message. For an RPC style message, the first child
- * element of the body should be the RPC wrapper element.
- *
- * @param body The body element.
- */
- public void setBody(Element body);
-
- /**
- * Returns the body of this message. The deep parameter dictates whether
- * the method returns the whole body with all its descendants elements or just the
- * body. For an RPC style message, the first child element of the
- * body should be the RPC wrapper element, regardless of the value of the deep
- * parameter.
- *
- * @param deep If true, the body and its descendants are returned, otherwise only
- * the body (and the RPC wrapper element if the message is RPC style) is returned.
- * @return An element.
- */
- public Element getBody(boolean deep);
-
- /**
- * Sets an array of elements that goes into the message's body. For an RPC style
- * message, the body contents are the elements inside the RPC wrapper element.
- *
- * @param bodyContent An array of elements.
- */
- public void setBodyContent(Element[] bodyContent);
-
- /**
- * Returns the array of elements that are inside the message's body. For an RPC style
- * message, the body contents are the elements inside the RPC wrapper element.
- *
- * @return An array of elements.
- */
- public Element[] getBodyContent();
-
- /**
- * Set the fault element for this message, if any.
- *
- * @param fault A fault element.
- */
- public void setFault(Element fault);
-
- /**
- * Returns the fault element, if any.
- *
- * @return The fault element or null if no fault has occurred.
- */
- public Element getFault();
-
- /**
- * Returns the XML serialized form of this ISOAPMessage.
- *
- * @return An XML string.
- * @see ISerializer
- * @throws TransportException
- */
- public String toXML() throws TransportException;
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java
deleted file mode 100644
index 7d2a3f9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java
+++ /dev/null
@@ -1,59 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The ISOAPTransport is the core piece of the Web Services Explorer transport stack.
- * It is responsible for invoking the web service and it also acts as the factory for
- * creating ISerialier, IDeserializer, and ISOAPMessage instances which make up the
- * rest of the WSE transport.
- */
-public interface ISOAPTransport {
-
- /**
- * Factory method for ISerializer.
- *
- * @return An instance of ISerializer.
- */
- public ISerializer newSerializer();
-
- /**
- * Factory method for IDeserializer.
- *
- * @return An instance of IDeserializer.
- */
- public IDeserializer newDeserializer();
-
- /**
- * Factory method for ISOAPMessage.
- *
- * @param context MessageContext encapsulating information about the web service operation.
- * @return An instance of ISOAPMessage.
- * @throws TransportException
- */
- public ISOAPMessage newMessage(MessageContext context) throws TransportException;
-
- /**
- * Invokes the web service operation by sending the SOAP message, then parsing the results
- * into a response ISOAPMessage.
- *
- * @param url The endpoint URL.
- * @param username Username to use for basic auth protected endpoints. Set to null if not required.
- * @param password Password to use for basic auth protected endpoints. Set to null if not required.
- * @param message The SOAP request message.
- * @return An ISOAPMesage representing the response from the web service invocation.
- * @throws TransportException
- */
- public ISOAPMessage send(String url, String username, String password, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java
deleted file mode 100644
index 1de3dc2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java
+++ /dev/null
@@ -1,30 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * ISOAPTransportProvider is a factory for creating ISOAPTransport objects.
- * Anyone who wishes to extend the org.eclipse.wst.ws.explorer.wseTransportProvider
- * extension-point must provide an implementation for this interface.
- */
-public interface ISOAPTransportProvider {
-
- /**
- * Method for obtaining a new ISOAPTransport from this provider.
- * This method should never return null.
- *
- * @return A new ISOAPTransport object.
- */
- public ISOAPTransport newTransport();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java
deleted file mode 100644
index 5db69fb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java
+++ /dev/null
@@ -1,35 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The ISerializer is responsible for taking an ISOAPMessage and serializing it
- * into an XML string.
- */
-public interface ISerializer {
-
- /**
- * Serialize the ISOAPMessage into an XML string. The part parameter tells the method
- * which part of the message (the envelope or the contents of the header or body) to
- * serialize. Note that "contents" refers to the list of elements inside the header
- * or body, and not the header or body element itself.
- *
- * @param part One of {@link ISOAPMessage#ENVELOPE}, {@link ISOAPMessage#HEADER_CONTENT}, or
- * {@link ISOAPMessage#BODY_CONTENT}.
- * @param message The ISOAPMessage to serialize.
- * @return An XML string.
- * @throws TransportException
- */
- public String serialize(int part, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java
deleted file mode 100644
index 3e327cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java
+++ /dev/null
@@ -1,107 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-/**
- * A MessageContext object holds information about the message that is to be
- * sent on a web service invocation. This information is passed to the
- * ISOAPTransport so that it can construct an appropriate ISOAPMessage to
- * handle the invocation.
- */
-public class MessageContext {
-
- private Definition definition;
- private ExtensibilityElement bindingProtocol;
- private BindingOperation bindingOperation;
- private boolean documentStyle;
-
- /**
- * Sets a reference to the WSDL definition.
- *
- * @param definition The WSDL definition.
- */
- public void setDefinition(Definition definition) {
- this.definition = definition;
- }
-
- /**
- * Returns the WSDL definition.
- *
- * @return The WSDL definition.
- */
- public Definition getDefinition() {
- return definition;
- }
-
- /**
- * Sets a reference to the binding extensibility element in the WSDL document.
- * For a web service that uses the SOAP protocol, this will be an instance of
- * javax.wsdl.extensions.soap.SOAPBinding
- *
- * @param bindingProtocol The binding extensibility element.
- */
- public void setBindingProtocol(ExtensibilityElement bindingProtocol) {
- this.bindingProtocol = bindingProtocol;
- }
-
- /**
- * Returns the binding extensibility element.
- *
- * @return The binding extensibility element.
- */
- public ExtensibilityElement getBindingProtocol() {
- return bindingProtocol;
- }
-
- /**
- * Sets a reference to the binding operation element in the WSDL document.
- *
- * @param bindingOperation The binding operation element.
- */
- public void setBindingOperation(BindingOperation bindingOperation) {
- this.bindingOperation = bindingOperation;
- }
-
- /**
- * Returns the binding operation element.
- *
- * @return The binding operation element.
- */
- public BindingOperation getBindingOperation() {
- return bindingOperation;
- }
-
- /**
- * Sets the flag on whether the message created from this MessageContext
- * is document style or not.
- *
- * @param documentStyle True for document style, false otherwise.
- */
- public void setDocumentStyle(boolean documentStyle) {
- this.documentStyle = documentStyle;
- }
-
- /**
- * Returns the document style property.
- *
- * @return The document style property.
- */
- public boolean isDocumentStyle() {
- return documentStyle;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java
deleted file mode 100644
index b9a41f4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java
+++ /dev/null
@@ -1,339 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This is a default implementation of the ISOAPMessage interface that extenders of the Web
- * Services Explorer transport can use if they do not wish to implement their own message.
- * This class is implemented as a collection of loose pieces of the SOAP message, and each
- * piece must be set individually (for example, setting the envelope element will not
- * automatically populate the header or body elements).
- * <br/>
- * <br/>
- * This class does not know how to serialize itself. It depends on an ISerializer provided by
- * the transport extender.
- */
-public final class SOAPMessage implements ISOAPMessage {
-
- private MessageContext context;
- private ISerializer serializer;
-
- private Map properties = new Hashtable();
-
- private Element envelope = null;
-
- private Element header = null;
- private Element[] headerContent = null;
-
- private Element body = null;
- private Element[] bodyContent = null;
-
- private Element fault = null;
-
- private String xml = null;
-
- /**
- * Constructor.
- *
- * @param context The MessageContext.
- * @param serializer An ISerializer to use to serialize this message.
- */
- public SOAPMessage(MessageContext context, ISerializer serializer) {
- this.context = context;
- this.serializer = serializer;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getMessageContext()
- */
- public MessageContext getMessageContext() {
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setProperty(java.lang.String, java.lang.Object)
- */
- public void setProperty(String key, Object value) {
- properties.put(key, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getProperty(java.lang.String)
- */
- public Object getProperty(String key) {
- return properties.get(key);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setNamespaceTable(java.util.Map)
- */
- public synchronized void setNamespaceTable(Map namespaceTable) {
- if (namespaceTable == null || envelope == null)
- return;
-
- Iterator iter = namespaceTable.entrySet().iterator();
-
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- String name = "xmlns:" + entry.getValue();
- envelope.setAttribute(name, entry.getKey().toString());
- }
-
- xml = null;
- }
-
- /*
- * If the attribute is a namespace declaration, the namespace prefix is returned.
- * Otherwise null is returned.
- */
- private String getNSPrefix(Attr attribute) {
- String name = attribute.getName();
- if (name.startsWith("xmlns:"))
- return name.substring(6);
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getNamespaceTable()
- */
- public Map getNamespaceTable() {
-
- Hashtable namespaceTable = new Hashtable();
-
- if (envelope != null) {
- NamedNodeMap attributes = envelope.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Attr attribute = (Attr) attributes.item(i);
- String prefix = getNSPrefix(attribute);
- if (prefix != null)
- namespaceTable.put(attribute.getValue(), prefix);
- }
- }
-
- return namespaceTable;
- }
-
- /*
- * Appends a child node to a parent node, takes care of importing
- * the child node if neccessary.
- */
- private void appendNode(Node parent, Node child) {
- if (parent == null || child == null)
- return;
-
- Document owner = parent.getOwnerDocument();
-
- if (!owner.equals(child.getOwnerDocument()))
- child = owner.importNode(child, true);
-
- parent.appendChild(child);
- }
-
- /*
- * Adds an array of elements to the parent element as child elements.
- */
- private void appendChildren(Element parent, Element[] children) {
- if (parent == null || children == null)
- return;
-
- for (int i = 0; i < children.length; i++) {
- if (children[i] == null)
- continue;
- appendNode(parent, children[i]);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setEnvelope(org.w3c.dom.Element)
- */
- public synchronized void setEnvelope(Element envelope) {
- if (envelope == null)
- this.envelope = envelope;
- else
- this.envelope = (Element) envelope.cloneNode(false);
-
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getEnvelope(boolean)
- */
- public Element getEnvelope(boolean deep) {
- if (!deep)
- return envelope;
-
- synchronized (this) {
- if (envelope == null)
- return null;
-
- Element clonedEnvelope = (Element) envelope.cloneNode(false);
-
- if (headerContent != null && headerContent.length > 0)
- appendNode(clonedEnvelope, getHeader(true));
-
- appendNode(clonedEnvelope, getBody(true));
-
- return clonedEnvelope;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setHeader(org.w3c.dom.Element)
- */
- public synchronized void setHeader(Element header) {
- if (header == null)
- this.header = null;
- else
- this.header = (Element) header.cloneNode(false);
-
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getHeader(boolean)
- */
- public Element getHeader(boolean deep) {
- if (!deep)
- return header;
-
- synchronized (this) {
- if (header == null)
- return null;
-
- Element clonedHeader = (Element) header.cloneNode(false);
- appendChildren(clonedHeader, headerContent);
- return clonedHeader;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setHeaderContent(org.w3c.dom.Element[])
- */
- public synchronized void setHeaderContent(Element[] headerContent) {
- this.headerContent = headerContent;
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getHeaderContent()
- */
- public Element[] getHeaderContent() {
- return headerContent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setBody(org.w3c.dom.Element)
- */
- public synchronized void setBody(Element body) {
- if (body == null)
- this.body = null;
- else {
- this.body = (Element) body.cloneNode(false);
-
- if (!context.isDocumentStyle() && fault == null) {
- NodeList childElements = body.getElementsByTagName("*");
- if (childElements.getLength() > 0)
- this.body.appendChild(childElements.item(0).cloneNode(false));
- }
- }
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getBody(boolean)
- */
- public Element getBody(boolean deep) {
- if (!deep)
- return body;
-
- synchronized (this) {
- if (body == null)
- return null;
-
- // copy the rpc wrapper element as well, if any
- Element clonedBody = (Element) body.cloneNode(true);
-
- if (fault != null)
- appendNode(clonedBody, fault);
- else {
- Element target = clonedBody;
-
- // check for rpc wrapper
- if (clonedBody.getFirstChild() != null)
- target = (Element) clonedBody.getFirstChild();
-
- appendChildren(target, bodyContent);
- }
-
- return clonedBody;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setBodyContent(org.w3c.dom.Element[])
- */
- public synchronized void setBodyContent(Element[] bodyContent) {
- this.bodyContent = bodyContent;
- if (bodyContent != null)
- fault = null;
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getBodyContent()
- */
- public Element[] getBodyContent() {
- return bodyContent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setFault(org.w3c.dom.Element)
- */
- public synchronized void setFault(Element fault) {
- this.fault = fault;
- if (fault != null) {
- if (body != null && body.getFirstChild() != null)
- body.removeChild(body.getFirstChild());
- bodyContent = null;
- }
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getFault()
- */
- public Element getFault() {
- return fault;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#toXML()
- */
- public synchronized String toXML() throws TransportException {
- if (xml == null)
- xml = serializer.serialize(ENVELOPE, this);
- return xml;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java
deleted file mode 100644
index 2cac2fd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java
+++ /dev/null
@@ -1,51 +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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * An general purpose exception to indicate a problem has occurred when
- * invoking a web service.
- */
-public class TransportException extends RuntimeException {
-
- private static final long serialVersionUID = -1502247230726021403L;
-
- /**
- * Constructor.
- *
- * @param message A message about the problem that occurred.
- */
- public TransportException(String message) {
- super(message);
- }
-
- /**
- * Constructor that accepts a message and a cause.
- *
- * @param message A message about the problem that occurred.
- * @param cause The cause for this exception.
- */
- public TransportException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructor that accepts a cause.
- *
- * @param cause The cause for this exception.
- */
- public TransportException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
deleted file mode 100644
index 5492c6c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
+++ /dev/null
@@ -1,188 +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
-###############################################################################
-
-TITLE_WSEXPLORER=Web Services Explorer
-
-# Tree Nodes
-ALT_OPEN=Open
-ALT_CLOSE=Close
-
-# Perspective Toolbar
-ALT_BACK=Back
-ALT_FORWARD=Forward
-ALT_ACTION_ENGINE=Action Recorder
-ALT_UDDI_PERSPECTIVE=UDDI Page
-ALT_WSIL_PERSPECTIVE=WSIL Page
-ALT_WSDL_PERSPECTIVE=WSDL Page
-ALT_FAVORITES_PERSPECTIVE=Favorites
-
-# Toolbars
-ALT_DOUBLE_CLICK_TO_MAXIMIZE=Double Click to Maximize
-ALT_DOUBLE_CLICK_TO_RESTORE=Double Click to Restore
-
-# SetDefaultViewTool
-ALT_BACK_TO_TOP=Back to top
-
-# Common Actions
-ALT_REFRESH=Refresh
-ALT_CLEAR=Clear
-ALT_RESULTS=Results
-
-# Common Labels
-ALT_NAVIGATOR=Navigator
-ALT_ACTIONS=Actions
-ALT_STATUS=Status
-ALT_OTHER_ACTIONS=Other Actions
-FORM_BUTTON_GO= Go
-FORM_BUTTON_RESET=Reset
-FORM_BUTTON_CANCEL=Cancel
-FORM_LABEL_ACTIONS=Actions
-FORM_LABEL_ACTIONS_NONE=None
-
-# Placeholder for blank table entries
-TABLE_BLANK_PLACEHOLDER=--
-
-# Common Form Control Titles
-FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX=Select all
-FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX=Select row
-
-# Common Messages
-MSG_ERROR_UNEXPECTED=IWAB0135E An unexpected error has occurred.
-MSG_ERROR_NO_ACTION_SELECTED=IWAB0124E Select an action.
-MSG_ERROR_NO_NODE_SELECTED=IWAB0125E Select a node.
-MSG_SUBMIT_IN_PROGRESS=Please wait. The operation is still in progress.
-MSG_LOAD_IN_PROGRESS=Please wait while the form loads...
-
-#LaunchWebServiceWizardAction
-ALT_LAUNCH_WEB_SERVICE_WIZARD=Launch Web Service Wizard
-FORM_LABEL_CHOOSE_WIZARD=Select a wizard to launch:
-FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD=Web Service Client
-FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD=Web Service Skeleton
-MSG_ERROR_WIZARD_ALREADY_RUNNING=IWAB0126E A Web service wizard is already in progress. Finish with the existing wizard before launching a new one.
-MSG_ERROR_WSDL_URL_IS_UNREACHABLE=IWAB0127E The WSDL document is unreachable.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-MSG_ERROR_RETRIEVING_WSDL_DOC=IWAB0128E Unable to retrieve WSDL document.
-MSG_ERROR_RETRIEVING_WSIL_DOC=IWAB0129E Unable to retrieve WSIL document.
-MSG_IMPORT_WSDL_SUCCESSFUL=WSDL document successfully imported.
-MSG_IMPORT_WSIL_SUCCESSFUL=WSIL document successfully imported.
-
-# ImportToWorkbenchAction
-ALT_IMPORT_WSDL_TO_WORKBENCH=Import WSDL To workbench
-FORM_LABEL_IMPORT_TO_WORKBENCH_DESC=Select a workbench project to save the WSDL file into. You may also change the name of the WSDL file.
-WEB_PROJECT_NAME=Web project:
-WORKBENCH_PROJECT_NAME=Workbench project:
-LABEL_IMPORT_WSDL=Import WSDL document
-LABEL_IMPORT_TO_WSIL=Import as a service reference to a WSIL document
-IMPORTED_WSDL_FILE_NAME=WSDL file name:
-WSIL_FILE_NAME=WSIL file name:
-MSG_ERROR_FILE_OVERWRITE_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_INVALID_WORKBENCH_PROJECT=IWAB0130E Select a workbench project.
-MSG_ERROR_INVALID_WSDL_FILE_NAME=IWAB0131E Invalid file name.
-MSG_ERROR_INVALID_WSIL_FILE_NAME=IWAB0470E Invalid WSIL file name.
-MSG_ERROR_NO_IMPORT_OPTION_SELECTED=IWAB0471E No import option is selected. Please choose at least one import option.
-MSG_ERROR_WRITING_TEMP_FILE_TO_FS=IWAB0132E Unable to write temporary file.
-MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL=IWAB0314I %1 was successfully imported to the workbench.
-MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL=IWAB0472I Service reference was successfully imported to %1.
-
-# CheckWorkbenchFileReadOnlyAction
-MSG_ERROR_FILE_CHECKOUT_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-# ClearNodeAction
-MSG_INFO_NODE_CLEARED=IWAB0133I %1 cleared.
-
-# Table twistees
-ALT_TWIST_OPENED=Hide
-ALT_TWIST_CLOSED=Expand
-
-# WSDL Browser
-FORM_LINK_BROWSE=Browse...
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_CATEGORY=Category
-FORM_LABEL_WSDL_All=All
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Workspace Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Workspace Project
-FORM_LABEL_WSDL_URL=WSDL URL
-FORM_BUTTON_REFRESH=Refresh
-ALT_WSDL_BROWSER=WSDL Browser
-WSDL_TYPE_SERVICE_INTERFACES=Service Interfaces
-WSDL_TYPE_SERVICES=Services
-
-# Calendar Browser
-TITLE_CALENDAR_BROWSER=Calendar Browser
-# 2 character abbreviations for days of the week.
-FORM_LABEL_SH_SUNDAY=Su
-FORM_LABEL_SH_MONDAY=Mo
-FORM_LABEL_SH_TUESDAY=Tu
-FORM_LABEL_SH_WEDNESDAY=We
-FORM_LABEL_SH_THURSDAY=Th
-FORM_LABEL_SH_FRIDAY=Fr
-FORM_LABEL_SH_SATURDAY=Sa
-# Months of the year
-FORM_LABEL_MONTH=Month:
-FORM_LABEL_JANUARY=January
-FORM_LABEL_FEBRUARY=February
-FORM_LABEL_MARCH=March
-FORM_LABEL_APRIL=April
-FORM_LABEL_MAY=May
-FORM_LABEL_JUNE=June
-FORM_LABEL_JULY=July
-FORM_LABEL_AUGUST=August
-FORM_LABEL_SEPTEMBER=September
-FORM_LABEL_OCTOBER=October
-FORM_LABEL_NOVEMBER=November
-FORM_LABEL_DECEMBER=December
-FORM_LABEL_YEAR=Year:
-FORM_LABEL_TIME=Time:
-FORM_LINK_TODAY=Today
-FORM_LINK_PREVIOUS_YEAR=<<
-FORM_LINK_PREVIOUS_MONTH=<
-FORM_LINK_NEXT_MONTH=>
-FORM_LINK_NEXT_YEAR=>>
-ALT_PREVIOUS_YEAR=Previous Year
-ALT_PREVIOUS_MONTH=Previous Month
-ALT_NEXT_MONTH=Next Month
-ALT_NEXT_YEAR=Next Year
-ALT_TODAY=Today
-ALT_CALENDAR_BROWSER=Calendar Browser
-MSG_ERROR_INVALID_TIME_FORMAT=IWAB0368E Time was not formatted as HH:MM:SS[.SSS]. Do you wish to use the current time instead?
-
-# Action engine
-TITLE_ACTION_RECORDER=Action Recorder
-FORM_LABEL_MODE=Mode:
-FORM_LABEL_MODE_PLAY=Play
-FORM_LABEL_MODE_STOP=Stop
-FORM_LABEL_MODE_RECORD=Record
-FORM_LABEL_SAVE=Save
-FORM_LABEL_PLAY_FILE=Play file:
-MSG_ERROR_INVALID_PLAY_FILE=IWAB0362E Enter a play file.
-
-# Frame titles
-FRAME_TITLE_PERSPECTIVE_WORKAREA=Web Services Explorer Internal Work Area
-FRAME_TITLE_PERSPECTIVE_TOOLBAR=Web Services Explorer Toolbar
-FRAME_TITLE_PERSPECTIVE_CONTENT=Web Services Explorer Page Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_PAGE_LOADER=Page Loader
-FORM_TITLE_PAGE_CONTENT=Loaded Page Content
-FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD=Launch Web Service Wizard Form
-FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
-
-# SessionTimedOut message
-MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after 30 minutes of inactivity to free up memory resources.
-MSG_ERROR_RESTART_SESSION=Relaunch the Web Service Explorer to test your Web service.
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
deleted file mode 100644
index f3988f5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
+++ /dev/null
@@ -1,164 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-###############################################################################
-
-title=Favorites
-
-# Navigator
-FAVORITES_MAIN_NODE=Favorites Main
-FAVORITES_WSIL_FOLDER_NODE=Favorite WSILs
-FAVORITES_WSDL_SERVICE_FOLDER_NODE=Favorite WSDL Services
-FAVORITES_UDDI_SERVICE_FOLDER_NODE=Favorite UDDI Services
-FAVORITES_UDDI_BUSINESSES_FOLDER_NODE=Favorite UDDI Businesses
-FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE=Favorite UDDI Service Interfaces
-FAVORITES_UDDI_REGISTRIES_FOLDER_NODE=Favorite UDDI Registries
-FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE=Favorite User Defined UDDI Registries
-
-# Form
-FORM_LABEL_FAVORITE_WSIL=Favorite WSILs
-FORM_LABEL_FAVORITE_WSDL=Favorite WSDLs
-FORM_LABEL_FAVORITE_UDDI_REGISTRY=Favorite UDDI Registries
-FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY=Favorite User Defined UDDI Registries
-FORM_LABEL_FAVORITE_UDDI_SERVICE=Favorite UDDI Services
-FORM_LABEL_FAVORITE_UDDI_BUSINESS=Favorite UDDI Business Entities
-FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE=Favorite UDDI Service Interfaces
-FORM_LABEL_REMOVE=Remove
-FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE=Add To WSIL Page
-FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_VERSION=UDDI Version
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESC=Description
-FORM_LABEL_DEFAULT_LOGIN=Default Login
-FORM_LABEL_DEFAULT_PASSWORD=Default Password
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_SECURE_INQUIRY_URL=Secure Inquiry URL
-FORM_LABEL_SECURE_PUBLISH_URL=Secure Publish URL
-FORM_LABEL_TAXONOMY=Taxonomy
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_BUSINESS_NAME=Business Name
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_NAME=Service Name
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_NAME=Service Interface Name
-FORM_LABEL_SERVICE_INTERFACE_KEY=Service Interface Key
-FORM_LABEL_REGISTRY_URL=<a href="%1" target="_blank">Click here</a> to obtain a user ID and password for this registry.
-FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES=Data files for User Defined Categories
-MSG_ERROR_NOTHING_SELECTED=IWAB0315E Select at least one item.
-
-# ListFavoriteWSILAction
-ALT_LIST_FAVORITE_WSIL=List Favorite WSILs
-FORM_LABEL_LIST_FAVORITE_WSIL_DESC=Select a set of favorite WSIL links and press <strong>Add to WSIL Page</strong> to open them in the WSIL navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteWSDLServiceAction
-ALT_LIST_FAVORITE_WSDL_SERVICE=List Favorite WSDL Services
-FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC=Select a set of favorite WSDL services and press <strong>Remove</strong> to remove them.
-
-# ListFavoriteUDDIServiceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE=List Favorite UDDI Services
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC=Select a set of favorite UDDI services and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIBusinessAction
-ALT_LIST_FAVORITE_UDDI_BUSINESS=List Favorite UDDI Businesses
-FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC=Select a set of favorite UDDI businesses and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIRegistryAction
-ALT_LIST_FAVORITE_UDDI_REGISTRY=List Favorite UDDI Registries
-FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUserDefUDDIRegistryAction
-ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY=List Favorite User Defined UDDI Registries
-FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator.
-
-# ListFavoriteUDDIServiceInterfaceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE=List Favorite UDDI Service Interfaces
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC=Select a set of favorite UDDI service interfaces and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# FavoritesWSILDetailsAction
-ALT_FAVORITES_WSIL_DETAILS=Favorite WSIL Details
-
-# FavoritesWSDLDetailsAction
-ALT_FAVORITES_WSDL_DETAILS=Favorite WSDL Details
-
-# FavoritesUDDIRegistryDetailsAction
-ALT_FAVORITES_UDDI_REGISTRY_DETAILS=Favorite UDDI Registry Details
-
-# FavoritesUserDefUDDIRegistryDetailsAction
-ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS=Favorite User Defined UDDI Registry Details
-
-# FavoritesUDDIBusinessDetailsAction
-ALT_FAVORITES_UDDI_BUSINESS_DETAILS=Favorite UDDI Business Details
-
-# FavoritesUDDIServiceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_DETAILS=Favorite UDDI Service Details
-
-# FavoritesUDDIServiceInterfaceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS=Favorite UDDI Service Interface Details
-
-# AddWSILToWSILPerspectiveAction
-ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE=Add to WSIL Page
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0316E %1 is already opened in WSIL Page.
-MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL=IWAB0317I %1 is added to WSIL Page.
-MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE=IWAB0318E WSIL %1 could not be loaded.
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_TO_UDDI_PERSPECTIVE=Add to UDDI Page
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0320E %1 could not be found in the registry.
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0321I %1 is added to UDDI Page.
-
-# FavoritesAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add to WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0369I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0370E WSDL %1 could not be loaded.
-
-# RemoveFavoriteAction
-ALT_REMOVE_FAVORITE=Remove Favorite
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# FavoritesRestoreDefaultFavoritesAction
-ALT_RESTORE_DEFAULT_FAVORITES=Restore Default Favorites
-MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES=This operation will overwrite the current favorites. Do you wish to continue?
-MSG_ERROR_OPEN_FAVORITES_BACKUP=IWAB0134E Unable to load the default favorites.
-MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT=IWAB0322I Default Favorites are restored.
-MSG_ERROR_SAVE_FAVORITES_WSIL=IWAB0186E Unable to save favorites to %1.
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_REGISTRY_DETAILS=UDDI Registry Details Form
-FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS=User Defined UDDI Registry Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS=UDDI Service Interface Details Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESS_LIST=UDDI Businesses List View
-VIEW_TITLE_UDDI_REGISTRY_LIST=UDDI Registries List View
-VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST=User Defined UDDI Registries List View
-VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST=UDDI Service Interfaces List View
-VIEW_TITLE_UDDI_SERVICE_LIST=UDDI Services List View
-VIEW_TITLE_WSDL_SERVICE_LIST=WSDL Services List View
-VIEW_TITLE_WSIL_LIST=WSIL Links List View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
deleted file mode 100644
index 093a614..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
+++ /dev/null
@@ -1,496 +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
-###############################################################################
-
-title=UDDI
-
-# Nodes
-NODE_NAME_UDDI_MAIN=UDDI Main
-NODE_NAME_QUERIES_FOLDER=Executed Queries
-NODE_NAME_PUBLISHED_BUSINESSES_FOLDER=Published Businesses
-NODE_NAME_PUBLISHED_SERVICES_FOLDER=Published Services
-NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER=Published Service Interfaces
-
-# OpenRegistryAction
-ALT_OPEN_REGISTRY=Open Registry
-FORM_LABEL_OPEN_REGISTRY_DESC=Specify the name and inquiry URL of the registry to be opened. Selecting a favorite registry will automatically fill in the required information. Press <strong>Go</strong> to open the registry.
-FORM_LABEL_FAVORITE_REGISTRY=Favorite Registry
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-MSG_ERROR_INVALID_REGISTRY_NAME=IWAB0136E Enter a valid registry name.
-MSG_ERROR_INVALID_INQUIRY_URL=IWAB0138E Enter a valid inquiry URL.
-MSG_INFO_REGISTRY_OPENED=IWAB0139I The registry named %1 located at %2 was opened successfully.
-
-# User-defined Categories
-FORM_LABEL_ADD_CATEGORY_DATA=<a href="%1">Click here</a> to load this category's data.
-FORM_CONTROL_TITLE_CATEGORY_FILE=Category data file name
-MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND=IWAB0371I No user defined categories detected.
-MSG_INFO_NO_CATEGORY_DATA=IWAB0372I Category data for %1 is not available or is invalid.
-MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED=IWAB0373I Data for user defined category %1 was successfully loaded.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY=IWAB0374E Invalid data file for user defined category %1. A category key '%2' was found but '%3' was expected.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT=IWAB0473E Unknown format in line: %1 of the data file for user defined category %2. The line is: "%3"
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE=IWAB0375E Invalid data file for user defined category %1.
-MSG_ERROR_SAVING_CATEGORY_DATA=IWAB0474E An error occured while saving data for category %1. Exception text: %2
-
-# UDDI Category Browser
-TITLE_CATEGORY_BROWSER=Category Browser
-ALT_CATEGORIES=Categories
-
-# Details
-ALT_REGISTRY_DETAILS=Registry Details
-ALT_BUSINESS_DETAILS=Business Details
-ALT_SERVICE_DETAILS=Service Details
-ALT_SERVICE_INTERFACE_DETAILS=Service Interface Details
-FORM_LABEL_DETAILS_EDITABLE=Details for <strong>%1</strong> are shown below. Some items may be added, removed, or changed. Authentication may be required for changes. Other actions are listed at the bottom of this page.
-
-# Get
-ALT_GET=Get
-
-# Common Form Control Title
-FORM_CONTROL_TITLE_NAME_TEXT_VALUE=Name value
-FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE=Description value
-FORM_CONTROL_TITLE_CATEGORY_KEY_NAME=Category key name
-FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE=Category key value
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME=Identifier key name
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE=Identifier key value
-FORM_CONTROL_TITLE_DISCOVERY_URL=Discovery URL
-FORM_CONTROL_TITLE_INPUT_TEXT_VALUE=UDDI registry name
-
-# Find actions
-ALT_FIND=Find
-ALT_SUBQUERY=Find %1 Subquery
-FORM_LABEL_QUERY_NAME=Name of this query
-DEFAULT_QUERY_NAME=query results
-DEFAULT_SUBQUERY_NAME=%1 - %2 subquery
-FORM_LABEL_SEARCH_FOR=Search for
-FORM_OPTION_BUSINESSES=Businesses
-FORM_OPTION_SERVICES=Services
-FORM_OPTION_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_SEARCH_TYPE=Type of search
-FORM_RADIO_SIMPLE=Simple
-FORM_RADIO_ADVANCED=Advanced
-FORM_RADIO_UUID=UUID
-FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC=Enter the partial or complete name of a business to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_ADVANCED_DESC=Enter values for one or more of the parameters listed below. The '%' symbol can be used as a wildcard that matches any character in the Name field of the Names table. Authentication may be required. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_BUSINESS_UUID_DESC=Enter the UUID of the business to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_NAMES=Names
-FORM_LINK_ADD=Add
-FORM_LINK_GET=Get
-FORM_LINK_FIND=Find
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_OWNED=Owned
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_USERID=User ID
-FORM_LABEL_PASSWORD=Password
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESCRIPTION=Description
-FORM_OPTION_LANGUAGE_EN=English
-FORM_OPTION_LANGUAGE_AA=Afar
-FORM_OPTION_LANGUAGE_AB=Abkhazian
-FORM_OPTION_LANGUAGE_AF=Afrikaans
-FORM_OPTION_LANGUAGE_AM=Amharic
-FORM_OPTION_LANGUAGE_AR=Arabic
-FORM_OPTION_LANGUAGE_AS=Assamese
-FORM_OPTION_LANGUAGE_AY=Aymara
-FORM_OPTION_LANGUAGE_AZ=Azerbaijani
-FORM_OPTION_LANGUAGE_BA=Bashkir
-FORM_OPTION_LANGUAGE_BE=Byelorussian
-FORM_OPTION_LANGUAGE_BG=Bulgarian
-FORM_OPTION_LANGUAGE_BH=Bihari
-FORM_OPTION_LANGUAGE_BI=Bislama
-FORM_OPTION_LANGUAGE_BN=Bengali; Bangla
-FORM_OPTION_LANGUAGE_BO=Tibetan
-FORM_OPTION_LANGUAGE_BR=Breton
-FORM_OPTION_LANGUAGE_CA=Catalan
-FORM_OPTION_LANGUAGE_CO=Corsican
-FORM_OPTION_LANGUAGE_CZ=Czech
-FORM_OPTION_LANGUAGE_CY=Welsh
-FORM_OPTION_LANGUAGE_DA=Danish
-FORM_OPTION_LANGUAGE_DE=German
-FORM_OPTION_LANGUAGE_DZ=Bhutani
-FORM_OPTION_LANGUAGE_EL=Greek
-FORM_OPTION_LANGUAGE_EO=Esperanto
-FORM_OPTION_LANGUAGE_ES=Spanish
-FORM_OPTION_LANGUAGE_ET=Estonian
-FORM_OPTION_LANGUAGE_EU=Basque
-FORM_OPTION_LANGUAGE_FA=Persian
-FORM_OPTION_LANGUAGE_FI=Finnish
-FORM_OPTION_LANGUAGE_FJ=Fiji
-FORM_OPTION_LANGUAGE_FO=Faeroese
-FORM_OPTION_LANGUAGE_FR=French
-FORM_OPTION_LANGUAGE_FY=Frisian
-FORM_OPTION_LANGUAGE_GA=Irish
-FORM_OPTION_LANGUAGE_GD=Scots Gaelic
-FORM_OPTION_LANGUAGE_GL=Galician
-FORM_OPTION_LANGUAGE_GN=Guarani
-FORM_OPTION_LANGUAGE_GU=Gujarati
-FORM_OPTION_LANGUAGE_HA=Hausa
-FORM_OPTION_LANGUAGE_HI=Hindi
-FORM_OPTION_LANGUAGE_HR=Croatian
-FORM_OPTION_LANGUAGE_HU=Hungarian
-FORM_OPTION_LANGUAGE_HY=Armenian
-FORM_OPTION_LANGUAGE_IA=Interlingua
-FORM_OPTION_LANGUAGE_IE=Interlingue
-FORM_OPTION_LANGUAGE_IK=Inupiak
-FORM_OPTION_LANGUAGE_IN=Indonesian
-FORM_OPTION_LANGUAGE_IS=Icelandic
-FORM_OPTION_LANGUAGE_IT=Italian
-FORM_OPTION_LANGUAGE_IW=Hebrew
-FORM_OPTION_LANGUAGE_JA=Japanese
-FORM_OPTION_LANGUAGE_JI=Yiddish
-FORM_OPTION_LANGUAGE_JW=Javanese
-FORM_OPTION_LANGUAGE_KA=Georgian
-FORM_OPTION_LANGUAGE_KK=Kazakh
-FORM_OPTION_LANGUAGE_KL=Greenlandic
-FORM_OPTION_LANGUAGE_KM=Cambodian
-FORM_OPTION_LANGUAGE_KN=Kannada
-FORM_OPTION_LANGUAGE_KO=Korean
-FORM_OPTION_LANGUAGE_KS=Kashmiri
-FORM_OPTION_LANGUAGE_KU=Kurdish
-FORM_OPTION_LANGUAGE_KY=Kirghiz
-FORM_OPTION_LANGUAGE_LA=Latin
-FORM_OPTION_LANGUAGE_LN=Lingala
-FORM_OPTION_LANGUAGE_LO=Laothian
-FORM_OPTION_LANGUAGE_LT=Lithuanian
-FORM_OPTION_LANGUAGE_LV=Latvian, Lettish
-FORM_OPTION_LANGUAGE_MG=Malagasy
-FORM_OPTION_LANGUAGE_MI=Maori
-FORM_OPTION_LANGUAGE_MK=Macedonian
-FORM_OPTION_LANGUAGE_ML=Malayalam
-FORM_OPTION_LANGUAGE_MN=Mongolian
-FORM_OPTION_LANGUAGE_MO=Moldavian
-FORM_OPTION_LANGUAGE_MR=Marathi
-FORM_OPTION_LANGUAGE_MS=Malay
-FORM_OPTION_LANGUAGE_MT=Maltese
-FORM_OPTION_LANGUAGE_MY=Burmese
-FORM_OPTION_LANGUAGE_NA=Nauru
-FORM_OPTION_LANGUAGE_NE=Nepali
-FORM_OPTION_LANGUAGE_NL=Dutch
-FORM_OPTION_LANGUAGE_NO=Norwegian
-FORM_OPTION_LANGUAGE_OC=Occitan
-FORM_OPTION_LANGUAGE_OM=(Afan) Oromo
-FORM_OPTION_LANGUAGE_OR=Oriya
-FORM_OPTION_LANGUAGE_PA=Punjabi
-FORM_OPTION_LANGUAGE_PL=Polish
-FORM_OPTION_LANGUAGE_PS=Pashto, Pushto
-FORM_OPTION_LANGUAGE_PT=Portuguese
-FORM_OPTION_LANGUAGE_QU=Quechua
-FORM_OPTION_LANGUAGE_RM=Rhaeto-Romance
-FORM_OPTION_LANGUAGE_RN=Kirundi
-FORM_OPTION_LANGUAGE_RO=Romanian
-FORM_OPTION_LANGUAGE_RU=Russian
-FORM_OPTION_LANGUAGE_RW=Kinyarwanda
-FORM_OPTION_LANGUAGE_SA=Sanskrit
-FORM_OPTION_LANGUAGE_SD=Sindhi
-FORM_OPTION_LANGUAGE_SG=Sangro
-FORM_OPTION_LANGUAGE_SH=Serbo-Croatian
-FORM_OPTION_LANGUAGE_SI=Singhalese
-FORM_OPTION_LANGUAGE_SK=Slovak
-FORM_OPTION_LANGUAGE_SL=Slovenian
-FORM_OPTION_LANGUAGE_SM=Samoan
-FORM_OPTION_LANGUAGE_SN=Shona
-FORM_OPTION_LANGUAGE_SO=Somali
-FORM_OPTION_LANGUAGE_SQ=Albanian
-FORM_OPTION_LANGUAGE_SR=Serbian
-FORM_OPTION_LANGUAGE_SS=Siswati
-FORM_OPTION_LANGUAGE_ST=Sesotho
-FORM_OPTION_LANGUAGE_SU=Sundanese
-FORM_OPTION_LANGUAGE_SV=Swedish
-FORM_OPTION_LANGUAGE_SW=Swahili
-FORM_OPTION_LANGUAGE_TA=Tamil
-FORM_OPTION_LANGUAGE_TE=Tegulu
-FORM_OPTION_LANGUAGE_TG=Tajik
-FORM_OPTION_LANGUAGE_TH=Thai
-FORM_OPTION_LANGUAGE_TI=Tigrinya
-FORM_OPTION_LANGUAGE_TK=Turkmen
-FORM_OPTION_LANGUAGE_TL=Tagalog
-FORM_OPTION_LANGUAGE_TN=Setswana
-FORM_OPTION_LANGUAGE_TO=Tonga
-FORM_OPTION_LANGUAGE_TR=Turkish
-FORM_OPTION_LANGUAGE_TS=Tsonga
-FORM_OPTION_LANGUAGE_TT=Tatar
-FORM_OPTION_LANGUAGE_TW=Twi
-FORM_OPTION_LANGUAGE_UK=Ukrainian
-FORM_OPTION_LANGUAGE_UR=Urdu
-FORM_OPTION_LANGUAGE_UZ=Uzbek
-FORM_OPTION_LANGUAGE_VI=Vietnamese
-FORM_OPTION_LANGUAGE_VO=Volapuk
-FORM_OPTION_LANGUAGE_WO=Wolof
-FORM_OPTION_LANGUAGE_XH=Xhosa
-FORM_OPTION_LANGUAGE_YO=Yoruba
-FORM_OPTION_LANGUAGE_ZH=Chinese
-FORM_OPTION_LANGUAGE_ZU=Zulu
-FORM_LABEL_EXACT_NAME_MATCH=Exact match
-FORM_LABEL_CASE_SENSITIVE_MATCH=Case sensitive
-FORM_LABEL_SOUNDEX=Sound alike
-FORM_LABEL_IDENTIFIERS=Identifiers
-FORM_LABEL_IDENTIFIER_TYPE=Type
-
-# Do not translate the two items below.
-FORM_OPTION_IDENTIFIER_DUNS=D-U-N-S
-FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY=Thomas Registry
-
-FORM_LABEL_KEY_NAME=Key name
-FORM_LABEL_KEY_VALUE=Key value
-FORM_LABEL_CATEGORIES=Categories
-FORM_LABEL_CATEGORY_TYPE=Type
-FORM_OPTION_CATEGORY_NAICS=NAICS
-FORM_OPTION_CATEGORY_UNSPSC_73=UNSPSC 7.3
-FORM_OPTION_CATEGORY_GEO=GEO
-FORM_LABEL_BUSINESS_CATEGORIES=Compare with:
-FORM_OPTION_BUSINESSES_ONLY=Businesses only
-FORM_OPTION_SERVICES_ONLY=Services only
-FORM_OPTION_BOTH=Businesses and Services
-FORM_LABEL_DISCOVERYURLS=Discovery URLs
-FORM_LABEL_DISCOVERYURL=Discovery URL
-FORM_LABEL_FINDQUALIFIERS=Find Qualifiers
-FORM_LABEL_COMBINE_KEYS=Combine keys:
-FORM_OPTION_ANDALLKEYS=And
-FORM_OPTION_ORALLKEYS=Or
-FORM_OPTION_ORLIKEKEYS=Or Like
-FORM_LABEL_SORT_BY_NAME=Sort by name:
-FORM_RADIO_SORT_ASC=Ascending
-FORM_RADIO_SORT_DESC=Descending
-FORM_LABEL_SORT_BY_DATE=Sort by date:
-FORM_LABEL_MAX_SEARCH_SET=Maximum size of search set:
-FORM_LABEL_MAX_RESULTS=Maximum number of results:
-FORM_LABEL_FIND_SERVICES_SIMPLE_DESC=Enter the partial or complete name of a service to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_UUID_DESC=Enter the UUID of the service to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC=Enter the partial or complete name of a service interface to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC=Enter the UUID of the service interface to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_UUID_KEY=UUID Key:
-FORM_LABEL_USE_SERVICE=Use service
-FORM_LABEL_SERVICE=Service
-FORM_LABEL_BUSINESS=Business
-FORM_LABEL_PUBLISH_ASSERTIONS=Publisher Assertions
-FORM_LABEL_DIRECTION=Direction
-FORM_LABEL_FROM_KEY=From Key
-FORM_LABEL_TO_KEY=To Key
-FORM_LABEL_STATUS=Status
-FORM_LABEL_ASSERTION_TYPE=Assertion Type
-FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD=Parent-Child
-FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER=Peer-Peer
-FORM_OPTION_ASSERTION_TYPE_IDENTITY=Identity
-FORM_LABEL_ASSERTION_DIRETION_DESC=Direction <strong>From</strong> will create a publisher assertion from this business to the businesses above. Direction <strong>To</strong> will create a publisher assertion from the above businesses to this business.
-FORM_OPTION_ASSERTION_DIRECTION_FROM=--->
-FORM_OPTION_ASSERTION_DIRECTION_TO=<---
-FORM_LABEL_THIS_BUSINESS=This
-MSG_ERROR_INVALID_QUERY_NAME=IWAB0140E Enter a valid name for the query.
-MSG_ERROR_INVALID_NAMES=IWAB0141E Enter a series of valid names.
-MSG_ERROR_INVALID_PUBLISH_URL=IWAB0142E Enter a valid publish URL.
-MSG_ERROR_INVALID_USERID=IWAB0143E Enter a valid user ID.
-MSG_ERROR_INVALID_MAX_SEARCH_SET=IWAB0145E Enter a valid size for the maximum search set.
-MSG_ERROR_INVALID_MAX_RESULTS=IWAB0146E Enter a valid size for the maximum number of results.
-MSG_INFO_BUSINESSES_FOUND=IWAB0147I Number of businesses found: %1
-MSG_ERROR_NO_BUSINESSES_FOUND=IWAB0148E No businesses found.
-MSG_INFO_SERVICES_FOUND=IWAB0149I Number of services found: %1
-MSG_ERROR_NO_SERVICES_FOUND=IWAB0150E No services found.
-MSG_ERROR_SINGLE_ITEM=IWAB0151E Select just one item.
-MSG_QUESTION_ITEM_REPLACEMENT=The selection will replace an item already in the target. Do you wish to proceed?
-MSG_INFO_SERVICE_INTERFACES_FOUND=IWAB0152I Number of service interfaces found: %1
-MSG_ERROR_NO_SERVICE_INTERFACES_FOUND=IWAB0153E No service interfaces found.
-MSG_ERROR_NOTHING_SELECTED=IWAB0154E Select at least one item.
-MSG_ERROR_INVALID_UUID_KEY=IWAB0155E Enter a valid UUID key.
-MSG_ERROR_QUERY_NAME_CONFLICT=IWAB0156E The subquery's query name cannot be the same as the originator.
-MSG_ERROR_NO_ITEMS_TO_GET=IWAB0157E No items of the specified type have been published or discovered yet.
-MSG_INFO_NO_BUSINESSES_OR_SERVICE_INTERFACES_FOUND=IWAB0162I No Businesses, Services or Service Interfaces found.
-
-# Results
-ALT_QUERY_RESULTS=Query Results
-FORM_LABEL_SUBQUERY=The results may be used as inputs of another operation. Click the <strong>target</strong> link at the top to see the operation. Selected results can be used in the operation by clicking the <strong>Transfer</strong> button.
-FORM_LABEL_QUERY=Select a result to see more details or select a set of results and click a button to perform an operation.
-FORM_LINK_TARGET=target
-FORM_BUTTON_TRANSFER=Transfer
-FORM_BUTTON_REFRESH=Refresh
-FORM_BUTTON_ADD_TO_FAVORITES=Add to favorites
-FORM_BUTTON_UNPUBLISH=Unpublish
-FORM_BUTTON_CLEAR=Clear
-
-# Publish actions
-ALT_PUBLISH=Publish
-FORM_LABEL_PUBLISH=Publish:
-FORM_OPTION_BUSINESS=Business
-FORM_OPTION_SERVICE=Service
-FORM_OPTION_SERVICE_INTERFACE=Service Interface
-FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC=Enter a name and an optional description for the business to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC=Provide a name for the business to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC=Get or find a business and then provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC=Get or find a business and then provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC=Provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC=Provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC=Enter a WSDL URL, name and an optional description for the service interface to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC=Provide the WSDL URL and name for the service interface to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_FORM=Publication format
-FORM_LABEL_DESCRIPTION=Description
-FORM_LABEL_DESCRIPTIONS=Descriptions
-MSG_INFO_BUSINESS_PUBLISHED=IWAB0158I Business %1 was successfully published.
-MSG_INFO_SERVICE_PUBLISHED=IWAB0159I Service %1 was successfully published.
-MSG_INFO_SERVICE_INTERFACE_PUBLISHED=IWAB0160I Service interface %1 was successfully published.
-MSG_ERROR_INVALID_NAME=IWAB0161E Enter a valid name.
-MSG_ERROR_ROW_BLANK_LANGUAGE=IWAB0250E Select a non-blank language for the %1 in row %2. Only the first row can have a blank language.
-MSG_ERROR_ROW_DUPLICATE_LANGUAGE=IWAB0251E Change the language for the %1 in row %2. The current one is already in use.
-MSG_ERROR_ROW_INVALID_TEXT=IWAB0252E Enter a valid %1 in row %2
-MSG_ERROR_INVALID_WSDL_URL=IWAB0253E Enter a valid WSDL URL.
-MSG_ERROR_NO_NAMES=IWAB0254E Add at least one name.
-MSG_ERROR_INVALID_SERVICE=IWAB0255E Provide a valid service.
-MSG_ERROR_INVALID_BUSINESS=IWAB0256E Provide a valid business.
-
-# Business Publish Service action
-ALT_PUBLISH_SERVICE=Publish Service
-
-# Login actions
-ALT_LOGIN=Login
-ALT_LOGOUT=Logout
-MSG_INFO_NO_MULTIPLE_LOGIN=Multiple logins with same ID not allowed
-MSG_INFO_LOGGED_IN_NODE=%1 - logged in as %2
-
-# WSDL Browser
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Web Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Web Project
-FORM_LABEL_WSDL_URL=WSDL URL
-ALT_WSDL_BROWSER=WSDL Browser
-
-# Details
-FORM_LINK_EDIT=Edit
-FORM_LINK_CANCEL=Cancel
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_KEY=TModel Key
-FORM_LABEL_USER_DEFINED_CATEGORIES=User Defined Categories
-FORM_LABEL_CHECKED=Checked
-FORM_LABEL_FILE=File
-MSG_QUESTION_PUBLISH_ITEM=The item could not be found in the registry. Do you wish to publish it?
-MSG_QUESTION_SERVICE_PUBLISH_BUSINESS=The service and its business could not be found in the registry. Proceed to publish?
-MSG_INFO_BUSINESS_UPDATED=IWAB0257I Business %1 was successfully updated.
-MSG_INFO_SERVICE_UPDATED=IWAB0258I Service %1 was successfully updated.
-MSG_INFO_SERVICE_INTERFACE_UPDATED=IWAB0259I Service Interface %1 was successfully updated.
-MSG_INFO_REGISTRY_UPDATED=IWAB0323I Registry %1 was successfully updated.
-
-# UnpublishAction
-ALT_UNPUBLISH_BUSINESS=Unpublish Business
-ALT_UNPUBLISH_SERVICE=Unpublish Service
-ALT_UNPUBLISH_SERVICE_INTERFACE=Unpublish Service Interface
-FORM_LABEL_UNPUBLISH_DESC=Press <strong>Go</strong> to unpublish this object. Authentication may be required.
-MSG_INFO_BUSINESS_UNPUBLISHED=IWAB0260I Business %1 was successfully unpublished.
-MSG_INFO_SERVICE_UNPUBLISHED=IWAB0261I Service %1 was successfully unpublished.
-MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED=IWAB0262I Service Interface %1 was successfully unpublished.
-
-# Add to WSDL Perspective
-ALT_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE=IWAB0376I %1 was successfully added to WSDL page.
-MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE=IWAB0377E %1 could not be added to WSDL page.
-
-# Add to Favorites
-ALT_ADD_TO_FAVORITES=Add To Favorites
-MSG_INFO_FAVORITE_ADDED=IWAB0263I %1 was successfully added to favorites.
-MSG_ERROR_FAVORITE_NOT_ADDED=IWAB0264E %1 could not be added to favorites.
-MSG_ERROR_FAVORITE_ALREADY_EXISTS=IWAB0324E %1 already exists in favorties.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# Refresh
-MSG_INFO_NODE_REFRESHED=IWAB0265I %1 refreshed.
-MSG_QUESTION_REMOVE_NODE=%1 could not be found in the registry. Do you wish to clear it?
-
-# ManageReferencedServices
-ALT_MANAGE_REFERENCED_SERVICES=Manage Referenced Services
-FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC=Add discovered or published services to the list of referenced services by clicking the <strong>Add Services</strong> button. Remove selected references by clicking the <strong>Remove References</strong> button. Authentication may be required for changes.
-FORM_LABEL_REFERENCED_SERVICES=Referenced Services
-FORM_BUTTON_ADD_SERVICES=Add Services
-FORM_BUTTON_REMOVE_REFERENCES=Remove References
-MSG_ERROR_NO_REFERENCE_SELECTED=IWAB0266E Select at least one referenced service before proceeding.
-MSG_ERROR_NO_SERVICES=IWAB0267E Get or find at least one service before proceeding.
-MSG_ERROR_SERVICE_NOT_REFERENCED=IWAB0268E Service %1 could not be referenced.
-MSG_ERROR_REFERENCE_NOT_REMOVED=IWAB0269E Service reference %1 could not be removed.
-MSG_INFO_SERVICE_REFERENCED=IWAB0270I Service %1 was successfully referenced.
-MSG_INFO_SERVICE_REFERENCE_REMOVED=IWAB0271I Service reference %1 was successfully removed.
-
-# ManagePublisherAssertions
-ALT_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions
-FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC=Add discovered or published businesses to the list of publisher assertions by clicking <strong>Add Assertions</strong>. Remove selected assertions by clicking <strong>Remove Assertions</strong>. Complete selected assertions by clicking <strong>Complete Assertions</strong>. Click <strong>Refresh Assertions</strong> to refresh the list of assertions.
-FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC=Please note that incomplete publisher assertions are visible only to the owner of the business.
-FORM_LABEL_BUSINESSES=Businesses
-FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS=Refresh Assertions
-FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS=Complete Assertions
-FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS=Add Assertions
-FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS=Remove Assertions
-MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED=IWAB0325I Publisher Assertions are refreshed.
-MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED=IWAB0326E Select at least one incomplete publisher assertion.
-MSG_ERROR_NOT_OWNED_BUSINESS=IWAB0327E This operation cannot be performed on a business owned by another party.
-
-# GetBusinesses
-ALT_GET_BUSINESS=Get Business
-ALT_GET_BUSINESSES=Get Businesses
-NODE_NAME_SERVICE_BUSINESS=Business for service %1
-NODE_NAME_SI_BUSINESSES=Businesses for service interface %1
-MSG_QUESTION_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServiceInterfaces
-ALT_GET_SERVICE_INTERFACES=Get Service Interfaces
-NODE_NAME_SERVICE_SERVICE_INTERFACES=Service interfaces for service %1
-MSG_QUESTION_GET_SI_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServices
-ALT_GET_SERVICES=Get Services
-NODE_NAME_SI_SERVICES=Services for service interface %1
-NODE_NAME_BUSINESS_SERVICES=Services for business %1
-MSG_QUESTION_REMOVE_SI_NODE=The service interface could not be found in the registry. Do you wish to remove this node?
-MSG_QUESTION_REMOVE_BUSINESS_NODE=The business could not be found in the registry. Do you wish to remove this node?
-
-# RefreshUDDINodesAction
-MSG_ERROR_NODE_DATA_VALIDATION_FAILED=IWAB0272E %1 could not be found in the registry.
-
-# Summaries
-ALT_SUMMARY_QUERIES=Summary of Queries
-ALT_SUMMARY_BUSINESSES=Summary of Businesses
-ALT_SUMMARY_SERVICES=Summary of Services
-ALT_SUMMARY_SERVICE_INTERFACES=Summary of Service Interfaces
-FORM_LABEL_QUERIES=Queries
-
-# SelectSubQueryItemAction
-MSG_QUESTION_ITEM_VALIDATION_FAILED=%1 could not be found in the registry. Do you wish to remove it?
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT=UDDI Page Content
-FRAME_TITLE_CATEGORIES_WORKAREA=Categories Work Area
-FRAME_TITLE_CATEGORIES_TOOLBAR=Categories Toolbar
-FRAME_TITLE_CATEGORIES_CONTENT=Categories Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_BUSINESS_DETAILS=Business Details Form
-FORM_TITLE_BUSINESS_PUBLISH_SERVICE=Business Publish Service Form
-FORM_TITLE_GET_FORM=Select from Discovered and Published Objects Form
-FORM_TITLE_ITEMS_SUMMARY=Summary of Items Form
-FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions Form
-FORM_TITLE_MANAGE_REFERENCED_SERVICES=Manage Referenced Services Form
-FORM_TITLE_OPEN_REGISTRY=Open Registry Form
-FORM_TITLE_REGISTRY_DETAILS=Registry Details Form
-FORM_TITLE_REGISTRY_PUBLISH=Registry Publish Form
-FORM_TITLE_REGISTRY_FIND=Registry Find Form
-FORM_TITLE_RESULTS=Results Form
-FORM_TITLE_SERVICE_DETAILS=Service Details Form
-FORM_TITLE_SERVICE_INTERFACE_DETAILS=Service Interface Details Form
-FORM_TITLE_UNPUBLISH=Unpublish Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
deleted file mode 100644
index 3c9f225..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
+++ /dev/null
@@ -1,172 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# -------- -------- -----------------------------------------------------------
-# 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
-# 20070507 185600 makandre@ca.ibm.com - Andrew Mak, WSE status pane's "header" twistie should not appear for responses without headers
-###############################################################################
-
-title=WSDL
-
-# Nodes
-NODE_NAME_WSDL_MAIN=WSDL Main
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_WSDL_PERSPECTIVE_CONTENT=WSDL Page Content
-FRAME_TITLE_XSD_INFORMATION_TOOLBAR=XSD Information Dialog Toolbar
-FRAME_TITLE_XSD_INFORMATION_CONTENT=XSD Information Dialog Content
-
-# OpenWSDLAction
-ALT_OPEN_WSDL=Open WSDL
-MSG_ERROR_INVALID_WSDL_URL=IWAB0378E Enter a valid WSDL URL.
-MSG_ERROR_OPEN_WSDL=IWAB0379E Unable to open %1.
-MSG_ERROR_XSD_VALIDATION=IWAB0380E Errors were encountered while validating XML schemas.
-MSG_INFO_OPEN_WSDL_SUCCESSFUL=IWAB0381I %1 was successfully opened.
-
-# WSDL Element details
-ALT_WSDL_DETAILS=WSDL Details
-FORM_LABEL_WSDL_DETAILS_DESC=Shown below are the details for this WSDL document. Click on a service or binding to see its details.
-
-# WSDL Service Element details
-ALT_WSDL_SERVICE_DETAILS=WSDL Service Details
-FORM_LABEL_SERVICE_DETAILS_DESC=Shown below are the details for this <service> element. Click on a binding to see its operations.
-
-ALT_NIL=nil?
-
-# WSDL Binding Element details
-ALT_WSDL_BINDING_DETAILS=WSDL Binding Details
-FORM_LABEL_BINDING_DETAILS_DESC=Shown below are the details for this <strong>%1</strong> <binding> element. Click on an operation to fill in its parameters and invoke it or specify additional endpoints.
-
-# InvokeWSDLOperationAction
-ALT_INVOKE_WSDL_OPERATION=Invoke a WSDL Operation
-MSG_ERROR_UNABLE_TO_CONNECT=IWAB0382E Unable to connect to %1
-MSG_ERROR_VALIDATING_PARAMETER=IWAB0383E Error validating %1
-
-# WSDLAddToFavoritesAction
-ALT_ADD_WSDL_TO_FAVORITES=Add WSDL To Favorites
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0384E %1 already exists in favorites.
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0385E Unable to add %1 to favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0386I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# RefreshWSDLAction
-MSG_INFO_REFRESH_WSDL_SUCCESSFUL=IWAB0387I %1 is refreshed.
-MSG_QUESTION_REMOVE_WSDL_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# UpdateWSDLBindingAction
-MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL=IWAB0388I Endpoints were successfully updated.
-
-# Form titles
-FORM_TITLE_OPEN_WSDL=Open WSDL Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSDL_BINDING_DETAILS=WSDL Binding Details Form
-FORM_TITLE_INVOKE_WSDL_OPERATION=WSDL Operation Form
-
-# Form Labels
-FORM_LABEL_OPEN_WSDL_DESC=Enter the URL of a WSDL document and click <strong>Go</strong> to explore.
-FORM_LABEL_SERVICES=Services
-FORM_LABEL_BINDINGS=Bindings
-FORM_LABEL_OPERATIONS=Operations
-FORM_LABEL_BINDING_TYPE=Type
-FORM_LABEL_BINDING_TYPE_UNSUPPORTED=Unsupported
-FORM_LABEL_BINDING_TYPE_SOAP=SOAP
-FORM_LABEL_BINDING_TYPE_HTTP_GET=HTTP GET
-FORM_LABEL_BINDING_TYPE_HTTP_POST=HTTP POST
-FORM_LABEL_NAME=Name
-FORM_LABEL_DOCUMENTATION=Documentation
-FORM_LABEL_ENDPOINT=Endpoint
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC=Enter the parameters of this WSDL operation and click <strong>Go</Strong> to invoke.
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC_NO_INPUT=There are no input parameters for the WSDL operation "%1". Click <strong>Go</Strong> to invoke.
-FORM_LINK_ADD=Add
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_VALUES=Values
-FORM_LABEL_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_LABEL_UNION_TYPE=Union types
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_XSD_APPLICATION_INFORMATION=Application Information
-FORM_LABEL_XSD_DOCUMENTATION=Documentation
-FORM_LABEL_SOAP_REQUEST_ENVELOPE=SOAP Request Envelope:
-FORM_LABEL_SOAP_RESPONSE_ENVELOPE=SOAP Response Envelope:
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP=Move element up
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN=Move element down
-FORM_LABEL_BASE_TYPE=Base type
-FORM_LABEL_UNBOUNDED=Unbounded
-FORM_LABEL_LENGTH=Length
-FORM_LABEL_LENGTH_VALUE=[%1..%2]
-FORM_LABEL_PATTERN=Pattern
-FORM_LABEL_WHITESPACE=Whitespace
-FORM_LABEL_RANGE_OF_VALUES=Range of values
-FORM_LABEL_MIN_EXCLUSIVE=(%1..
-FORM_LABEL_MIN_INCLUSIVE=[%1..
-FORM_LABEL_MAX_EXCLUSIVE=%1)
-FORM_LABEL_MAX_INCLUSIVE=%1]
-FORM_LABEL_TOTAL_DIGITS=Total digits
-FORM_LABEL_FRACTION_DIGITS=Fraction digits
-FORM_LABEL_OCCURANCE=Occurance of
-FORM_LABEL_UNION_MEMBERS=Union Members
-FORM_LABEL_LIST_ITEMS=List items
-FORM_LABEL_ELEMENTS=Elements
-FORM_LABEL_SOAP_ENC_ARRAYS=SOAP Arrays
-FORM_LABEL_CONTENT=Content
-FORM_LABEL_ATOMIC_NAME_TYPE=%1 (%2):
-FORM_LABEL_NULL=null
-FORM_LABEL_GROUP_NUMBER=Group %1
-FORM_LABEL_CHOICES=Choices
-FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW=There is nothing to be displayed in the form view. Please switch to the source view for the SOAP request and response.
-FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW=The SOAP response failed schema validation. Please switch to the source view for the SOAP response in XML format.
-FORM_LABEL_CANNOT_DISPLAY_HEADER_IN_FORM_VIEW=The content of the header cannot be displayed in the form view. Please switch to the source view to examine the raw content.
-FORM_LABEL_CANNOT_DISPLAY_BODY_IN_FORM_VIEW=The content of the body cannot be displayed in the form view. Please switch to the source view to examine the raw content.
-FORM_LABEL_BODY_IS_EMPTY=The body is empty.
-FORM_LABEL_END_POINTS=Endpoints
-FORM_LABEL_HEADER=Header
-FORM_LABEL_BODY=Body
-FORM_LABEL_MUSTUNDERSTAND=mustUnderstand
-FORM_LABEL_ACTOR=actor
-
-# Source/Form views
-FORM_LINK_FORM=Form
-ALT_SWITCH_TO_FORM_VIEW=Switch to form view
-FORM_LINK_SOURCE=Source
-ALT_SWITCH_TO_SOURCE_VIEW=Switch to source view
-FORM_LABEL_FRAGMENT_SOAP_VIEW_CONTENT=Soap Body:
-BUTTON_LABEL_LOAD=Load
-BUTTON_LABEL_SAVE_AS=Save As...
-MSG_QUESTION_SYNC_VIEWS=Format of the source content may be altered as a result of switching to the form view. Do you wish to process?
-MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT=Content of the source view failed schema validation. Synchronize anyways? (Content of the source view may be modified)
-
-# Form control titles
-FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP=Select element in group
-FORM_CONTROL_TITLE_SELECT_UNION_TYPE=Select union type
-FORM_CONTROL_TITLE_SOAP_FILE=SOAP data file
-
-# XSD Information Dialog
-TITLE_XSD_INFORMATION_DIALOG=XSD Information Dialog
-
-# Error messages
-MSG_ERROR_NOTHING_SELECTED=IWAB0389E Select at least one item.
-MSG_ERROR_MAX_OCCURS_VIOLATION=IWAB0390E Maximum occurance is reached.
-MSG_ERROR_MIN_OCCURS_VIOLATION=IWAB0391E Minimum occurance is reached.
-MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP=IWAB0392E Selected element is already the first in the group.
-MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN=IWAB0393E Selected element is already the last in the group.
-
-# SOAP transport messages
-MSG_ERROR_NO_SUITABLE_TRANSPORT=Failed to invoke operation, a suitable transport extension was not found.
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
deleted file mode 100644
index c798fd7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
+++ /dev/null
@@ -1,163 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-###############################################################################
-
-title=WSIL
-
-# Navigator
-WSIL_MAIN_NODE=WSIL Main
-
-# Forms
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_BUSINESS_NAME=UDDI Business Name
-FORM_LABEL_UDDI_SERVICE_NAME=UDDI Service Name
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_ABSTRACT=Abstract
-FORM_LABEL_NAME=Name
-FORM_LABEL_WSDL_BINDINGS=WSDL Bindings
-FORM_LABEL_NAMESPACE_URI=Namespace URI
-FORM_LABEL_LOCAL_NAME=Local Name
-FORM_LABEL_INQUIRY_API=Inquiry API
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_DISCOVERY_URL=Discovery URL
-FORM_LABEL_WSIL=WSIL Details
-FORM_LABEL_WSIL_LINKS=WSIL Links
-FORM_LABEL_WSDL_SERVICE=WSDL Services
-FORM_LABEL_UDDI_SERVICE=UDDI Services
-FORM_LABEL_UDDI_BUSINESS=UDDI Businesses
-FORM_LABEL_ADD_TO_NAVIGATOR=Add To Navigator
-FORM_LABEL_ADD_TO_FAVORITES=Add To Favorites
-FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_REFRESH=Refresh
-FORM_LABEL_NA=N/A
-FORM_LABEL_UNAVAILABLE_UDDI_SERVICE=Service Unavailable:
-FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS=Business Unavailable:
-FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE=Choose the type of objects to inspect:
-MSG_ERROR_NOTHING_SELECTED=IWAB0328E Select at least one item.
-
-# OpenWSILAction
-ALT_OPEN_WSIL=Open WSIL
-FORM_LABEL_OPEN_WSIL_DESC=Enter the URL of a WSIL document or a HTML document and click <strong>Go</strong> to open inspect.
-WSIL_URL=URL to document:
-MSG_ERROR_INVALID_WSIL_URL=IWAB0394E %1 is not a valid WSIL URL or HTML URL.
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0329E %1 is already opened in the navigator.
-MSG_INFO_OPEN_WSIL_SUCCESSFUL=IWAB0330I %1 was successfully opened.
-
-# OpenWSILLinkAction
-ALT_OPEN_WSIL_LINK=Open WSIL Link
-MSG_ERROR_WSIL_LINK_ALREADY_OPENED=IWAB0331E %1 is already opened in the navigator
-MSG_INFO_OPEN_WSIL_LINK_SUCCESSFUL=IWAB0332I %1 was successfully opened.
-
-# WsilDetailsAction
-ALT_WSIL_DETAILS=WSIL Details
-
-# WsilServiceDetailsAction
-ALT_WSIL_SERVICE_DETAILS=WSIL Service Details
-
-# UddiLinkDetailsAction
-ALT_UDDI_LINK_DETAILS=UDDI Business Details
-
-# WsilLinkDetailsAction
-ALT_WSIL_LINK_DETAILS=WSIL Link Details
-
-# ListWSDLServicesAction
-ALT_LIST_WSDL_SERVICES=List All WSDL Services
-FORM_LABEL_LIST_WSDL_SERVICES_DESC=Select a set of WSDL services and click <strong>Add to Favorites</strong> to add these to the list of favorites.
-
-# ListUDDIServicesAction
-ALT_LIST_UDDI_SERVICES=List All UDDI Services
-FORM_LABEL_LIST_UDDI_SERVICES_DESC=Select a set of UDDI services and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add the selections to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListUDDIBusinessesAction
-ALT_LIST_UDDI_LINKS=List All UDDI Businesses
-FORM_LABEL_LIST_UDDI_BUSINESSES_DESC=Select a set of UDDI businesses and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add these to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListWSILLinksAction
-ALT_LIST_WSIL_LINKS=List All WSIL Links
-FORM_LABEL_LIST_WSIL_LINKS=Select a set of WSIL links and press <strong>Add to Navigator</strong> to open them in the navigator.
-
-# ClearWSILAction
-ALT_CLEAR_WSIL=Clear WSIL
-
-# RefreshAction
-ALT_REFRESH_WSIL=Refresh WSIL
-ALT_REFRESH_UDDI_BUSINESS=Refresh UDDI Business
-ALT_REFRESH_UDDI_SERVICE=Refresh UDDI Service
-MSG_ERROR_WSIL_NOT_FOUND=IWAB0333E WSIL %1 could not be loaded.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0334E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0335E Service %1 could not be found in the registry.
-MSG_INFO_REFRESH_SUCCESSFUL=IWAB0336I %1 is refreshed.
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE=Add Business To UDDI Page
-ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE=Add Service To UDDI Page
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0337I %1 is added to UDDI Page.
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0338E Unable to add %1 to UDDI Page.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0339E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0340E Service %1 could not be found in the registry.
-
-# WsilAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add WSDL To WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0395I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0396E %1 could not be loaded.
-
-# AddWSILToFavoritesAction
-ALT_ADD_WSIL_TO_FAVORITES=Add WSIL To Favorites
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0341E Unable to add %1 to favorites.
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0342E %1 already exists in favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0343I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# AddWSDLServiceToFavoritesAction
-ALT_ADD_WSDL_SERVICE_TO_FAVORITES=Add WSDL To Favorites
-
-# AddBusinessToFavoritesAction
-ALT_ADD_UDDI_BUSINESS_TO_FAVORITES=Add UDDI Business To Favorites
-
-# AddServiceToFavoritesAction
-ALT_ADD_SERVICE_TO_FAVORITES=Add UDDI Service To Favorites
-
-# WSILImportWSILToWorkbench
-ATL_IMPORT_WSIL_TO_WORKBENCH=Import WSIL To Workbench
-FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC=Select a workbench project to save the WSIL file into. You may also change the name of the WSIL file.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_OPEN_WSIL=Open WSIL Form
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-FORM_TITLE_WSIL_LINK_DETAILS=WSIL Link Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESSES=UDDI Businesses View
-VIEW_TITLE_UDDI_SERVICES=UDDI Services View
-VIEW_TITLE_WSDL_SERVICES=WSDL Services View
-VIEW_TITLE_WSIL_LINKS=WSIL Links View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
deleted file mode 100644
index 40b5829..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.jar
-wsexplorersrc.zip
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
deleted file mode 100644
index a90b044..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
+++ /dev/null
@@ -1,91 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
- org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser,
- java.util.List,
- java.util.Iterator" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-String mode = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-String scenario = null;
-try
-{
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request, HTMLUtils.UTF8_ENCODING);
- scenario = parser.getParameter(ActionInputs.ACTION_ENGINE_SCENARIO);
-}
-catch (Throwable t)
-{
-}
-ActionEngine actionEngine = controller.getActionEngine();
-if (mode != null)
-{
- actionEngine.setMode(ActionEngine.MODE_DISABLED);
- try
- {
- actionEngine.setMode(Byte.parseByte(mode));
- }
- catch (NumberFormatException nfe)
- {
- }
-}
-if (scenario != null && scenario.length() > 0)
-{
- ScenarioDescriptor scenarioDescriptor = null;
- try
- {
- ActionDataParser parser = new ActionDataParser();
- scenarioDescriptor = parser.parseScenario(XMLUtils.stringToElement(scenario));
- actionEngine.executeScenario(scenarioDescriptor);
- }
- catch (Throwable t)
- {
- }
- if (scenarioDescriptor != null)
- {
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- {
- ActionDescriptor[] actionDescriptors = transactionDescriptors[i].getActionDescriptors();
- for (int j = 0; j < actionDescriptors.length; j++)
- {
- %>
- <!--
- <%=actionDescriptors[j].getId()%>
- <%=actionDescriptors[j].getStatusId()%>
- <%
- List status = actionDescriptors[j].getStatus();
- if (status != null)
- {
- for (Iterator it = status.iterator(); it.hasNext();)
- {
- %>
- <%=it.next().toString()%>
- <%
- }
- }
- %>
- -->
- <%
- }
- }
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
deleted file mode 100644
index aebca6d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
+++ /dev/null
@@ -1,138 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
- java.net.*" %>
-<%
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-ActionEngine actionEngine = controller.getActionEngine();
-String modeString = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-if (modeString != null && modeString.length() > 0)
-{
- try
- {
- byte mode = Byte.parseByte(modeString);
- actionEngine.setMode(mode);
- }
- catch (Throwable t)
- {
- }
-}
-String playFileId = "playFileId";
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("TITLE_ACTION_RECORDER")%></title>
- <script language="javascript">
- function setMode(mode)
- {
- <%
- StringBuffer formAction = new StringBuffer(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp?")));
- formAction.append(ActionInputs.SESSIONID);
- formAction.append("=");
- formAction.append(sessionId);
- formAction.append("&");
- formAction.append(ActionInputs.ACTION_ENGINE_MODE);
- formAction.append("=");
- %>
- var form = document.forms[0];
- form.action = '<%=formAction.toString()%>' + mode;
- form.target = "_self";
- form.submit();
- }
-
- function play()
- {
- var playFile = document.getElementById("<%=playFileId%>");
- if (playFile.value != null && playFile.value.length > 0)
- {
- var form = document.forms[0];
- form.action = '<%=response.encodeURL(controller.getPathWithContext("wsexplorer.jsp"))%>';
- form.target = "<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>";
- form.enctype = "multipart/form-data";
- // for backward compatibility
- form.encoding = "multipart/form-data";
- form.submit();
- setMode('<%=ActionEngine.MODE_PLAY%>');
- }
- else
- alert('<%=controller.getMessage("MSG_ERROR_INVALID_PLAY_FILE")%>');
- }
-
- function save()
- {
- var form = document.forms[0];
- form.action = '<%=response.encodeURL(controller.getPathWithContext("actions/SaveActionEngineScenario.jsp"))%>';
- form.target = "_self";
- form.submit();
- }
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <form method="post">
- <%
- String labelModePlay = controller.getMessage("FORM_LABEL_MODE_PLAY");
- String labelModeStop = controller.getMessage("FORM_LABEL_MODE_STOP");
- String labelModeRecord = controller.getMessage("FORM_LABEL_MODE_RECORD");
- String labelSave = controller.getMessage("FORM_LABEL_SAVE");
- byte mode = actionEngine.getMode();
- String imgPlay = (mode == ActionEngine.MODE_PLAY) ? "images/elcl16/actionengine_play.gif" : "images/dlcl16/actionengine_play.gif";
- String imgStop = (mode == ActionEngine.MODE_STOP) ? "images/elcl16/actionengine_stop.gif" : "images/dlcl16/actionengine_stop.gif";
- String imgRecord = (mode == ActionEngine.MODE_RECORD) ? "images/elcl16/actionengine_record.gif" : "images/dlcl16/actionengine_record.gif";
- String imgSave = "images/dlcl16/actionengine_save.gif";
- %>
- <table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:play()">
- <img class="normal" border=0 alt="<%=labelModePlay%>" title="<%=labelModePlay%>" src="<%=response.encodeURL(controller.getPathWithContext(imgPlay))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_PLAY")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_STOP)%>')">
- <img class="normal" border=0 alt="<%=labelModeStop%>" title="<%=labelModeStop%>" src="<%=response.encodeURL(controller.getPathWithContext(imgStop))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_STOP")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_RECORD)%>')">
- <img class="normal" border=0 alt="<%=labelModeRecord%>" title="<%=labelModeRecord%>" src="<%=response.encodeURL(controller.getPathWithContext(imgRecord))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_RECORD")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:save()">
- <img class="normal" border=0 alt="<%=labelSave%>" title="<%=labelSave%>" src="<%=response.encodeURL(controller.getPathWithContext(imgSave))%>">
- <%=controller.getMessage("FORM_LABEL_SAVE")%>
- </a>
- </td>
- </tr>
- </table>
- <table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td valign="center" align="left" class="labels" nowrap><%=controller.getMessage("FORM_LABEL_PLAY_FILE")%></td>
- <td valign="center" align="left" class="labels">
- <input type="file" id="<%=playFileId%>" name="<%=ActionInputs.ACTION_ENGINE_SCENARIO%>">
- </td>
- </tr>
- </table>
- </form>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
deleted file mode 100644
index 5384fc3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
+++ /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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- if (action.isTargetFileResourceReadOnly())
- {
-%>
- var proceed = true;
-<%
- if (!action.isCheckoutFilesEnabled())
- {
-%>
- proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_CHECKOUT_DISABLED"))%>");
-<%
- }
-%>
- if (proceed)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ValidateEditAction.getActionLink()))%>";
-<%
- }
- else
- {
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
deleted file mode 100644
index a66489d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
+++ /dev/null
@@ -1,60 +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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
-<%
- String treeContentVar = action.getTreeContentVar();
- if (treeContentVar != null)
- {
-%>
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-<%
- }
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
deleted file mode 100644
index 7e3cb57..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
+++ /dev/null
@@ -1,46 +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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
deleted file mode 100644
index 28fb7e3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-%>
-<%
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // run the action
- boolean actionResult = action.run();
- boolean written = false;
-
- if (actionResult)
- {
- // write to file system
- response.setContentType("application/octet-stream");
- response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultFileName());
- action.write(response.getOutputStream());
- written = true;
- }
-
- if (!written)
- {
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (action.getStatusContentVar() != null)
- {
-%>
-<script language="javascript">
- <%=action.getStatusContentVar()%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
deleted file mode 100644
index 6535cdf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
+++ /dev/null
@@ -1,67 +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
- *******************************************************************************/
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- //Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
- if (!inputsValid)
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
- }
- else
- {
- session.setAttribute(ActionInputs.IMPORT_ACTION,action);
- if (action.fileExists())
- {
-%>
- var proceed = true;
-<%
- if (!action.isOverwriteFilesEnabled())
- {
-%>
- proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_OVERWRITE_DISABLED"))%>");
-<%
- }
-%>
- if (proceed)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(CheckWorkbenchFileReadOnlyAction.getActionLink()))%>";
-<%
- }
- else
- {
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
- }
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
deleted file mode 100644
index 29fb0dc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
+++ /dev/null
@@ -1,46 +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
- *******************************************************************************/
-%>
-<%
- //Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.run();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
deleted file mode 100644
index 3dbd2bc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- RetrieveHistoryAction action = new RetrieveHistoryAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.run();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
- <jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- BreadCrumb b = action.getBreadCrumb();
- if (b != null)
- {
- int breadCrumbPerspectiveId = b.getPerspectiveId();
- if (breadCrumbPerspectiveId != controller.getCurrentPerspective().getPerspectiveId())
- {
- // Switch the perspective.
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(breadCrumbPerspectiveId,true)))%>";
-<%
- }
- else
- {
- // Jump to the page retrieved from history.
-%>
- perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(b.getURL()))%>";
-<%
- }
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
deleted file mode 100644
index 700b9d7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
- org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
- java.io.PrintWriter,
- org.w3c.dom.Element"%>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-response.setContentType("application/octet-stream");
-response.setHeader("Content-Disposition","attachment;filename=scenario.xml");
-ScenarioDescriptor scenarioDescriptor = controller.getActionEngine().getScenario();
-ActionDataParser parser = new ActionDataParser();
-Element scenario = parser.toElement(scenarioDescriptor);
-if (scenario != null)
-{
- try
- {
- String scenarioString = XMLUtils.serialize(scenario, false);
- if (scenarioString != null)
- {
- PrintWriter pw = new PrintWriter(response.getOutputStream());
- pw.println(scenarioString);
- pw.close();
- }
- }
- catch (Throwable t)
- {
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
deleted file mode 100644
index 5dd117e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
+++ /dev/null
@@ -1,110 +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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- String treeContentVar = action.getTreeContentVar();
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (action.requiresTreeViewRefresh())
- {
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the treeview.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
- }
- }
- else
- {
- Node selectedNode = action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the perspective.
-<%
- if (previousSelectedNode != null && previousSelectedNode.isVisible())
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
- <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
- <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
deleted file mode 100644
index 5ef19e0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
+++ /dev/null
@@ -1,184 +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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- if (action.requiresStatusUpdate())
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the status content with any messages arising from this action.
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
- }
-
- String treeContentVar = action.getTreeContentVar();
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (action.requiresTreeViewRefresh())
- {
-%>
-<script language="javascript">
-<%
- if (treeContentVar != null)
- {
-%>
- if (isMicrosoftInternetExplorer())
- {
- // Reload the navigator tree view to show the structural change.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- {
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
- }
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- if (isMicrosoftInternetExplorer())
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- else if (action.requiresNodeSelection())
- {
- Node selectedNode = action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
- if (treeContentVar != null)
- {
-%>
- // Update the navigator tree to show the selection.
-<%
- if (previousSelectedNode != null)
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
- <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
- <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- else if (action.requiresViewSelection())
- {
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- // Update the properties container to show the view.
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
- }
- }
- else
- {
- String propertiesContentVar = action.getPropertiesContentVar();
- Tool tool = action.getSelectedViewTool();
- if (tool == null)
- tool = action.getSelectedTool();
- if (tool.getToolType() != ToolTypes.ACTION)
- {
- if (propertiesContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the properties content with the tool's form.
- <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getFormLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- if (!action.isHistoryAction())
- {
-%>
-<script language="javascript">
- // Run the tool's action only if it is not from the history.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getActionLink()))%>";
-</script>
-<%
- }
- else
- {
- if (propertiesContentVar != null)
- {
-%>
-<script language="javascript">
- <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContentPage()))%>";
-</script>
-<%
- }
- }
- }
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp
deleted file mode 100644
index e5f8ee1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" %>
- <jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL("/wsexplorer/css/treeview.css")%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL("/wsexplorer/css/windows.css")%>">
-</head>
-<body>
-<center>
-<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT")%>
-<br>
-<%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>
-</center>
-<br>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
deleted file mode 100644
index 7271d47..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
- StringBuffer framesetsFile = new StringBuffer("/");
- framesetsFile.append(currentPerspective.getFramesetsFile());
-
- StringBuffer framesetsForm = new StringBuffer("/");
- framesetsForm.append(currentPerspective.getProcessFramesetsForm());
-
- int targetPerspectiveId;
- boolean isHistory;
- try
- {
- targetPerspectiveId = Integer.parseInt(request.getParameter(ActionInputs.PERSPECTIVE));
- isHistory = ("1".equals(request.getParameter(ActionInputs.ISHISTORY)));
- }
- catch (NumberFormatException e)
- {
- targetPerspectiveId = ActionInputs.PERSPECTIVE_UDDI;
- isHistory = false;
- }
-
- if (controller.isPerspectiveContentBlank())
- {
- controller.enablePerspectiveContentBlank(false);
- controller.addToHistory(currentPerspective.getPerspectiveId(),ShowPerspectiveAction.getActionLink(targetPerspectiveId,true));
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
-<%
- }
- else
- {
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="<%=framesetsFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append(currentPerspective.getSwitchPerspectiveFormActionLink(targetPerspectiveId,isHistory));
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<jsp:include page="<%=framesetsForm.toString()%>" flush="true"/>
-<script language="javascript">
- processFramesetSizes(document.forms[0]);
-</script>
-</body>
-</html>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
deleted file mode 100644
index 07319ba..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
+++ /dev/null
@@ -1,79 +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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- String treeContentVar = action.getTreeContentVar();
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the perspective.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
- }
- if (action.requiresNodeSelection())
- {
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the properties container.
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
- }
-</script>
-<%
- }
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
deleted file mode 100644
index c0b04fe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
+++ /dev/null
@@ -1,49 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- boolean result = action.validateEdit();
-%>
-<script language="javascript">
- if (<%=result%>)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
- else
- {
-<%
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
- }
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 9c29a2a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,42 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- action.run();
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
deleted file mode 100644
index c20c3a2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>
- <%=controller.getMessage("TITLE_CALENDAR_BROWSER")%>
- </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
- StringBuffer link = new StringBuffer("calendar_toolbar.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
- <frame name="<%=FrameNames.CALENDAR_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%
- link.setLength(0);
- link.append("calendar_content.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- link.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
- <frame name="<%=FrameNames.CALENDAR_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
deleted file mode 100644
index 68e46e8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
+++ /dev/null
@@ -1,627 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/calendar.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
- var days = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SUNDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_MONDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_TUESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_WEDNESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_THURSDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_FRIDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SATURDAY"))%>");
- var months = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JANUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_FEBRUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MARCH"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_APRIL"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JUNE"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JULY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_AUGUST"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SEPTEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_OCTOBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_NOVEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_DECEMBER"))%>");
- var engMonths = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
- var currentDate;
- var calendarBodySet = false;
- var calendarBody;
- var savedYearTextValue = "";
-
-<%
- // Regular expressions
- // time - HH:MM:SS[.SSS]
- // year - Y*
- // date - YYYY+-MM-DD
- // dateTime - YYYY+-MM-DDTHH:MM:SS[.SSS]Z
- // gYearMonth - YYYY+-MM
- // gDay - ---DD
- // gMonthDay - --MM-DD
-%>
- var timeRegExp = /^(\d{2}):(\d{2}):(\d{2})(\.\d{3})?$/;
- var yearRegExp = /^(\d*)$/;
- var dateRegExp = /^(\d{4,})-(\d{2})-(\d{2})$/;
- var dateTimeRegExp = /^(\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?Z$/;
- var gYearMonthRegExp = /^(\d{4,})-(\d{2})$/;
- var gDayRegExp = /^-{3}(\d{2})$/;
- var gMonthDayRegExp = /^-{2}(\d{2})-(\d{2})$/;
-
- function validateYearString(yearString)
- {
- return yearRegExp.test(yearString);
- }
-
- function getTimeParameters(timeString)
- {
- return timeRegExp.exec(timeString);
- }
-
- function getDateParameters(dateString)
- {
- return dateRegExp.exec(dateString);
- }
-
- function getDateTimeParameters(dateTimeString)
- {
- return dateTimeRegExp.exec(dateTimeString);
- }
-
- function getGYearMonthParameters(gYearMonthString)
- {
- return gYearMonthRegExp.exec(gYearMonthString);
- }
-
- function getGDayParameters(gDayString)
- {
- return gDayRegExp.exec(gDayString);
- }
-
- function getGMonthDayParameters(gMonthDayString)
- {
- return gMonthDayRegExp.exec(gMonthDayString);
- }
-
-<%
- // HH:MM:SS[.SSS]
-%>
- function serializeTime(hours,minutes,seconds,milliseconds)
- {
- var timeString = "";
- if (hours < 10)
- timeString += "0";
- timeString += hours + ":";
- if (minutes < 10)
- timeString += "0";
- timeString += minutes + ":";
- if (seconds < 10)
- timeString += "0";
- timeString += seconds;
- if (milliseconds > 0)
- {
- timeString += ".";
- if (milliseconds < 100)
- {
- if (milliseconds < 10)
- timeString += "00";
- else
- timeString += "0";
- }
- timeString += milliseconds;
- }
- return timeString;
- }
-
-<%
- // YYYY+-MM
-%>
- function serializeGYearMonth(fullYear,month)
- {
- var gYearMonthString = "";
- if (fullYear < 1000)
- {
- if (fullYear < 100)
- {
- if (fullYear < 10)
- gYearMonthString += "000";
- else
- gYearMonthString += "00";
- }
- else
- gYearMonthString += "0";
- }
- gYearMonthString += fullYear+"-";
- if (month < 10)
- gYearMonthString += "0";
- gYearMonthString += month;
- return gYearMonthString;
- }
-
-<%
- // YYYY+-MM-DD
-%>
- function serializeDate(fullYear,month,date)
- {
- var dateString = serializeGYearMonth(fullYear,month) + "-";
- if (date < 10)
- dateString += "0";
- dateString += date;
- return dateString;
- }
-
- function serializeGDay(date)
- {
- var gDayString = "---";
- if (date < 10)
- gDayString += "0";
- gDayString += date;
- return gDayString;
- }
-
- function serializeGMonthDay(month,date)
- {
- var gMonthDayString = "--";
- if (month < 10)
- gMonthDayString += "0";
- gMonthDayString += month+"-";
- if (date < 10)
- gMonthDayString += "0";
- gMonthDayString += date;
- return gMonthDayString;
- }
-
- function setDateUsingGDayParameters(gDayParameters,dateObj)
- {
- if (gDayParameters != null)
- dateObj.setDate(gDayParameters[1]);
- }
-
- function setDateUsingGMonthDayParameters(gMonthDayParameters,dateObj)
- {
- if (gMonthDayParameters != null)
- {
- dateObj.setMonth(gMonthDayParameters[1]-1);
- dateObj.setDate(gMonthDayParameters[2]);
- }
- }
-
- function setDateUsingGYearMonthParameters(gYearMonthParameters,dateObj)
- {
- if (gYearMonthParameters != null)
- {
- dateObj.setFullYear(gYearMonthParameters[1]);
- dateObj.setMonth(gYearMonthParameters[2]-1);
- }
- }
-
- function setDateUsingDateParameters(dateParameters,dateObj)
- {
- if (dateParameters != null)
- {
- setDateUsingGYearMonthParameters(dateParameters,dateObj);
- dateObj.setDate(dateParameters[3]);
- }
- }
-
- function setDateUsingDateTimeParameters(dateTimeParameters,dateObj)
- {
- if (dateTimeParameters != null)
- {
- setDateUsingDateParameters(dateTimeParameters,dateObj);
- dateObj.setUTCHours(dateTimeParameters[4]);
- dateObj.setUTCMinutes(dateTimeParameters[5]);
- dateObj.setUTCSeconds(dateTimeParameters[6]);
- var milliseconds = dateTimeParameters[7];
- if (milliseconds.length > 0)
-<%
- // Eliminate the decimal point
-%>
- dateObj.setUTCMilliseconds(milliseconds.substr(1));
- else
- dateObj.setUTCMilliseconds(0);
- }
- }
-
- function setDateUsingTimeParameters(timeParameters,dateObj)
- {
- if (timeParameters != null)
- {
- dateObj.setHours(timeParameters[1]);
- dateObj.setMinutes(timeParameters[2]);
- dateObj.setSeconds(timeParameters[3]);
- var milliseconds = timeParameters[4];
- if (milliseconds.length > 0)
-<%
- // Eliminate the decimal point
-%>
- dateObj.setMilliseconds(milliseconds.substr(1));
- else
- dateObj.setMilliseconds(0);
- }
- }
-
- function init()
- {
- var d = new Date();
-<%
- switch (calendarType)
- {
- case ActionInputs.CALENDAR_TYPE_DATE:
-%>
- setDateUsingDateParameters(getDateParameters(top.opener.calendarTarget.value),d);
-<%
- break;
- case ActionInputs.CALENDAR_TYPE_DATETIME:
-%>
- setDateUsingDateTimeParameters(getDateTimeParameters(top.opener.calendarTarget.value),d);
-<%
- break;
- case ActionInputs.CALENDAR_TYPE_GYEARMONTH:
-%>
- setDateUsingGYearMonthParameters(getGYearMonthParameters(top.opener.calendarTarget.value),d);
-<%
- case ActionInputs.CALENDAR_TYPE_GDAY:
-%>
- setDateUsingGDayParameters(getGDayParameters(top.opener.calendarTarget.value),d);
-<%
- case ActionInputs.CALENDAR_TYPE_GMONTHDAY:
-%>
- setDateUsingGMonthDayParameters(getGMonthDayParameters(top.opener.calendarTarget.value),d);
-<%
- default:
- break;
- }
-%>
- generateCalendar(d);
- var monthSelector = document.getElementById("monthSelector");
- for (var i=0;i<months.length;i++)
- monthSelector.options[i] = new Option(months[i],i);
- generateCalendar(d);
- }
-
- function initCalendarHeader(table)
- {
- calendarBody = document.createElement("TBODY");
- var headerRow = document.createElement("tr");
- for (var i=0;i<days.length;i++)
- {
- var header = document.createElement("th");
- header.appendChild(document.createTextNode(days[i]));
- header.className="headercolor";
- headerRow.appendChild(header);
- }
- calendarBody.appendChild(headerRow);
- table.appendChild(calendarBody);
- calendarBodySet = true;
- }
-
- function generateCalendar(date)
- {
- var table = document.getElementById("calendar");
- var dateDate = date.getDate();
- var dateMonth = date.getMonth();
- var dateFullYear = date.getFullYear();
- var dateIterator = new Date();
- dateIterator.setTime(Date.parse(engMonths[dateMonth]+" 1, "+dateFullYear));
- var startingDate = dateIterator.getDate(); // 1,2,3...
- var startingDay = dateIterator.getDay(); // Sun,Mon,Tues...
- clearCalendar();
- for (var rows=0;rows<6;rows++)
- {
- var row = document.createElement("tr");
- for (var columns=0;columns<days.length;columns++)
- {
- var column = document.createElement("td");
- var dateIteratorDate = dateIterator.getDate();
- var dateIteratorMonth = dateIterator.getMonth();
- var dateIteratorFullYear = dateIterator.getFullYear();
- column.width = 24;
- column.height = 24;
- column.align = "center";
- column.valign = "center";
- column.className = "calendartablecells";
- if ((dateIteratorDate == startingDate && columns < startingDay) || (dateIteratorMonth != dateMonth))
- column.innerHTML = " ";
- else if (dateIteratorMonth == dateMonth)
- {
- var link = document.createElement("a");
- switch (<%=calendarType%>)
- {
- case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
- link.href = "javascript:transferDate("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
- link.href = "javascript:transferDateTime("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
- link.href = "javascript:transferGYearMonth()";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
- link.href = "javascript:transferGDay("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
- link.href = "javascript:transferGMonthDay("+dateIteratorDate+")";
- break;
- }
- link.appendChild(document.createTextNode(dateIteratorDate));
- column.appendChild(link);
- if (dateIteratorDate == dateDate && dateIteratorFullYear == dateFullYear)
- column.className = "todaytablecell";
- dateIteratorDate++;
- dateIterator.setTime(Date.parse(engMonths[dateIteratorMonth]+" "+dateIteratorDate+", "+dateIterator.getFullYear()));
- }
- row.appendChild(column);
- }
- calendarBody.appendChild(row);
- }
- var monthSelector = document.getElementById("monthSelector");
- for (var i=0;i<monthSelector.options.length;i++)
- {
- if (monthSelector.options[i].value == dateMonth)
- {
- monthSelector.selectedIndex = i;
- break;
- }
- }
- var yearText = document.getElementById("yearText");
- yearText.value = dateFullYear;
- savedYearTextValue = yearText.value;
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- var timeText = document.getElementById("timeText");
- timeText.value = serializeTime(date.getHours(),date.getMinutes(),date.getSeconds(),date.getMilliseconds());
-<%
- }
-%>
- currentDate = date;
- }
-
- function clearCalendar()
- {
- var table = document.getElementById("calendar");
- if (!calendarBodySet)
- initCalendarHeader(table);
- for (var i=1;i<table.rows.length;i++)
- {
- table.deleteRow(i);
- i--;
- }
- }
-
- function updateCalendar(newMonth,newFullYear)
- {
- var d = new Date();
- if (newMonth > months.length)
- {
- newFullYear++;
- newMonth = 0;
- }
- else if (newMonth < 0)
- {
- newFullYear--;
- newMonth = months.length-1;
- }
- d.setMonth(newMonth);
- d.setFullYear(newFullYear);
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- setDateUsingTimeParameters(getTimeParameters(document.getElementById("timeText").value),d);
-<%
- }
-%>
- generateCalendar(d);
- }
-
- function jumpToPreviousYear()
- {
- updateCalendar(currentDate.getMonth(),currentDate.getFullYear()-1)
- }
-
- function jumpToPreviousMonth()
- {
- updateCalendar(currentDate.getMonth()-1,currentDate.getFullYear());
- }
-
- function jumpToNextMonth()
- {
- updateCalendar(currentDate.getMonth()+1,currentDate.getFullYear());
- }
-
- function jumpToNextYear()
- {
- updateCalendar(currentDate.getMonth(),currentDate.getFullYear()+1);
- }
-
- function jumpToToday()
- {
- generateCalendar(new Date());
- }
-
- function setNewDate()
- {
- var monthSelector = document.getElementById("monthSelector");
- var newMonth = monthSelector.options[monthSelector.selectedIndex].value;
- var newFullYear = document.getElementById("yearText").value;
-<%
- // YYYY+
-%>
- var d = new Date();
- if (validateYearString(newFullYear))
- {
- // The year string contains only digits and is hence a valid year.
- d.setFullYear(newFullYear);
- d.setMonth(newMonth);
- }
- generateCalendar(d);
- }
-
- function handleYearTextKeyUpEvent()
- {
- var currentYearTextValue = document.getElementById("yearText").value;
- if (currentYearTextValue == savedYearTextValue)
- return false;
- setNewDate();
- }
-
-<%
- // YYYY+-MM-DD
-%>
- function transferDate(date)
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- top.opener.calendarTarget.value = serializeDate(fullYear,month,date);
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-%>
- function transferDateTime(date)
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- var serializedDate = serializeDate(fullYear,month,date);
- var d = new Date();
- setDateUsingDateParameters(getDateParameters(serializedDate),d);
- var timeValue = document.getElementById("timeText").value;
- var timeParameters = getTimeParameters(timeValue);
- if (timeParameters == null)
- {
- if (!confirm("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_INVALID_TIME_FORMAT"))%>"))
- return;
- }
- else
- setDateUsingTimeParameters(timeParameters,d);
- top.opener.calendarTarget.value = serializedDate + "T" + serializeTime(d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds(),d.getUTCMilliseconds()) + "Z";
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // YYYY+-MM
-%>
- function transferGYearMonth()
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- var serializedGYearMonth = serializeGYearMonth(fullYear,month);
- var d = new Date();
- setDateUsingGYearMonthParameters(getGYearMonthParameters(serializedGYearMonth),d);
- top.opener.calendarTarget.value = serializedGYearMonth;
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // ---DD
-%>
- function transferGDay(date)
- {
- top.opener.calendarTarget.value = serializeGDay(date);
- top.opener.closeCalendarBrowser();
- }
-<%
- // --MM-DD
-%>
- function transferGMonthDay(date)
- {
- var month = document.getElementById("monthSelector").selectedIndex+1;
- top.opener.calendarTarget.value = serializeGMonthDay(month,date);
- top.opener.closeCalendarBrowser();
- }
-</script>
-</head>
-<body class="contentbodymargin">
- <div id="contentborder">
- <table border=0>
- <tr>
- <td align="center" valign="top">
- <table>
- <tr>
- <td align="left" valign="top" class="labels">
- <label for="monthSelector"><%=controller.getMessage("FORM_LABEL_MONTH")%></label>
- </td>
- <td width="20%"> </td>
- <td align="left" valign="top" class="labels">
- <label for="yearText"><%=controller.getMessage("FORM_LABEL_YEAR")%></label>
- </td>
- </tr>
- <tr>
- <td align="left" valign="center">
- <select id="monthSelector" onChange="setNewDate()" class="selectlist">
- </select>
- </td>
- <td width="20%"> </td>
- <td width="30%" align="left" valign="center">
- <input id="yearText" size=6 onkeyup="handleYearTextKeyUpEvent()" class="tabletextenter">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top">
- <table id="calendar" border=0 cellspacing=0 cellpadding=3 class="tableborder">
- </table>
- </td>
- </tr>
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- <tr>
- <td align="center" valign="top">
- <table border=0>
- <td align="center" valign="center" class="labels">
- <label for="timeText"><%=controller.getMessage("FORM_LABEL_TIME")%></label>
- </td>
- <td align="center" valign="center" width="80%">
- <input id="timeText" type="text" class="tabletextenter" size=12 maxlength=12>
- </td>
- <td width="10%"> </td>
- </table>
- </td>
- </tr>
-<%
- }
-%>
- <tr>
- <td align="center" valign="top">
- <table border=0>
- <tr>
- <td>
- <a href="javascript:jumpToPreviousYear()" title="<%=controller.getMessage("ALT_PREVIOUS_YEAR")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_YEAR")%></a>
- </td>
- <td>
- <a href="javascript:jumpToPreviousMonth()" title="<%=controller.getMessage("ALT_PREVIOUS_MONTH")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_MONTH")%></a>
- </td>
- <td>
- <a href="javascript:jumpToToday()" title="<%=controller.getMessage("ALT_TODAY")%>"><%=controller.getMessage("FORM_LINK_TODAY")%></a>
- </td>
- <td>
- <a href="javascript:jumpToNextMonth()" title="<%=controller.getMessage("ALT_NEXT_MONTH")%>"><%=controller.getMessage("FORM_LINK_NEXT_MONTH")%></a>
- </td>
- <td>
- <a href="javascript:jumpToNextYear()" title="<%=controller.getMessage("ALT_NEXT_YEAR")%>"><%=controller.getMessage("FORM_LINK_NEXT_YEAR")%></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
-<script language="javascript">
- init();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
deleted file mode 100644
index 7cf9119..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.calendarBrowserClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar">
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/calendar.gif"))%>" alt="" width=16 height=16></td>
- <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_CALENDAR_BROWSER")%></td>
- </tr>
- </table>
- </div>
-</div>
-<script language="javascript">
- top.opener.calendarBrowserClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
deleted file mode 100644
index 3838806..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.calendartablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
-.todaytablecell { background-color:yellow; border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
deleted file mode 100644
index 485ea12..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#toolbar { width:100%; height:25px; background:#ECE9D8; border-color:white; border-style:solid; border-width:1 1 1 1px; border-bottom-color:#848284; border-right-color:#848284; margin:0 0 0 0px;}
-#toolbarborder { height:26px; width:100%; border-style:solid; border-width:1 0 0 1px; border-color:#848284; }
-
-/* iframe Spacing Contol */
-.toolbarbodymargin { margin: 5 5 0 5; background: #ECE9D8; }
-
-/* Toolbar Styles */
-.text {font-size:12px; font: icon;}
-a:link {color: black;}
-
-/* JS Rollover Style */
-IMG { border-width:2px; border-style:solid;}
-.normal { border-color : #ECE9D8; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#ECE9D8; border-right-color :#ECE9D8;}
-.hover { border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#8C8E8C; border-right-color :#8C8E8C; }
-.down { border-color : #8C8E8C; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color:white; border-right-color:white;}
-
-/* GlobalToolbar */
-.gtoolbarbodymargin {margin : 0 1 3 0; background: #ECE9D8}
-#globaltoolbar{height:100%; background: #ECE9D8; border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :black; border-right-width: 1px; border-right-color :#848284;}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
deleted file mode 100644
index da1e6a5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
+++ /dev/null
@@ -1,5 +0,0 @@
-a {text-decoration: none;}
-a:hover {text-decoration: underline;}
-td {font: icon; font-size: 12px; color: Black;}
-.unselectedTextAnchor {color:blue; background-color:document.backgroundColor}
-.selectedTextAnchor {color:white; background-color:navy}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
deleted file mode 100644
index ecdb400..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
+++ /dev/null
@@ -1,49 +0,0 @@
-#contentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-left:10px; padding-right:0; padding-top:10; padding-bottom:10}
-#treecontentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-top:5px}
-
-/* iframe Spacing Contol */
-.contentbodymargin { margin: 0 5 12 5; background:#ECE9D8; }
-
-/* Document Styles */
-.labels { font: icon; font-size: 12px; color:black; font-weight: normal;}
-
-/* fieldset+legend Styles */
-.keylinefieldset { border-color:#8080FF; border-width:1px; border-style:solid; }
-.headerfieldset { -moz-border-radius: 7pt; padding: 3px; border:1px solid #C0C0C0; }
-
-/* table Styles */
-.tableborder {border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3; }
-.tablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:left}
-.checkboxcells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color: #ECE9D8}
-th.headercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:center}
-th.singleheadercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:left}
-.firstcolumnerrantrowcolor { border-left:1px solid red; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.middleerrantrowcolor { border-left:1px solid #B7B4A3; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.lastcolumnerrantrowcolor { border-left:1px solid #B7B4A3; border-right:1px solid red; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.rowcolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-
-/* Form elements and status contents */
-td { font: icon; font-size: 12px; }
-th { font: icon; font-size: 12px; }
-input { font: icon; font-size: 12px; }
-.selectlist {font: icon; font-size: 12px; color: Black; border-style:solid; border-width : 1px; border-color:#C7C5B2;}
-select { font: icon; font-size: 12px; }
-pre { font: icon; font-size: 12px; }
-.smtextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:10%; }
-.textenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:90%; }
-.tabletextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; }
-.tablefilebrowse {width:100%; border-style:solid; border-width:1px; font-size: 14px; border-color: #C7C5B2; font: icon; }
-input.button {font: icon; font-size: 11px; border-width : 1px; border-style:outset; height:22px;}
-input.radio {font: icon; font-size: 11px;}
-img.twist {border-width:0 0 0 0px; height:10px; width:11px;}
-
-/* Fragment Styles */
-.fixfragtable {width:95%; border:0px none; }
-.innerfixfragtable {width:100%; border:0px none; }
-.rangefragtable {width:95%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.innerrangefragtable {width:100%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.textareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:150px; }
-.bigtextareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:300px; }
-.fragarea { padding-left: 3px; padding-bottom: 5px; }
-
-iframe {border-width: 2px; border-style: inset; }
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
deleted file mode 100644
index 2a10e3f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddWSILToWSILPerspectiveAction action = new AddWSILToWSILPerspectiveAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>";
- </script>
-<%
- }
- else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
deleted file mode 100644
index 6eceed1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddToUDDIPerspectiveAction action = AddToUDDIPerspectiveAction.newAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
- controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>";
- </script>
-<%
- }
- else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index 1f298ec..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-FavoritesAddToWSDLPerspectiveAction action = new FavoritesAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-if (actionResult) {
-%>
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
-</script>
-<%
-}
-else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
deleted file mode 100644
index 9e99421..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
deleted file mode 100644
index 51935b4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesImportToWorkbenchAction action = new FavoritesImportToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index ea033b1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesLaunchWebServiceWizardAction action = new FavoritesLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
deleted file mode 100644
index 3e8d156..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- FavoritesToggleNodeAction action = new FavoritesToggleNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
deleted file mode 100644
index 0fa1b2b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<%
- // Prepare the action.
- RemoveFavoritesAction action = new RemoveFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
deleted file mode 100644
index a5970f2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_REMOVE_NODE", controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getNodeName())%>")) {
- <%
- Node selectedNode = controller.getFavoritesPerspective().getNodeManager().getSelectedNode();
- %>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT)))%>";
- }
- else {
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- }
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
deleted file mode 100644
index 303d346..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeFavoritesFramesAction action = new ResizeFavoritesFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=favPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=favPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
deleted file mode 100644
index b4b9e72..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- FavoritesRestoreDefaultFavoritesAction action = new FavoritesRestoreDefaultFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
-%>
- <script language="javascript">
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
deleted file mode 100644
index 4aeb125..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES")%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesActionJSP.jsp"))%>";
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
deleted file mode 100644
index 9556e06..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesNodeAction action = new SelectFavoritesNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
deleted file mode 100644
index f1b7d20..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesToolAction action = new SelectFavoritesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp
deleted file mode 100644
index aef1198..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesUserDefUDDIRegistryNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesUserDefUDDIRegistryNodeAction action = new SelectFavoritesUserDefUDDIRegistryNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-//make sure to refresh node view
-action.setTreeRefreshNeeded();
-
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
deleted file mode 100644
index 0ba0cde..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromFavoritesAction action = new SwitchPerspectiveFromFavoritesAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
deleted file mode 100644
index c779abc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=favPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.STATUS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
deleted file mode 100644
index 570e2ac..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
deleted file mode 100644
index cb8fc02..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-</head>
-<%
- String selectedAnchorName = "";
- NodeManager nodeManager = favPerspective.getNodeManager();
- int focusedNodeId = nodeManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-<div id="treecontentborder">
- <%=nodeManager.renderTreeView(response)%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
deleted file mode 100644
index 0512197..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- else
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
- String altRestore = favPerspective.getMessage("ALT_RESTORE_DEFAULT_FAVORITES");
- String altRemove = favPerspective.getMessage("ALT_REMOVE_FAVORITE");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRestore%>" title="<%=altRestore%>"></a></td>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RemoveFavoritesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altRemove%>" title="<%=altRemove%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
deleted file mode 100644
index 2491c8a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<frameset cols="<%=favPerspective.getPerspectiveContentFramesetCols()%>" bgcolor=#ECE9D8>
- <%
- if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
- {
- %>
- <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- else
- {
- %>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- %>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
deleted file mode 100644
index 89a6125..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
deleted file mode 100644
index 4f956a4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null)
- {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
- %>
- <script language="javascript">
- location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
- </script>
- <%
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
deleted file mode 100644
index 02f4db5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (favPerspective.getActionsContainerFramesetRows().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- for(int i=0; i<toolManager.getNumberOfTools(); i++) {
- Tool tool = (Tool)toolManager.getTool(i);
- %>
- <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
- <%
- }
- }
-%>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
deleted file mode 100644
index 215fc52..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.STATUS_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.STATUS_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
deleted file mode 100644
index 67b55c1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
+++ /dev/null
@@ -1,43 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <pre>
-<%=HTMLUtils.charactersToHTMLEntitiesStrict(favPerspective.getMessageQueue().getMessagesFromList())%>
- </pre>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
deleted file mode 100644
index f0748b7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (favPerspective.getActionsContainerFramesetRows().endsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" target="<%=FavoritesFrameNames.STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
deleted file mode 100644
index 48b4184..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- // The selected node must be a FavoritesWSDLServiceNode.
- Node selectedNode = nodeManager.getSelectedNode();
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedNode.getTreeElement();
- formProperties.put("formActionLink","favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp");
- formProperties.put("wsdlURL",wsdlElement.getWsdlUrl());
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index e9323df..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
- formActionLink.append("favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
deleted file mode 100644
index b50b6d6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_BUSINESS_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIBusinessElement) {
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getBusinessKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index 25d934c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,155 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.apache.wsil.extension.uddi.*,
- java.io.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_REGISTRY_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIRegistryElement) {
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)selectedElement;
- String registryName = regElement.getName();
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=registryName%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=regElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-<%
- String publishURL = regElement.getPublishURL();
- if (Validator.validateURL(publishURL))
- {
-%>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=publishURL%>
- </td>
- </tr>
- </table>
-<%
- }
-
- String registryURL = regElement.getRegistrationURL();
- if (Validator.validateURL(registryURL))
- {
-%>
- <br>
- <table>
- <tr>
- <td align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_URL",registryURL)%>
- </td>
- </tr>
- </table>
-<%
- }
-
- StringBuffer categoryDirectory = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoryDirectory,controller.getServletEngineStateLocation(),registryName);
- File categoryDirectoryFile = new File(categoryDirectory.toString());
- String[] categoryFiles = categoryDirectoryFile.list();
- if (categoryFiles != null)
- {
-%>
-<br>
-<table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES")%>
- </th>
- </tr>
-<%
- for (int i=0;i<categoryFiles.length;i++)
- {
-%>
- <tr>
- <td class="tablecells">
- <%=categoryFiles[i]%>
- </td>
- </tr>
-<%
- }
-%>
-</table>
-<%
- }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
deleted file mode 100644
index be43c52..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIServiceElement) {
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getServiceKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
deleted file mode 100644
index 668423d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement) {
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getServiceInterfaceKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index a408a1a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,312 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.apache.wsil.extension.uddi.*,
- java.io.*,
- java.util.*,
- org.eclipse.wst.ws.internal.model.v10.registry.Name,
- org.eclipse.wst.ws.internal.model.v10.registry.Description,
- org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies,
- org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUserDefUDDIRegistryElement) {
- FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
- regElement.refreshMeta();
-
- String version = regElement.getVersion();
- if (version != null)
- {
- %>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_UDDI_VERSION")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=version%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- List names = regElement.getNames();
- if (names != null && !names.isEmpty())
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
- <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
- </th>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
- </th>
- </tr>
- <%
- for (Iterator it = names.iterator(); it.hasNext();)
- {
- Name name = (Name)it.next();
- String lang = name.getLang();
- %>
- <tr>
- <td class="tablecells"><%=lang != null ? lang : "--"%></td>
- <td class="tablecells"><%=name.getValue()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
- <%
- List descs = regElement.getDescs();
- if (descs != null && !descs.isEmpty())
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
- <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
- </th>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DESC")%>
- </th>
- </tr>
- <%
- for (Iterator it = descs.iterator(); it.hasNext();)
- {
- Description desc = (Description)it.next();
- String lang = desc.getLang();
- %>
- <tr>
- <td class="tablecells"><%=lang != null ? lang : "--"%></td>
- <td class="tablecells"><%=desc.getValue()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
- <%
- String defaultLogin = regElement.getDefaultLogin();
- if (defaultLogin != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_LOGIN")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=defaultLogin%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String defaultPassword = regElement.getDefaultPassword();
- if (defaultPassword != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_PASSWORD")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=defaultPassword%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String inquiryURL = regElement.getInquiryURL();
- if (inquiryURL != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=inquiryURL%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String publishURL = regElement.getPublishURL();
- if (Validator.validateURL(publishURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=publishURL%>
- </td>
- </tr>
- </table>
- <%
- }
-
- String secureInquiryURL = regElement.getSecureInquiryURL();
- if (Validator.validateURL(secureInquiryURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SECURE_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=secureInquiryURL%>
- </td>
- </tr>
- </table>
- <%
- }
-
- String securePublishURL = regElement.getSecurePublishURL();
- if (Validator.validateURL(securePublishURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SECURE_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=securePublishURL%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- Taxonomy[] taxonomies = regElement.getTaxonomies();
- if (taxonomies != null && taxonomies.length > 0)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_TAXONOMY")%>
- </th>
- </tr>
- <%
- for (int i=0; i<taxonomies.length; i++)
- {
- Taxonomy taxonomy = taxonomies[i];
- %>
- <tr>
- <td class="tablecells"><%=taxonomy.getName()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
deleted file mode 100644
index 2449538..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
+++ /dev/null
@@ -1,72 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_WSDL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesWSDLServiceElement) {
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsdlElement.getWsdlUrl()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
deleted file mode 100644
index aee1ad7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_WSIL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesWSILElement) {
- FavoritesWSILElement wsilElement = (FavoritesWSILElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsilElement.getWsilUrl()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
deleted file mode 100644
index 2f9a71c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
- <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
- <input name="<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=favPerspective.getPerspectiveContentFramesetCols()%>">
- <input name="<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=favPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
deleted file mode 100644
index e65d19a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
deleted file mode 100644
index 4aa3ddc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
deleted file mode 100644
index 0741841..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
deleted file mode 100644
index 362b8cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
deleted file mode 100644
index 0fa0984..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
deleted file mode 100644
index 18a4ceb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
deleted file mode 100644
index bd1e37a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
deleted file mode 100644
index d51b975..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
deleted file mode 100644
index ef2aa15..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
deleted file mode 100644
index d91ecb5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
deleted file mode 100644
index c351daf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
deleted file mode 100644
index 53e1335..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
deleted file mode 100644
index 446986a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
deleted file mode 100644
index 8153122..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
deleted file mode 100644
index 6dc0285..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
deleted file mode 100644
index 428c8ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
deleted file mode 100644
index d3d6a77..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
deleted file mode 100644
index feec281..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
deleted file mode 100644
index 21325ca..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
deleted file mode 100644
index 8c0252a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
deleted file mode 100644
index 915fe97..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-<script language="javascript">
- function isSomethingSelected(tableContainerId) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- if (rowCheckbox.checked)
- return true;
- }
- alert("<%=controller.getFavoritesPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- return false;
- }
-
- function setFormLocationAndSubmit(tableContainerId, form, location) {
- if (isSomethingSelected(tableContainerId))
- setLocationAndSubmit(form, location);
- }
-
- function setLocationAndSubmit(form, location) {
- if (handleSubmit(form))
- {
- form.action = location;
- form.submit();
- }
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
deleted file mode 100644
index 7ca588e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- var favNavigatorContainer = perspectiveContent.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>"];
- var favNavigatorToolbar = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>"];
- var favNavigatorContent = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>"];
- var favActionsContainer = perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"];
- var favPropertiesContainer = favActionsContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>"];
- var favPropertiesToolbar = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>"];
- var favPropertiesContent = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTENT%>"];
- var favStatusContainer = favActionsContainer.frames["<%=FavoritesFrameNames.STATUS_CONTAINER%>"];
- var favStatusToolbar = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_TOOLBAR%>"];
- var favStatusContent = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
deleted file mode 100644
index e76ad2b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript">
-
- function favHandleCheckAllClick(tableContainerId, checkAllCheckbox) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked) {
- highlightRow(table.rows[i],"rowcolor");
- rowCheckbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
- }
- else {
- highlightRow(table.rows[i],"tablecells");
- rowCheckbox.name = "";
- }
- }
- }
-
- function validateCheckBoxInput(checkbox, isChecked) {
- if (isChecked) {
- checkbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
- }
- else {
- checkbox.name = "";
- }
- handleRowCheckboxClick();
- }
-
- function twistInit(tableContainerId,twistImageName) {
- var tableContainer = document.getElementById(tableContainerId);
- var table = getTable(tableContainerId);
- if (table.rows.length > numberOfHeaderRows) {
- tableContainer.style.display = "none";
- twist(tableContainerId, twistImageName);
- }
- else {
- tableContainer.style.display = "";
- twist(tableContainerId, twistImageName);
- }
- }
-
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
deleted file mode 100644
index 4fbe090..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function getActionsContainerFrameset()
- {
- return perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
- }
-
- function processFramesetSizes(framesetSizesForm)
- {
- toggleDoubleClickColumnTitle();
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
- framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
- framesetSizesForm.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
deleted file mode 100644
index d7cadc7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIBusinessTable = "divFavoriteUDDIBusinessTable";
- String xdivFavoriteUDDIBusinessTable = "xdivFavoriteUDDIBusinessTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_BUSINESS_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- String titleImagePath = "wsil/images/list_business_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIBusinessFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>')"><img name="<%=xdivFavoriteUDDIBusinessTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_BUSINESS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIBusinessTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIBusinessTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIBusinessFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIBusinessElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIBusinessElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIBusinessElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
deleted file mode 100644
index f97ec69..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
- String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_REGISTRY_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_registry_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIRegistryFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_REGISTRY")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIRegistryTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIRegistryFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
deleted file mode 100644
index 8c3ec16..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIServiceIntTable = "divFavoriteUDDIServiceIntTable";
- String xdivFavoriteUDDIServiceIntTable = "xdivFavoriteUDDIServiceIntTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_service_interface_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>')"><img name="<%=xdivFavoriteUDDIServiceIntTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIServiceIntTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceIntTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIServiceInterfaceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDISerIntElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDISerIntElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDISerIntElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
deleted file mode 100644
index bd0575f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIServiceTable = "divFavoriteUDDIServiceTable";
- String xdivFavoriteUDDIServiceTable = "xdivFavoriteUDDIServiceTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_UDDI_service_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIServiceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>')"><img name="<%=xdivFavoriteUDDIServiceTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIServiceTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIServiceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIServiceElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
deleted file mode 100644
index 4bd8d80..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
+++ /dev/null
@@ -1,124 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
- String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_registry_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUserDefUDDIRegistryFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIRegistryTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUserDefUDDIRegistryFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUserDefUDDIRegistryElement favUDDIRegistryElement = (FavoritesUserDefUDDIRegistryElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
deleted file mode 100644
index a96cc1e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteWSDLTable = "divFavoriteWSDLTable";
- String xdivFavoriteWSDLTable = "xdivFavoriteWSDLTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSDL_SERVICE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_WSDL_service_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesWSDLServiceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>')"><img name="<%=xdivFavoriteWSDLTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSDL")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteWSDLTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSDLTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesWSDLServiceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSDLServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSDLServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSDLServiceElement.getWsdlUrl()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(FavoritesAddToWSDLPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
deleted file mode 100644
index a117be5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
+++ /dev/null
@@ -1,129 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteWSILTable = "divFavoriteWSILTable";
- String xdivFavoriteWSILTable = "xdivFavoriteWSILTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSIL_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_WSIL_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSIL");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSIL_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesWSILFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>')"><img name="<%=xdivFavoriteWSILTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSIL")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteWSILTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSILTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- FavoritesWSILFolderElement favWSILFolderElement = (FavoritesWSILFolderElement)selectedElement;
- Enumeration e = favWSILFolderElement.getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSILElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSILElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSILElement.getWsilUrl()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>');
- </script>
-
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddWSILToWSILPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
- %>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
deleted file mode 100644
index c2f54c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
+++ /dev/null
@@ -1,104 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <input type="hidden" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>">
-
- <%
- String titleImagePath = "images/import_to_workbench_highlighted.gif";
- String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
- </td>
- </tr>
- </table>
- <table>
- <tr>
- <td class="labels" height=40 valign="center">
- <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
- </td>
- <td class="labels" height=40 valign="center" nowrap>
- <%
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- %>
- <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
- <%
- for (int i = 0; i < projects.length; i++) {
- try {
- if (!projects[i].isOpen()) continue;
- String projectName = projects[i].getName();
- %>
- <option value="<%=projectName%>"><%=projectName%>
- <%
- }
- catch (Exception e) {}
- }
- %>
- </select>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <label for="input_imported_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsdlFileName="temp.wsdl";
- String wsdlURL = (String)formProperties.get("wsdlURL");
- if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
- }
-%>
- <input type="text" id="input_imported_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
deleted file mode 100644
index bc1a670..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
+++ /dev/null
@@ -1,161 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<script language="javascript">
- function toggleDivContainer(divId)
- {
- var divContainer = document.getElementById(divId);
- if (divContainer.style.display == "none")
- divContainer.style.display = "";
- else
- divContainer.style.display = "none";
- }
-</script>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
- <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
- <%
- String titleImagePath = "images/import_to_workbench_highlighted.gif";
- String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
- </td>
- </tr>
- </table>
- <table>
- <tr>
- <td class="labels" height=40 valign="center">
- <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
- </td>
- <td class="labels" height=40 valign="center" nowrap>
- <%
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- %>
- <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
- <%
- for (int i = 0; i < projects.length; i++) {
- try {
- if (!projects[i].isOpen())
- continue;
- String projectName = projects[i].getName();
- %>
- <option value="<%=projectName%>"><%=projectName%>
- <%
- }
- catch (Exception e) {}
- }
- %>
- </select>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <input type="checkbox" checked id="input_import_wsdl" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>" onClick="toggleDivContainer('div_import_wsdl')">
- <label for="input_import_wsdl"><%=controller.getMessage("LABEL_IMPORT_WSDL")%></label>
- </td>
- </tr>
- </table>
- <div id="div_import_wsdl">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <label for="input_imported_wsdl_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsdlFileName="temp.wsdl";
- String wsdlURL = (String)formProperties.get("wsdlURL");
- if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
- }
-%>
- <input type="text" id="input_imported_wsdl_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
- </div>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom"> </td>
- </tr>
- </table>
-
- <input type="hidden" name="<%=ActionInputs.IMPORTED_WSDL_URL%>" value="<%=wsdlURL%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <input type="checkbox" id="input_import_wsil" name="<%=ActionInputs.IMPORT_TO_WSIL%>" value="<%=ActionInputs.IMPORT_TO_WSIL%>" onClick="toggleDivContainer('div_import_wsil')">
- <label for="input_import_wsil"><%=controller.getMessage("LABEL_IMPORT_TO_WSIL")%></label>
- </td>
- </tr>
- </table>
- <div id="div_import_wsil" style="display:none;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <label for="input_imported_wsil_file_name"><%=controller.getMessage("WSIL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsilFileName = (String)formProperties.get("wsilFileName");
- if (wsilFileName == null || wsilFileName.length() <= 0)
- wsilFileName = wsdlFileName.substring(0, wsdlFileName.length()-4) + "wsil";
-%>
- <input type="text" id="input_imported_wsil_file_name" name="<%=ActionInputs.WSIL_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsilFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
- </div>
-
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 61f04e7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(formActionLink.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
-<%
- String titleImagePath = "images/launch_wswizard_highlighted.gif";
- String title = controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD");
-%>
-<%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <%=controller.getMessage("FORM_LABEL_CHOOSE_WIZARD")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_ws_client_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" checked=true value="<%=String.valueOf(ActionInputs.WEB_SERVICE_CLIENT_WIZARD)%>"><label for="radio_ws_client_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD")%></label>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_ws_skeleton_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" value="<%=String.valueOf(ActionInputs.WEB_SERVICE_SKELETON_WIZARD)%>"><label for="radio_ws_skeleton_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD")%></label>
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
deleted file mode 100644
index 6d66937..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- Controller controller;
- StringBuffer targetContentLink = new StringBuffer(request.getParameter(ActionInputs.TARGET_PAGE));
- if (sessionId != null)
- {
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- controller = (Controller)currentSession.getAttribute("controller");
- if (targetContentLink.toString().indexOf("?") != -1)
- targetContentLink.append('&');
- else
- targetContentLink.append('?');
- targetContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- }
- else
- controller = (Controller)session.getAttribute("controller");
-
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
- function loadContent()
- {
- var frameset = parent.document.getElementById("proxyPage");
- var contentFrame = frameset.getElementsByTagName("frame").item(1);
- contentFrame.src = "<%=response.encodeURL(controller.getPathWithContext(targetContentLink.toString()))%>";
- }
-
- function handleCompletion()
- {
- var table = document.getElementsByTagName("table").item(0);
- var tBody = table.getElementsByTagName("TBODY").item(0);
- var doneRow = document.createElement("tr");
- var doneColumn = document.createElement("td");
- doneColumn.appendChild(document.createTextNode("Page loaded."));
- doneRow.appendChild(doneColumn);
- tBody.appendChild(doneRow);
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <table>
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- </div>
-<script language="javascript">
- loadContent();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
deleted file mode 100644
index a62462e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils,
- java.util.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- Controller controller;
- StringBuffer loadContentLink = new StringBuffer("forms/ProxyLoadContent.jsp?");
- if (sessionId != null)
- {
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- controller = (Controller)currentSession.getAttribute("controller");
- loadContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
- }
- else
- controller = (Controller)session.getAttribute("controller");
- loadContentLink.append(ActionInputs.TARGET_PAGE).append('=').append(URLUtils.encode(request.getParameter(ActionInputs.TARGET_PAGE)));
-%>
-<frameset id="proxyPage" rows="100%,*" border=0>
- <frame src="<%=controller.getPathWithContext(loadContentLink.toString())%>" title="<%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
- <frame title="<%=controller.getMessage("FORM_TITLE_PAGE_CONTENT")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
deleted file mode 100644
index a7fdcef..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
deleted file mode 100644
index afe5b2b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
+++ /dev/null
@@ -1,23 +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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
- </tr>
- <tr>
- <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
deleted file mode 100644
index dde6156..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request"/>
-<%
- ToolManager currentToolManager = (ToolManager)currentToolManagerHash.get(ActionInputs.CURRENT_TOOL_MANAGER);
- int numberOfTools = currentToolManager.getNumberOfTools();
- if (numberOfTools > 1)
- {
-%>
-<table>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <strong><%=controller.getMessage("ALT_OTHER_ACTIONS")%></strong>
- </td>
- </tr>
- <tr>
- <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
-</table>
-<table>
-<%
- for (int i=1;i<numberOfTools;i++)
- {
- Tool t = currentToolManager.getTool(i);
-%>
- <tr>
- <td><a href="<%=response.encodeURL(controller.getPathWithContext(t.getSelectToolActionHref(false)))%>" target="<%=t.getSelectToolActionTarget()%>"><%=t.getAltText()%></a></td>
- </tr>
-<%
- }
-%>
-</table>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
deleted file mode 100644
index 6dfe8a8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="submit" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" class="button">
- </td>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_RESET")%>" onClick="resetFormInputs()" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
deleted file mode 100644
index d5aed7a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
deleted file mode 100644
index 55ce561..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
deleted file mode 100644
index 8ead667..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
deleted file mode 100644
index 1a46673..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
deleted file mode 100644
index 4fb4150..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
deleted file mode 100644
index be2817b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
deleted file mode 100644
index 5798483..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
deleted file mode 100644
index 6bc10f9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
deleted file mode 100644
index 3333273..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
deleted file mode 100644
index 98a2ba0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
deleted file mode 100644
index eb17c11..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
deleted file mode 100644
index 03004f5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
deleted file mode 100644
index fe0048b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
deleted file mode 100644
index 3aee9aa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
deleted file mode 100644
index b88fb72..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
deleted file mode 100644
index 26ccfe2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
deleted file mode 100644
index c6e7b9d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
deleted file mode 100644
index 0dc366d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
deleted file mode 100644
index bf64bc2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
deleted file mode 100644
index acb0268..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
deleted file mode 100644
index fa62218..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
deleted file mode 100644
index 39004bf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
deleted file mode 100644
index 1965b84..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
deleted file mode 100644
index 42e027c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
deleted file mode 100644
index 21322e0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
deleted file mode 100644
index 4231431..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
deleted file mode 100644
index e2f8c3e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
deleted file mode 100644
index a70c7a7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
deleted file mode 100644
index 946d3e7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
deleted file mode 100644
index b64a07d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
deleted file mode 100644
index d38085ad..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
deleted file mode 100644
index de8069e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
deleted file mode 100644
index d258dc5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
deleted file mode 100644
index 5f097d5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
deleted file mode 100644
index 881e5b7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
deleted file mode 100644
index 8f0ef83..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
deleted file mode 100644
index 8292ce2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
deleted file mode 100644
index 19ebb73..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
deleted file mode 100644
index cd6431b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
deleted file mode 100644
index 88c0567..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
deleted file mode 100644
index e00c89a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
deleted file mode 100644
index 257bd16..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
deleted file mode 100644
index 5bd5d19..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
deleted file mode 100644
index 4290429..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
deleted file mode 100644
index 27ade02..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
deleted file mode 100644
index 4811915..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
deleted file mode 100644
index 2da001e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
deleted file mode 100644
index 7b5bc9d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
deleted file mode 100644
index 0716475..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
deleted file mode 100644
index 264331e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
deleted file mode 100644
index 4c2c5f2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
deleted file mode 100644
index 9acab3d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
deleted file mode 100644
index 7cfc0af..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
deleted file mode 100644
index 932acfe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
deleted file mode 100644
index ae8efc9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
deleted file mode 100644
index 7af88fc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
deleted file mode 100644
index 23b35a6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
deleted file mode 100644
index 11c0782..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
+++ /dev/null
@@ -1,50 +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
- * -------- -------- -----------------------------------------------------------
- * 20060515 128602 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.WSExplorerContext,
- java.util.Enumeration,
- java.util.Hashtable,
- org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils" %>
-
-<%
- request.setCharacterEncoding("UTF-8");
- String key = null;
- Hashtable options = new Hashtable();
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements())
- {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- if (paramValues != null && paramValues.length > 0)
- {
- if (key == null && URLUtils.decode(paramName).equals(WSExplorerContext.ID))
- key = paramValues[0];
- else
- options.put(paramName, paramValues);
- }
- }
- if (key != null)
- {
- LaunchOptionsManager manager = LaunchOptionsManager.getInstance();
- manager.manage(key, options, application);
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
deleted file mode 100644
index ef07423..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(controller.getCurrentPerspective().getPerspectiveId(),false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
deleted file mode 100644
index 03f9a57..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-StringBuffer hrefActionEngine = new StringBuffer();
-hrefActionEngine.append(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp")));
-hrefActionEngine.append("?");
-hrefActionEngine.append(ActionInputs.SESSIONID);
-hrefActionEngine.append("=");
-hrefActionEngine.append(session.getId());
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
- </script>
- <script language="javascript">
- function openActionEngineContainer()
- {
- var link = "<%=hrefActionEngine.toString()%>";
- var actionEngineContainer = window.open(link,"actionEngineContainer","height=100,width=350,status=yes,scrollbars=yes,resizable=yes");
- if (actionEngineContainer.focus)
- actionEngineContainer.focus();
- }
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="gtoolbarbodymargin">
-<div id="globaltoolbar">
-<table width="100%" cellpadding=3 cellspacing=0 border=0>
- <tr>
- <td class="text" nowrap valign="middle" width="100%" height=25><%=controller.getMessage("TITLE_WSEXPLORER")%></td>
- <%
- String altHistoryBack = controller.getMessage("ALT_BACK");
- String altHistoryForward = controller.getMessage("ALT_FORWARD");
- String altActionEngine = controller.getMessage("ALT_ACTION_ENGINE");
- String altUDDI = controller.getMessage("ALT_UDDI_PERSPECTIVE");
- String altWSIL = controller.getMessage("ALT_WSIL_PERSPECTIVE");
- String altWSDL = controller.getMessage("ALT_WSDL_PERSPECTIVE");
- String altFavorites = controller.getMessage("ALT_FAVORITES_PERSPECTIVE");
- %>
- <td class="text" nowrap valign="middle" align="center" width=16 height=26><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_BACK)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryBack%>" title="<%=altHistoryBack%>" src="<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_FORWARD)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryForward%>" title="<%=altHistoryForward%>" src="<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseup(this)"></a></td>
- <%
- ActionEngine actionEngine = controller.getActionEngine();
- if (actionEngine != null && actionEngine.getMode() != ActionEngine.MODE_DISABLED)
- {
- %>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="javascript:openActionEngineContainer()"><img class="normal" alt="<%=altActionEngine%>" title="<%=altActionEngine%>" src="<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseup(this)"></a></td>
- <%
- }
- %>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altUDDI%>" title="<%=altUDDI%>" src="<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSIL%>" title="<%=altWSIL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSDL%>" title="<%=altWSDL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_FAVORITES,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altFavorites%>" title="<%=altFavorites%>" src="<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- </tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
deleted file mode 100644
index 6b81358..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
+++ /dev/null
@@ -1,15 +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
-//
-
-function isMicrosoftInternetExplorer()
-{
- return navigator.appName == "Microsoft Internet Explorer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
deleted file mode 100644
index 79b9ca2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String sessionId = session.getId();
-%>
-<script language="javascript">
- var calendarBrowser;
- var calendarBrowserClosed = true;
- var calendarTargetRow = -1;
- var calendarTarget;
-
- function openCalendarBrowser(type,formContainerId,elementName,index)
- {
- var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
- var elements = form.elements[elementName];
- if (index == 0 && elements.length == undefined)
-<%
- // Only one element.
-%>
- calendarTarget = elements;
- else
- {
- calendarTargetRow = index;
- calendarTarget = elements.item(index);
- }
- var link;
- switch (type)
- {
- case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDate(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDateTime(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGYearMonth(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGDay(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGMonthDay(sessionId)))%>";
- break;
- }
- calendarBrowser = window.open(link,"calendarBrowser","height=350,width=264,status=yes,scrollbars=yes,resizable=yes");
- if (calendarBrowser.focus)
- calendarBrowser.focus();
- }
-
- function closeCalendarBrowser()
- {
- if (!calendarBrowserClosed)
- calendarBrowser.close();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
deleted file mode 100644
index 3b3b4f3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- var requestSubmitted = false;
-
- function handleSubmit(form)
- {
- if (requestSubmitted)
- {
- alert("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_SUBMIT_IN_PROGRESS"))%>");
- return false;
- }
- requestSubmitted = true;
- return true;
- }
-
- function resetSubmission()
- {
- requestSubmitted = false;
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
deleted file mode 100644
index 2dec805..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<script language="javascript">
- <%// Requires browserdetect.js%>
- function createHiddenElement(elementName,value)
- {
- var hiddenInput;
- if (elementName.length > 0)
- {
- if (isMicrosoftInternetExplorer())
- hiddenInput = document.createElement("<input name='"+elementName+"'>");
- else
- {
- hiddenInput = document.createElement("input");
- hiddenInput.setAttribute("name",elementName);
- }
- }
- else
- hiddenInput = document.createElement("input");
- hiddenInput.type = "hidden";
- hiddenInput.value = value;
- return hiddenInput;
- }
-
- function resetFormInputs()
- {
- document.location.reload();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
deleted file mode 100644
index aa69c2c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- var perspectiveWorkArea = top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"];
- var perspectiveToolbar = top.frames["<%=FrameNames.PERSPECTIVE_TOOLBAR%>"];
- var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
-
- function getPerspectiveContentFrameset()
- {
- return perspectiveContent.document.getElementsByTagName("frameset").item(0);
- }
-
- function toggleDoubleClickColumnTitle()
- {
- var doubleClickColumn = document.getElementById("doubleclickcolumn");
- if (doubleClickColumn == null)
- return;
-<%
- String jsAltRestore = HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE"));
-%>
- if (doubleClickColumn.title == "<%=jsAltRestore%>")
- doubleClickColumn.title = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE"))%>";
- else
- doubleClickColumn.title = "<%=jsAltRestore%>";
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
deleted file mode 100644
index d5e1549..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
+++ /dev/null
@@ -1,17 +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
-//
-
-function resumeProxyLoadPage()
-{
- var proxyPage = parent.document.getElementById("proxyPage");
- proxyPage.setAttribute("rows", "0,100%");
- parent.frames[0].handleCompletion();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
deleted file mode 100644
index 9aac192..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(controller.getCurrentPerspective().getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
deleted file mode 100644
index 99a24ee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
+++ /dev/null
@@ -1,159 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- var numberOfHeaderRows = 1;
- function getTable(tableContainerId)
- {
- var container = document.getElementById(tableContainerId);
- return container.getElementsByTagName("table").item(0);
- }
-
- function setSelect(select,value)
- {
- for (var i=0;i<select.options.length;i++)
- {
- if (select.options[i].value == value)
- {
- select.selectedIndex = i;
- return select.options[i].text;
- }
- }
- }
-
- function removeSelectedRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- {
- table.deleteRow(i);
- i--;
- }
- }
- var checkAllCheckboxRow = table.rows[0];
- var checkAllCheckbox = checkAllCheckboxRow.getElementsByTagName("input").item(0);
- if (checkAllCheckbox.checked)
- checkAllCheckbox.checked = false;
- }
-
- function handleRowCheckboxClick(e)
- {
- var checkbox;
- if (isMicrosoftInternetExplorer())
- checkbox = event.srcElement;
- else
- checkbox = e.target;
- var cell = checkbox.parentNode;
- var row = cell.parentNode;
- if (checkbox.checked)
- highlightRow(row,"rowcolor");
- else
- highlightRow(row,"tablecells");
-
- var tbody = row.parentNode;
- var table = tbody.parentNode;
- var checkAllCheckbox = table.rows[0].getElementsByTagName("input").item(0);
- if (checkAllCheckbox.checked)
- checkAllCheckbox.checked = false;
- }
-
- function createRowCheckbox()
- {
- var rowCheckbox = document.createElement("input");
- rowCheckbox.setAttribute("name",rowCheckboxName);
- rowCheckbox.type = "checkbox";
- rowCheckbox.title = "<%=HTMLUtils.JSMangle(controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX"))%>";
- rowCheckbox.onclick = handleRowCheckboxClick;
- return rowCheckbox;
- }
-
- function handleCheckAllClick(tableContainerId,checkAllCheckbox)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked)
- highlightRow(table.rows[i],"rowcolor");
- else
- highlightRow(table.rows[i],"tablecells");
- }
- }
-
- function highlightRow(row,className)
- {
- var rowColumns = row.getElementsByTagName("td");
- for (var i=1;i<rowColumns.length;i++)
- rowColumns.item(i).className = className;
- }
-
- function highlightErrantRow(row,className)
- {
- var rowColumns = row.getElementsByTagName("td");
- var column0 = rowColumns.item(0);
- var column0Control = column0.childNodes[0];
- var start;
- if (column0Control.type == "checkbox")
- {
- column0Control.checked = true;
- rowColumns.item(1).className = "firstcolumnerrantrowcolor";
- start = 2;
- }
- else
- {
- column0.className = "firstcolumnerrantrowcolor";
- start = 1;
- }
- rowColumns.item(rowColumns.length-1).className = "lastcolumnerrantrowcolor";
- for (var i=start;i<rowColumns.length-1;i++)
- rowColumns.item(i).className = "middleerrantrowcolor";
- }
-
- function twist(tableContainerId,twistImageName)
- {
- var tableContainer = document.getElementById(tableContainerId);
- var twistImage = document.images[twistImageName];
- if (tableContainer.style.display == "none")
- {
- tableContainer.style.display = "";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_OPENED"))%>";
- }
- else
- {
- tableContainer.style.display = "none";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_CLOSED"))%>";
- }
- }
-
- function twistOpen(tableContainerId)
- {
- if (document.getElementById(tableContainerId).style.display == "none")
- twist(tableContainerId,"x"+tableContainerId);
- }
-
- function getDefaultDisplayString(inputValue)
- {
- if (inputValue == null || inputValue.length < 1)
- return "<%=HTMLUtils.JSMangle(controller.getMessage("TABLE_BLANK_PLACEHOLDER"))%>";
- return inputValue;
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
deleted file mode 100644
index bab1b2d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
+++ /dev/null
@@ -1,30 +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
-//
-
-function mouseover(img)
-{
- img.className = "hover";
-}
-
-function mouseout(img)
-{
- img.className = "normal";
-}
-
-function mousedown(img)
-{
- img.className = "down";
-}
-
-function mouseup(img)
-{
- return mouseout(img);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
deleted file mode 100644
index 0e843fb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
+++ /dev/null
@@ -1,50 +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
-//
-
-// Requires browserdetect.js
-
-var selectedAnchorName = "";
-
-function setSelectedAnchorName(anchorName)
-{
- selectedAnchorName = anchorName;
-}
-
-function selectNode(anchorName,openImagePath)
-{
- var isIE = isMicrosoftInternetExplorer();
- if (selectedAnchorName.length > 0)
- {
- var selectedAnchor;
- if (isIE)
- selectedAnchor = document.anchors(selectedAnchorName);
- else
- selectedAnchor = document.anchors[selectedAnchorName];
- if (selectedAnchor)
- selectedAnchor.className = "unselectedTextAnchor";
- }
- if (anchorName.indexOf("-1") == -1)
- {
- if (isIE)
- document.anchors(anchorName).className = "selectedTextAnchor";
- else
- document.anchors[anchorName].className = "selectedTextAnchor";
- setSelectedAnchorName(anchorName);
- alterImage(anchorName,openImagePath);
- }
- else
- setSelectedAnchorName("");
-}
-
-function alterImage(imageName,imagePath)
-{
- document.images[imageName].src = imagePath;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
deleted file mode 100644
index 4e45a7f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String sessionId = session.getId();
-%>
-<script language="javascript">
- var wsdlWindow;
- var wsdlWindowClosed = true;
- var targetWSDLURLElement;
- function openWSDLBrowser(formContainerId,type)
- {
- var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
- targetWSDLURLElement = form.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>;
- var link;
- switch (type)
- {
- case <%=ActionInputs.WSDL_TYPE_SERVICE%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForService(sessionId)))%>";
- break;
- case <%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>:
- default:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForServiceInterface(sessionId)))%>";
- }
- wsdlWindow = window.open(link,"wsdlWindow","height=300,width=450,status=yes,scrollbars=yes,resizable=yes");
- if (wsdlWindow.focus)
- wsdlWindow.focus();
- }
-
- function closeWSDLBrowser()
- {
- if (!wsdlWindowClosed)
- wsdlWindow.close();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
deleted file mode 100644
index e7e0f39..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- AddItemsToFavoritesAction action = new AddItemsToFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 519a4fb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddPublisherAssertionsAction action = new AddPublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
deleted file mode 100644
index 11f7b4a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- AddToFavoritesAction action = new AddToFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index cc6f2f4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action
- BusPublishServiceAdvancedAction action = new BusPublishServiceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index b87ef0d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- BusPublishServiceSimpleAction action = new BusPublishServiceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
deleted file mode 100644
index 3ee5d24..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- BusinessGetServicesAction action = new BusinessGetServicesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean businessExists = action.validateBusiness();
-
- if (!businessExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_BUSINESS_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 73d1e43..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-Enumeration paramNames = request.getParameterNames();
-while (paramNames.hasMoreElements()) {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- for (int i = 0; i < paramValues.length; i++) {
-%>
- <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
- }
-}
-%>
-</form>
-</body>
-</html>
-
-<%
-// Prepare the action.
-AddToFavoritesAction action = new AddToFavoritesAction(controller);
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-if (action.favoriteExists()) {
-%>
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(controller.getUDDIPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
- document.forms[0].submit();
- </script>
-<%
-}
-else {
-%>
- <script language="javascript">
- document.forms[0].submit();
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
deleted file mode 100644
index c9dec43..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- NodeManager navigatorManager = controller.getUDDIPerspective().getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- ClearNavigatorNodeAction action;
- if (selectedNode instanceof FolderNode)
- action = new ClearNavigatorFolderNodeAction(controller);
- else
- action = new ClearNavigatorNodeAction(controller);
-
- // The action may be executed programmed link.
- action.populatePropertyTable(request);
-
- boolean inputsValid = true;
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
deleted file mode 100644
index 4277ca3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- ClearNavigatorNodesAction action = new ClearNavigatorNodesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 5231575..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- CompletePublisherAssertionsAction action = new CompletePublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
deleted file mode 100644
index c3bfee0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
+++ /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
- *******************************************************************************/
-%>
-<%
- String subQueryKey = action.getSubQueryKey();
- StringBuffer newSubQueryKey = new StringBuffer();
- if (subQueryKey != null && subQueryKey.length() > 0)
- newSubQueryKey.append(action.getSubQueryKey()).append(':');
- newSubQueryKey.append(action.getNewSubQuery());
- FormTool formTool = (FormTool)action.getSelectedFormTool();
- FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- FormToolPropertiesInterface subQueryFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(newSubQueryKey.toString());
- String newSubQueryItemString = action.getNewSubQueryItem();
- subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,newSubQueryItemString);
- subQueryFormToolPI.setProperty(UDDIActionInputs.SUBQUERY_GET,new Boolean(action.isSubQueryGet()));
-
- // Always initialize the query name so the subquery makes sense.
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String parentQueryName = (String)parentFormToolPI.getProperty(UDDIActionInputs.QUERY_NAME);
- if (parentQueryName == null)
- parentQueryName = uddiPerspective.getMessage("DEFAULT_QUERY_NAME");
- int newSubQueryItem = Integer.parseInt(newSubQueryItemString);
- String newSubQueryItemTypeString = null;
- switch (newSubQueryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
- }
- String[] messageParameters = {parentQueryName,newSubQueryItemTypeString};
- subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_SUBQUERY_NAME",messageParameters));
-
- Node node = action.getSelectedNavigatorNode();
- int nodeId = node.getNodeId();
- int toolId = node.getToolManager().getSelectedToolId();
- int viewId = node.getViewId();
- int viewToolId = node.getViewToolId();
-%>
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,newSubQueryKey.toString(),false)))%>";
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp
deleted file mode 100644
index 2233b4b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,55 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body>
-<%
- // Prepare the action.
- LoginAdvancedAction action = new LoginAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp
deleted file mode 100644
index e9ce7a8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,44 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body>
-<%
- // Prepare the action.
- LogoutAdvancedAction action = new LogoutAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = true; //action.populatePropertyTable(request);
-
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
deleted file mode 100644
index 9004073..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- ManageReferencedServicesAction action = new ManageReferencedServicesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- if (!action.isSubQueryInitiated())
- {
- action.execute();
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
deleted file mode 100644
index 2f9e480..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult)
- {
- // Ensure that the selected node is visible.
- controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- navigatorContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_content.jsp"))%>";
- propertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
deleted file mode 100644
index 2fc743a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
-
- OpenRegistryAction action = new OpenRegistryAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
deleted file mode 100644
index 10cbcea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- // Prepare the action.
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller);
-
- // The action may be executed via program link.
- action.populatePropertyTable(request);
- boolean isNodeDataValid = action.verifyNodeData();
-
- boolean inputsValid = true;
- String onLoadAction;
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- function processClearNodesForm()
- {
- var clearNodesForm = document.forms[0];
- var submitClearNodesForm = false;
-<%
- Vector staleNodes = action.getStaleNodes();
- for (int i=0;i<staleNodes.size();i++)
- {
- Node staleNode = (Node)staleNodes.elementAt(i);
-%>
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
- {
- clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
- submitClearNodesForm = true;
- }
-<%
- }
-%>
- if (submitClearNodesForm)
- clearNodesForm.submit();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<%
- if (!isNodeDataValid)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- String nodeName = uddiPerspective.getNavigatorManager().getNode(nodeId).getNodeName();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",nodeName))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<script language="javascript">
- processClearNodesForm();
-</script>
-<%@ include file = "/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
deleted file mode 100644
index e7ef367..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- // Prepare the action.
- RefreshUDDINodesAction action = new RefreshUDDINodesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action
- boolean actionResult = action.execute();
-%>
-<script language="javascript">
- function processClearNodesForm()
- {
- var clearNodesForm = document.forms[0];
-<%
- Vector staleNodes = action.getStaleNodes();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- for (int i=0;i<staleNodes.size();i++)
- {
- Node staleNode = (Node)staleNodes.elementAt(i);
-%>
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
- clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
-<%
- }
-%>
- clearNodesForm.submit();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<script language="javascript">
- processClearNodesForm();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
deleted file mode 100644
index f2bc983..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
deleted file mode 100644
index 7eb43cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
deleted file mode 100644
index 06be1f8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessesSimpleAction action = new RegFindBusinessesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
deleted file mode 100644
index 2d72749..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
deleted file mode 100644
index c0edc8f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
deleted file mode 100644
index 46ff1bb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfacesSimpleAction action = new RegFindServiceInterfacesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
deleted file mode 100644
index 43638d7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
deleted file mode 100644
index dc062c3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
deleted file mode 100644
index 981e75c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServicesSimpleAction action = new RegFindServicesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
deleted file mode 100644
index 6e3a40e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishBusinessAdvancedAction action = new RegPublishBusinessAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
deleted file mode 100644
index 00119e8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishBusinessSimpleAction action = new RegPublishBusinessSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index 7247e09..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceAdvancedAction action = new RegPublishServiceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
deleted file mode 100644
index ff7aa92..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceInterfaceAdvancedAction action = new RegPublishServiceInterfaceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
deleted file mode 100644
index 8395f8e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceInterfaceSimpleAction action = new RegPublishServiceInterfaceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index 1f43602..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceSimpleAction action = new RegPublishServiceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 2fcbcc2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RemovePublisherAssertionsAction action = new RemovePublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
deleted file mode 100644
index 2824a93..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RemoveSubQueryItemAction action = new RemoveSubQueryItemAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
deleted file mode 100644
index fa98374..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeUDDIFramesAction action = new ResizeUDDIFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
-
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=uddiPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=uddiPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
deleted file mode 100644
index 4cbb193..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.uddi4j.util.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/cbpanes.jsp" flush="true"/>
-<%
- // Prepare the action.
- SelectCategoryNodeAction action = new SelectCategoryNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute(false);
-
- CategoryNode selectedNode = (CategoryNode)action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
- String treeContentVar = action.getTreeContentVar();
- if (previousSelectedNode != null)
- {
- if (treeContentVar != null)
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
- if (treeContentVar != null)
- {
-%>
- <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
- <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
- }
-
- CategoryElement categoryElement = (CategoryElement)selectedNode.getTreeElement();
- KeyedReference kr = categoryElement.getCategory();
-%>
- categoryBrowserWindow.opener.targetCategoryKeyNameElement.value = "<%=kr.getKeyName()%>";
- categoryBrowserWindow.opener.targetCategoryKeyValueElement.value = "<%=kr.getKeyValue()%>";
- categoryBrowserWindow.opener.closeCategoryBrowser();
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp
deleted file mode 100644
index 063cf1f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- SelectFindToolAction action = new SelectFindToolAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp
deleted file mode 100644
index 8cb7d0d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- SelectNavigatorNodeAction action = new SelectNavigatorNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp
deleted file mode 100644
index 474a40f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectPropertiesToolAction action = new SelectPropertiesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp
deleted file mode 100644
index 9c1637b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- SelectSubQueryItemAction action = new SelectSubQueryItemAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute(false);
-
- if (!actionResult)
- {
- Hashtable propertyTable = action.getPropertyTable();
- String subQueryKey = (String)propertyTable.get(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryListKey = (String)propertyTable.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
- int subQueryListItemId = Integer.parseInt((String)propertyTable.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_ITEM_VALIDATION_FAILED",action.getItemName()))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(RemoveSubQueryItemAction.getActionLink(subQueryKey,subQueryListKey,subQueryListItemId)))%>";
-</script>
-</body>
-</html>
-<%
- }
- else
- {
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp
deleted file mode 100644
index 939e71b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- ServiceGetBusinessAction action = new ServiceGetBusinessAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean serviceExists = action.validateService();
-
- if (!serviceExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SERVICE_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp
deleted file mode 100644
index 9cb5f99..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- ServiceGetServiceInterfacesAction action = new ServiceGetServiceInterfacesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean serviceExists = action.validateService();
-
- if (!serviceExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SERVICE_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp
deleted file mode 100644
index e5b2879..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- ServiceInterfaceGetBusinessesAction action = new ServiceInterfaceGetBusinessesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean siExists = action.validateServiceInterface();
-
- if (!siExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SI_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp
deleted file mode 100644
index 12967b1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- ServiceInterfaceGetServicesAction action = new ServiceInterfaceGetServicesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean siExists = action.validateServiceInterface();
-
- if (!siExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_SI_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 40405d3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- ShowPublisherAssertionsAction action = new ShowPublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp
deleted file mode 100644
index 5ce374b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromUDDIAction action = new SwitchPerspectiveFromUDDIAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp
deleted file mode 100644
index 1ae04f8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/cbpanes.jsp" flush="true"/>
-<%
- // Prepare the action.
- ToggleCategoryNodeAction action = new ToggleCategoryNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute(false);
-
- String treeContentVar = action.getTreeContentVar();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
-<%
- if (treeContentVar != null)
- {
-%>
- if (isMicrosoftInternetExplorer())
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- else
- categoryBrowserWindow.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContainerPage()))%>";
-<%
- }
-%>
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp
deleted file mode 100644
index adee740..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-ToggleNavigatorNodeAction action = new ToggleNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp
deleted file mode 100644
index 9d98c73..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- TransferSubQueryResultsAction action = new TransferSubQueryResultsAction(controller);
-
- if (request.getParameter(UDDIActionInputs.SHOW_RESULTS_TARGET) != null)
- action.enableShowResultsTarget();
- else
- action.populatePropertyTable(request);
-
- boolean actionResult = action.execute();
- Node targetNode = action.getTargetNode();
- String targetNodeAnchorName = targetNode.getAnchorName();
-%>
-<script language="javascript">
- navigatorContent.selectNode('<%=targetNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(targetNode.getOpenImagePath()))%>');
- navigatorContent.location.hash='#<%=targetNodeAnchorName%>';
- propertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp
deleted file mode 100644
index 1ddef0b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
- RegistryDetailsTool regDetailsTool = regNode.getRegDetailsTool();
- regDetailsTool.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,categoryTModelKey);
- regNode.getCurrentToolManager().setSelectedToolId(regDetailsTool.getToolId());
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(SelectNavigatorNodeAction.getActionLink(regNode.getNodeId(),false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index 665cbcc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-UDDIAddToWSDLPerspectiveAction action = new UDDIAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean paramValid = action.populatePropertyTable(request);
-
-if (paramValid) {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- if (actionResult) {
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-<%
- }
-}
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index 9103ff7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 245820b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIImportWSDLToWorkbenchAction action = new UDDIImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index c331f63..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDILaunchWebServiceWizardAction action = new UDDILaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp
deleted file mode 100644
index 939eb43..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- UnpublishAction action = new UnpublishAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc
deleted file mode 100644
index 08f402a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc
+++ /dev/null
@@ -1,47 +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
- *******************************************************************************/
-%>
-<%
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- boolean refreshResult = action.refreshFromRegistry();
-
- if (!refreshResult)
- {
- session.setAttribute(UDDIActionInputs.PUBLISH_ACTION,action);
-%>
-<script language="javascript">
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_PUBLISH_ITEM"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateNewPublishActionJSP.jsp"))%>";
- else
- propertiesContent.requestSubmitted = false;
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp
deleted file mode 100644
index 9c0eab2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- UpdateBusinessAction action = new UpdateBusinessAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp
deleted file mode 100644
index 77aea5d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- UpdateAction action = (UpdateAction)session.getAttribute(UDDIActionInputs.PUBLISH_ACTION);
- session.removeAttribute(UDDIActionInputs.PUBLISH_ACTION);
- boolean inputsValid = true;
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp
deleted file mode 100644
index bfa753f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- UpdateRegistryAction action = new UpdateRegistryAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp
deleted file mode 100644
index 59d94f7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp
+++ /dev/null
@@ -1,87 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- UpdateServiceAction action = new UpdateServiceAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- boolean refreshServiceResult = action.refreshFromRegistry();
- boolean refreshBusinessResult = action.refreshBusinessFromRegistry();
- if (!refreshServiceResult)
- {
- session.setAttribute(UDDIActionInputs.PUBLISH_ACTION,action);
- if (!refreshBusinessResult)
- {
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_SERVICE_PUBLISH_BUSINESS"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp"))%>";
- else
- propertiesContent.requestSubmitted = false;
-</script>
-<%
- }
- else
- {
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_PUBLISH_ITEM"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateNewPublishActionJSP.jsp"))%>";
- else
- propertiesContent.requestSubmitted = false;
-</script>
-<%
- }
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp
deleted file mode 100644
index b9a8f04..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- UpdateServiceInterfaceAction action = new UpdateServiceInterfaceAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/UpdateAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp
deleted file mode 100644
index e9f6ee6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- UpdateServiceAction action = (UpdateServiceAction)session.getAttribute(UDDIActionInputs.PUBLISH_ACTION);
- session.removeAttribute(UDDIActionInputs.PUBLISH_ACTION);
-
- RegPublishTool regPublishTool = action.setupRegPublishTool();
-%>
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(regPublishTool.getSelectToolActionHref(false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp
deleted file mode 100644
index d51ba19..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=uddiPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
- <frame name="<%=UDDIFrameNames.PROPERTIES_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
- <frame name="<%=UDDIFrameNames.STATUS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp
deleted file mode 100644
index db9e530..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- uddiPerspective.setCategoryTModelKey(categoryTModelKey);
-
- StringBuffer toolbarLink = new StringBuffer("uddi/category_toolbar.jsp?");
- toolbarLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("TITLE_CATEGORY_BROWSER")%></title>
-</head>
-<frameset rows="0,33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=UDDIFrameNames.CATEGORIES_WORKAREA%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_WORKAREA")%>" frameborder=0 noresize>
- <frame name="<%=UDDIFrameNames.CATEGORIES_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(toolbarLink.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=UDDIFrameNames.CATEGORIES_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(OpenCategoryBrowserAction.getCategoryContentPage(sessionId,categoryTModelKey)))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp
deleted file mode 100644
index 77003d7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp
+++ /dev/null
@@ -1,115 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="commonCategoryModels" class="java.util.Hashtable" scope="application"/>
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- String categoryTModelKey = request.getParameter(UDDIActionInputs.CATEGORY_TMODEL_KEY);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-<script language="javascript">
- function transferToAddCategoryData()
- {
- top.opener.top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"].location = "<%=response.encodeURL(controller.getPathWithContext(TransferToAddCategoryDataAction.getActionLink(sessionId,categoryTModelKey)))%>";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<%
- // Check if the category is a common category.
- CategoryModel categoryModel = (CategoryModel)commonCategoryModels.get(categoryTModelKey);
- if (categoryModel == null)
- {
- // The category is user-defined.
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- categoryModel = (CategoryModel)regElement.getUserDefinedCategory(categoryTModelKey);
- }
- byte rc = CategoryModel.OPERATION_SUCCESSFUL;
- if (!categoryModel.isDataLoaded())
- {
- synchronized(categoryModel)
- {
- if (!categoryModel.isDataLoaded())
- rc = categoryModel.loadFromDefaultDataFile();
- }
- }
- if (rc != CategoryModel.OPERATION_SUCCESSFUL)
- {
-%>
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <%=uddiPerspective.getMessage("MSG_INFO_NO_CATEGORY_DATA",categoryModel.getDisplayName())%>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom"> </td>
- </tr>
- <tr>
- <td>
- <%=uddiPerspective.getMessage("FORM_LABEL_ADD_CATEGORY_DATA","javascript:transferToAddCategoryData()")%>
- </td>
- </tr>
- </table>
-</div>
-<%
- }
- else
- {
- NodeManager categoryManager = uddiPerspective.getCategoryManager(categoryModel);
- String selectedAnchorName = "";
- int focusedNodeId = categoryManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = categoryManager.getSelectedNode();
- if (selectedNode != null)
- {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<div id="treecontentborder">
-<%=categoryManager.renderTreeView(response)%>
-</div>
-<script language="javascript">
- self.location.hash="#<%=focusedAnchorName%>"
- setSelectedAnchorName("<%=selectedAnchorName%>");
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp
deleted file mode 100644
index 77d8d55..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_CATEGORIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin" onUnload="top.opener.categoryWindowClosed=true">
-<div id="toolbarborder">
- <div id="toolbar">
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("uddi/images/category.gif"))%>" alt="" width=16 height=16></td>
- <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=uddiPerspective.getMessage("ALT_CATEGORIES")%></td>
- </tr>
- </table>
- </div>
-</div>
-<script language="javascript">
- top.opener.categoryWindowClosed=false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt
deleted file mode 100644
index f978abd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt
+++ /dev/null
@@ -1,1383 +0,0 @@
-geo#--#World#--
-geo#AE#United Arab Emirates#--
-geo#AF#Afghanistan#--
-geo#AG#Antigua And Barbuda#--
-geo#AI#Anguilla#--
-geo#AL#Albania#--
-geo#AM#Armenia#--
-geo#AN#Netherlands Antilles#--
-geo#AO#Angola#--
-geo#AQ#Antarctica#--
-geo#AR#Argentina#--
-geo#AR-A#Salta#AR
-geo#AR-B#Buenos Aires#AR
-geo#AR-C#Distrito Federal#AR
-geo#AR-D#San Luis#AR
-geo#AR-E#Entre Rios#AR
-geo#AR-F#La Rioja#AR
-geo#AR-G#Santiago Del Estero#AR
-geo#AR-H#Chaco#AR
-geo#AR-J#San Juan#AR
-geo#AR-K#Catamarca#AR
-geo#AR-L#La Pampa#AR
-geo#AR-M#Mendoza#AR
-geo#AR-N#Misiones#AR
-geo#AR-P#Formosa#AR
-geo#AR-Q#Neuquen#AR
-geo#AR-R#Rio Negro#AR
-geo#AR-S#Santa Fe#AR
-geo#AR-T#Tucuman#AR
-geo#AR-U#Chubut#AR
-geo#AR-V#Tierra Del Fuego#AR
-geo#AR-W#Corrientes#AR
-geo#AR-X#Cordoba#AR
-geo#AR-Y#Jujuy#AR
-geo#AR-Z#Santa Cruz#AR
-geo#AS#American Samoa#--
-geo#AT#Austria#--
-geo#AU#Australia#--
-geo#AU-CT#Australian Capital Territory#AU
-geo#AU-NS#New South Wales#AU
-geo#AU-NT#Northern Territory#AU
-geo#AU-QL#Queensland#AU
-geo#AU-SA#South Australia#AU
-geo#AU-TS#Tasmania#AU
-geo#AU-VI#Victoria#AU
-geo#AU-WA#Western Australia#AU
-geo#AW#Aruba#--
-geo#AZ#Azerbaijan#--
-geo#BA#Bosnia-Hercegovina#--
-geo#BB#Barbados#--
-geo#BD#Bangladesh#--
-geo#BE#Belgium#--
-geo#BF#Burkina Faso#--
-geo#BG#Bulgaria#--
-geo#BH#Bahrain#--
-geo#BI#Burundi#--
-geo#BJ#Benin#--
-geo#BM#Bermuda#--
-geo#BN#Brunei Darussalam#--
-geo#BO#Bolivia#--
-geo#BR#Brazil#--
-geo#BR-AC#Acre#BR
-geo#BR-AL#Alagoas#BR
-geo#BR-AM#Amazonas#BR
-geo#BR-AP#Amapa#BR
-geo#BR-BA#Bahia#BR
-geo#BR-CE#Ceara#BR
-geo#BR-DF#Distrito Federal#BR
-geo#BR-ES#Espirito Santo#BR
-geo#BR-GO#Goias#BR
-geo#BR-MA#Maranhao#BR
-geo#BR-MG#Minas Gerais#BR
-geo#BR-MS#Mato Grosso Do Sul#BR
-geo#BR-MT#Mato Grosso#BR
-geo#BR-PA#Para#BR
-geo#BR-PB#Paraiba#BR
-geo#BR-PE#Pernambuco#BR
-geo#BR-PI#Piaui#BR
-geo#BR-PR#Parana#BR
-geo#BR-RJ#Rio De Janeiro#BR
-geo#BR-RN#Rio Grande Do Norte#BR
-geo#BR-RO#Rondonia#BR
-geo#BR-RR#Roraima#BR
-geo#BR-RS#Rio Grande Do Sul#BR
-geo#BR-SC#Santa Catarina#BR
-geo#BR-SE#Sergipe#BR
-geo#BR-SP#Sao Paulo#BR
-geo#BR-TO#Tocantina#BR
-geo#BS#Bahamas#--
-geo#BT#Bhutan#--
-geo#BU#Burma (See MM Myanmar)#--
-geo#BW#Botswana#--
-geo#BY#Belarus#--
-geo#BY-BR#Brestskaya voblasts'#BY
-geo#BY-HO#Homyel'skaya voblasts'#BY
-geo#BY-HR#Hrodzenskaya voblasts'#BY
-geo#BY-MA#Mahilyowskaya voblasts'#BY
-geo#BY-MI#Minskaya voblasts'#BY
-geo#BY-VI#Vitsyebskaya voblasts'#BY
-geo#BZ#Belize#--
-geo#CA#Canada#--
-geo#CA-AB#Alberta#CA
-geo#CA-BC#British Columbia#CA
-geo#CA-MB#Manitoba#CA
-geo#CA-NB#New Brunswick#CA
-geo#CA-NF#Newfoundland#CA
-geo#CA-NS#Nova Scotia#CA
-geo#CA-NT#Northwest Territories#CA
-geo#CA-NU#Nunavut#CA
-geo#CA-ON#Ontario#CA
-geo#CA-PE#Prince Edward Island#CA
-geo#CA-QC#Quebec#CA
-geo#CA-SK#Saskatchewan#CA
-geo#CA-YT#Yukon Territory#CA
-geo#CC#Cocos (Keeling) Islands#--
-geo#CD#"Congo, Democratic Republic of"#--
-geo#CF#Central African Republic#--
-geo#CG#Congo#--
-geo#CH#Switzerland#--
-geo#CH-AG#Aargau#CH
-geo#CH-AI#Appenzell Inner-Rhoden#CH
-geo#CH-AR#Appenzell Ausser-Rhoden#CH
-geo#CH-BE#Bern#CH
-geo#CH-BL#Basel-Landschaft#CH
-geo#CH-BS#Basel-Stadt#CH
-geo#CH-FR#Fribourg#CH
-geo#CH-GE#Genève#CH
-geo#CH-GL#Glarus#CH
-geo#CH-GR#Graubünden#CH
-geo#CH-JU#Jura#CH
-geo#CH-LU#Luzern#CH
-geo#CH-NE#Neuchatel#CH
-geo#CH-NW#Nidwalden#CH
-geo#CH-OW#Obwalden#CH
-geo#CH-SG#St Gallen#CH
-geo#CH-SH#Schaffhausen#CH
-geo#CH-SO#Solothurn#CH
-geo#CH-SZ#Schwyz#CH
-geo#CH-TG#Thurgau#CH
-geo#CH-TI#Ticino#CH
-geo#CH-UR#Uri#CH
-geo#CH-VD#Vaud#CH
-geo#CH-VS#Valais#CH
-geo#CH-ZG#Zug#CH
-geo#CH-ZH#Zürich#CH
-geo#CI#Cote D'Ivoire#--
-geo#CK#Cook Islands#--
-geo#CL#Chile#--
-geo#CM#Cameroon#--
-geo#CN#China#--
-geo#CN-11#Beijing#CN
-geo#CN-12#Tianjin#CN
-geo#CN-13#Hebei#CN
-geo#CN-14#Shanxi#CN
-geo#CN-15#Nei Mongol#CN
-geo#CN-21#Liaoning#CN
-geo#CN-22#Jilin#CN
-geo#CN-23#Heilongjiang#CN
-geo#CN-31#Shanghai#CN
-geo#CN-32#Jiangsu#CN
-geo#CN-33#Zhejiang#CN
-geo#CN-34#Anhui#CN
-geo#CN-35#Fujian#CN
-geo#CN-36#Jiangxi#CN
-geo#CN-37#Shandong#CN
-geo#CN-41#Henan#CN
-geo#CN-42#Hubei#CN
-geo#CN-43#Hunan#CN
-geo#CN-44#Guangdong#CN
-geo#CN-45#Guangxi#CN
-geo#CN-46#Hainan#CN
-geo#CN-51#Sichuan#CN
-geo#CN-52#Guizhou#CN
-geo#CN-53#Yunnan#CN
-geo#CN-54#Xizang#CN
-geo#CN-61#Shaanxi#CN
-geo#CN-62#Gansu#CN
-geo#CN-63#Qinghai#CN
-geo#CN-64#Ningxia#CN
-geo#CN-65#Xinjiang#CN
-geo#CN-71#Taiwan#CN
-geo#CN-91#Xianggang (Hong Kong)#CN
-geo#CN-92#Aomen (Macau)#CN
-geo#CO#Colombia#--
-geo#CR#Costa Rica#--
-geo#CS#Former Czechoslovakia#--
-geo#CU#Cuba#--
-geo#CV#Cape Verde#--
-geo#CX#Christmas Islands#--
-geo#CY#Cyprus#--
-geo#CZ#Czech Republic#--
-geo#DE#"Germany, Federal Republic of"#--
-geo#DE-BE#Berlin#DE
-geo#DE-BR#Brandenburg#DE
-geo#DE-BW#Baden-Württemberg#DE
-geo#DE-BY#Bayern#DE
-geo#DE-HB#Bremen (Hansestadt)#DE
-geo#DE-HE#Hessen#DE
-geo#DE-HH#Hamburg (Hansestadt)#DE
-geo#DE-MV#Mecklenburg-Vorpommern#DE
-geo#DE-NI#Niedersachsen#DE
-geo#DE-NW#Nordrhein-Westfalen#DE
-geo#DE-RP#Rheinland-Pfalz#DE
-geo#DE-SH#Schleswig-Holstein#DE
-geo#DE-SL#Saarland#DE
-geo#DE-SN#Sachsen#DE
-geo#DE-ST#Sachsen-Anhalt#DE
-geo#DE-TH#Thüringen#DE
-geo#DJ#Djibouti#--
-geo#DK#Denmark#--
-geo#DM#Dominica#--
-geo#DO#Dominican Republic#--
-geo#DO-02#Azua#DO
-geo#DO-03#Bahoruco#DO
-geo#DO-04#Barahona#DO
-geo#DO-05#Dajabón#DO
-geo#DO-06#Duarte#DO
-geo#DO-08#El Seybo#DO
-geo#DO-09#Espaillat#DO
-geo#DO-30#Hato Mayor#DO
-geo#DO-10#Independencia#DO
-geo#DO-11#La Altagracia#DO
-geo#DO-07#La Estrelleta#DO
-geo#DO-12#La Romana#DO
-geo#DO-13#La Vega#DO
-geo#DO-14#María Trinidad Sánchez#DO
-geo#DO-28#Monsenor Nouel#DO
-geo#DO-15#Monte Cristi#DO
-geo#DO-29#Monte Plata#DO
-geo#DO-16#Pedernales#DO
-geo#DO-17#Peravia#DO
-geo#DO-18#Puerto Plata#DO
-geo#DO-19#Solcedo#DO
-geo#DO-20#Samaná#DO
-geo#DO-21#San Cristóbal#DO
-geo#DO-22#San Juan#DO
-geo#DO-23#San Pedro de Macorís#DO
-geo#DO-24#Sánchez Ramírez#DO
-geo#DO-25#Santiago#DO
-geo#DO-26#Santiago Rodríguez#DO
-geo#DO-27#Valverde#DO
-geo#DZ#Algeria#--
-geo#EC#Ecuador#--
-geo#EE#Estonia#--
-geo#EG#Egypt#--
-geo#EH#Western Sahara#--
-geo#ER#Eritrea#--
-geo#ER-AN#Anseba#ER
-geo#ER-DU#Debub#ER
-geo#ER-DK#Debubawi Keyih Bahri [Debub-Keih-Bahri]#ER
-geo#ER-GB#Gash-Barka#ER
-geo#ER-MA#Maakel [Maekel]#ER
-geo#ER-SK#Semenawi Keyih Bahri [Semien-Keih-Bahri]#ER
-geo#ES#Spain#--
-geo#ES-AN#Andalucía#ES
-geo#ES-AL#Almería#ES-AN
-geo#ES-CA#Cádiz#ES-AN
-geo#ES-CO#Córdoba#ES-AN
-geo#ES-GR#Granada#ES-AN
-geo#ES-H#Huelva#ES-AN
-geo#ES-J#Jaén#ES-AN
-geo#ES-MA#Málaga#ES-AN
-geo#ES-SE#Sevilla#ES-AN
-geo#ES-AR#Aragón#ES
-geo#ES-HU#Huesca#ES-AR
-geo#ES-TE#Teruel#ES-AR
-geo#ES-Z#Zaragoza#ES-AR
-geo#ES-O#"Asturias, Principado de"#ES
-geo#ES-CN#Canarias#ES
-geo#ES-GC#Las Palmas#ES-CN
-geo#ES-TF#Santa Cruz de Tenerife#ES-CN
-geo#ES-S#Cantabria#ES
-geo#ES-CM#Castilla-La Mancha#ES
-geo#ES-AB#Albacete#ES-CM
-geo#ES-CR#Cuidad Real#ES-CM
-geo#ES-CU#Cuenca#ES-CM
-geo#ES-GU#Guadalajara#ES-CM
-geo#ES-TO#Toledo#ES-CM
-geo#ES-CL#Castilla y León#ES
-geo#ES-AV#Ávila#ES-CL
-geo#ES-BU#Burgos#ES-CL
-geo#ES-LE#León#ES-CL
-geo#ES-P#Palencia#ES-CL
-geo#ES-SA#Salamanca#ES-CL
-geo#ES-SG#Segovia#ES-CL
-geo#ES-SO#Soria#ES-CL
-geo#ES-VA#Valladolid#ES-CL
-geo#ES-ZA#Zamora#ES-CL
-geo#ES-CT#Cataluna#ES
-geo#ES-B#Barcelona#ES-CT
-geo#ES-GE#Girona [Gerona]#ES-CT
-geo#ES-L#Lleida [Léruda]#ES-CT
-geo#ES-T#Tarragona#ES-CT
-geo#ES-EX#Extremadura#ES
-geo#ES-BA#Badajoz#ES-EX
-geo#ES-CC#Cáceres#ES-EX
-geo#ES-GA#Galicia#ES
-geo#ES-C#La Coruna#ES-GA
-geo#ES-LU#Lugo#ES-GA
-geo#ES-OR#Orense#ES-GA
-geo#ES-PO#Pontevedra#ES-GA
-geo#ES-PM#Islas Baleares#ES
-geo#ES-LO#La Rioja#ES
-geo#ES-M#"Madrid, Comunidad de"#ES
-geo#ES-MU#"Murcia, Región de"#ES
-geo#ES-NA#"Navarra, Comunidad Foral de"#ES
-geo#ES-PV#País Vasci#ES
-geo#ES-VI#Álava#ES-PV
-geo#ES-SS#Guipúzcoa#ES-PV
-geo#ES-BI#Vizcaya#ES-PV
-geo#ES-VC#"Valenciana, Comunidad"#ES
-geo#ES-A#Alicante#ES-VC
-geo#ES-CS#Castellón#ES-VC
-geo#ES-V#Valencia#ES-VC
-geo#ES-CE#Ceuta#ES
-geo#ES-ML#Melilla#ES
-geo#ET#Ethiopia#--
-geo#FI#Finland#--
-geo#FI-AL#Ahvenanmaan Maakunta (Fi) Ålands Län (Sv)#FI
-geo#FI-ES#Etelä-Suomen Lääni (Fi) Södra Finlands Län (Sv)#FI
-geo#FI-IS#Itä-Suomen Lääni (Fi) Östra Finlands Län (Sv)#FI
-geo#FI-LL#Lapin Lääni (Fi) Laplands Län (Sv)#FI
-geo#FI-LS#Länsi-Suomen Lääni (Fi) Västra Finlands Län (Sv)#FI
-geo#FI-OL#Oulun Lääni (Fi) Uleåborgs Län (Sv)#FI
-geo#FJ#Fiji#--
-geo#FK#Falkland Islands (Malvinas)#--
-geo#FM#Federated States Of Micronesia#--
-geo#FO#Faeroe Islands#--
-geo#FR#France#--
-geo#FR-01#Ain#FR-V
-geo#FR-02#Aisne#FR-S
-geo#FR-03#Allier#FR-C
-geo#FR-04#Alpes-De-Haute-Provence#FR-U
-geo#FR-05#Hautes-Alpes#FR-U
-geo#FR-06#Alpes-Maritimes#FR-U
-geo#FR-07#Ardèche#FR-V
-geo#FR-08#Ardennes#FR-G
-geo#FR-09#Ariège#FR-N
-geo#FR-10#Aube#FR-G
-geo#FR-11#Aude#FR-K
-geo#FR-12#Aveyron#FR-N
-geo#FR-13#Bouches-Du-Rhône#FR-U
-geo#FR-14#Calvados#FR-P
-geo#FR-15#Cantal#FR-C
-geo#FR-16#Charente#FR-T
-geo#FR-17#Charente-Maritime#FR-T
-geo#FR-18#Cher#FR-F
-geo#FR-19#Corrèze#FR-L
-geo#FR-21#Côte-D'Or#FR-D
-geo#FR-22#Côtes-D'Armor#FR-E
-geo#FR-23#Creuse#FR-L
-geo#FR-24#Dordogne#FR-B
-geo#FR-25#Doubs#FR-I
-geo#FR-26#Drôme#FR-V
-geo#FR-27#Eure#FR-Q
-geo#FR-28#Eure-Et-Loir#FR-F
-geo#FR-29#Finistère#FR-E
-geo#FR-2A#Corse-Du-Sud#FR-H
-geo#FR-2B#Haute-Corse#FR-H
-geo#FR-30#Gard#FR-K
-geo#FR-31#Haute-Garonne#FR-N
-geo#FR-32#Gers#FR-N
-geo#FR-33#Gironde#FR-B
-geo#FR-34#Hérault#FR-K
-geo#FR-35#Ille-Et-Vilaine#FR-E
-geo#FR-36#Indre#FR-F
-geo#FR-37#Indre-Et-Loire#FR-F
-geo#FR-38#Isère#FR-V
-geo#FR-39#Jura#FR-I
-geo#FR-40#Landes#FR-B
-geo#FR-41#Loir-Et-Cher#FR-F
-geo#FR-42#Loire#FR-V
-geo#FR-43#Haute-Loire#FR-C
-geo#FR-44#Loire-Atlantique#FR-R
-geo#FR-45#Loiret#FR-F
-geo#FR-46#Lot#FR-N
-geo#FR-47#Lot-Et-Garonne#FR-B
-geo#FR-48#Lozère#FR-K
-geo#FR-49#Maine-Et-Loire#FR-R
-geo#FR-50#Manche#FR-P
-geo#FR-51#Marne#FR-G
-geo#FR-52#Haute-Marne#FR-G
-geo#FR-53#Mayenne#FR-R
-geo#FR-54#Meurthe-Et-Moselle#FR-M
-geo#FR-55#Meuse#FR-M
-geo#FR-56#Morbihan#FR-E
-geo#FR-57#Moselle#FR-M
-geo#FR-58#Nièvre#FR-D
-geo#FR-59#Nord#FR-O
-geo#FR-60#Oise#FR-S
-geo#FR-61#Orne#FR-P
-geo#FR-62#Pas-De-Calais#FR-O
-geo#FR-63#Puy-De-Dôme#FR-C
-geo#FR-64#Pyrénées-Atlantiques#FR-B
-geo#FR-65#Hautes-Pyrénées#FR-N
-geo#FR-66#Pyrénées-Orientales#FR-K
-geo#FR-67#Bas-Rhin#FR-A
-geo#FR-68#Haut-Rhin#FR-A
-geo#FR-69#Rhône#FR-V
-geo#FR-70#Haute-Saône#FR-I
-geo#FR-71#Saône-Et-Loire#FR-D
-geo#FR-72#Sarthe#FR-R
-geo#FR-73#Savoie#FR-V
-geo#FR-74#Haute-Savoie#FR-V
-geo#FR-75#Paris#FR-J
-geo#FR-76#Seine-Maritime#FR-Q
-geo#FR-77#Seine-Et-Marne#FR-J
-geo#FR-78#Yvelines#FR-J
-geo#FR-79#Deux-Sèvres#FR-B
-geo#FR-80#Somme#FR-S
-geo#FR-81#Tarn#FR-N
-geo#FR-82#Tarn-Et-Garonne#FR-N
-geo#FR-83#Var#FR-U
-geo#FR-84#Vaucluse#FR-U
-geo#FR-85#Vendée#FR-R
-geo#FR-86#Vienne#FR-T
-geo#FR-87#Haute-Vienne#FR-L
-geo#FR-88#Vosges#FR-M
-geo#FR-89#Yonne#FR-D
-geo#FR-90#Territoire De Belfort#FR-I
-geo#FR-91#Essonne#FR-J
-geo#FR-92#Hauts-De-Seine#FR-J
-geo#FR-93#Seine-Saint-Denis#FR-J
-geo#FR-94#Val-De-Marne#FR-J
-geo#FR-95#Val-D'Oise#FR-J
-geo#FR-A#Alsace#FR
-geo#FR-B#Aquitaine#FR
-geo#FR-C#Auvergne#FR
-geo#FR-D#Bourgogne#FR
-geo#FR-E#Bretagne#FR
-geo#FR-F#Centre#FR
-geo#FR-G#Champagne-Ardenne#FR
-geo#FR-H#Corse#FR
-geo#FR-I#Franche-Comté#FR
-geo#FR-J#Ile-De-France#FR
-geo#FR-K#Languedoc-Roussillon#FR
-geo#FR-L#Limousin#FR
-geo#FR-M#Lorraine#FR
-geo#FR-N#Midi-Pyrénées#FR
-geo#FR-O#Nord-Pas-De-Calais#FR
-geo#FR-P#Basse-Normandie#FR
-geo#FR-Q#Haute-Normandie#FR
-geo#FR-R#Pays De La Loire#FR
-geo#FR-S#Picardie#FR
-geo#FR-T#Poitou-Charentes#FR
-geo#FR-U#Provence-Alpes-Côte D'Azur#FR
-geo#FR-V#Rhône-Alpes#FR
-geo#GA#Gabon#--
-geo#GB#United Kingdom#--
-geo#GB-ANT#Antrim#GB-NIR
-geo#GB-ARD#Ards#GB-NIR
-geo#GB-ARM#Armagh#GB-NIR
-geo#GB-AVN#Avon#GB-ENG
-geo#GB-BDF#Bedfordshire#GB-ENG
-geo#GB-BFS#Belfast#GB-NIR
-geo#GB-BKM#Buckinghamshire#GB-ENG
-geo#GB-BLA#Ballymena#GB-NIR
-geo#GB-BLY#Ballymoney#GB-NIR
-geo#GB-BNB#Banbridge#GB-NIR
-geo#GB-BOR#Borders Region#GB-SCT
-geo#GB-BRK#Berkshire#GB-ENG
-geo#GB-CAM#Cambridgeshire#GB-ENG
-geo#GB-CEN#Central Region#GB-SCT
-geo#GB-CGV#Craigavon#GB-NIR
-geo#GB-CHA#Channel Islands#GB
-geo#GB-CHS#Cheshire#GB-ENG
-geo#GB-CKF#Carrickfergus#GB-NIR
-geo#GB-CKT#Cookstown#GB-NIR
-geo#GB-CLR#Coleraine#GB-NIR
-geo#GB-CLV#Cleveland#GB-ENG
-geo#GB-CMA#Cumbria#GB-ENG
-geo#GB-CON#Cornwall#GB-ENG
-geo#GB-CSR#Castlereagh#GB-NIR
-geo#GB-CWD#Clwyd#GB-WLS
-geo#GB-DBY#Derbyshire#GB-ENG
-geo#GB-DFD#Dyfed#GB-WLS
-geo#GB-DGN#Dungannon#GB-NIR
-geo#GB-DGY#Dumfries & Galloway Region#GB-SCT
-geo#GB-DOR#Dorset#GB-ENG
-geo#GB-DOW#Down#GB-NIR
-geo#GB-DRY#Derry#GB-NIR
-geo#GB-DUR#Durham#GB-ENG
-geo#GB-DVV#Devon#GB-ENG
-geo#GB-ENG#England#GB
-geo#GB-ESS#Essex#GB-ENG
-geo#GB-ESX#East Sussex#GB-ENG
-geo#GB-FER#Fermanagh#GB-NIR
-geo#GB-FIF#Fife Region#GB-SCT
-geo#GB-GLS#Gloucestershire#GB-ENG
-geo#GB-GMP#Grampian Region#GB-SCT
-geo#GB-GNT#Gwent#GB-WLS
-geo#GB-GSY#Guernsey#GB-CHA
-geo#GB-GTL#Greater London#GB-ENG
-geo#GB-GTM#Greater Manchester#GB-ENG
-geo#GB-GWN#Gwynedd#GB-WLS
-geo#GB-HAM#Hampshire#GB-ENG
-geo#GB-HLD#Highland Region#GB-SCT
-geo#GB-HRT#Hertfordshire#GB-ENG
-geo#GB-HUM#Humberside#GB-ENG
-geo#GB-HWR#Hereford And Worcester#GB-ENG
-geo#GB-IOM#Isle Of Man#GB
-geo#GB-IOS#Isles Of Scilly#GB-ENG
-geo#GB-IOW#Isle Of Wight#GB-ENG
-geo#GB-JSY#Jersey#GB-CHA
-geo#GB-KEN#Kent#GB-ENG
-geo#GB-LAN#Lancashire#GB-ENG
-geo#GB-LEC#Leicestershire#GB-ENG
-geo#GB-LIN#Lincolnshire#GB-ENG
-geo#GB-LMV#Limavady#GB-NIR
-geo#GB-LRN#Larne#GB-NIR
-geo#GB-LSB#Lisburn#GB-NIR
-geo#GB-LTN#Lothian Region#GB-SCT
-geo#GB-MFT#Magherafelt#GB-NIR
-geo#GB-MGM#Mid Glamorgan#GB-WLS
-geo#GB-MSY#Merseyside#GB-ENG
-geo#GB-MYL#Moyle#GB-NIR
-geo#GB-NBL#Northumberland#GB-ENG
-geo#GB-NDN#North Down#GB-NIR
-geo#GB-NFK#Norfolk#GB-ENG
-geo#GB-NIR#Northern Ireland#GB
-geo#GB-NTA#Newtonabbey#GB-NIR
-geo#GB-NTH#Northamptonshire#GB-ENG
-geo#GB-NTT#Nottinghamshire#GB-ENG
-geo#GB-NYK#North Yorkshire#GB-ENG
-geo#GB-NYM#Newry And Mourne#GB-NIR
-geo#GB-OMH#Omagh#GB-NIR
-geo#GB-ORK#Orkney#GB-SCT
-geo#GB-OXF#Oxfordshire#GB-ENG
-geo#GB-POW#Powys#GB-WLS
-geo#GB-SCT#Scotland#GB
-geo#GB-SFK#Suffolk#GB-ENG
-geo#GB-SGM#South Glamorgan#GB-WLS
-geo#GB-SHR#Shropshire#GB-ENG
-geo#GB-SOM#Somerset#GB-ENG
-geo#GB-SRY#Surrey#GB-ENG
-geo#GB-STB#Strabane#GB-NIR
-geo#GB-STD#Strathclyde Region#GB-SCT
-geo#GB-STS#Staffordshire#GB-ENG
-geo#GB-SYK#South Yorkshire#GB-ENG
-geo#GB-TAY#Tayside Region#GB-SCT
-geo#GB-TWR#Tyne And Wear#GB-ENG
-geo#GB-WAR#Warwickshire#GB-ENG
-geo#GB-WGM#West Glamorgan#GB-WLS
-geo#GB-WIL#Wiltshire#GB-ENG
-geo#GB-WIS#Western Isles#GB-SCT
-geo#GB-WLS#Wales#GB
-geo#GB-WMD#West Midlands#GB-ENG
-geo#GB-WSX#West Sussex#GB-ENG
-geo#GB-WYK#West Yorkshire#GB-ENG
-geo#GB-ZET#Shetland (Zetland)#GB-SCT
-geo#GD#Grenada#--
-geo#GE#Georgia#--
-geo#GF#French Guiana#--
-geo#GH#Ghana#--
-geo#GI#Gibraltar#--
-geo#GL#Greenland#--
-geo#GM#Gambia#--
-geo#GN#Guinea#--
-geo#GP#Guadeloupe#--
-geo#GQ#Equatorial Guinea#--
-geo#GR#Greece#--
-geo#GS#Georgia & Sandwich Islands#--
-geo#GT#Guatemala#--
-geo#GU#Guam#--
-geo#GW#Guinea-Bissau#--
-geo#GY#Guyana#--
-geo#HK#Hong Kong#--
-geo#HN#Honduras#--
-geo#HR#Croatia#--
-geo#HT#Haiti#--
-geo#HU#Hungary#--
-geo#ID#Indonesia#--
-geo#IE#Ireland#--
-geo#IL#Israel#--
-geo#IN#India#--
-geo#IO#Indian Ocean Territory#--
-geo#IQ#Iraq#--
-geo#IR#"Iran, Islamic Republic of"#--
-geo#IS#Iceland#--
-geo#IT#Italy#--
-geo#IT-21#Piemonte#IT
-geo#IT-AL#Alessandria#IT-21
-geo#IT-AT#Asti#IT-22
-geo#IT-BI#Biella#IT-23
-geo#IT-AO#Aosta Aoste (fr)#IT-23
-geo#IT-CN#Cuneo#IT-24
-geo#IT-NO#Novara#IT-25
-geo#IT-BG#Bergamo#IT-25
-geo#IT-BS#Brescia#IT-25
-geo#IT-CO#Como#IT-25
-geo#IT-CR#Cremona#IT-25
-geo#IT-LC#Lecco#IT-25
-geo#IT-LO#Lodi#IT-25
-geo#IT-MN#Mantova#IT-25
-geo#IT-MI#Milano#IT-25
-geo#IT-PV#Pavia#IT-25
-geo#IT-SO#Sondrio#IT-25
-geo#IT-VA#Varese#IT-25
-geo#IT-TO#Torino#IT-26
-geo#IT-VB#Verbano-Cusio-Ossola#IT-27
-geo#IT-VC#Vercelli#IT-28
-geo#IT-23#Valle d'Aosta#IT
-geo#IT-25#Lombardia#IT
-geo#IT-32#Trentino-Alto Adige#IT
-geo#IT-BZ#Bolzano Bozen (de)#IT-32
-geo#IT-TN#Trento#IT-32
-geo#IT-34#Veneto#IT
-geo#IT-BL#Belluno#IT-34
-geo#IT-PD#Padova#IT-34
-geo#IT-RO#Rovigo#IT-34
-geo#IT-TV#Treviso#IT-34
-geo#IT-VE#Venezia#IT-34
-geo#IT-VR#Verona#IT-34
-geo#IT-VI#Vicenza#IT-34
-geo#IT-36#Friuli-Venezia Giulia#IT
-geo#IT-GO#Gorizia#IT-36
-geo#IT-PN#Pordenone#IT-36
-geo#IT-TS#Trieste#IT-36
-geo#IT-UD#Udine#IT-36
-geo#IT-42#Liguria#IT
-geo#IT-GE#Genova#IT-42
-geo#IT-IM#Imperia#IT-42
-geo#IT-SP#La Spezia#IT-42
-geo#IT-SV#Savona#IT-42
-geo#IT-45#Emilia-Romagna#IT
-geo#IT-BO#Bologna#IT-45
-geo#IT-FE#Ferrara#IT-45
-geo#IT-FO#Forlì#IT-45
-geo#IT-MO#Modena#IT-45
-geo#IT-PR#Parma#IT-45
-geo#IT-PC#Piacenza#IT-45
-geo#IT-RA#Ravenna#IT-45
-geo#IT-RE#Reggio Emilia#IT-45
-geo#IT-RN#Rimini#IT-45
-geo#IT-52#Toscana#IT
-geo#IT-AR#Arezzo#IT-52
-geo#IT-FI#Firenze#IT-52
-geo#IT-GR#Grosseto#IT-52
-geo#IT-LI#Livorno#IT-52
-geo#IT-LU#Lucca#IT-52
-geo#IT-MS#Massa-Carrara#IT-52
-geo#IT-PI#Pisa#IT-52
-geo#IT-PT#Pistoia#IT-52
-geo#IT-PO#Prato#IT-52
-geo#IT-SI#Siena#IT-52
-geo#IT-55#Umbria#IT
-geo#IT-PG#Perugia#IT-55
-geo#IT-TR#Terni#IT-55
-geo#IT-57#Marche#IT
-geo#IT-AN#Ancona#IT-57
-geo#IT-AP#Ascoli Piceno#IT-57
-geo#IT-MC#Macerata#IT-57
-geo#IT-PS#Pesaro e Urbino#IT-57
-geo#IT-62#Lazio#IT
-geo#IT-FR#Frosinone#IT-62
-geo#IT-LT#Latina#IT-62
-geo#IT-RI#Rieti#IT-62
-geo#IT-RM#Roma#IT-62
-geo#IT-VT#Viterbo#IT-62
-geo#IT-65#Abruzzo#IT
-geo#IT-CH#Chieti#IT-65
-geo#IT-AQ#L'Aquila#IT-65
-geo#IT-PE#Pescara#IT-65
-geo#IT-TE#Teramo#IT-65
-geo#IT-67#Molise#IT
-geo#IT-CB#Campobasso#IT-67
-geo#IT-IS#Isernia#IT-67
-geo#IT-72#Campania#IT
-geo#IT-BN#Benevento#IT-72
-geo#IT-CE#Caserta#IT-72
-geo#IT-NA#Napoli#IT-72
-geo#IT-SA#Salerno#IT-72
-geo#IT-AV#Avellino#IT-72
-geo#IT-75#Puglia#IT
-geo#IT-BA#Bari#IT-75
-geo#IT-BR#Brindisi#IT-75
-geo#IT-FG#Foggia#IT-75
-geo#IT-LE#Lecce#IT-75
-geo#IT-TA#Taranto#IT-75
-geo#IT-77#Basilicata#IT
-geo#IT-MT#Matera#IT-77
-geo#IT-PZ#Potenza#IT-77
-geo#IT-78#Calabria#IT
-geo#IT-CZ#Catanzaro#IT-78
-geo#IT-CS#Cosenza#IT-78
-geo#IT-KR#Crotone#IT-78
-geo#IT-RC#Reggio Calabria#IT-78
-geo#IT-VV#Vibo Valentia#IT-78
-geo#IT-82#Sicilia#IT
-geo#IT-AG#Agrigento#IT-82
-geo#IT-CL#Caltanissetta#IT-82
-geo#IT-CT#Catania#IT-82
-geo#IT-EN#Enna#IT-82
-geo#IT-ME#Messina#IT-82
-geo#IT-PA#Palermo#IT-82
-geo#IT-RG#Ragusa#IT-82
-geo#IT-SR#Siracusa#IT-82
-geo#IT-TP#Trapani#IT-82
-geo#IT-88#Sardegna#IT
-geo#IT-CA#Cagliari#IT-88
-geo#IT-NU#Nuoro#IT-88
-geo#IT-OR#Oristano#IT-88
-geo#IT-SS#Sassari#IT-88
-geo#JM#Jamaica#--
-geo#JO#Jordan#--
-geo#JP#Japan#--
-geo#JP-01#Hokkaido#JP
-geo#JP-02#Aomori#JP
-geo#JP-03#Iwate#JP
-geo#JP-04#Miyagi#JP
-geo#JP-05#Akita#JP
-geo#JP-06#Yamagata#JP
-geo#JP-07#Hukusima (Fukushima)#JP
-geo#JP-08#Ibaraki#JP
-geo#JP-09#Totigi (Tochigi)#JP
-geo#JP-10#Gunma#JP
-geo#JP-11#Saitama#JP
-geo#JP-12#Tiba (Chiba)#JP
-geo#JP-13#Tokyo#JP
-geo#JP-14#Kanagawa#JP
-geo#JP-15#Niigata#JP
-geo#JP-16#Toyama#JP
-geo#JP-17#Isikawa (Ishikawa)#JP
-geo#JP-18#Hukui (Fukui)#JP
-geo#JP-19#Yamanasi (Yamanashi)#JP
-geo#JP-20#Nagano#JP
-geo#JP-21#Gihu (Gifu)#JP
-geo#JP-22#Sizuoka (Shizuoka)#JP
-geo#JP-23#Aiti (Aichi)#JP
-geo#JP-24#Mie#JP
-geo#JP-25#Siga (Shiga)#JP
-geo#JP-26#Kyoto#JP
-geo#JP-27#Osaka#JP
-geo#JP-28#Hyogo#JP
-geo#JP-29#Nara#JP
-geo#JP-30#Wakayama#JP
-geo#JP-31#Tottori#JP
-geo#JP-32#Simane (Shimane)#JP
-geo#JP-33#Okayama#JP
-geo#JP-34#Hirosima (Hiroshima)#JP
-geo#JP-35#Yamaguti (Yamaguchi)#JP
-geo#JP-36#Tokusima (Tokushima)#JP
-geo#JP-37#Kagawa#JP
-geo#JP-38#Ehime#JP
-geo#JP-39#Koti (Kochi)#JP
-geo#JP-40#Hukuoka (Fukuoka)#JP
-geo#JP-41#Saga#JP
-geo#JP-42#Nagasaki#JP
-geo#JP-43#Kumamoto#JP
-geo#JP-44#Oita#JP
-geo#JP-45#Miyazaki#JP
-geo#JP-46#Kagosima (Kagoshima)#JP
-geo#JP-47#Okinawa#JP
-geo#KE#Kenya#--
-geo#KG#Kyrgyzstan#--
-geo#KH#Cambodia#--
-geo#KI#Kiribati#--
-geo#KM#Comoros#--
-geo#KN#St Kitts-Nevis#--
-geo#KP#"Korea, Dem People's Republic"#--
-geo#KR#"Korea, Republic of"#--
-geo#KR-11#Seoul Teugbyeolsi#KR
-geo#KR-26#Busan Gwang'yeogsi#KR
-geo#KR-27#Daegu Gwang'yeogsi#KR
-geo#KR-30#Daejeon Gwang'yeogsi#KR
-geo#KR-29#Gwangju Gwang'yeogsi#KR
-geo#KR-28#Incheon Gwang'yeogsi#KR
-geo#KR-31#Ulsan Gwang'yeogsi#KR
-geo#KR-43#Chungcheongbugdo#KR
-geo#KR-44#Chungcheongnamdo#KR
-geo#KR-42#Gang'weondo#KR
-geo#KR-41#Gyeonggido#KR
-geo#KR-47#Gyeongsangbugdo#KR
-geo#KR-48#Gyeongsangnamdo#KR
-geo#KR-49#Jejudo#KR
-geo#KR-45#Jeonrabugdo#KR
-geo#KR-46#Jeonranamdo#KR
-geo#KW#Kuwait#--
-geo#KY#Cayman Islands#--
-geo#KZ#Kazakhstan#--
-geo#LA#Lao People's Democratic Republic#--
-geo#LB#Lebanon#--
-geo#LC#Saint Lucia#--
-geo#LI#Liechtenstein#--
-geo#LK#Sri Lanka#--
-geo#LR#Liberia#--
-geo#LS#Lesotho#--
-geo#LT#Lithuania#--
-geo#LU#Luxembourg#--
-geo#LV#Latvia#--
-geo#LY#Lybian Arab Jamahiriya#--
-geo#MA#Morocco#--
-geo#MC#Monaco#--
-geo#MD#Moldova#--
-geo#MG#Madagascar#--
-geo#MH#Marshall Islands#--
-geo#MK#Former Yugoslav Republic Of Macedonia#--
-geo#ML#Mali#--
-geo#MM#Myanmar (Former Burma)#--
-geo#MN#Mongolia#--
-geo#MO#Macau#--
-geo#MP#Northern Marianas#--
-geo#MQ#Martinique#--
-geo#MR#Mauritania#--
-geo#MS#Montserrat#--
-geo#MT#Malta#--
-geo#MU#Mauritius#--
-geo#MV#Maldives#--
-geo#MW#Malawi#--
-geo#MX#Mexico#--
-geo#MX-AGU#Aguascalientes#MX
-geo#MX-BCN#Baja California#MX
-geo#MX-BCS#Baja California Sur#MX
-geo#MX-CAM#Campeche#MX
-geo#MX-CHH#Chihuahua#MX
-geo#MX-CHP#Chiapas#MX
-geo#MX-COA#Coahuila#MX
-geo#MX-COL#Colima#MX
-geo#MX-DF#Distrito Federal#MX
-geo#MX-DUR#Durango#MX
-geo#MX-GRO#Guerrero#MX
-geo#MX-GUA#Guanajuato#MX
-geo#MX-HID#Hidalgo#MX
-geo#MX-JAL#Jalisco#MX
-geo#MX-MEX#Mexico#MX
-geo#MX-MIC#Michoacan#MX
-geo#MX-MOR#Morelos#MX
-geo#MX-NAY#Nayarit#MX
-geo#MX-NLE#Nuevo Leon#MX
-geo#MX-OAX#Oaxaca#MX
-geo#MX-PUE#Puebla#MX
-geo#MX-QUE#Queretaro#MX
-geo#MX-ROO#Quintana Roo#MX
-geo#MX-SIN#Sinaloa#MX
-geo#MX-SLP#San Luis Potosi#MX
-geo#MX-SON#Sonora#MX
-geo#MX-TAB#Tabasco#MX
-geo#MX-TAM#Tamaulipas#MX
-geo#MX-TLA#Tlaxcala#MX
-geo#MX-VER#Veracruz#MX
-geo#MX-YUC#Yucatan#MX
-geo#MX-ZAC#Zacatecas#MX
-geo#MY#Malaysia#--
-geo#MZ#Mozambique#--
-geo#NA#Namibia#--
-geo#NC#New Caledonia#--
-geo#NE#Niger#--
-geo#NF#Norfolk Island#--
-geo#NG#Nigeria#--
-geo#NG-FC#Abuja Capital Territory#NG
-geo#NG-AB#Abia#NG
-geo#NG-AD#Adamawa#NG
-geo#NG-AK#Akwa Ibom#NG
-geo#NG-AN#Anambra#NG
-geo#NG-BA#Bauchi#NG
-geo#NG-BY#Bayelsa#NG
-geo#NG-BE#Benue#NG
-geo#NG-BO#Borno#NG
-geo#NG-CR#Cross River#NG
-geo#NG-DE#Delta#NG
-geo#NG-EB#Ebonyi#NG
-geo#NG-ED#Edo#NG
-geo#NG-EK#Ekiti#NG
-geo#NG-EN#Enugu#NG
-geo#NG-GO#Gombe#NG
-geo#NG-IM#Imo#NG
-geo#NG-JI#Jigawa#NG
-geo#NG-KD#Kaduna#NG
-geo#NG-KN#Kano#NG
-geo#NG-KT#Katsina#NG
-geo#NG-KE#Kebbi#NG
-geo#NG-KO#Kogi#NG
-geo#NG-KW#Kwara#NG
-geo#NG-LA#Lagos#NG
-geo#NG-NA#Nassarawa#NG
-geo#NG-NI#Niger#NG
-geo#NG-OG#Ogun#NG
-geo#NG-ON#Ondo#NG
-geo#NG-OS#Osun#NG
-geo#NG-OY#Oyo#NG
-geo#NG-PL#Plateau#NG
-geo#NG-RI#Rivers#NG
-geo#NG-SO#Sokoto#NG
-geo#NG-TA#Taraba#NG
-geo#NG-YO#Yobe#NG
-geo#NG-ZA#Zamfara#NG
-geo#NI#Nicaragua#--
-geo#NL#Netherlands#--
-geo#NO#Norway#--
-geo#NO-01#Østfold#NO
-geo#NO-02#Akershus#NO
-geo#NO-03#Oslo#NO
-geo#NO-04#Hedmark#NO
-geo#NO-05#Oppland#NO
-geo#NO-06#Buskerud#NO
-geo#NO-07#Vestfold#NO
-geo#NO-08#Telemark#NO
-geo#NO-09#Aust-Agder#NO
-geo#NO-10#Vest-Agder#NO
-geo#NO-11#Rogaland#NO
-geo#NO-12#Nordaland#NO
-geo#NO-14#Sogn Og Fjordane#NO
-geo#NO-15#Møre Og Romsdal#NO
-geo#NO-16#Sør-Trøndelag#NO
-geo#NO-17#Nord-Trøndelag#NO
-geo#NO-18#Nordland#NO
-geo#NO-19#Troms#NO
-geo#NO-20#Finnmark#NO
-geo#NP#Nepal#--
-geo#NR#Nauru#--
-geo#NU#Niue#--
-geo#NZ#New Zealand#--
-geo#NZ-AUK#Auckland#NZ-N
-geo#NZ-BOP#Bay Of Plenty#NZ-N
-geo#NZ-CAN#Canterbury#NZ-S
-geo#NZ-GIS#Gisborne#NZ-N
-geo#NZ-HKB#Hawkes'S Bay#NZ-N
-geo#NZ-MBH#Marlborough#NZ-S
-geo#NZ-MWT#Manawatu-Wanganui#NZ-N
-geo#NZ-N#North Island#NZ
-geo#NZ-NSN#Nelson#NZ-S
-geo#NZ-NTL#Northland#NZ-N
-geo#NZ-OTA#Otago#NZ-S
-geo#NZ-S#South Island#NZ
-geo#NZ-STL#Southland#NZ-S
-geo#NZ-TAS#Tasman#NZ-S
-geo#NZ-TKI#Taranaki#NZ-N
-geo#NZ-WGN#Wellington#NZ-N
-geo#NZ-WKO#Waikato#NZ-N
-geo#NZ-WTC#West Coast#NZ-S
-geo#OM#Oman#--
-geo#PA#Panama#--
-geo#PE#Peru#--
-geo#PF#French Polynesia#--
-geo#PG#Papua New Guinea#--
-geo#PH#Philippines#--
-geo#PK#Pakistan#--
-geo#PL#Poland#--
-geo#PL-DS#Dolnośląskie#PL
-geo#PL-KP#Kujawsko-pomorskie#PL
-geo#PL-LU#Lubelskie#PL
-geo#PL-LB#Lubuskie#PL
-geo#PL-LD#Łódzkie#PL
-geo#PL-MA#Małopolskie#PL
-geo#PL-MZ#Mazowieckie#PL
-geo#PL-OP#Opolskie#PL
-geo#PL-PK#Podkarpackie#PL
-geo#PL-PD#Podlaskie#PL
-geo#PL-PM#Pomorskie#PL
-geo#PL-SL#Śląskie#PL
-geo#PL-SK#Świętokrzyskie#PL
-geo#PL-WN#Warmińsko-mazurskie#PL
-geo#PL-WP#Wielkopolskie#PL
-geo#PL-ZP#Zachodniopomorskie#PL
-geo#PM#St Pierre And Miquelon#--
-geo#PN#Pitcairn#--
-geo#PR#Puerto Rico#--
-geo#PS#"Palestinian Territory, Occupied"#--
-geo#PT#Portugal#--
-geo#PW#Palau#--
-geo#PY#Paraguay#--
-geo#QA#Qatar#--
-geo#RE#Reunion#--
-geo#RO#Romania#--
-geo#RO-B#Bucureşti#RO
-geo#RO-AB#Alba#RO
-geo#RO-AR#Arad#RO
-geo#RO-AG#Argeş#RO
-geo#RO-BC#Bacău#RO
-geo#RO-BH#Bihor#RO
-geo#RO-BN#Bistriţa-Năsăud#RO
-geo#RO-BT#Botoşani#RO
-geo#RO-BV#Braşov#RO
-geo#RO-BR#Brăila#RO
-geo#RO-BZ#Buzău#RO
-geo#RO-CS#Caraş-Severin#RO
-geo#RO-CL#Călăraşi#RO
-geo#RO-CJ#Cluj#RO
-geo#RO-CT#Constanţa#RO
-geo#RO-CV#Covasna#RO
-geo#RO-DB#Dâmboviţa#RO
-geo#RO-DJ#Dolj#RO
-geo#RO-GL#Galaţi#RO
-geo#RO-GR#Giurgiu#RO
-geo#RO-GJ#Gorj#RO
-geo#RO-HR#Harghita#RO
-geo#RO-HD#Hunedoara#RO
-geo#RO-IL#Ialomiţa#RO
-geo#RO-IS#Iaşi#RO
-geo#RO-MM#Maramureş#RO
-geo#RO-MH#Mehedinţi#RO
-geo#RO-MS#Mureş#RO
-geo#RO-NT#Neamţ#RO
-geo#RO-OT#Olt#RO
-geo#RO-PH#Prahova#RO
-geo#RO-SM#Satu Mare#RO
-geo#RO-SJ#Sălaj#RO
-geo#RO-SB#Sibiu#RO
-geo#RO-SV#Suceava#RO
-geo#RO-TR#Teleorman#RO
-geo#RO-TM#Timiş#RO
-geo#RO-TL#Tulcea#RO
-geo#RO-VS#Vaslui#RO
-geo#RO-VL#Vâlcea#RO
-geo#RO-VN#Vrancea#RO
-geo#RU#Russian Federation#--
-geo#RU-AD#"Adygeja, Respublika"#RU
-geo#RU-AL#"Altaj, Respublika"#RU
-geo#RU-BA#"Baškortostan, Respublika"#RU
-geo#RU-BU#"Burjatija, Respublika"#RU
-geo#RU-CE#Čečenskaja Respublika#RU
-geo#RU-CU#Čuvašskaja Respublika#RU
-geo#RU-DA#"Dagestan, Respublika"#RU
-geo#RU-IN#Ingušskaja Respublika [Respublika Ingušetija]#RU
-geo#RU-KB#Kabardino-Balkarskaja Respublika#RU
-geo#RU-KL#"Kalmykija, Respublika"#RU
-geo#RU-KC#Karačajevo-Čerkesskaja Respublika#RU
-geo#RU-KR#"Karelija, Respublika"#RU
-geo#RU-KK#"Hakasija, Respublika"#RU
-geo#RU-KO#"Komi, Respublika"#RU
-geo#RU-ME#"Marij Èl, Respublika"#RU
-geo#RU-MO#"Mordovija, Respublika"#RU
-geo#RU-SA#"Saha, Respublika [Jakutija]"#RU
-geo#RU-SE#"Severnaja Osetija, Respublika [Alanija] [Respublika Severnaja Osetija-Alanija]"#RU
-geo#RU-TA#"Tatarstan, Respublika"#RU
-geo#RU-TY#"Tyva, Respublika [Tuva]"#RU
-geo#RU-UD#Udmurtskaja Respublika#RU
-geo#RU-ALT#Altajskij kraj#RU
-geo#RU-KHA#Habarovskij kraj#RU
-geo#RU-KDA#Krasnodarskij kraj#RU
-geo#RU-KYA#Krasnojarskij kraj#RU
-geo#RU-PRI#Primorskij kraj#RU
-geo#RU-STA#Stavropol'skij kraj#RU
-geo#RU-AMU#Amurskaja oblast'#RU
-geo#RU-ARK#Arhangel'skaja oblast'#RU
-geo#RU-AST#Astrahanskaja oblast'#RU
-geo#RU-BEL#Belgorodskaja oblast'#RU
-geo#RU-BRY#Brjanskaja oblast'#RU
-geo#RU-CHE#Čeljabinskaja oblast'#RU
-geo#RU-CHI#Čitinskaja oblast'#RU
-geo#RU-IRK#Irkutskaja oblast'#RU
-geo#RU-IVA#Ivanovskaja oblast'#RU
-geo#RU-KGD#Kaliningradskaja oblast'#RU
-geo#RU-KLU#Kalužskaja oblast'#RU
-geo#RU-KAM#Kamčatskaja oblast'#RU
-geo#RU-KEM#Kemerovskaja oblast'#RU
-geo#RU-KIR#Kirovskaja oblast'#RU
-geo#RU-KOS#Kostromskaja oblast'#RU
-geo#RU-KGN#Kurganskaja oblast'#RU
-geo#RU-KRS#Kurskaja oblast'#RU
-geo#RU-LEN#Leningradskaja oblast'#RU
-geo#RU-LIP#Lipetskaja oblast'#RU
-geo#RU-MAG#Magadanskaja oblast'#RU
-geo#RU-MOS#Moskovskaja oblast'#RU
-geo#RU-MUR#Murmanskaja oblast'#RU
-geo#RU-NIZ#Nižegorodskaja oblast'#RU
-geo#RU-NGR#Novgorodskaja oblast'#RU
-geo#RU-NVS#Novosibirskaja oblast'#RU
-geo#RU-OMS#Omskaja oblast'#RU
-geo#RU-ORE#Orenburgskaja oblast'#RU
-geo#RU-ORL#Orlovskaja oblast'#RU
-geo#RU-PNZ#Penzenskaja oblast'#RU
-geo#RU-PER#Permskaja oblast'#RU
-geo#RU-PSK#Pskovskaja oblast'#RU
-geo#RU-ROS#Rostovskaja oblast'#RU
-geo#RU-RYA#Rjazanskaja oblast'#RU
-geo#RU-SAK#Sahalinskaja oblast'#RU
-geo#RU-SAM#Samarskaja oblast'#RU
-geo#RU-SAR#Saratovskaja oblast'#RU
-geo#RU-SMO#Smolenskaja oblast'#RU
-geo#RU-SVE#Sverdlovskaja oblast'#RU
-geo#RU-TAM#Tambovskaja oblast'#RU
-geo#RU-TOM#Tomskaja oblast'#RU
-geo#RU-TUL#Tul'skaja oblast'#RU
-geo#RU-TVE#Tverskaja oblast'#RU
-geo#RU-TYU#Tjumenskaja oblast'#RU
-geo#RU-ULY#Ul'janovskaja oblast'#RU
-geo#RU-VLA#Vladimirskaja oblast'#RU
-geo#RU-VGG#Volgogradskaja oblast'#RU
-geo#RU-VLG#Vologodskaja oblast'#RU
-geo#RU-VOR#Voronežskaja oblast'#RU
-geo#RU-YAR#Jaroslavskaja oblast'#RU
-geo#RU-MOW#Moskva#RU
-geo#RU-SPE#Sankt-Peterburg#RU
-geo#RU-YEV#Evrejskaja avtonomnaja oblast'#RU
-geo#RU-AGB#Aginskij Burjatskij avtonomnyj okrug#RU
-geo#RU-CHU#Čukotskij avtonomnyj okrug#RU
-geo#RU-EVE#Èvenkijskij avtonomnyj okrug#RU
-geo#RU-KHM#Hanty-Mansijskij avtonomnyj okrug#RU
-geo#RU-KOP#Komi-Permjatskij avtonomnyj okrug#RU
-geo#RU-KOR#Korjakskij avtonomnyj okrug#RU
-geo#RU-NEN#Nenetskij avtonomnyj okrug#RU
-geo#RU-TAY#Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug#RU
-geo#RU-UOB#Ust'-Ordynskij Burjatskij avtonomnyj okrug#RU
-geo#RU-YAN#Jamalo-Nenetskij avtonomnyj okrug#RU
-geo#RW#Rwanda#--
-geo#SA#Saudi Arabia#--
-geo#SB#Solomon Islands#--
-geo#SC#Seychelles#--
-geo#SD#Sudan#--
-geo#SE#Sweden#--
-geo#SE-AB#Stockholms Län#SE
-geo#SE-AC#Västerbottens Län#SE
-geo#SE-BD#Norrbottens Län#SE
-geo#SE-C#Uppsala Län#SE
-geo#SE-D#Södermanlands Län#SE
-geo#SE-E#Östergötlands Län#SE
-geo#SE-F#Jönköpings Län#SE
-geo#SE-G#Kronoborgs Län#SE
-geo#SE-H#Kalmar Län#SE
-geo#SE-I#Gotlands Län#SE
-geo#SE-K#Blekinge Län#SE
-geo#SE-M#Skåne Län#SE
-geo#SE-N#Hallands Län#SE
-geo#SE-O#Västra Götalands Län#SE
-geo#SE-S#Värmlands Län#SE
-geo#SE-T#Örebro Län#SE
-geo#SE-U#Västmanlands Län#SE
-geo#SE-W#Dalarnes Län#SE
-geo#SE-X#Gävleborgs Län#SE
-geo#SE-Y#Västernorrlands Län#SE
-geo#SE-Z#Jämtlands Län#SE
-geo#SG#Singapore#--
-geo#SH#St Helena#--
-geo#SI#Slovenia#--
-geo#SJ#Svalbard And Jan Mayen#--
-geo#SK#Slovakia#--
-geo#SL#Sierra Leone#--
-geo#SM#San Marino#--
-geo#SN#Senegal#--
-geo#SO#Somalia#--
-geo#SR#Suriname#--
-geo#ST#Sao Tome And Principe#--
-geo#SV#El Salvador#--
-geo#SY#Syrian Arab Republic#--
-geo#SZ#Swaziland#--
-geo#TC#Turks And Caicos Islands#--
-geo#TD#Chad#--
-geo#TF#French Southern Territories#--
-geo#TG#Togo#--
-geo#TH#Thailand#--
-geo#TJ#Tajikistan#--
-geo#TM#Turkmenistan#--
-geo#TN#Tunisia#--
-geo#TO#Tonga#--
-geo#TP#East Timor#--
-geo#TR#Turkey#--
-geo#TR-01#Adana#TR
-geo#TR-02#Adıyaman#TR
-geo#TR-03#Afyon#TR
-geo#TR-04#Ağrı#TR
-geo#TR-05#Amasya#TR
-geo#TR-06#Ankara#TR
-geo#TR-07#Antalya#TR
-geo#TR-08#Artvin#TR
-geo#TR-09#Aydın#TR
-geo#TR-10#Balıkesir#TR
-geo#TR-11#Bilecik#TR
-geo#TR-12#Bingöl#TR
-geo#TR-13#Bitlis#TR
-geo#TR-14#Bolu#TR
-geo#TR-15#Burdur#TR
-geo#TR-16#Bursa#TR
-geo#TR-17#Çanakkale#TR
-geo#TR-18#Çankırı#TR
-geo#TR-19#Çorum#TR
-geo#TR-20#Denizli#TR
-geo#TR-21#Diyarbakır#TR
-geo#TR-22#Edirne#TR
-geo#TR-23#Elazıg#TR
-geo#TR-24#Erzincan#TR
-geo#TR-25#Erzurum#TR
-geo#TR-26#Eskişehir#TR
-geo#TR-27#Gaziantep#TR
-geo#TR-28#Giresun#TR
-geo#TR-29#Gümüşhane#TR
-geo#TR-30#Hakkâri#TR
-geo#TR-31#Hatay#TR
-geo#TR-32#Isparta#TR
-geo#TR-33#İçel#TR
-geo#TR-34#İstanbul#TR
-geo#TR-35#İzmir#TR
-geo#TR-36#Kars#TR
-geo#TR-37#Kastamonu#TR
-geo#TR-38#Kayseri#TR
-geo#TR-39#Kırklareli#TR
-geo#TR-40#Kırşehir#TR
-geo#TR-41#Kocaeli#TR
-geo#TR-42#Konya#TR
-geo#TR-43#Kütahya#TR
-geo#TR-44#Malatya#TR
-geo#TR-45#Manisa#TR
-geo#TR-46#Kahramanmaraş#TR
-geo#TR-47#Mardin#TR
-geo#TR-48#Muğla#TR
-geo#TR-49#Muş#TR
-geo#TR-50#Nevşehir#TR
-geo#TR-51#Niğde#TR
-geo#TR-52#Ordu#TR
-geo#TR-53#Rize#TR
-geo#TR-54#Sakarya#TR
-geo#TR-55#Samsun#TR
-geo#TR-56#Siirt#TR
-geo#TR-57#Sinop#TR
-geo#TR-58#Sivas#TR
-geo#TR-59#Tekirdağ#TR
-geo#TR-60#Tokat#TR
-geo#TR-61#Trabzon#TR
-geo#TR-62#Tunceli#TR
-geo#TR-63#Şanlıurfa#TR
-geo#TR-64#Uşak#TR
-geo#TR-65#Van#TR
-geo#TR-66#Yozgat#TR
-geo#TR-67#Zonguldak#TR
-geo#TR-68#Aksaray#TR
-geo#TR-69#Bayburt#TR
-geo#TR-70#Karaman#TR
-geo#TR-71#Kırıkkale#TR
-geo#TR-72#Batman#TR
-geo#TR-73#Şırnak#TR
-geo#TR-74#Bartın#TR
-geo#TR-75#Ardahan#TR
-geo#TR-76#Iğdır#TR
-geo#TR-77#Yalova#TR
-geo#TR-78#Karabük#TR
-geo#TR-79#Kilis#TR
-geo#TR-80#Osmaniye#TR
-geo#TT#Trinidad And Tobago#--
-geo#TV#Tuvalu#--
-geo#TW#"Taiwan, Province Of China"#--
-geo#TZ#"Tanzania, United Republic of"#--
-geo#UA#Ukraine#--
-geo#UG#Uganda#--
-geo#UM#US Minor Outlying Islands#--
-geo#UM-67#Johnston Atoll#UM
-geo#UM-71#Midway Islands#UM
-geo#UM-76#Navassa Island#UM
-geo#UM-79#Wake Island#UM
-geo#UM-81#Baker Island#UM
-geo#UM-84#Howland Island#UM
-geo#UM-86#Jarvis Island#UM
-geo#UM-89#Kingman Reef#UM
-geo#UM-95#Palmyra Atoll#UM
-geo#US#United States#--
-geo#US-AK#Alaska#US
-geo#US-AL#Alabama#US
-geo#US-AR#Arkansas#US
-geo#US-AS#American Samoa#US
-geo#US-AZ#Arizona#US
-geo#US-CA#California#US
-geo#US-CO#Colorado#US
-geo#US-CT#Connecticut#US
-geo#US-DC#District Of Columbia#US
-geo#US-DE#Delaware#US
-geo#US-FL#Florida#US
-geo#US-GA#Georgia#US
-geo#US-GU#Guam#US
-geo#US-HI#Hawaii#US
-geo#US-IA#Iowa#US
-geo#US-ID#Idaho#US
-geo#US-IL#Illinois#US
-geo#US-IN#Indiana#US
-geo#US-KS#Kansas#US
-geo#US-KY#Kentucky#US
-geo#US-LA#Louisiana#US
-geo#US-MA#Massachusetts#US
-geo#US-MD#Maryland#US
-geo#US-ME#Maine#US
-geo#US-MI#Michigan#US
-geo#US-MN#Minnesota#US
-geo#US-MO#Missouri#US
-geo#US-MP#Northern Mariana Islands#US
-geo#US-MS#Mississippi#US
-geo#US-MT#Montana#US
-geo#US-NC#North Carolina#US
-geo#US-ND#North Dakota#US
-geo#US-NE#Nebraska#US
-geo#US-NH#New Hampshire#US
-geo#US-NJ#New Jersey#US
-geo#US-NM#New Mexico#US
-geo#US-NV#Nevada#US
-geo#US-NY#New York#US
-geo#US-OH#Ohio#US
-geo#US-OK#Oklahoma#US
-geo#US-OR#Oregon#US
-geo#US-PA#Pennsylvania#US
-geo#US-PR#Puerto Rico#US
-geo#US-RI#Rhode Island#US
-geo#US-SC#South Carolina#US
-geo#US-SD#South Dakota#US
-geo#US-TN#Tennessee#US
-geo#US-TX#Texas#US
-geo#US-UM#U.S. Minor Outlying Islands#US
-geo#US-UT#Utah#US
-geo#US-VA#Virginia#US
-geo#US-VI#Virgin Islands Of The U.S.#US
-geo#US-VT#Vermont#US
-geo#US-WA#Washington#US
-geo#US-WI#Wisconsin#US
-geo#US-WV#West Virginia#US
-geo#US-WY#Wyoming#US
-geo#UY#Uruguay#--
-geo#UZ#Uzbekistan#--
-geo#VA#Vatican City State#--
-geo#VC#St Vincent And Grenadines#--
-geo#VE#Venezuela#--
-geo#VG#"Virgin Islands, British"#--
-geo#VI#United States Virgin Islands#--
-geo#VN#Viet Nam#--
-geo#VN-01#Lai Chau#VN
-geo#VN-02#Lao Cai#VN
-geo#VN-03#Ha Giang#VN
-geo#VN-04#Cao Bang#VN
-geo#VN-05#Son La#VN
-geo#VN-06#Yen Bai#VN
-geo#VN-07#Tuyen Quang#VN
-geo#VN-09#Lang Son#VN
-geo#VN-13#Quang Ninh#VN
-geo#VN-14#Hoa Binh#VN
-geo#VN-15#Ha Tay#VN
-geo#VN-18#Ninh Binh#VN
-geo#VN-20#Thai Binh#VN
-geo#VN-21#Thanh Hoa#VN
-geo#VN-22#Nghe An#VN
-geo#VN-23#Ha Tinh#VN
-geo#VN-24#Quang Binh#VN
-geo#VN-25#Quang Tri#VN
-geo#VN-26#Thua Thien-Hue#VN
-geo#VN-27#Quang Nam#VN
-geo#VN-28#Kon Tum#VN
-geo#VN-29#Quang Ngai#VN
-geo#VN-30#Gia Lai#VN
-geo#VN-31#Binh Dinh#VN
-geo#VN-32#Phu Yen#VN
-geo#VN-33#Dac Lac#VN
-geo#VN-34#Khanh Hoa#VN
-geo#VN-35#Lam Dong#VN
-geo#VN-36#Ninh Thuan#VN
-geo#VN-37#Tay Ninh#VN
-geo#VN-39#Dong Nai#VN
-geo#VN-40#Binh Thuan#VN
-geo#VN-41#Long An#VN
-geo#VN-43#Ba Ria - Vung Tau#VN
-geo#VN-44#An Giang#VN
-geo#VN-45#Dong Thap#VN
-geo#VN-46#Tien Giang#VN
-geo#VN-47#Kien Giang#VN
-geo#VN-48#Can Tho#VN
-geo#VN-49#Vinh Long#VN
-geo#VN-50#Ben Tre#VN
-geo#VN-51#Tra Vinh#VN
-geo#VN-52#Soc Trang#VN
-geo#VN-53#Bac Can#VN
-geo#VN-54#Bac Giang#VN
-geo#VN-55#Bac Lieu#VN
-geo#VN-56#Bac Ninh#VN
-geo#VN-57#Binh Duong#VN
-geo#VN-58#Binh Phuoc#VN
-geo#VN-59#Ca Mau#VN
-geo#VN-60#"Da Nang, thanh pho"#VN
-geo#VN-61#Hai Duong#VN
-geo#VN-62#"Hai Phong, thanh pho"#VN
-geo#VN-63#Ha Nam#VN
-geo#VN-64#"Ha Noi, thu do"#VN
-geo#VN-65#"Ho Chi Minh, thanh po [Sai Gon]"#VN
-geo#VN-66#Hung Yen#VN
-geo#VN-67#Nam Dinh#VN
-geo#VN-68#Phu Tho#VN
-geo#VN-69#Thai Nguyen#VN
-geo#VN-70#Vinh Phuc#VN
-geo#VU#Vanuatu#--
-geo#WF#Wallis And Futuna Islands#--
-geo#WS#Samoa#--
-geo#YE#Yemen#--
-geo#YT#Mayotte#--
-geo#YU#Yugoslavia (Fed Rep Of)#--
-geo#YU-CG#Crna Gora#YU
-geo#YU-SR#Srbija#YU
-geo#YU-KM#Kosovo-Metohija#YU-SR
-geo#YU-VO#Vojvodina#YU-SR
-geo#ZA#South Africa#--
-geo#ZM#Zambia#--
-geo#ZW#Zimbabwe#--
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt
deleted file mode 100644
index b46f905..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt
+++ /dev/null
@@ -1,1814 +0,0 @@
-naics#11#Agriculture, Forestry, Fishing and Hunting#11
-naics#111#Crop Production#11
-naics#1111#Oilseed and Grain Farming#111
-naics#11111#Soybean Farming#1111
-naics#11112#Oilseed (except Soybean) Farming#1111
-naics#11113#Dry Pea and Bean Farming#1111
-naics#11114#Wheat Farming#1111
-naics#11115#Corn Farming#1111
-naics#11116#Rice Farming#1111
-naics#11119#Other Grain Farming#1111
-naics#111191#Oilseed and Grain Combination Farming#11119
-naics#111199#All Other Grain Farming#11119
-naics#1112#Vegetable and Melon Farming#111
-naics#11121#Vegetable and Melon Farming#1112
-naics#111211#Potato Farming#11121
-naics#111219#Other Vegetable (except Potato) and Melon Farming#11121
-naics#1113#Fruit and Tree Nut Farming#111
-naics#11131#Orange Groves#1113
-naics#11132#Citrus (except Orange) Groves#1113
-naics#11133#Noncitrus Fruit and Tree Nut Farming#1113
-naics#111331#Apple Orchards#11133
-naics#111332#Grape Vineyards#11133
-naics#111333#Strawberry Farming#11133
-naics#111334#Berry (except Strawberry) Farming#11133
-naics#111335#Tree Nut Farming#11133
-naics#111336#Fruit and Tree Nut Combination Farming#11133
-naics#111339#Other Noncitrus Fruit Farming#11133
-naics#1114#Greenhouse, Nursery, and Floriculture Production#111
-naics#11141#Food Crops Grown Under Cover#1114
-naics#111411#Mushroom Production#11141
-naics#111419#Other Food Crops Grown Under Cover#11141
-naics#11142#Nursery and Floriculture Production#1114
-naics#111421#Nursery and Tree Production#11142
-naics#111422#Floriculture Production#11142
-naics#1119#Other Crop Farming#111
-naics#11191#Tobacco Farming#1119
-naics#11192#Cotton Farming#1119
-naics#11193#Sugarcane Farming#1119
-naics#11194#Hay Farming#1119
-naics#11199#All Other Crop Farming#1119
-naics#111991#Sugar Beet Farming#11199
-naics#111992#Peanut Farming#11199
-naics#111998#All Other Miscellaneous Crop Farming#11199
-naics#112#Animal Production#11
-naics#1121#Cattle Ranching and Farming#112
-naics#11211#Beef Cattle Ranching and Farming, including Feedlots#1121
-naics#112111#Beef Cattle Ranching and Farming#11211
-naics#112112#Cattle Feedlots#11211
-naics#11212#Dairy Cattle and Milk Production#1121
-naics#11213#Dual Purpose Cattle Ranching and Farming#1121
-naics#1122#Hog and Pig Farming#112
-naics#11221#Hog and Pig Farming#1122
-naics#1123#Poultry and Egg Production#112
-naics#11231#Chicken Egg Production#1123
-naics#11232#Broilers and Other Meat Type Chicken Production#1123
-naics#11233#Turkey Production#1123
-naics#11234#Poultry Hatcheries#1123
-naics#11239#Other Poultry Production#1123
-naics#1124#Sheep and Goat Farming#112
-naics#11241#Sheep Farming#1124
-naics#11242#Goat Farming#1124
-naics#1125#Animal Aquaculture#112
-naics#11251#Animal Aquaculture#1125
-naics#112511#Finfish Farming and Fish Hatcheries#11251
-naics#112512#Shellfish Farming#11251
-naics#112519#Other Animal Aquaculture#11251
-naics#1129#Other Animal Production#112
-naics#11291#Apiculture#1129
-naics#11292#Horse and Other Equine Production#1129
-naics#11293#Fur-Bearing Animal and Rabbit Production#1129
-naics#11299#All Other Animal Production#1129
-naics#113#Forestry and Logging#11
-naics#1131#Timber Tract Operations#113
-naics#11311#Timber Tract Operations#1131
-naics#1132#Forest Nurseries and Gathering of Forest Products#113
-naics#11321#Forest Nurseries and Gathering of Forest Products#1132
-naics#1133#Logging#113
-naics#11331#Logging#1133
-naics#114#Fishing, Hunting and Trapping#11
-naics#1141#Fishing#114
-naics#11411#Fishing#1141
-naics#114111#Finfish Fishing#11411
-naics#114112#Shellfish Fishing#11411
-naics#114119#Other Marine Fishing#11411
-naics#1142#Hunting and Trapping#114
-naics#11421#Hunting and Trapping#1142
-naics#115#Support Activities for Agriculture and Forestry#11
-naics#1151#Support Activities for Crop Production#115
-naics#11511#Support Activities for Crop Production#1151
-naics#115111#Cotton Ginning#11511
-naics#115112#Soil Preparation, Planting, and Cultivating#11511
-naics#115113#Crop Harvesting, Primarily by Machine#11511
-naics#115114#Postharvest Crop Activities (except Cotton Ginning)#11511
-naics#115115#Farm Labor Contractors and Crew Leaders#11511
-naics#115116#Farm Management Services#11511
-naics#1152#Support Activities for Animal Production#115
-naics#11521#Support Activities for Animal Production#1152
-naics#1153#Support Activities for Forestry#115
-naics#11531#Support Activities for Forestry#1153
-naics#21#Mining#21
-naics#211#Oil and Gas Extraction#21
-naics#2111#Oil and Gas Extraction#211
-naics#21111#Oil and Gas Extraction#2111
-naics#211111#Crude Petroleum and Natural Gas Extraction#21111
-naics#211112#Natural Gas Liquid Extraction#21111
-naics#212#Mining (except Oil and Gas)#21
-naics#2121#Coal Mining#212
-naics#21211#Coal Mining#2121
-naics#212111#Bituminous Coal and Lignite Surface Mining#21211
-naics#212112#Bituminous Coal Underground Mining#21211
-naics#212113#Anthracite Mining#21211
-naics#2122#Metal Ore Mining#212
-naics#21221#Iron Ore Mining#2122
-naics#21222#Gold Ore and Silver Ore Mining#2122
-naics#212221#Gold Ore Mining#21222
-naics#212222#Silver Ore Mining#21222
-naics#21223#Copper, Nickel, Lead, and Zinc Mining#2122
-naics#212231#Lead Ore and Zinc Ore Mining#21223
-naics#212234#Copper Ore and Nickel Ore Mining#21223
-naics#21229#Other Metal Ore Mining#2122
-naics#212291#Uranium-Radium-Vanadium Ore Mining#21229
-naics#212299#All Other Metal Ore Mining#21229
-naics#2123#Nonmetallic Mineral Mining and Quarrying#212
-naics#21231#Stone Mining and Quarrying#2123
-naics#212311#Dimension Stone Mining and Quarrying#21231
-naics#212312#Crushed and Broken Limestone Mining and Quarrying#21231
-naics#212313#Crushed and Broken Granite Mining and Quarrying#21231
-naics#212319#Other Crushed and Broken Stone Mining and Quarrying#21231
-naics#21232#Sand, Gravel, Clay, and Ceramic and Refractory Minerals Mining and Quarrying#2123
-naics#212321#Construction Sand and Gravel Mining#21232
-naics#212322#Industrial Sand Mining#21232
-naics#212324#Kaolin and Ball Clay Mining#21232
-naics#212325#Clay and Ceramic and Refractory Minerals Mining#21232
-naics#21239#Other Nonmetallic Mineral Mining and Quarrying#2123
-naics#212391#Potash, Soda, and Borate Mineral Mining#21239
-naics#212392#Phosphate Rock Mining#21239
-naics#212393#Other Chemical and Fertilizer Mineral Mining#21239
-naics#212399#All Other Nonmetallic Mineral Mining#21239
-naics#213#Support Activities for Mining#21
-naics#2131#Support Activities for Mining#213
-naics#21311#Support Activities for Mining#2131
-naics#213111#Drilling Oil and Gas Wells#21311
-naics#213112#Support Activities for Oil and Gas Operations#21311
-naics#213113#Support Activities for Coal Mining#21311
-naics#213114#Support Activities for Metal Mining#21311
-naics#213115#Support Activities for Nonmetallic Minerals (except Fuels)#21311
-naics#22#Utilities#22
-naics#221#Utilities#22
-naics#2211#Electric Power Generation, Transmission and Distribution#221
-naics#22111#Electric Power Generation#2211
-naics#221111#Hydroelectric Power Generation#22111
-naics#221112#Fossil Fuel Electric Power Generation#22111
-naics#221113#Nuclear Electric Power Generation#22111
-naics#221119#Other Electric Power Generation#22111
-naics#22112#Electric Power Transmission, Control, and Distribution#2211
-naics#221121#Electric Bulk Power Transmission and Control#22112
-naics#221122#Electric Power Distribution#22112
-naics#2212#Natural Gas Distribution#221
-naics#22121#Natural Gas Distribution#2212
-naics#2213#Water, Sewage and Other Systems#221
-naics#22131#Water Supply and Irrigation Systems#2213
-naics#22132#Sewage Treatment Facilities#2213
-naics#22133#Steam and Air-Conditioning Supply#2213
-naics#23#Construction#23
-naics#233#Building, Developing, and General Contracting#23
-naics#2331#Land Subdivision and Land Development#233
-naics#23311#Land Subdivision and Land Development#2331
-naics#2332#Residential Building Construction#233
-naics#23321#Single Family Housing Construction#2332
-naics#23322#Multifamily Housing Construction#2332
-naics#2333#Nonresidential Building Construction#233
-naics#23331#Manufacturing and Industrial Building Construction#2333
-naics#23332#Commercial and Institutional Building Construction#2333
-naics#234#Heavy Construction#23
-naics#2341#Highway, Street, Bridge, and Tunnel Construction#234
-naics#23411#Highway and Street Construction#2341
-naics#23412#Bridge and Tunnel Construction#2341
-naics#2349#Other Heavy Construction#234
-naics#23491#Water, Sewer, and Pipeline Construction#2349
-naics#23492#Power and Communication Transmission Line Construction#2349
-naics#23493#Industrial Nonbuilding Structure Construction#2349
-naics#23499#All Other Heavy Construction#2349
-naics#235#Special Trade Contractors#23
-naics#2351#Plumbing, Heating, and Air-Conditioning Contractors#235
-naics#23511#Plumbing, Heating, and Air-Conditioning Contractors#2351
-naics#2352#Painting and Wall Covering Contractors#235
-naics#23521#Painting and Wall Covering Contractors#2352
-naics#2353#Electrical Contractors#235
-naics#23531#Electrical Contractors#2353
-naics#2354#Masonry, Drywall, Insulation, and Tile Contractors#235
-naics#23541#Masonry and Stone Contractors#2354
-naics#23542#Drywall, Plastering, Acoustical, and Insulation Contractors#2354
-naics#23543#Tile, Marble, Terrazzo, and Mosaic Contractors#2354
-naics#2355#Carpentry and Floor Contractors#235
-naics#23551#Carpentry Contractors#2355
-naics#23552#Floor Laying and Other Floor Contractors#2355
-naics#2356#Roofing, Siding, and Sheet Metal Contractors#235
-naics#23561#Roofing, Siding, and Sheet Metal Contractors#2356
-naics#2357#Concrete Contractors#235
-naics#23571#Concrete Contractors#2357
-naics#2358#Water Well Drilling Contractors#235
-naics#23581#Water Well Drilling Contractors#2358
-naics#2359#Other Special Trade Contractors#235
-naics#23591#Structural Steel Erection Contractors#2359
-naics#23592#Glass and Glazing Contractors#2359
-naics#23593#Excavation Contractors#2359
-naics#23594#Wrecking and Demolition Contractors#2359
-naics#23595#Building Equipment and Other Machinery Installation Contractors#2359
-naics#23599#All Other Special Trade Contractors#2359
-naics#31#Manufacturing#31
-naics#311#Food Manufacturing#31
-naics#3111#Animal Food Manufacturing#311
-naics#31111#Animal Food Manufacturing#3111
-naics#311111#Dog and Cat Food Manufacturing#31111
-naics#311119#Other Animal Food Manufacturing#31111
-naics#3112#Grain and Oilseed Milling#311
-naics#31121#Flour Milling and Malt Manufacturing#3112
-naics#311211#Flour Milling#31121
-naics#311212#Rice Milling#31121
-naics#311213#Malt Manufacturing#31121
-naics#31122#Starch and Vegetable Fats and Oils Manufacturing#3112
-naics#311221#Wet Corn Milling#31122
-naics#311222#Soybean Processing#31122
-naics#311223#Other Oilseed Processing#31122
-naics#311225#Fats and Oils Refining and Blending#31122
-naics#31123#Breakfast Cereal Manufacturing#3112
-naics#3113#Sugar and Confectionery Product Manufacturing#311
-naics#31131#Sugar Manufacturing#3113
-naics#311311#Sugarcane Mills#31131
-naics#311312#Cane Sugar Refining#31131
-naics#311313#Beet Sugar Manufacturing#31131
-naics#31132#Chocolate and Confectionery Manufacturing from Cacao Beans#3113
-naics#31133#Confectionery Manufacturing from Purchased Chocolate#3113
-naics#31134#Nonchocolate Confectionery Manufacturing#3113
-naics#3114#Fruit and Vegetable Preserving and Specialty Food Manufacturing#311
-naics#31141#Frozen Food Manufacturing#3114
-naics#311411#Frozen Fruit, Juice, and Vegetable Manufacturing#31141
-naics#311412#Frozen Specialty Food Manufacturing#31141
-naics#31142#Fruit and Vegetable Canning, Pickling, and Drying#3114
-naics#311421#Fruit and Vegetable Canning#31142
-naics#311422#Specialty Canning#31142
-naics#311423#Dried and Dehydrated Food Manufacturing#31142
-naics#3115#Dairy Product Manufacturing#311
-naics#31151#Dairy Product (except Frozen) Manufacturing#3115
-naics#311511#Fluid Milk Manufacturing#31151
-naics#311512#Creamery Butter Manufacturing#31151
-naics#311513#Cheese Manufacturing#31151
-naics#311514#Dry, Condensed, and Evaporated Dairy Product Manufacturing#31151
-naics#31152#Ice Cream and Frozen Dessert Manufacturing#3115
-naics#3116#Animal Slaughtering and Processing#311
-naics#31161#Animal Slaughtering and Processing#3116
-naics#311611#Animal (except Poultry) Slaughtering#31161
-naics#311612#Meat Processed from Carcasses#31161
-naics#311613#Rendering and Meat Byproduct Processing#31161
-naics#311615#Poultry Processing#31161
-naics#3117#Seafood Product Preparation and Packaging#311
-naics#31171#Seafood Product Preparation and Packaging#3117
-naics#311711#Seafood Canning#31171
-naics#311712#Fresh and Frozen Seafood Processing#31171
-naics#3118#Bakeries and Tortilla Manufacturing#311
-naics#31181#Bread and Bakery Product Manufacturing#3118
-naics#311811#Retail Bakeries#31181
-naics#311812#Commercial Bakeries#31181
-naics#311813#Frozen Cakes, Pies, and Other Pastries Manufacturing#31181
-naics#31182#Cookie, Cracker, and Pasta Manufacturing#3118
-naics#311821#Cookie and Cracker Manufacturing#31182
-naics#311822#Flour Mixes and Dough Manufacturing from Purchased Flour#31182
-naics#311823#Dry Pasta Manufacturing#31182
-naics#31183#Tortilla Manufacturing#3118
-naics#3119#Other Food Manufacturing#311
-naics#31191#Snack Food Manufacturing#3119
-naics#311911#Roasted Nuts and Peanut Butter Manufacturing#31191
-naics#311919#Other Snack Food Manufacturing#31191
-naics#31192#Coffee and Tea Manufacturing#3119
-naics#31193#Flavoring Syrup and Concentrate Manufacturing#3119
-naics#31194#Seasoning and Dressing Manufacturing#3119
-naics#311941#Mayonnaise, Dressing, and Other Prepared Sauce Manufacturing#31194
-naics#311942#Spice and Extract Manufacturing#31194
-naics#31199#All Other Food Manufacturing#3119
-naics#311991#Perishable Prepared Food Manufacturing#31199
-naics#311999#All Other Miscellaneous Food Manufacturing#31199
-naics#312#Beverage and Tobacco Product Manufacturing#31
-naics#3121#Beverage Manufacturing#312
-naics#31211#Soft Drink and Ice Manufacturing#3121
-naics#312111#Soft Drink Manufacturing#31211
-naics#312112#Bottled Water Manufacturing#31211
-naics#312113#Ice Manufacturing#31211
-naics#31212#Breweries#3121
-naics#31213#Wineries#3121
-naics#31214#Distilleries#3121
-naics#3122#Tobacco Manufacturing#312
-naics#31221#Tobacco Stemming and Redrying#3122
-naics#31222#Tobacco Product Manufacturing#3122
-naics#312221#Cigarette Manufacturing#31222
-naics#312229#Other Tobacco Product Manufacturing#31222
-naics#313#Textile Mills#31
-naics#3131#Fiber, Yarn, and Thread Mills#313
-naics#31311#Fiber, Yarn, and Thread Mills#3131
-naics#313111#Yarn Spinning Mills#31311
-naics#313112#Yarn Texturizing, Throwing, and Twisting Mills#31311
-naics#313113#Thread Mills#31311
-naics#3132#Fabric Mills#313
-naics#31321#Broadwoven Fabric Mills#3132
-naics#31322#Narrow Fabric Mills and Schiffli Machine Embroidery#3132
-naics#313221#Narrow Fabric Mills#31322
-naics#313222#Schiffli Machine Embroidery#31322
-naics#31323#Nonwoven Fabric Mills#3132
-naics#31324#Knit Fabric Mills#3132
-naics#313241#Weft Knit Fabric Mills#31324
-naics#313249#Other Knit Fabric and Lace Mills#31324
-naics#3133#Textile and Fabric Finishing and Fabric Coating Mills#313
-naics#31331#Textile and Fabric Finishing Mills#3133
-naics#313311#Broadwoven Fabric Finishing Mills#31331
-naics#313312#Textile and Fabric Finishing (except Broadwoven Fabric) Mills#31331
-naics#31332#Fabric Coating Mills#3133
-naics#314#Textile Product Mills#31
-naics#3141#Textile Furnishings Mills#314
-naics#31411#Carpet and Rug Mills#3141
-naics#31412#Curtain and Linen Mills#3141
-naics#314121#Curtain and Drapery Mills#31412
-naics#314129#Other Household Textile Product Mills#31412
-naics#3149#Other Textile Product Mills#314
-naics#31491#Textile Bag and Canvas Mills#3149
-naics#314911#Textile Bag Mills#31491
-naics#314912#Canvas and Related Product Mills#31491
-naics#31499#All Other Textile Product Mills#3149
-naics#314991#Rope, Cordage, and Twine Mills#31499
-naics#314992#Tire Cord and Tire Fabric Mills#31499
-naics#314999#All Other Miscellaneous Textile Product Mills#31499
-naics#315#Apparel Manufacturing#31
-naics#3151#Apparel Knitting Mills#315
-naics#31511#Hosiery and Sock Mills#3151
-naics#315111#Sheer Hosiery Mills#31511
-naics#315119#Other Hosiery and Sock Mills#31511
-naics#31519#Other Apparel Knitting Mills#3151
-naics#315191#Outerwear Knitting Mills#31519
-naics#315192#Underwear and Nightwear Knitting Mills#31519
-naics#3152#Cut and Sew Apparel Manufacturing#315
-naics#31521#Cut and Sew Apparel Contractors#3152
-naics#315211#Men's and Boys' Cut and Sew Apparel Contractors#31521
-naics#315212#Women's, Girls', and Infants' Cut and Sew Apparel Contractors#31521
-naics#31522#Men's and Boys' Cut and Sew Apparel Manufacturing#3152
-naics#315221#Men's and Boys' Cut and Sew Underwear and Nightwear Manufacturing#31522
-naics#315222#Men's and Boys' Cut and Sew Suit, Coat, and Overcoat Manufacturing#31522
-naics#315223#Men's and Boys' Cut and Sew Shirt (except Work Shirt) Manufacturing#31522
-naics#315224#Men's and Boys' Cut and Sew Trouser, Slack, and Jean Manufacturing#31522
-naics#315225#Men's and Boys' Cut and Sew Work Clothing Manufacturing#31522
-naics#315228#Men's and Boys' Cut and Sew Other Outerwear Manufacturing#31522
-naics#31523#Women's and Girls' Cut and Sew Apparel Manufacturing#3152
-naics#315231#Women's and Girls' Cut and Sew Lingerie, Loungewear, and Nightwear Manufacturing#31523
-naics#315232#Women's and Girls' Cut and Sew Blouse and Shirt Manufacturing#31523
-naics#315233#Women's and Girls' Cut and Sew Dress Manufacturing#31523
-naics#315234#Women's and Girls' Cut and Sew Suit, Coat, Tailored Jacket, and Skirt Manufacturing#31523
-naics#315239#Women's and Girls' Cut and Sew Other Outerwear Manufacturing#31523
-naics#31529#Other Cut and Sew Apparel Manufacturing#3152
-naics#315291#Infants' Cut and Sew Apparel Manufacturing#31529
-naics#315292#Fur and Leather Apparel Manufacturing#31529
-naics#315299#All Other Cut and Sew Apparel Manufacturing#31529
-naics#3159#Apparel Accessories and Other Apparel Manufacturing#315
-naics#31599#Apparel Accessories and Other Apparel Manufacturing#3159
-naics#315991#Hat, Cap, and Millinery Manufacturing#31599
-naics#315992#Glove and Mitten Manufacturing#31599
-naics#315993#Men's and Boys' Neckwear Manufacturing#31599
-naics#315999#Other Apparel Accessories and Other Apparel Manufacturing#31599
-naics#316#Leather and Allied Product Manufacturing#31
-naics#3161#Leather and Hide Tanning and Finishing#316
-naics#31611#Leather and Hide Tanning and Finishing#3161
-naics#3162#Footwear Manufacturing#316
-naics#31621#Footwear Manufacturing#3162
-naics#316211#Rubber and Plastics Footwear Manufacturing#31621
-naics#316212#House Slipper Manufacturing#31621
-naics#316213#Men's Footwear (except Athletic) Manufacturing#31621
-naics#316214#Women's Footwear (except Athletic) Manufacturing#31621
-naics#316219#Other Footwear Manufacturing#31621
-naics#3169#Other Leather and Allied Product Manufacturing#316
-naics#31699#Other Leather and Allied Product Manufacturing#3169
-naics#316991#Luggage Manufacturing#31699
-naics#316992#Women's Handbag and Purse Manufacturing#31699
-naics#316993#Personal Leather Good (except Women's Handbag and Purse) Manufacturing#31699
-naics#316999#All Other Leather Good Manufacturing#31699
-naics#32#Manufacturing#32
-naics#321#Wood Product Manufacturing#32
-naics#3211#Sawmills and Wood Preservation#321
-naics#32111#Sawmills and Wood Preservation#3211
-naics#321113#Sawmills#32111
-naics#321114#Wood Preservation#32111
-naics#3212#Veneer, Plywood, and Engineered Wood Product Manufacturing#321
-naics#32121#Veneer, Plywood, and Engineered Wood Product Manufacturing#3212
-naics#321211#Hardwood Veneer and Plywood Manufacturing#32121
-naics#321212#Softwood Veneer and Plywood Manufacturing#32121
-naics#321213#Engineered Wood Member (except Truss) Manufacturing#32121
-naics#321214#Truss Manufacturing#32121
-naics#321219#Reconstituted Wood Product Manufacturing#32121
-naics#3219#Other Wood Product Manufacturing#321
-naics#32191#Millwork#3219
-naics#321911#Wood Window and Door Manufacturing#32191
-naics#321912#Cut Stock, Resawing Lumber, and Planing#32191
-naics#321918#Other Millwork (including Flooring)#32191
-naics#32192#Wood Container and Pallet Manufacturing#3219
-naics#32199#All Other Wood Product Manufacturing#3219
-naics#321991#Manufactured Home (Mobile Home) Manufacturing#32199
-naics#321992#Prefabricated Wood Building Manufacturing#32199
-naics#321999#All Other Miscellaneous Wood Product Manufacturing#32199
-naics#322#Paper Manufacturing#32
-naics#3221#Pulp, Paper, and Paperboard Mills#322
-naics#32211#Pulp Mills#3221
-naics#32212#Paper Mills#3221
-naics#322121#Paper (except Newsprint) Mills#32212
-naics#322122#Newsprint Mills#32212
-naics#32213#Paperboard Mills#3221
-naics#3222#Converted Paper Product Manufacturing#322
-naics#32221#Paperboard Container Manufacturing#3222
-naics#322211#Corrugated and Solid Fiber Box Manufacturing#32221
-naics#322212#Folding Paperboard Box Manufacturing#32221
-naics#322213#Setup Paperboard Box Manufacturing#32221
-naics#322214#Fiber Can, Tube, Drum, and Similar Products Manufacturing#32221
-naics#322215#Nonfolding Sanitary Food Container Manufacturing#32221
-naics#32222#Paper Bag and Coated and Treated Paper Manufacturing#3222
-naics#322221#Coated and Laminated Packaging Paper and Plastics Film Manufacturing#32222
-naics#322222#Coated and Laminated Paper Manufacturing#32222
-naics#322223#Plastics, Foil, and Coated Paper Bag Manufacturing#32222
-naics#322224#Uncoated Paper and Multiwall Bag Manufacturing#32222
-naics#322225#Laminated Aluminum Foil Manufacturing for Flexible Packaging Uses#32222
-naics#322226#Surface-Coated Paperboard Manufacturing#32222
-naics#32223#Stationery Product Manufacturing#3222
-naics#322231#Die-Cut Paper and Paperboard Office Supplies Manufacturing#32223
-naics#322232#Envelope Manufacturing#32223
-naics#322233#Stationery, Tablet, and Related Product Manufacturing#32223
-naics#32229#Other Converted Paper Product Manufacturing#3222
-naics#322291#Sanitary Paper Product Manufacturing#32229
-naics#322299#All Other Converted Paper Product Manufacturing#32229
-naics#323#Printing and Related Support Activities#32
-naics#3231#Printing and Related Support Activities#323
-naics#32311#Printing#3231
-naics#323110#Commercial Lithographic Printing#32311
-naics#323111#Commercial Gravure Printing#32311
-naics#323112#Commercial Flexographic Printing#32311
-naics#323113#Commercial Screen Printing#32311
-naics#323114#Quick Printing#32311
-naics#323115#Digital Printing#32311
-naics#323116#Manifold Business Forms Printing#32311
-naics#323117#Books Printing#32311
-naics#323118#Blankbook, Looseleaf Binders, and Devices Manufacturing#32311
-naics#323119#Other Commercial Printing#32311
-naics#32312#Support Activities for Printing#3231
-naics#323121#Tradebinding and Related Work#32312
-naics#323122#Prepress Services#32312
-naics#324#Petroleum and Coal Products Manufacturing#32
-naics#3241#Petroleum and Coal Products Manufacturing#324
-naics#32411#Petroleum Refineries#3241
-naics#32412#Asphalt Paving, Roofing, and Saturated Materials Manufacturing#3241
-naics#324121#Asphalt Paving Mixture and Block Manufacturing#32412
-naics#324122#Asphalt Shingle and Coating Materials Manufacturing#32412
-naics#32419#Other Petroleum and Coal Products Manufacturing#3241
-naics#324191#Petroleum Lubricating Oil and Grease Manufacturing#32419
-naics#324199#All Other Petroleum and Coal Products Manufacturing#32419
-naics#325#Chemical Manufacturing#32
-naics#3251#Basic Chemical Manufacturing#325
-naics#32511#Petrochemical Manufacturing#3251
-naics#32512#Industrial Gas Manufacturing#3251
-naics#32513#Synthetic Dye and Pigment Manufacturing#3251
-naics#325131#Inorganic Dye and Pigment Manufacturing#32513
-naics#325132#Synthetic Organic Dye and Pigment Manufacturing#32513
-naics#32518#Other Basic Inorganic Chemical Manufacturing#3251
-naics#325181#Alkalies and Chlorine Manufacturing#32518
-naics#325182#Carbon Black Manufacturing#32518
-naics#325188#All Other Basic Inorganic Chemical Manufacturing#32518
-naics#32519#Other Basic Organic Chemical Manufacturing#3251
-naics#325191#Gum and Wood Chemical Manufacturing#32519
-naics#325192#Cyclic Crude and Intermediate Manufacturing#32519
-naics#325193#Ethyl Alcohol Manufacturing#32519
-naics#325199#All Other Basic Organic Chemical Manufacturing#32519
-naics#3252#Resin, Synthetic Rubber, and Artificial and Synthetic Fibers and Filaments Manufacturing#325
-naics#32521#Resin and Synthetic Rubber Manufacturing#3252
-naics#325211#Plastics Material and Resin Manufacturing#32521
-naics#325212#Synthetic Rubber Manufacturing#32521
-naics#32522#Artificial and Synthetic Fibers and Filaments Manufacturing#3252
-naics#325221#Cellulosic Organic Fiber Manufacturing#32522
-naics#325222#Noncellulosic Organic Fiber Manufacturing#32522
-naics#3253#Pesticide, Fertilizer, and Other Agricultural Chemical Manufacturing#325
-naics#32531#Fertilizer Manufacturing#3253
-naics#325311#Nitrogenous Fertilizer Manufacturing#32531
-naics#325312#Phosphatic Fertilizer Manufacturing#32531
-naics#325314#Fertilizer (Mixing Only) Manufacturing#32531
-naics#32532#Pesticide and Other Agricultural Chemical Manufacturing#3253
-naics#3254#Pharmaceutical and Medicine Manufacturing#325
-naics#32541#Pharmaceutical and Medicine Manufacturing#3254
-naics#325411#Medicinal and Botanical Manufacturing#32541
-naics#325412#Pharmaceutical Preparation Manufacturing#32541
-naics#325413#In-Vitro Diagnostic Substance Manufacturing#32541
-naics#325414#Biological Product (except Diagnostic) Manufacturing#32541
-naics#3255#Paint, Coating, and Adhesive Manufacturing#325
-naics#32551#Paint and Coating Manufacturing#3255
-naics#32552#Adhesive Manufacturing#3255
-naics#3256#Soap, Cleaning Compound, and Toilet Preparation Manufacturing#325
-naics#32561#Soap and Cleaning Compound Manufacturing#3256
-naics#325611#Soap and Other Detergent Manufacturing#32561
-naics#325612#Polish and Other Sanitation Good Manufacturing#32561
-naics#325613#Surface Active Agent Manufacturing#32561
-naics#32562#Toilet Preparation Manufacturing#3256
-naics#3259#Other Chemical Product and Preparation Manufacturing#325
-naics#32591#Printing Ink Manufacturing#3259
-naics#32592#Explosives Manufacturing#3259
-naics#32599#All Other Chemical Product and Preparation Manufacturing#3259
-naics#325991#Custom Compounding of Purchased Resins#32599
-naics#325992#Photographic Film, Paper, Plate, and Chemical Manufacturing#32599
-naics#325998#All Other Miscellaneous Chemical Product and Preparation Manufacturing#32599
-naics#326#Plastics and Rubber Products Manufacturing#32
-naics#3261#Plastics Product Manufacturing#326
-naics#32611#Unsupported Plastics Film, Sheet, and Bag Manufacturing#3261
-naics#326111#Unsupported Plastics Bag Manufacturing#32611
-naics#326112#Unsupported Plastics Packaging Film and Sheet Manufacturing#32611
-naics#326113#Unsupported Plastics Film and Sheet (except Packaging) Manufacturing#32611
-naics#32612#Plastics Pipe, Pipe Fitting, and Unsupported Profile Shape Manufacturing#3261
-naics#326121#Unsupported Plastics Profile Shape Manufacturing#32612
-naics#326122#Plastics Pipe and Pipe Fitting Manufacturing#32612
-naics#32613#Laminated Plastics Plate, Sheet, and Shape Manufacturing#3261
-naics#32614#Polystyrene Foam Product Manufacturing#3261
-naics#32615#Urethane and Other Foam Product (except Polystyrene) Manufacturing#3261
-naics#32616#Plastics Bottle Manufacturing#3261
-naics#32619#Other Plastics Product Manufacturing#3261
-naics#326191#Plastics Plumbing Fixture Manufacturing#32619
-naics#326192#Resilient Floor Covering Manufacturing#32619
-naics#326199#All Other Plastics Product Manufacturing#32619
-naics#3262#Rubber Product Manufacturing#326
-naics#32621#Tire Manufacturing#3262
-naics#326211#Tire Manufacturing (except Retreading)#32621
-naics#326212#Tire Retreading#32621
-naics#32622#Rubber and Plastics Hoses and Belting Manufacturing#3262
-naics#32629#Other Rubber Product Manufacturing#3262
-naics#326291#Rubber Product Manufacturing for Mechanical Use#32629
-naics#326299#All Other Rubber Product Manufacturing#32629
-naics#327#Nonmetallic Mineral Product Manufacturing#32
-naics#3271#Clay Product and Refractory Manufacturing#327
-naics#32711#Pottery, Ceramics, and Plumbing Fixture Manufacturing#3271
-naics#327111#Vitreous China Plumbing Fixture and China and Earthenware Bathroom Accessories Manufacturing#32711
-naics#327112#Vitreous China, Fine Earthenware, and Other Pottery Product Manufacturing#32711
-naics#327113#Porcelain Electrical Supply Manufacturing#32711
-naics#32712#Clay Building Material and Refractories Manufacturing#3271
-naics#327121#Brick and Structural Clay Tile Manufacturing#32712
-naics#327122#Ceramic Wall and Floor Tile Manufacturing#32712
-naics#327123#Other Structural Clay Product Manufacturing#32712
-naics#327124#Clay Refractory Manufacturing#32712
-naics#327125#Nonclay Refractory Manufacturing#32712
-naics#3272#Glass and Glass Product Manufacturing#327
-naics#32721#Glass and Glass Product Manufacturing#3272
-naics#327211#Flat Glass Manufacturing#32721
-naics#327212#Other Pressed and Blown Glass and Glassware Manufacturing#32721
-naics#327213#Glass Container Manufacturing#32721
-naics#327215#Glass Product Manufacturing Made of Purchased Glass#32721
-naics#3273#Cement and Concrete Product Manufacturing#327
-naics#32731#Cement Manufacturing#3273
-naics#32732#Ready-Mix Concrete Manufacturing#3273
-naics#32733#Concrete Pipe, Brick, and Block Manufacturing#3273
-naics#327331#Concrete Block and Brick Manufacturing#32733
-naics#327332#Concrete Pipe Manufacturing#32733
-naics#32739#Other Concrete Product Manufacturing#3273
-naics#3274#Lime and Gypsum Product Manufacturing#327
-naics#32741#Lime Manufacturing#3274
-naics#32742#Gypsum Product Manufacturing#3274
-naics#3279#Other Nonmetallic Mineral Product Manufacturing#327
-naics#32791#Abrasive Product Manufacturing#3279
-naics#32799#All Other Nonmetallic Mineral Product Manufacturing#3279
-naics#327991#Cut Stone and Stone Product Manufacturing#32799
-naics#327992#Ground or Treated Mineral and Earth Manufacturing#32799
-naics#327993#Mineral Wool Manufacturing#32799
-naics#327999#All Other Miscellaneous Nonmetallic Mineral Product Manufacturing#32799
-naics#33#Manufacturing#33
-naics#331#Primary Metal Manufacturing#33
-naics#3311#Iron and Steel Mills and Ferroalloy Manufacturing#331
-naics#33111#Iron and Steel Mills and Ferroalloy Manufacturing#3311
-naics#331111#Iron and Steel Mills#33111
-naics#331112#Electrometallurgical Ferroalloy Product Manufacturing#33111
-naics#3312#Steel Product Manufacturing from Purchased Steel#331
-naics#33121#Iron and Steel Pipe and Tube Manufacturing from Purchased Steel#3312
-naics#33122#Rolling and Drawing of Purchased Steel#3312
-naics#331221#Rolled Steel Shape Manufacturing#33122
-naics#331222#Steel Wire Drawing#33122
-naics#3313#Alumina and Aluminum Production and Processing#331
-naics#33131#Alumina and Aluminum Production and Processing#3313
-naics#331311#Alumina Refining#33131
-naics#331312#Primary Aluminum Production#33131
-naics#331314#Secondary Smelting and Alloying of Aluminum#33131
-naics#331315#Aluminum Sheet, Plate, and Foil Manufacturing#33131
-naics#331316#Aluminum Extruded Product Manufacturing#33131
-naics#331319#Other Aluminum Rolling and Drawing#33131
-naics#3314#Nonferrous Metal (except Aluminum) Production and Processing#331
-naics#33141#Nonferrous Metal (except Aluminum) Smelting and Refining#3314
-naics#331411#Primary Smelting and Refining of Copper#33141
-naics#331419#Primary Smelting and Refining of Nonferrous Metal (except Copper and Aluminum)#33141
-naics#33142#Copper Rolling, Drawing, Extruding, and Alloying#3314
-naics#331421#Copper Rolling, Drawing, and Extruding#33142
-naics#331422#Copper Wire (except Mechanical) Drawing#33142
-naics#331423#Secondary Smelting, Refining, and Alloying of Copper#33142
-naics#33149#Nonferrous Metal (except Copper and Aluminum) Rolling, Drawing, Extruding, and Alloying#3314
-naics#331491#Nonferrous Metal (except Copper and Aluminum) Rolling, Drawing, and Extruding#33149
-naics#331492#Secondary Smelting, Refining, and Alloying of Nonferrous Metal (except Copper and Aluminum)#33149
-naics#3315#Foundries#331
-naics#33151#Ferrous Metal Foundries#3315
-naics#331511#Iron Foundries#33151
-naics#331512#Steel Investment Foundries#33151
-naics#331513#Steel Foundries (except Investment)#33151
-naics#33152#Nonferrous Metal Foundries#3315
-naics#331521#Aluminum Die-Casting Foundries#33152
-naics#331522#Nonferrous (except Aluminum) Die-Casting Foundries#33152
-naics#331524#Aluminum Foundries (except Die-Casting)#33152
-naics#331525#Copper Foundries (except Die-Casting)#33152
-naics#331528#Other Nonferrous Foundries (except Die-Casting)#33152
-naics#332#Fabricated Metal Product Manufacturing#33
-naics#3321#Forging and Stamping#332
-naics#33211#Forging and Stamping#3321
-naics#332111#Iron and Steel Forging#33211
-naics#332112#Nonferrous Forging#33211
-naics#332114#Custom Roll Forming#33211
-naics#332115#Crown and Closure Manufacturing#33211
-naics#332116#Metal Stamping#33211
-naics#332117#Powder Metallurgy Part Manufacturing#33211
-naics#3322#Cutlery and Handtool Manufacturing#332
-naics#33221#Cutlery and Handtool Manufacturing#3322
-naics#332211#Cutlery and Flatware (except Precious) Manufacturing#33221
-naics#332212#Hand and Edge Tool Manufacturing#33221
-naics#332213#Saw Blade and Handsaw Manufacturing#33221
-naics#332214#Kitchen Utensil, Pot, and Pan Manufacturing#33221
-naics#3323#Architectural and Structural Metals Manufacturing#332
-naics#33231#Plate Work and Fabricated Structural Product Manufacturing#3323
-naics#332311#Prefabricated Metal Building and Component Manufacturing#33231
-naics#332312#Fabricated Structural Metal Manufacturing#33231
-naics#332313#Plate Work Manufacturing#33231
-naics#33232#Ornamental and Architectural Metal Products Manufacturing#3323
-naics#332321#Metal Window and Door Manufacturing#33232
-naics#332322#Sheet Metal Work Manufacturing#33232
-naics#332323#Ornamental and Architectural Metal Work Manufacturing#33232
-naics#3324#Boiler, Tank, and Shipping Container Manufacturing#332
-naics#33241#Power Boiler and Heat Exchanger Manufacturing#3324
-naics#33242#Metal Tank (Heavy Gauge) Manufacturing#3324
-naics#33243#Metal Can, Box, and Other Metal Container (Light Gauge) Manufacturing#3324
-naics#332431#Metal Can Manufacturing#33243
-naics#332439#Other Metal Container Manufacturing#33243
-naics#3325#Hardware Manufacturing#332
-naics#33251#Hardware Manufacturing#3325
-naics#3326#Spring and Wire Product Manufacturing#332
-naics#33261#Spring and Wire Product Manufacturing#3326
-naics#332611#Spring (Heavy Gauge) Manufacturing#33261
-naics#332612#Spring (Light Gauge) Manufacturing#33261
-naics#332618#Other Fabricated Wire Product Manufacturing#33261
-naics#3327#Machine Shops; Turned Product; and Screw, Nut, and Bolt Manufacturing#332
-naics#33271#Machine Shops#3327
-naics#33272#Turned Product and Screw, Nut, and Bolt Manufacturing#3327
-naics#332721#Precision Turned Product Manufacturing#33272
-naics#332722#Bolt, Nut, Screw, Rivet, and Washer Manufacturing#33272
-naics#3328#Coating, Engraving, Heat Treating, and Allied Activities#332
-naics#33281#Coating, Engraving, Heat Treating, and Allied Activities#3328
-naics#332811#Metal Heat Treating#33281
-naics#332812#Metal Coating, Engraving (except Jewelry and Silverware), and Allied Services to Manufacturers#33281
-naics#332813#Electroplating, Plating, Polishing, Anodizing, and Coloring#33281
-naics#3329#Other Fabricated Metal Product Manufacturing#332
-naics#33291#Metal Valve Manufacturing#3329
-naics#332911#Industrial Valve Manufacturing#33291
-naics#332912#Fluid Power Valve and Hose Fitting Manufacturing#33291
-naics#332913#Plumbing Fixture Fitting and Trim Manufacturing#33291
-naics#332919#Other Metal Valve and Pipe Fitting Manufacturing#33291
-naics#33299#All Other Fabricated Metal Product Manufacturing#3329
-naics#332991#Ball and Roller Bearing Manufacturing#33299
-naics#332992#Small Arms Ammunition Manufacturing#33299
-naics#332993#Ammunition (except Small Arms) Manufacturing#33299
-naics#332994#Small Arms Manufacturing#33299
-naics#332995#Other Ordnance and Accessories Manufacturing#33299
-naics#332996#Fabricated Pipe and Pipe Fitting Manufacturing#33299
-naics#332997#Industrial Pattern Manufacturing#33299
-naics#332998#Enameled Iron and Metal Sanitary Ware Manufacturing#33299
-naics#332999#All Other Miscellaneous Fabricated Metal Product Manufacturing#33299
-naics#333#Machinery Manufacturing#33
-naics#3331#Agriculture, Construction, and Mining Machinery Manufacturing#333
-naics#33311#Agricultural Implement Manufacturing#3331
-naics#333111#Farm Machinery and Equipment Manufacturing#33311
-naics#333112#Lawn and Garden Tractor and Home Lawn and Garden Equipment Manufacturing#33311
-naics#33312#Construction Machinery Manufacturing#3331
-naics#33313#Mining and Oil and Gas Field Machinery Manufacturing#3331
-naics#333131#Mining Machinery and Equipment Manufacturing#33313
-naics#333132#Oil and Gas Field Machinery and Equipment Manufacturing#33313
-naics#3332#Industrial Machinery Manufacturing#333
-naics#33321#Sawmill and Woodworking Machinery Manufacturing#3332
-naics#33322#Plastics and Rubber Industry Machinery Manufacturing#3332
-naics#33329#Other Industrial Machinery Manufacturing#3332
-naics#333291#Paper Industry Machinery Manufacturing#33329
-naics#333292#Textile Machinery Manufacturing#33329
-naics#333293#Printing Machinery and Equipment Manufacturing#33329
-naics#333294#Food Product Machinery Manufacturing#33329
-naics#333295#Semiconductor Machinery Manufacturing#33329
-naics#333298#All Other Industrial Machinery Manufacturing#33329
-naics#3333#Commercial and Service Industry Machinery Manufacturing#333
-naics#33331#Commercial and Service Industry Machinery Manufacturing#3333
-naics#333311#Automatic Vending Machine Manufacturing#33331
-naics#333312#Commercial Laundry, Drycleaning, and Pressing Machine Manufacturing#33331
-naics#333313#Office Machinery Manufacturing#33331
-naics#333314#Optical Instrument and Lens Manufacturing#33331
-naics#333315#Photographic and Photocopying Equipment Manufacturing#33331
-naics#333319#Other Commercial and Service Industry Machinery Manufacturing#33331
-naics#3334#Ventilation, Heating, Air-Conditioning, and Commercial Refrigeration Equipment Manufacturing#333
-naics#33341#Ventilation, Heating, Air-Conditioning, and Commercial Refrigeration Equipment Manufacturing#3334
-naics#333411#Air Purification Equipment Manufacturing#33341
-naics#333412#Industrial and Commercial Fan and Blower Manufacturing#33341
-naics#333414#Heating Equipment (except Warm Air Furnaces) Manufacturing#33341
-naics#333415#Air-Conditioning and Warm Air Heating Equipment and Commercial and Industrial Refrigeration Equipment Manufacturing#33341
-naics#3335#Metalworking Machinery Manufacturing#333
-naics#33351#Metalworking Machinery Manufacturing#3335
-naics#333511#Industrial Mold Manufacturing#33351
-naics#333512#Machine Tool (Metal Cutting Types) Manufacturing#33351
-naics#333513#Machine Tool (Metal Forming Types) Manufacturing#33351
-naics#333514#Special Die and Tool, Die Set, Jig, and Fixture Manufacturing#33351
-naics#333515#Cutting Tool and Machine Tool Accessory Manufacturing#33351
-naics#333516#Rolling Mill Machinery and Equipment Manufacturing#33351
-naics#333518#Other Metalworking Machinery Manufacturing#33351
-naics#3336#Engine, Turbine, and Power Transmission Equipment Manufacturing#333
-naics#33361#Engine, Turbine, and Power Transmission Equipment Manufacturing#3336
-naics#333611#Turbine and Turbine Generator Set Units Manufacturing#33361
-naics#333612#Speed Changer, Industrial High-Speed Drive, and Gear Manufacturing#33361
-naics#333613#Mechanical Power Transmission Equipment Manufacturing#33361
-naics#333618#Other Engine Equipment Manufacturing#33361
-naics#3339#Other General Purpose Machinery Manufacturing#333
-naics#33391#Pump and Compressor Manufacturing#3339
-naics#333911#Pump and Pumping Equipment Manufacturing#33391
-naics#333912#Air and Gas Compressor Manufacturing#33391
-naics#333913#Measuring and Dispensing Pump Manufacturing#33391
-naics#33392#Material Handling Equipment Manufacturing#3339
-naics#333921#Elevator and Moving Stairway Manufacturing#33392
-naics#333922#Conveyor and Conveying Equipment Manufacturing#33392
-naics#333923#Overhead Traveling Crane, Hoist, and Monorail System Manufacturing#33392
-naics#333924#Industrial Truck, Tractor, Trailer, and Stacker Machinery Manufacturing#33392
-naics#33399#All Other General Purpose Machinery Manufacturing#3339
-naics#333991#Power-Driven Handtool Manufacturing#33399
-naics#333992#Welding and Soldering Equipment Manufacturing#33399
-naics#333993#Packaging Machinery Manufacturing#33399
-naics#333994#Industrial Process Furnace and Oven Manufacturing#33399
-naics#333995#Fluid Power Cylinder and Actuator Manufacturing#33399
-naics#333996#Fluid Power Pump and Motor Manufacturing#33399
-naics#333997#Scale and Balance (except Laboratory) Manufacturing#33399
-naics#333999#All Other Miscellaneous General Purpose Machinery Manufacturing#33399
-naics#334#Computer and Electronic Product Manufacturing#33
-naics#3341#Computer and Peripheral Equipment Manufacturing#334
-naics#33411#Computer and Peripheral Equipment Manufacturing#3341
-naics#334111#Electronic Computer Manufacturing#33411
-naics#334112#Computer Storage Device Manufacturing#33411
-naics#334113#Computer Terminal Manufacturing#33411
-naics#334119#Other Computer Peripheral Equipment Manufacturing#33411
-naics#3342#Communications Equipment Manufacturing#334
-naics#33421#Telephone Apparatus Manufacturing#3342
-naics#33422#Radio and Television Broadcasting and Wireless Communications Equipment Manufacturing#3342
-naics#33429#Other Communications Equipment Manufacturing#3342
-naics#3343#Audio and Video Equipment Manufacturing#334
-naics#33431#Audio and Video Equipment Manufacturing#3343
-naics#3344#Semiconductor and Other Electronic Component Manufacturing#334
-naics#33441#Semiconductor and Other Electronic Component Manufacturing#3344
-naics#334411#Electron Tube Manufacturing#33441
-naics#334412#Bare Printed Circuit Board Manufacturing#33441
-naics#334413#Semiconductor and Related Device Manufacturing#33441
-naics#334414#Electronic Capacitor Manufacturing#33441
-naics#334415#Electronic Resistor Manufacturing#33441
-naics#334416#Electronic Coil, Transformer, and Other Inductor Manufacturing#33441
-naics#334417#Electronic Connector Manufacturing#33441
-naics#334418#Printed Circuit Assembly (Electronic Assembly) Manufacturing#33441
-naics#334419#Other Electronic Component Manufacturing#33441
-naics#3345#Navigational, Measuring, Electromedical, and Control Instruments Manufacturing#334
-naics#33451#Navigational, Measuring, Electromedical, and Control Instruments Manufacturing#3345
-naics#334510#Electromedical and Electrotherapeutic Apparatus Manufacturing#33451
-naics#334511#Search, Detection, Navigation, Guidance, Aeronautical, and Nautical System and Instrument Manufacturing#33451
-naics#334512#Automatic Environmental Control Manufacturing for Residential, Commercial, and Appliance Use#33451
-naics#334513#Instruments and Related Products Manufacturing for Measuring, Displaying, and Controlling Industrial Process Variables#33451
-naics#334514#Totalizing Fluid Meter and Counting Device Manufacturing#33451
-naics#334515#Instrument Manufacturing for Measuring and Testing Electricity and Electrical Signals#33451
-naics#334516#Analytical Laboratory Instrument Manufacturing#33451
-naics#334517#Irradiation Apparatus Manufacturing#33451
-naics#334518#Watch, Clock, and Part Manufacturing#33451
-naics#334519#Other Measuring and Controlling Device Manufacturing#33451
-naics#3346#Manufacturing and Reproducing Magnetic and Optical Media#334
-naics#33461#Manufacturing and Reproducing Magnetic and Optical Media#3346
-naics#334611#Software Reproducing#33461
-naics#334612#Prerecorded Compact Disc (except Software), Tape, and Record Reproducing#33461
-naics#334613#Magnetic and Optical Recording Media Manufacturing#33461
-naics#335#Electrical Equipment, Appliance, and Component Manufacturing#33
-naics#3351#Electric Lighting Equipment Manufacturing#335
-naics#33511#Electric Lamp Bulb and Part Manufacturing#3351
-naics#33512#Lighting Fixture Manufacturing#3351
-naics#335121#Residential Electric Lighting Fixture Manufacturing#33512
-naics#335122#Commercial, Industrial, and Institutional Electric Lighting Fixture Manufacturing#33512
-naics#335129#Other Lighting Equipment Manufacturing#33512
-naics#3352#Household Appliance Manufacturing#335
-naics#33521#Small Electrical Appliance Manufacturing#3352
-naics#335211#Electric Housewares and Household Fan Manufacturing#33521
-naics#335212#Household Vacuum Cleaner Manufacturing#33521
-naics#33522#Major Appliance Manufacturing#3352
-naics#335221#Household Cooking Appliance Manufacturing#33522
-naics#335222#Household Refrigerator and Home Freezer Manufacturing#33522
-naics#335224#Household Laundry Equipment Manufacturing#33522
-naics#335228#Other Major Household Appliance Manufacturing#33522
-naics#3353#Electrical Equipment Manufacturing#335
-naics#33531#Electrical Equipment Manufacturing#3353
-naics#335311#Power, Distribution, and Specialty Transformer Manufacturing#33531
-naics#335312#Motor and Generator Manufacturing#33531
-naics#335313#Switchgear and Switchboard Apparatus Manufacturing#33531
-naics#335314#Relay and Industrial Control Manufacturing#33531
-naics#3359#Other Electrical Equipment and Component Manufacturing#335
-naics#33591#Battery Manufacturing#3359
-naics#335911#Storage Battery Manufacturing#33591
-naics#335912#Primary Battery Manufacturing#33591
-naics#33592#Communication and Energy Wire and Cable Manufacturing#3359
-naics#335921#Fiber Optic Cable Manufacturing#33592
-naics#335929#Other Communication and Energy Wire Manufacturing#33592
-naics#33593#Wiring Device Manufacturing#3359
-naics#335931#Current-Carrying Wiring Device Manufacturing#33593
-naics#335932#Noncurrent-Carrying Wiring Device Manufacturing#33593
-naics#33599#All Other Electrical Equipment and Component Manufacturing#3359
-naics#335991#Carbon and Graphite Product Manufacturing#33599
-naics#335999#All Other Miscellaneous Electrical Equipment and Component Manufacturing#33599
-naics#336#Transportation Equipment Manufacturing#33
-naics#3361#Motor Vehicle Manufacturing#336
-naics#33611#Automobile and Light Duty Motor Vehicle Manufacturing#3361
-naics#336111#Automobile Manufacturing#33611
-naics#336112#Light Truck and Utility Vehicle Manufacturing#33611
-naics#33612#Heavy Duty Truck Manufacturing#3361
-naics#3362#Motor Vehicle Body and Trailer Manufacturing#336
-naics#33621#Motor Vehicle Body and Trailer Manufacturing#3362
-naics#336211#Motor Vehicle Body Manufacturing#33621
-naics#336212#Truck Trailer Manufacturing#33621
-naics#336213#Motor Home Manufacturing#33621
-naics#336214#Travel Trailer and Camper Manufacturing#33621
-naics#3363#Motor Vehicle Parts Manufacturing#336
-naics#33631#Motor Vehicle Gasoline Engine and Engine Parts Manufacturing#3363
-naics#336311#Carburetor, Piston, Piston Ring, and Valve Manufacturing#33631
-naics#336312#Gasoline Engine and Engine Parts Manufacturing#33631
-naics#33632#Motor Vehicle Electrical and Electronic Equipment Manufacturing#3363
-naics#336321#Vehicular Lighting Equipment Manufacturing#33632
-naics#336322#Other Motor Vehicle Electrical and Electronic Equipment Manufacturing#33632
-naics#33633#Motor Vehicle Steering and Suspension Components (except Spring) Manufacturing#3363
-naics#33634#Motor Vehicle Brake System Manufacturing#3363
-naics#33635#Motor Vehicle Transmission and Power Train Parts Manufacturing#3363
-naics#33636#Motor Vehicle Seating and Interior Trim Manufacturing#3363
-naics#33637#Motor Vehicle Metal Stamping#3363
-naics#33639#Other Motor Vehicle Parts Manufacturing#3363
-naics#336391#Motor Vehicle Air-Conditioning Manufacturing#33639
-naics#336399#All Other Motor Vehicle Parts Manufacturing#33639
-naics#3364#Aerospace Product and Parts Manufacturing#336
-naics#33641#Aerospace Product and Parts Manufacturing#3364
-naics#336411#Aircraft Manufacturing#33641
-naics#336412#Aircraft Engine and Engine Parts Manufacturing#33641
-naics#336413#Other Aircraft Parts and Auxiliary Equipment Manufacturing#33641
-naics#336414#Guided Missile and Space Vehicle Manufacturing#33641
-naics#336415#Guided Missile and Space Vehicle Propulsion Unit and Propulsion Unit Parts Manufacturing#33641
-naics#336419#Other Guided Missile and Space Vehicle Parts and Auxiliary Equipment Manufacturing#33641
-naics#3365#Railroad Rolling Stock Manufacturing#336
-naics#33651#Railroad Rolling Stock Manufacturing#3365
-naics#3366#Ship and Boat Building#336
-naics#33661#Ship and Boat Building#3366
-naics#336611#Ship Building and Repairing#33661
-naics#336612#Boat Building#33661
-naics#3369#Other Transportation Equipment Manufacturing#336
-naics#33699#Other Transportation Equipment Manufacturing#3369
-naics#336991#Motorcycle, Bicycle, and Parts Manufacturing#33699
-naics#336992#Military Armored Vehicle, Tank, and Tank Component Manufacturing#33699
-naics#336999#All Other Transportation Equipment Manufacturing#33699
-naics#337#Furniture and Related Product Manufacturing#33
-naics#3371#Household and Institutional Furniture and Kitchen Cabinet Manufacturing#337
-naics#33711#Wood Kitchen Cabinet and Countertop Manufacturing#3371
-naics#33712#Household and Institutional Furniture Manufacturing#3371
-naics#337121#Upholstered Household Furniture Manufacturing#33712
-naics#337122#Nonupholstered Wood Household Furniture Manufacturing#33712
-naics#337124#Metal Household Furniture Manufacturing#33712
-naics#337125#Household Furniture (except Wood and Metal) Manufacturing#33712
-naics#337127#Institutional Furniture Manufacturing#33712
-naics#337129#Wood Television, Radio, and Sewing Machine Cabinet Manufacturing#33712
-naics#3372#Office Furniture (including Fixtures) Manufacturing#337
-naics#33721#Office Furniture (including Fixtures) Manufacturing#3372
-naics#337211#Wood Office Furniture Manufacturing#33721
-naics#337212#Custom Architectural Woodwork and Millwork Manufacturing#33721
-naics#337214#Office Furniture (except Wood) Manufacturing#33721
-naics#337215#Showcase, Partition, Shelving, and Locker Manufacturing#33721
-naics#3379#Other Furniture Related Product Manufacturing#337
-naics#33791#Mattress Manufacturing#3379
-naics#33792#Blind and Shade Manufacturing#3379
-naics#339#Miscellaneous Manufacturing#33
-naics#3391#Medical Equipment and Supplies Manufacturing#339
-naics#33911#Medical Equipment and Supplies Manufacturing#3391
-naics#339111#Laboratory Apparatus and Furniture Manufacturing#33911
-naics#339112#Surgical and Medical Instrument Manufacturing#33911
-naics#339113#Surgical Appliance and Supplies Manufacturing#33911
-naics#339114#Dental Equipment and Supplies Manufacturing#33911
-naics#339115#Ophthalmic Goods Manufacturing#33911
-naics#339116#Dental Laboratories#33911
-naics#3399#Other Miscellaneous Manufacturing#339
-naics#33991#Jewelry and Silverware Manufacturing#3399
-naics#339911#Jewelry (except Costume) Manufacturing#33991
-naics#339912#Silverware and Hollowware Manufacturing#33991
-naics#339913#Jewelers' Material and Lapidary Work Manufacturing#33991
-naics#339914#Costume Jewelry and Novelty Manufacturing#33991
-naics#33992#Sporting and Athletic Goods Manufacturing#3399
-naics#33993#Doll, Toy, and Game Manufacturing#3399
-naics#339931#Doll and Stuffed Toy Manufacturing#33993
-naics#339932#Game, Toy, and Children's Vehicle Manufacturing#33993
-naics#33994#Office Supplies (except Paper) Manufacturing#3399
-naics#339941#Pen and Mechanical Pencil Manufacturing#33994
-naics#339942#Lead Pencil and Art Good Manufacturing#33994
-naics#339943#Marking Device Manufacturing#33994
-naics#339944#Carbon Paper and Inked Ribbon Manufacturing#33994
-naics#33995#Sign Manufacturing#3399
-naics#33999#All Other Miscellaneous Manufacturing#3399
-naics#339991#Gasket, Packing, and Sealing Device Manufacturing#33999
-naics#339992#Musical Instrument Manufacturing#33999
-naics#339993#Fastener, Button, Needle, and Pin Manufacturing#33999
-naics#339994#Broom, Brush, and Mop Manufacturing#33999
-naics#339995#Burial Casket Manufacturing#33999
-naics#339999#All Other Miscellaneous Manufacturing#33999
-naics#42#Wholesale Trade#42
-naics#421#Wholesale Trade, Durable Goods#42
-naics#4211#Motor Vehicle and Motor Vehicle Parts and Supplies Wholesalers#421
-naics#42111#Automobile and Other Motor Vehicle Wholesalers#4211
-naics#42112#Motor Vehicle Supplies and New Parts Wholesalers#4211
-naics#42113#Tire and Tube Wholesalers#4211
-naics#42114#Motor Vehicle Parts (Used) Wholesalers#4211
-naics#4212#Furniture and Home Furnishing Wholesalers#421
-naics#42121#Furniture Wholesalers#4212
-naics#42122#Home Furnishing Wholesalers#4212
-naics#4213#Lumber and Other Construction Materials Wholesalers#421
-naics#42131#Lumber, Plywood, Millwork, and Wood Panel Wholesalers#4213
-naics#42132#Brick, Stone, and Related Construction Material Wholesalers#4213
-naics#42133#Roofing, Siding, and Insulation Material Wholesalers#4213
-naics#42139#Other Construction Material Wholesalers#4213
-naics#4214#Professional and Commercial Equipment and Supplies Wholesalers#421
-naics#42141#Photographic Equipment and Supplies Wholesalers#4214
-naics#42142#Office Equipment Wholesalers#4214
-naics#42143#Computer and Computer Peripheral Equipment and Software Wholesalers#4214
-naics#42144#Other Commercial Equipment Wholesalers#4214
-naics#42145#Medical, Dental, and Hospital Equipment and Supplies Wholesalers#4214
-naics#42146#Ophthalmic Goods Wholesalers#4214
-naics#42149#Other Professional Equipment and Supplies Wholesalers#4214
-naics#4215#Metal and Mineral (except Petroleum) Wholesalers#421
-naics#42151#Metal Service Centers and Offices#4215
-naics#42152#Coal and Other Mineral and Ore Wholesalers#4215
-naics#4216#Electrical Goods Wholesalers#421
-naics#42161#Electrical Apparatus and Equipment, Wiring Supplies, and Construction Material Wholesalers#4216
-naics#42162#Electrical Appliance, Television, and Radio Set Wholesalers#4216
-naics#42169#Other Electronic Parts and Equipment Wholesalers#4216
-naics#4217#Hardware, and Plumbing and Heating Equipment and Supplies Wholesalers#421
-naics#42171#Hardware Wholesalers#4217
-naics#42172#Plumbing and Heating Equipment and Supplies (Hydronics) Wholesalers#4217
-naics#42173#Warm Air Heating and Air-Conditioning Equipment and Supplies Wholesalers#4217
-naics#42174#Refrigeration Equipment and Supplies Wholesalers#4217
-naics#4218#Machinery, Equipment, and Supplies Wholesalers#421
-naics#42181#Construction and Mining (except Oil Well) Machinery and Equipment Wholesalers#4218
-naics#42182#Farm and Garden Machinery and Equipment Wholesalers#4218
-naics#42183#Industrial Machinery and Equipment Wholesalers#4218
-naics#42184#Industrial Supplies Wholesalers#4218
-naics#42185#Service Establishment Equipment and Supplies Wholesalers#4218
-naics#42186#Transportation Equipment and Supplies (except Motor Vehicle) Wholesalers#4218
-naics#4219#Miscellaneous Durable Goods Wholesalers#421
-naics#42191#Sporting and Recreational Goods and Supplies Wholesalers#4219
-naics#42192#Toy and Hobby Goods and Supplies Wholesalers#4219
-naics#42193#Recyclable Material Wholesalers#4219
-naics#42194#Jewelry, Watch, Precious Stone, and Precious Metal Wholesalers#4219
-naics#42199#Other Miscellaneous Durable Goods Wholesalers#4219
-naics#422#Wholesale Trade, Nondurable Goods#42
-naics#4221#Paper and Paper Product Wholesalers#422
-naics#42211#Printing and Writing Paper Wholesalers#4221
-naics#42212#Stationery and Office Supplies Wholesalers#4221
-naics#42213#Industrial and Personal Service Paper Wholesalers#4221
-naics#4222#Drugs and Druggists' Sundries Wholesalers#422
-naics#42221#Drugs and Druggists' Sundries Wholesalers#4222
-naics#4223#Apparel, Piece Goods, and Notions Wholesalers#422
-naics#42231#Piece Goods, Notions, and Other Dry Goods Wholesalers#4223
-naics#42232#Men's and Boys' Clothing and Furnishings Wholesalers#4223
-naics#42233#Women's, Children's, and Infants' Clothing and Accessories Wholesalers#4223
-naics#42234#Footwear Wholesalers#4223
-naics#4224#Grocery and Related Product Wholesalers#422
-naics#42241#General Line Grocery Wholesalers#4224
-naics#42242#Packaged Frozen Food Wholesalers#4224
-naics#42243#Dairy Product (except Dried or Canned) Wholesalers#4224
-naics#42244#Poultry and Poultry Product Wholesalers#4224
-naics#42245#Confectionery Wholesalers#4224
-naics#42246#Fish and Seafood Wholesalers#4224
-naics#42247#Meat and Meat Product Wholesalers#4224
-naics#42248#Fresh Fruit and Vegetable Wholesalers#4224
-naics#42249#Other Grocery and Related Products Wholesalers#4224
-naics#4225#Farm Product Raw Material Wholesalers#422
-naics#42251#Grain and Field Bean Wholesalers#4225
-naics#42252#Livestock Wholesalers#4225
-naics#42259#Other Farm Product Raw Material Wholesalers#4225
-naics#4226#Chemical and Allied Products Wholesalers#422
-naics#42261#Plastics Materials and Basic Forms and Shapes Wholesalers#4226
-naics#42269#Other Chemical and Allied Products Wholesalers#4226
-naics#4227#Petroleum and Petroleum Products Wholesalers#422
-naics#42271#Petroleum Bulk Stations and Terminals#4227
-naics#42272#Petroleum and Petroleum Products Wholesalers (except Bulk Stations and Terminals)#4227
-naics#4228#Beer, Wine, and Distilled Alcoholic Beverage Wholesalers#422
-naics#42281#Beer and Ale Wholesalers#4228
-naics#42282#Wine and Distilled Alcoholic Beverage Wholesalers#4228
-naics#4229#Miscellaneous Nondurable Goods Wholesalers#422
-naics#42291#Farm Supplies Wholesalers#4229
-naics#42292#Book, Periodical, and Newspaper Wholesalers#4229
-naics#42293#Flower, Nursery Stock, and Florists' Supplies Wholesalers#4229
-naics#42294#Tobacco and Tobacco Product Wholesalers#4229
-naics#42295#Paint, Varnish, and Supplies Wholesalers#4229
-naics#42299#Other Miscellaneous Nondurable Goods Wholesalers#4229
-naics#44#Retail Trade#44
-naics#441#Motor Vehicle and Parts Dealers#44
-naics#4411#Automobile Dealers#441
-naics#44111#New Car Dealers#4411
-naics#44112#Used Car Dealers#4411
-naics#4412#Other Motor Vehicle Dealers#441
-naics#44121#Recreational Vehicle Dealers#4412
-naics#44122#Motorcycle, Boat, and Other Motor Vehicle Dealers#4412
-naics#441221#Motorcycle Dealers#44122
-naics#441222#Boat Dealers#44122
-naics#441229#All Other Motor Vehicle Dealers#44122
-naics#4413#Automotive Parts, Accessories, and Tire Stores#441
-naics#44131#Automotive Parts and Accessories Stores#4413
-naics#44132#Tire Dealers#4413
-naics#442#Furniture and Home Furnishings Stores#44
-naics#4421#Furniture Stores#442
-naics#44211#Furniture Stores#4421
-naics#4422#Home Furnishings Stores#442
-naics#44221#Floor Covering Stores#4422
-naics#44229#Other Home Furnishings Stores#4422
-naics#442291#Window Treatment Stores#44229
-naics#442299#All Other Home Furnishings Stores#44229
-naics#443#Electronics and Appliance Stores#44
-naics#4431#Electronics and Appliance Stores#443
-naics#44311#Appliance, Television, and Other Electronics Stores#4431
-naics#443111#Household Appliance Stores#44311
-naics#443112#Radio, Television, and Other Electronics Stores#44311
-naics#44312#Computer and Software Stores#4431
-naics#44313#Camera and Photographic Supplies Stores#4431
-naics#444#Building Material and Garden Equipment and Supplies Dealers#44
-naics#4441#Building Material and Supplies Dealers#444
-naics#44411#Home Centers#4441
-naics#44412#Paint and Wallpaper Stores#4441
-naics#44413#Hardware Stores#4441
-naics#44419#Other Building Material Dealers#4441
-naics#4442#Lawn and Garden Equipment and Supplies Stores#444
-naics#44421#Outdoor Power Equipment Stores#4442
-naics#44422#Nursery and Garden Centers#4442
-naics#445#Food and Beverage Stores#44
-naics#4451#Grocery Stores#445
-naics#44511#Supermarkets and Other Grocery (except Convenience) Stores#4451
-naics#44512#Convenience Stores#4451
-naics#4452#Specialty Food Stores#445
-naics#44521#Meat Markets#4452
-naics#44522#Fish and Seafood Markets#4452
-naics#44523#Fruit and Vegetable Markets#4452
-naics#44529#Other Specialty Food Stores#4452
-naics#445291#Baked Goods Stores#44529
-naics#445292#Confectionery and Nut Stores#44529
-naics#445299#All Other Specialty Food Stores#44529
-naics#4453#Beer, Wine, and Liquor Stores#445
-naics#44531#Beer, Wine, and Liquor Stores#4453
-naics#446#Health and Personal Care Stores#44
-naics#4461#Health and Personal Care Stores#446
-naics#44611#Pharmacies and Drug Stores#4461
-naics#44612#Cosmetics, Beauty Supplies, and Perfume Stores#4461
-naics#44613#Optical Goods Stores#4461
-naics#44619#Other Health and Personal Care Stores#4461
-naics#446191#Food (Health) Supplement Stores#44619
-naics#446199#All Other Health and Personal Care Stores#44619
-naics#447#Gasoline Stations#44
-naics#4471#Gasoline Stations#447
-naics#44711#Gasoline Stations with Convenience Stores#4471
-naics#44719#Other Gasoline Stations#4471
-naics#448#Clothing and Clothing Accessories Stores#44
-naics#4481#Clothing Stores#448
-naics#44811#Men's Clothing Stores#4481
-naics#44812#Women's Clothing Stores#4481
-naics#44813#Children's and Infants' Clothing Stores#4481
-naics#44814#Family Clothing Stores#4481
-naics#44815#Clothing Accessories Stores#4481
-naics#44819#Other Clothing Stores#4481
-naics#4482#Shoe Stores#448
-naics#44821#Shoe Stores#4482
-naics#4483#Jewelry, Luggage, and Leather Goods Stores#448
-naics#44831#Jewelry Stores#4483
-naics#44832#Luggage and Leather Goods Stores#4483
-naics#45#Retail Trade#45
-naics#451#Sporting Goods, Hobby, Book, and Music Stores#45
-naics#4511#Sporting Goods, Hobby, and Musical Instrument Stores#451
-naics#45111#Sporting Goods Stores#4511
-naics#45112#Hobby, Toy, and Game Stores#4511
-naics#45113#Sewing, Needlework, and Piece Goods Stores#4511
-naics#45114#Musical Instrument and Supplies Stores#4511
-naics#4512#Book, Periodical, and Music Stores#451
-naics#45121#Book Stores and News Dealers#4512
-naics#451211#Book Stores#45121
-naics#451212#News Dealers and Newsstands#45121
-naics#45122#Prerecorded Tape, Compact Disc, and Record Stores#4512
-naics#452#General Merchandise Stores#45
-naics#4521#Department Stores#452
-naics#45211#Department Stores#4521
-naics#4529#Other General Merchandise Stores#452
-naics#45291#Warehouse Clubs and Superstores#4529
-naics#45299#All Other General Merchandise Stores#4529
-naics#453#Miscellaneous Store Retailers#45
-naics#4531#Florists#453
-naics#45311#Florists#4531
-naics#4532#Office Supplies, Stationery, and Gift Stores#453
-naics#45321#Office Supplies and Stationery Stores#4532
-naics#45322#Gift, Novelty, and Souvenir Stores#4532
-naics#4533#Used Merchandise Stores#453
-naics#45331#Used Merchandise Stores#4533
-naics#4539#Other Miscellaneous Store Retailers#453
-naics#45391#Pet and Pet Supplies Stores#4539
-naics#45392#Art Dealers#4539
-naics#45393#Manufactured (Mobile) Home Dealers#4539
-naics#45399#All Other Miscellaneous Store Retailers#4539
-naics#453991#Tobacco Stores#45399
-naics#453998#All Other Miscellaneous Store Retailers (except Tobacco Stores)#45399
-naics#454#Nonstore Retailers#45
-naics#4541#Electronic Shopping and Mail-Order Houses#454
-naics#45411#Electronic Shopping and Mail-Order Houses#4541
-naics#4542#Vending Machine Operators#454
-naics#45421#Vending Machine Operators#4542
-naics#4543#Direct Selling Establishments#454
-naics#45431#Fuel Dealers#4543
-naics#454311#Heating Oil Dealers#45431
-naics#454312#Liquefied Petroleum Gas (Bottled Gas) Dealers#45431
-naics#454319#Other Fuel Dealers#45431
-naics#45439#Other Direct Selling Establishments#4543
-naics#48#Transportation and Warehousing#48
-naics#481#Air Transportation#48
-naics#4811#Scheduled Air Transportation#481
-naics#48111#Scheduled Air Transportation#4811
-naics#481111#Scheduled Passenger Air Transportation#48111
-naics#481112#Scheduled Freight Air Transportation#48111
-naics#4812#Nonscheduled Air Transportation#481
-naics#48121#Nonscheduled Air Transportation#4812
-naics#481211#Nonscheduled Chartered Passenger Air Transportation#48121
-naics#481212#Nonscheduled Chartered Freight Air Transportation#48121
-naics#481219#Other Nonscheduled Air Transportation#48121
-naics#482#Rail Transportation#48
-naics#4821#Rail Transportation#482
-naics#48211#Rail Transportation#4821
-naics#482111#Line-Haul Railroads#48211
-naics#482112#Short Line Railroads#48211
-naics#483#Water Transportation#48
-naics#4831#Deep Sea, Coastal, and Great Lakes Water Transportation#483
-naics#48311#Deep Sea, Coastal, and Great Lakes Water Transportation#4831
-naics#483111#Deep Sea Freight Transportation#48311
-naics#483112#Deep Sea Passenger Transportation#48311
-naics#483113#Coastal and Great Lakes Freight Transportation#48311
-naics#483114#Coastal and Great Lakes Passenger Transportation#48311
-naics#4832#Inland Water Transportation#483
-naics#48321#Inland Water Transportation#4832
-naics#483211#Inland Water Freight Transportation#48321
-naics#483212#Inland Water Passenger Transportation#48321
-naics#484#Truck Transportation#48
-naics#4841#General Freight Trucking#484
-naics#48411#General Freight Trucking, Local#4841
-naics#48412#General Freight Trucking, Long-Distance#4841
-naics#484121#General Freight Trucking, Long-Distance, Truckload#48412
-naics#484122#General Freight Trucking, Long-Distance, Less Than Truckload#48412
-naics#4842#Specialized Freight Trucking#484
-naics#48421#Used Household and Office Goods Moving#4842
-naics#48422#Specialized Freight (except Used Goods) Trucking, Local#4842
-naics#48423#Specialized Freight (except Used Goods) Trucking, Long-Distance#4842
-naics#485#Transit and Ground Passenger Transportation#48
-naics#4851#Urban Transit Systems#485
-naics#48511#Urban Transit Systems#4851
-naics#485111#Mixed Mode Transit Systems#48511
-naics#485112#Commuter Rail Systems#48511
-naics#485113#Bus and Other Motor Vehicle Transit Systems#48511
-naics#485119#Other Urban Transit Systems#48511
-naics#4852#Interurban and Rural Bus Transportation#485
-naics#48521#Interurban and Rural Bus Transportation#4852
-naics#4853#Taxi and Limousine Service#485
-naics#48531#Taxi Service#4853
-naics#48532#Limousine Service#4853
-naics#4854#School and Employee Bus Transportation#485
-naics#48541#School and Employee Bus Transportation#4854
-naics#4855#Charter Bus Industry#485
-naics#48551#Charter Bus Industry#4855
-naics#4859#Other Transit and Ground Passenger Transportation#485
-naics#48599#Other Transit and Ground Passenger Transportation#4859
-naics#485991#Special Needs Transportation#48599
-naics#485999#All Other Transit and Ground Passenger Transportation#48599
-naics#486#Pipeline Transportation#48
-naics#4861#Pipeline Transportation of Crude Oil#486
-naics#48611#Pipeline Transportation of Crude Oil#4861
-naics#4862#Pipeline Transportation of Natural Gas#486
-naics#48621#Pipeline Transportation of Natural Gas#4862
-naics#4869#Other Pipeline Transportation#486
-naics#48691#Pipeline Transportation of Refined Petroleum Products#4869
-naics#48699#All Other Pipeline Transportation#4869
-naics#487#Scenic and Sightseeing Transportation#48
-naics#4871#Scenic and Sightseeing Transportation, Land#487
-naics#48711#Scenic and Sightseeing Transportation, Land#4871
-naics#4872#Scenic and Sightseeing Transportation, Water#487
-naics#48721#Scenic and Sightseeing Transportation, Water#4872
-naics#4879#Scenic and Sightseeing Transportation, Other#487
-naics#48799#Scenic and Sightseeing Transportation, Other#4879
-naics#488#Support Activities for Transportation#48
-naics#4881#Support Activities for Air Transportation#488
-naics#48811#Airport Operations#4881
-naics#488111#Air Traffic Control#48811
-naics#488119#Other Airport Operations#48811
-naics#48819#Other Support Activities for Air Transportation#4881
-naics#4882#Support Activities for Rail Transportation#488
-naics#48821#Support Activities for Rail Transportation#4882
-naics#4883#Support Activities for Water Transportation#488
-naics#48831#Port and Harbor Operations#4883
-naics#48832#Marine Cargo Handling#4883
-naics#48833#Navigational Services to Shipping#4883
-naics#48839#Other Support Activities for Water Transportation#4883
-naics#4884#Support Activities for Road Transportation#488
-naics#48841#Motor Vehicle Towing#4884
-naics#48849#Other Support Activities for Road Transportation#4884
-naics#4885#Freight Transportation Arrangement#488
-naics#48851#Freight Transportation Arrangement#4885
-naics#4889#Other Support Activities for Transportation#488
-naics#48899#Other Support Activities for Transportation#4889
-naics#488991#Packing and Crating#48899
-naics#488999#All Other Support Activities for Transportation#48899
-naics#49#Transportation and Warehousing#49
-naics#491#Postal Service#49
-naics#4911#Postal Service#491
-naics#49111#Postal Service#4911
-naics#492#Couriers and Messengers#49
-naics#4921#Couriers#492
-naics#49211#Couriers#4921
-naics#4922#Local Messengers and Local Delivery#492
-naics#49221#Local Messengers and Local Delivery#4922
-naics#493#Warehousing and Storage#49
-naics#4931#Warehousing and Storage#493
-naics#49311#General Warehousing and Storage#4931
-naics#49312#Refrigerated Warehousing and Storage#4931
-naics#49313#Farm Product Warehousing and Storage#4931
-naics#49319#Other Warehousing and Storage#4931
-naics#51#Information#51
-naics#511#Publishing Industries#51
-naics#5111#Newspaper, Periodical, Book, and Database Publishers#511
-naics#51111#Newspaper Publishers#5111
-naics#51112#Periodical Publishers#5111
-naics#51113#Book Publishers#5111
-naics#51114#Database and Directory Publishers#5111
-naics#51119#Other Publishers#5111
-naics#511191#Greeting Card Publishers#51119
-naics#511199#All Other Publishers#51119
-naics#5112#Software Publishers#511
-naics#51121#Software Publishers#5112
-naics#512#Motion Picture and Sound Recording Industries#51
-naics#5121#Motion Picture and Video Industries#512
-naics#51211#Motion Picture and Video Production#5121
-naics#51212#Motion Picture and Video Distribution#5121
-naics#51213#Motion Picture and Video Exhibition#5121
-naics#512131#Motion Picture Theaters (except Drive-Ins)#51213
-naics#512132#Drive-In Motion Picture Theaters#51213
-naics#51219#Postproduction Services and Other Motion Picture and Video Industries#5121
-naics#512191#Teleproduction and Other Postproduction Services#51219
-naics#512199#Other Motion Picture and Video Industries#51219
-naics#5122#Sound Recording Industries#512
-naics#51221#Record Production#5122
-naics#51222#Integrated Record Production/Distribution#5122
-naics#51223#Music Publishers#5122
-naics#51224#Sound Recording Studios#5122
-naics#51229#Other Sound Recording Industries#5122
-naics#513#Broadcasting and Telecommunications#51
-naics#5131#Radio and Television Broadcasting#513
-naics#51311#Radio Broadcasting#5131
-naics#513111#Radio Networks#51311
-naics#513112#Radio Stations#51311
-naics#51312#Television Broadcasting#5131
-naics#5132#Cable Networks and Program Distribution#513
-naics#51321#Cable Networks#5132
-naics#51322#Cable and Other Program Distribution#5132
-naics#5133#Telecommunications#513
-naics#51331#Wired Telecommunications Carriers#5133
-naics#51332#Wireless Telecommunications Carriers (except Satellite)#5133
-naics#513321#Paging#51332
-naics#513322#Cellular and Other Wireless Telecommunications#51332
-naics#51333#Telecommunications Resellers#5133
-naics#51334#Satellite Telecommunications#5133
-naics#51339#Other Telecommunications#5133
-naics#514#Information Services and Data Processing Services#51
-naics#5141#Information Services#514
-naics#51411#News Syndicates#5141
-naics#51412#Libraries and Archives#5141
-naics#51419#Other Information Services#5141
-naics#514191#On-Line Information Services#51419
-naics#514199#All Other Information Services#51419
-naics#5142#Data Processing Services#514
-naics#51421#Data Processing Services#5142
-naics#52#Finance and Insurance#52
-naics#521#Monetary Authorities - Central Bank#52
-naics#5211#Monetary Authorities - Central Bank#521
-naics#52111#Monetary Authorities - Central Bank#5211
-naics#522#Credit Intermediation and Related Activities#52
-naics#5221#Depository Credit Intermediation#522
-naics#52211#Commercial Banking#5221
-naics#52212#Savings Institutions#5221
-naics#52213#Credit Unions#5221
-naics#52219#Other Depository Credit Intermediation#5221
-naics#5222#Nondepository Credit Intermediation#522
-naics#52221#Credit Card Issuing#5222
-naics#52222#Sales Financing#5222
-naics#52229#Other Nondepository Credit Intermediation#5222
-naics#522291#Consumer Lending#52229
-naics#522292#Real Estate Credit#52229
-naics#522293#International Trade Financing#52229
-naics#522294#Secondary Market Financing#52229
-naics#522298#All Other Nondepository Credit Intermediation#52229
-naics#5223#Activities Related to Credit Intermediation#522
-naics#52231#Mortgage and Nonmortgage Loan Brokers#5223
-naics#52232#Financial Transactions Processing, Reserve, and Clearinghouse Activities#5223
-naics#52239#Other Activities Related to Credit Intermediation#5223
-naics#523#Securities, Commodity Contracts, and Other Financial Investments and Related Activities#52
-naics#5231#Securities and Commodity Contracts Intermediation and Brokerage#523
-naics#52311#Investment Banking and Securities Dealing#5231
-naics#52312#Securities Brokerage#5231
-naics#52313#Commodity Contracts Dealing#5231
-naics#52314#Commodity Contracts Brokerage#5231
-naics#5232#Securities and Commodity Exchanges#523
-naics#52321#Securities and Commodity Exchanges#5232
-naics#5239#Other Financial Investment Activities#523
-naics#52391#Miscellaneous Intermediation#5239
-naics#52392#Portfolio Management#5239
-naics#52393#Investment Advice#5239
-naics#52399#All Other Financial Investment Activities#5239
-naics#523991#Trust, Fiduciary, and Custody Activities#52399
-naics#523999#Miscellaneous Financial Investment Activities#52399
-naics#524#Insurance Carriers and Related Activities#52
-naics#5241#Insurance Carriers#524
-naics#52411#Direct Life, Health, and Medical Insurance Carriers#5241
-naics#524113#Direct Life Insurance Carriers#52411
-naics#524114#Direct Health and Medical Insurance Carriers#52411
-naics#52412#Direct Insurance (except Life, Health, and Medical) Carriers#5241
-naics#524126#Direct Property and Casualty Insurance Carriers#52412
-naics#524127#Direct Title Insurance Carriers#52412
-naics#524128#Other Direct Insurance (except Life, Health, and Medical) Carriers#52412
-naics#52413#Reinsurance Carriers#5241
-naics#5242#Agencies, Brokerages, and Other Insurance Related Activities#524
-naics#52421#Insurance Agencies and Brokerages#5242
-naics#52429#Other Insurance Related Activities#5242
-naics#524291#Claims Adjusting#52429
-naics#524292#Third Party Administration of Insurance and Pension Funds#52429
-naics#524298#All Other Insurance Related Activities#52429
-naics#525#Funds, Trusts, and Other Financial Vehicles#52
-naics#5251#Insurance and Employee Benefit Funds#525
-naics#52511#Pension Funds#5251
-naics#52512#Health and Welfare Funds#5251
-naics#52519#Other Insurance Funds#5251
-naics#5259#Other Investment Pools and Funds#525
-naics#52591#Open-End Investment Funds#5259
-naics#52592#Trusts, Estates, and Agency Accounts#5259
-naics#52593#Real Estate Investment Trusts#5259
-naics#52599#Other Financial Vehicles#5259
-naics#53#Real Estate and Rental and Leasing#53
-naics#531#Real Estate#53
-naics#5311#Lessors of Real Estate#531
-naics#53111#Lessors of Residential Buildings and Dwellings#5311
-naics#53112#Lessors of Nonresidential Buildings (except Miniwarehouses)#5311
-naics#53113#Lessors of Miniwarehouses and Self-Storage Units#5311
-naics#53119#Lessors of Other Real Estate Property#5311
-naics#5312#Offices of Real Estate Agents and Brokers#531
-naics#53121#Offices of Real Estate Agents and Brokers#5312
-naics#5313#Activities Related to Real Estate#531
-naics#53131#Real Estate Property Managers#5313
-naics#531311#Residential Property Managers#53131
-naics#531312#Nonresidential Property Managers#53131
-naics#53132#Offices of Real Estate Appraisers#5313
-naics#53139#Other Activities Related to Real Estate#5313
-naics#532#Rental and Leasing Services#53
-naics#5321#Automotive Equipment Rental and Leasing#532
-naics#53211#Passenger Car Rental and Leasing#5321
-naics#532111#Passenger Car Rental#53211
-naics#532112#Passenger Car Leasing#53211
-naics#53212#Truck, Utility Trailer, and RV (Recreational Vehicle) Rental and Leasing#5321
-naics#5322#Consumer Goods Rental#532
-naics#53221#Consumer Electronics and Appliances Rental#5322
-naics#53222#Formal Wear and Costume Rental#5322
-naics#53223#Video Tape and Disc Rental#5322
-naics#53229#Other Consumer Goods Rental#5322
-naics#532291#Home Health Equipment Rental#53229
-naics#532292#Recreational Goods Rental#53229
-naics#532299#All Other Consumer Goods Rental#53229
-naics#5323#General Rental Centers#532
-naics#53231#General Rental Centers#5323
-naics#5324#Commercial and Industrial Machinery and Equipment Rental and Leasing#532
-naics#53241#Construction, Transportation, Mining, and Forestry Machinery and Equipment Rental and Leasing#5324
-naics#532411#Commercial Air, Rail, and Water Transportation Equipment Rental and Leasing#53241
-naics#532412#Construction, Mining, and Forestry Machinery and Equipment Rental and Leasing#53241
-naics#53242#Office Machinery and Equipment Rental and Leasing#5324
-naics#53249#Other Commercial and Industrial Machinery and Equipment Rental and Leasing#5324
-naics#533#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#53
-naics#5331#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#533
-naics#53311#Lessors of Nonfinancial Intangible Assets (except Copyrighted Works)#5331
-naics#54#Professional, Scientific, and Technical Services#54
-naics#541#Professional, Scientific, and Technical Services#54
-naics#5411#Legal Services#541
-naics#54111#Offices of Lawyers#5411
-naics#54112#Offices of Notaries#5411
-naics#54119#Other Legal Services#5411
-naics#541191#Title Abstract and Settlement Offices#54119
-naics#541199#All Other Legal Services#54119
-naics#5412#Accounting, Tax Preparation, Bookkeeping, and Payroll Services#541
-naics#54121#Accounting, Tax Preparation, Bookkeeping, and Payroll Services#5412
-naics#541211#Offices of Certified Public Accountants#54121
-naics#541213#Tax Preparation Services#54121
-naics#541214#Payroll Services#54121
-naics#541219#Other Accounting Services#54121
-naics#5413#Architectural, Engineering, and Related Services#541
-naics#54131#Architectural Services#5413
-naics#54132#Landscape Architectural Services#5413
-naics#54133#Engineering Services#5413
-naics#54134#Drafting Services#5413
-naics#54135#Building Inspection Services#5413
-naics#54136#Geophysical Surveying and Mapping Services#5413
-naics#54137#Surveying and Mapping (except Geophysical) Services#5413
-naics#54138#Testing Laboratories#5413
-naics#5414#Specialized Design Services#541
-naics#54141#Interior Design Services#5414
-naics#54142#Industrial Design Services#5414
-naics#54143#Graphic Design Services#5414
-naics#54149#Other Specialized Design Services#5414
-naics#5415#Computer Systems Design and Related Services#541
-naics#54151#Computer Systems Design and Related Services#5415
-naics#541511#Custom Computer Programming Services#54151
-naics#541512#Computer Systems Design Services#54151
-naics#541513#Computer Facilities Management Services#54151
-naics#541519#Other Computer Related Services#54151
-naics#5416#Management, Scientific, and Technical Consulting Services#541
-naics#54161#Management Consulting Services#5416
-naics#541611#Administrative Management and General Management Consulting Services#54161
-naics#541612#Human Resources and Executive Search Consulting Services#54161
-naics#541613#Marketing Consulting Services#54161
-naics#541614#Process, Physical Distribution, and Logistics Consulting Services#54161
-naics#541618#Other Management Consulting Services#54161
-naics#54162#Environmental Consulting Services#5416
-naics#54169#Other Scientific and Technical Consulting Services#5416
-naics#5417#Scientific Research and Development Services#541
-naics#54171#Research and Development in the Physical, Engineering, and Life Sciences#5417
-naics#54172#Research and Development in the Social Sciences and Humanities#5417
-naics#5418#Advertising and Related Services#541
-naics#54181#Advertising Agencies#5418
-naics#54182#Public Relations Agencies#5418
-naics#54183#Media Buying Agencies#5418
-naics#54184#Media Representatives#5418
-naics#54185#Display Advertising#5418
-naics#54186#Direct Mail Advertising#5418
-naics#54187#Advertising Material Distribution Services#5418
-naics#54189#Other Services Related to Advertising#5418
-naics#5419#Other Professional, Scientific, and Technical Services#541
-naics#54191#Marketing Research and Public Opinion Polling#5419
-naics#54192#Photographic Services#5419
-naics#541921#Photography Studios, Portrait#54192
-naics#541922#Commercial Photography#54192
-naics#54193#Translation and Interpretation Services#5419
-naics#54194#Veterinary Services#5419
-naics#54199#All Other Professional, Scientific, and Technical Services#5419
-naics#55#Management of Companies and Enterprises#55
-naics#551#Management of Companies and Enterprises#55
-naics#5511#Management of Companies and Enterprises#551
-naics#55111#Management of Companies and Enterprises#5511
-naics#551111#Offices of Bank Holding Companies#55111
-naics#551112#Offices of Other Holding Companies#55111
-naics#551114#Corporate, Subsidiary, and Regional Managing Offices#55111
-naics#56#Administrative and Support and Waste Management and Remediation Services#56
-naics#561#Administrative and Support Services#56
-naics#5611#Office Administrative Services#561
-naics#56111#Office Administrative Services#5611
-naics#5612#Facilities Support Services#561
-naics#56121#Facilities Support Services#5612
-naics#5613#Employment Services#561
-naics#56131#Employment Placement Agencies#5613
-naics#56132#Temporary Help Services#5613
-naics#56133#Employee Leasing Services#5613
-naics#5614#Business Support Services#561
-naics#56141#Document Preparation Services#5614
-naics#56142#Telephone Call Centers#5614
-naics#561421#Telephone Answering Services#56142
-naics#561422#Telemarketing Bureaus#56142
-naics#56143#Business Service Centers#5614
-naics#561431#Private Mail Centers#56143
-naics#561439#Other Business Service Centers (including Copy Shops)#56143
-naics#56144#Collection Agencies#5614
-naics#56145#Credit Bureaus#5614
-naics#56149#Other Business Support Services#5614
-naics#561491#Repossession Services#56149
-naics#561492#Court Reporting and Stenotype Services#56149
-naics#561499#All Other Business Support Services#56149
-naics#5615#Travel Arrangement and Reservation Services#561
-naics#56151#Travel Agencies#5615
-naics#56152#Tour Operators#5615
-naics#56159#Other Travel Arrangement and Reservation Services#5615
-naics#561591#Convention and Visitors Bureaus#56159
-naics#561599#All Other Travel Arrangement and Reservation Services#56159
-naics#5616#Investigation and Security Services#561
-naics#56161#Investigation, Guard, and Armored Car Services#5616
-naics#561611#Investigation Services#56161
-naics#561612#Security Guards and Patrol Services#56161
-naics#561613#Armored Car Services#56161
-naics#56162#Security Systems Services#5616
-naics#561621#Security Systems Services (except Locksmiths)#56162
-naics#561622#Locksmiths#56162
-naics#5617#Services to Buildings and Dwellings#561
-naics#56171#Exterminating and Pest Control Services#5617
-naics#56172#Janitorial Services#5617
-naics#56173#Landscaping Services#5617
-naics#56174#Carpet and Upholstery Cleaning Services#5617
-naics#56179#Other Services to Buildings and Dwellings#5617
-naics#5619#Other Support Services#561
-naics#56191#Packaging and Labeling Services#5619
-naics#56192#Convention and Trade Show Organizers#5619
-naics#56199#All Other Support Services#5619
-naics#562#Waste Management and Remediation Services#56
-naics#5621#Waste Collection#562
-naics#56211#Waste Collection#5621
-naics#562111#Solid Waste Collection#56211
-naics#562112#Hazardous Waste Collection#56211
-naics#562119#Other Waste Collection#56211
-naics#5622#Waste Treatment and Disposal#562
-naics#56221#Waste Treatment and Disposal#5622
-naics#562211#Hazardous Waste Treatment and Disposal#56221
-naics#562212#Solid Waste Landfill#56221
-naics#562213#Solid Waste Combustors and Incinerators#56221
-naics#562219#Other Nonhazardous Waste Treatment and Disposal#56221
-naics#5629#Remediation and Other Waste Management Services#562
-naics#56291#Remediation Services#5629
-naics#56292#Materials Recovery Facilities#5629
-naics#56299#All Other Waste Management Services#5629
-naics#562991#Septic Tank and Related Services#56299
-naics#562998#All Other Miscellaneous Waste Management Services#56299
-naics#61#Educational Services#61
-naics#611#Educational Services#61
-naics#6111#Elementary and Secondary Schools#611
-naics#61111#Elementary and Secondary Schools#6111
-naics#6112#Junior Colleges#611
-naics#61121#Junior Colleges#6112
-naics#6113#Colleges, Universities, and Professional Schools#611
-naics#61131#Colleges, Universities, and Professional Schools#6113
-naics#6114#Business Schools and Computer and Management Training#611
-naics#61141#Business and Secretarial Schools#6114
-naics#61142#Computer Training#6114
-naics#61143#Professional and Management Development Training#6114
-naics#6115#Technical and Trade Schools#611
-naics#61151#Technical and Trade Schools#6115
-naics#611511#Cosmetology and Barber Schools#61151
-naics#611512#Flight Training#61151
-naics#611513#Apprenticeship Training#61151
-naics#611519#Other Technical and Trade Schools#61151
-naics#6116#Other Schools and Instruction#611
-naics#61161#Fine Arts Schools#6116
-naics#61162#Sports and Recreation Instruction#6116
-naics#61163#Language Schools#6116
-naics#61169#All Other Schools and Instruction#6116
-naics#611691#Exam Preparation and Tutoring#61169
-naics#611692#Automobile Driving Schools#61169
-naics#611699#All Other Miscellaneous Schools and Instruction#61169
-naics#6117#Educational Support Services#611
-naics#61171#Educational Support Services#6117
-naics#62#Health Care and Social Assistance#62
-naics#621#Ambulatory Health Care Services#62
-naics#6211#Offices of Physicians#621
-naics#62111#Offices of Physicians#6211
-naics#621111#Offices of Physicians (except Mental Health Specialists)#62111
-naics#621112#Offices of Physicians, Mental Health Specialists#62111
-naics#6212#Offices of Dentists#621
-naics#62121#Offices of Dentists#6212
-naics#6213#Offices of Other Health Practitioners#621
-naics#62131#Offices of Chiropractors#6213
-naics#62132#Offices of Optometrists#6213
-naics#62133#Offices of Mental Health Practitioners (except Physicians)#6213
-naics#62134#Offices of Physical, Occupational and Speech Therapists, and Audiologists#6213
-naics#62139#Offices of All Other Health Practitioners#6213
-naics#621391#Offices of Podiatrists#62139
-naics#621399#Offices of All Other Miscellaneous Health Practitioners#62139
-naics#6214#Outpatient Care Centers#621
-naics#62141#Family Planning Centers#6214
-naics#62142#Outpatient Mental Health and Substance Abuse Centers#6214
-naics#62149#Other Outpatient Care Centers#6214
-naics#621491#HMO Medical Centers#62149
-naics#621492#Kidney Dialysis Centers#62149
-naics#621493#Freestanding Ambulatory Surgical and Emergency Centers#62149
-naics#621498#All Other Outpatient Care Centers#62149
-naics#6215#Medical and Diagnostic Laboratories#621
-naics#62151#Medical and Diagnostic Laboratories#6215
-naics#621511#Medical Laboratories#62151
-naics#621512#Diagnostic Imaging Centers#62151
-naics#6216#Home Health Care Services#621
-naics#62161#Home Health Care Services#6216
-naics#6219#Other Ambulatory Health Care Services#621
-naics#62191#Ambulance Services#6219
-naics#62199#All Other Ambulatory Health Care Services#6219
-naics#621991#Blood and Organ Banks#62199
-naics#621999#All Other Miscellaneous Ambulatory Health Care Services#62199
-naics#622#Hospitals#62
-naics#6221#General Medical and Surgical Hospitals#622
-naics#62211#General Medical and Surgical Hospitals#6221
-naics#6222#Psychiatric and Substance Abuse Hospitals#622
-naics#62221#Psychiatric and Substance Abuse Hospitals#6222
-naics#6223#Specialty (except Psychiatric and Substance Abuse) Hospitals#622
-naics#62231#Specialty (except Psychiatric and Substance Abuse) Hospitals#6223
-naics#623#Nursing and Residential Care Facilities#62
-naics#6231#Nursing Care Facilities#623
-naics#62311#Nursing Care Facilities#6231
-naics#6232#Residential Mental Retardation, Mental Health and Substance Abuse Facilities#623
-naics#62321#Residential Mental Retardation Facilities#6232
-naics#62322#Residential Mental Health and Substance Abuse Facilities#6232
-naics#6233#Community Care Facilities for the Elderly#623
-naics#62331#Community Care Facilities for the Elderly#6233
-naics#623311#Continuing Care Retirement Communities#62331
-naics#623312#Homes for the Elderly#62331
-naics#6239#Other Residential Care Facilities#623
-naics#62399#Other Residential Care Facilities#6239
-naics#624#Social Assistance#62
-naics#6241#Individual and Family Services#624
-naics#62411#Child and Youth Services#6241
-naics#62412#Services for the Elderly and Persons with Disabilities#6241
-naics#62419#Other Individual and Family Services#6241
-naics#6242#Community Food and Housing, and Emergency and Other Relief Services#624
-naics#62421#Community Food Services#6242
-naics#62422#Community Housing Services#6242
-naics#624221#Temporary Shelters#62422
-naics#624229#Other Community Housing Services#62422
-naics#62423#Emergency and Other Relief Services#6242
-naics#6243#Vocational Rehabilitation Services#624
-naics#62431#Vocational Rehabilitation Services#6243
-naics#6244#Child Day Care Services#624
-naics#62441#Child Day Care Services#6244
-naics#71#Arts, Entertainment, and Recreation#71
-naics#711#Performing Arts, Spectator Sports, and Related Industries#71
-naics#7111#Performing Arts Companies#711
-naics#71111#Theater Companies and Dinner Theaters#7111
-naics#71112#Dance Companies#7111
-naics#71113#Musical Groups and Artists#7111
-naics#71119#Other Performing Arts Companies#7111
-naics#7112#Spectator Sports#711
-naics#71121#Spectator Sports#7112
-naics#711211#Sports Teams and Clubs#71121
-naics#711212#Racetracks#71121
-naics#711219#Other Spectator Sports#71121
-naics#7113#Promoters of Performing Arts, Sports, and Similar Events#711
-naics#71131#Promoters of Performing Arts, Sports, and Similar Events with Facilities#7113
-naics#71132#Promoters of Performing Arts, Sports, and Similar Events without Facilities#7113
-naics#7114#Agents and Managers for Artists, Athletes, Entertainers, and Other Public Figures#711
-naics#71141#Agents and Managers for Artists, Athletes, Entertainers, and Other Public Figures#7114
-naics#7115#Independent Artists, Writers, and Performers#711
-naics#71151#Independent Artists, Writers, and Performers#7115
-naics#712#Museums, Historical Sites, and Similar Institutions#71
-naics#7121#Museums, Historical Sites, and Similar Institutions#712
-naics#71211#Museums#7121
-naics#71212#Historical Sites#7121
-naics#71213#Zoos and Botanical Gardens#7121
-naics#71219#Nature Parks and Other Similar Institutions#7121
-naics#713#Amusement, Gambling, and Recreation Industries#71
-naics#7131#Amusement Parks and Arcades#713
-naics#71311#Amusement and Theme Parks#7131
-naics#71312#Amusement Arcades#7131
-naics#7132#Gambling Industries#713
-naics#71321#Casinos (except Casino Hotels)#7132
-naics#71329#Other Gambling Industries#7132
-naics#7139#Other Amusement and Recreation Industries#713
-naics#71391#Golf Courses and Country Clubs#7139
-naics#71392#Skiing Facilities#7139
-naics#71393#Marinas#7139
-naics#71394#Fitness and Recreational Sports Centers#7139
-naics#71395#Bowling Centers#7139
-naics#71399#All Other Amusement and Recreation Industries#7139
-naics#72#Accommodation and Food Services#72
-naics#721#Accommodation#72
-naics#7211#Traveler Accommodation#721
-naics#72111#Hotels (except Casino Hotels) and Motels#7211
-naics#72112#Casino Hotels#7211
-naics#72119#Other Traveler Accommodation#7211
-naics#721191#Bed-and-Breakfast Inns#72119
-naics#721199#All Other Traveler Accommodation#72119
-naics#7212#RV (Recreational Vehicle) Parks and Recreational Camps#721
-naics#72121#RV (Recreational Vehicle) Parks and Recreational Camps#7212
-naics#721211#RV (Recreational Vehicle) Parks and Campgrounds#72121
-naics#721214#Recreational and Vacation Camps (except Campgrounds)#72121
-naics#7213#Rooming and Boarding Houses#721
-naics#72131#Rooming and Boarding Houses#7213
-naics#722#Food Services and Drinking Places#72
-naics#7221#Full-Service Restaurants#722
-naics#72211#Full-Service Restaurants#7221
-naics#7222#Limited-Service Eating Places#722
-naics#72221#Limited-Service Eating Places#7222
-naics#722211#Limited-Service Restaurants#72221
-naics#722212#Cafeterias#72221
-naics#722213#Snack and Nonalcoholic Beverage Bars#72221
-naics#7223#Special Food Services#722
-naics#72231#Food Service Contractors#7223
-naics#72232#Caterers#7223
-naics#72233#Mobile Food Services#7223
-naics#7224#Drinking Places (Alcoholic Beverages)#722
-naics#72241#Drinking Places (Alcoholic Beverages)#7224
-naics#81#Other Services (except Public Administration)#81
-naics#811#Repair and Maintenance#81
-naics#8111#Automotive Repair and Maintenance#811
-naics#81111#Automotive Mechanical and Electrical Repair and Maintenance#8111
-naics#811111#General Automotive Repair#81111
-naics#811112#Automotive Exhaust System Repair#81111
-naics#811113#Automotive Transmission Repair#81111
-naics#811118#Other Automotive Mechanical and Electrical Repair and Maintenance#81111
-naics#81112#Automotive Body, Paint, Interior, and Glass Repair#8111
-naics#811121#Automotive Body, Paint, and Interior Repair and Maintenance#81112
-naics#811122#Automotive Glass Replacement Shops#81112
-naics#81119#Other Automotive Repair and Maintenance#8111
-naics#811191#Automotive Oil Change and Lubrication Shops#81119
-naics#811192#Car Washes#81119
-naics#811198#All Other Automotive Repair and Maintenance#81119
-naics#8112#Electronic and Precision Equipment Repair and Maintenance#811
-naics#81121#Electronic and Precision Equipment Repair and Maintenance#8112
-naics#811211#Consumer Electronics Repair and Maintenance#81121
-naics#811212#Computer and Office Machine Repair and Maintenance#81121
-naics#811213#Communication Equipment Repair and Maintenance#81121
-naics#811219#Other Electronic and Precision Equipment Repair and Maintenance#81121
-naics#8113#Commercial and Industrial Machinery and Equipment (except Automotive and Electronic) Repair and Maintenance#811
-naics#81131#Commercial and Industrial Machinery and Equipment (except Automotive and Electronic) Repair and Maintenance#8113
-naics#8114#Personal and Household Goods Repair and Maintenance#811
-naics#81141#Home and Garden Equipment and Appliance Repair and Maintenance#8114
-naics#811411#Home and Garden Equipment Repair and Maintenance#81141
-naics#811412#Appliance Repair and Maintenance#81141
-naics#81142#Reupholstery and Furniture Repair#8114
-naics#81143#Footwear and Leather Goods Repair#8114
-naics#81149#Other Personal and Household Goods Repair and Maintenance#8114
-naics#812#Personal and Laundry Services#81
-naics#8121#Personal Care Services#812
-naics#81211#Hair, Nail, and Skin Care Services#8121
-naics#812111#Barber Shops#81211
-naics#812112#Beauty Salons#81211
-naics#812113#Nail Salons#81211
-naics#81219#Other Personal Care Services#8121
-naics#812191#Diet and Weight Reducing Centers#81219
-naics#812199#Other Personal Care Services#81219
-naics#8122#Death Care Services#812
-naics#81221#Funeral Homes and Funeral Services#8122
-naics#81222#Cemeteries and Crematories#8122
-naics#8123#Drycleaning and Laundry Services#812
-naics#81231#Coin-Operated Laundries and Drycleaners#8123
-naics#81232#Drycleaning and Laundry Services (except Coin-Operated)#8123
-naics#81233#Linen and Uniform Supply#8123
-naics#812331#Linen Supply#81233
-naics#812332#Industrial Launderers#81233
-naics#8129#Other Personal Services#812
-naics#81291#Pet Care (except Veterinary) Services#8129
-naics#81292#Photofinishing#8129
-naics#812921#Photofinishing Laboratories (except One-Hour)#81292
-naics#812922#One-Hour Photofinishing#81292
-naics#81293#Parking Lots and Garages#8129
-naics#81299#All Other Personal Services#8129
-naics#813#Religious, Grantmaking, Civic, Professional, and Similar Organizations#81
-naics#8131#Religious Organizations#813
-naics#81311#Religious Organizations#8131
-naics#8132#Grantmaking and Giving Services#813
-naics#81321#Grantmaking and Giving Services#8132
-naics#813211#Grantmaking Foundations#81321
-naics#813212#Voluntary Health Organizations#81321
-naics#813219#Other Grantmaking and Giving Services#81321
-naics#8133#Social Advocacy Organizations#813
-naics#81331#Social Advocacy Organizations#8133
-naics#813311#Human Rights Organizations#81331
-naics#813312#Environment, Conservation and Wildlife Organizations#81331
-naics#813319#Other Social Advocacy Organizations#81331
-naics#8134#Civic and Social Organizations#813
-naics#81341#Civic and Social Organizations#8134
-naics#8139#Business, Professional, Labor, Political, and Similar Organizations#813
-naics#81391#Business Associations#8139
-naics#81392#Professional Organizations#8139
-naics#81393#Labor Unions and Similar Labor Organizations#8139
-naics#81394#Political Organizations#8139
-naics#81399#Other Similar Organizations (except Business, Professional, Labor, and Political Organizations)#8139
-naics#814#Private Households#81
-naics#8141#Private Households#814
-naics#81411#Private Households#8141
-naics#92#Public Administration#92
-naics#921#Executive, Legislative, and Other General Government Support#92
-naics#9211#Executive, Legislative, and Other General Government Support#921
-naics#92111#Executive Offices#9211
-naics#92112#Legislative Bodies#9211
-naics#92113#Public Finance Activities#9211
-naics#92114#Executive and Legislative Offices, Combined#9211
-naics#92115#American Indian and Alaska Native Tribal Governments#9211
-naics#92119#Other General Government Support#9211
-naics#922#Justice, Public Order, and Safety Activities#92
-naics#9221#Justice, Public Order, and Safety Activities#922
-naics#92211#Courts#9221
-naics#92212#Police Protection#9221
-naics#92213#Legal Counsel and Prosecution#9221
-naics#92214#Correctional Institutions#9221
-naics#92215#Parole Offices and Probation Offices#9221
-naics#92216#Fire Protection#9221
-naics#92219#Other Justice, Public Order, and Safety Activities#9221
-naics#923#Administration of Human Resource Programs#92
-naics#9231#Administration of Human Resource Programs#923
-naics#92311#Administration of Education Programs#9231
-naics#92312#Administration of Public Health Programs#9231
-naics#92313#Administration of Human Resource Programs (except Education, Public Health, and Veterans' Affairs Programs)#9231
-naics#92314#Administration of Veterans' Affairs#9231
-naics#924#Administration of Environmental Quality Programs#92
-naics#9241#Administration of Environmental Quality Programs#924
-naics#92411#Administration of Air and Water Resource and Solid Waste Management Programs#9241
-naics#92412#Administration of Conservation Programs#9241
-naics#925#Administration of Housing Programs, Urban Planning, and Community Development#92
-naics#9251#Administration of Housing Programs, Urban Planning, and Community Development#925
-naics#92511#Administration of Housing Programs#9251
-naics#92512#Administration of Urban Planning and Community and Rural Development#9251
-naics#926#Administration of Economic Programs#92
-naics#9261#Administration of Economic Programs#926
-naics#92611#Administration of General Economic Programs#9261
-naics#92612#Regulation and Administration of Transportation Programs#9261
-naics#92613#Regulation and Administration of Communications, Electric, Gas, and Other Utilities#9261
-naics#92614#Regulation of Agricultural Marketing and Commodities#9261
-naics#92615#Regulation, Licensing, and Inspection of Miscellaneous Commercial Sectors#9261
-naics#927#Space Research and Technology#92
-naics#9271#Space Research and Technology#927
-naics#92711#Space Research and Technology#9271
-naics#928#National Security and International Affairs#92
-naics#9281#National Security and International Affairs#928
-naics#92811#National Security#9281
-naics#92812#International Affairs#9281
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt
deleted file mode 100644
index 1783514..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt
+++ /dev/null
@@ -1,17054 +0,0 @@
-unspsc7#10.00.00.00.00#Live Plant and Animal Material and Accessories and Supplies#10.00.00.00.00
-unspsc7#10.10.00.00.00#Live animals#10.00.00.00.00
-unspsc7#10.10.15.00.00#Livestock#10.10.00.00.00
-unspsc7#10.10.15.01.00#Cats#10.10.15.00.00
-unspsc7#10.10.15.02.00#Dogs#10.10.15.00.00
-unspsc7#10.10.15.04.00#Mink#10.10.15.00.00
-unspsc7#10.10.15.05.00#Rats#10.10.15.00.00
-unspsc7#10.10.15.06.00#Horses#10.10.15.00.00
-unspsc7#10.10.15.07.00#Sheep#10.10.15.00.00
-unspsc7#10.10.15.08.00#Goats#10.10.15.00.00
-unspsc7#10.10.15.09.00#Asses#10.10.15.00.00
-unspsc7#10.10.15.10.00#Mice#10.10.15.00.00
-unspsc7#10.10.15.11.00#Swine#10.10.15.00.00
-unspsc7#10.10.15.12.00#Rabbits#10.10.15.00.00
-unspsc7#10.10.15.13.00#Guinea pigs#10.10.15.00.00
-unspsc7#10.10.15.14.00#Primates#10.10.15.00.00
-unspsc7#10.10.15.15.00#Armadillos#10.10.15.00.00
-unspsc7#10.10.15.16.00#Cattle#10.10.15.00.00
-unspsc7#10.10.15.17.00#Camels#10.10.15.00.00
-unspsc7#10.10.16.00.00#Birds and fowl#10.10.00.00.00
-unspsc7#10.10.16.01.00#Live chickens#10.10.16.00.00
-unspsc7#10.10.16.02.00#Live ducks#10.10.16.00.00
-unspsc7#10.10.16.03.00#Live turkeys#10.10.16.00.00
-unspsc7#10.10.16.04.00#Live geese#10.10.16.00.00
-unspsc7#10.10.16.05.00#Live pheasants#10.10.16.00.00
-unspsc7#10.10.17.00.00#Live fish#10.10.00.00.00
-unspsc7#10.10.17.01.00#Live salmon#10.10.17.00.00
-unspsc7#10.10.17.02.00#Live trout#10.10.17.00.00
-unspsc7#10.10.17.03.00#Live talapia#10.10.17.00.00
-unspsc7#10.10.17.04.00#Live carp#10.10.17.00.00
-unspsc7#10.10.17.05.00#Live eels#10.10.17.00.00
-unspsc7#10.10.18.00.00#Shellfish and aquatic invertebrates#10.10.00.00.00
-unspsc7#10.10.18.01.00#Live shrimp#10.10.18.00.00
-unspsc7#10.10.18.02.00#Live clams#10.10.18.00.00
-unspsc7#10.10.18.03.00#Live mussels#10.10.18.00.00
-unspsc7#10.10.18.04.00#Live oysters#10.10.18.00.00
-unspsc7#10.10.18.05.00#Live crabs#10.10.18.00.00
-unspsc7#10.10.18.06.00#Live abalone#10.10.18.00.00
-unspsc7#10.10.18.07.00#Live octopi#10.10.18.00.00
-unspsc7#10.10.18.08.00#Live squid#10.10.18.00.00
-unspsc7#10.10.19.00.00#Insects#10.10.00.00.00
-unspsc7#10.10.19.01.00#Butterflies#10.10.19.00.00
-unspsc7#10.10.19.02.00#Beetles#10.10.19.00.00
-unspsc7#10.10.19.03.00#Bees#10.10.19.00.00
-unspsc7#10.10.19.04.00#Silkworms#10.10.19.00.00
-unspsc7#10.10.20.00.00#Wild animals#10.10.00.00.00
-unspsc7#10.10.20.01.00#Elephants#10.10.20.00.00
-unspsc7#10.10.20.02.00#Live foxes#10.10.20.00.00
-unspsc7#10.11.00.00.00#Domestic pet products#10.00.00.00.00
-unspsc7#10.11.11.00.00#Pet food bowls or equipment#10.11.00.00.00
-unspsc7#10.11.12.00.00#Medicated pet treatments#10.11.00.00.00
-unspsc7#10.11.13.00.00#Domestic pet treatments and accessories and equipment#10.11.00.00.00
-unspsc7#10.11.13.01.00#Pet toys#10.11.13.00.00
-unspsc7#10.11.13.02.00#Pet grooming products#10.11.13.00.00
-unspsc7#10.11.13.03.00#Pet litter or equipment for pet waste management#10.11.13.00.00
-unspsc7#10.11.13.04.00#Pet food bowls or equipment#10.11.13.00.00
-unspsc7#10.11.13.05.00#Medicated pet treatments#10.11.13.00.00
-unspsc7#10.12.00.00.00#Animal feed#10.00.00.00.00
-unspsc7#10.12.15.00.00#Livestock feed#10.12.00.00.00
-unspsc7#10.12.15.01.00#Pure wheat bran#10.12.15.00.00
-unspsc7#10.12.15.02.00#Feed oats#10.12.15.00.00
-unspsc7#10.12.15.03.00#Feed corn#10.12.15.00.00
-unspsc7#10.12.15.04.00#Feed sorghum#10.12.15.00.00
-unspsc7#10.12.15.05.00#Hay#10.12.15.00.00
-unspsc7#10.12.15.06.00#Oil cake#10.12.15.00.00
-unspsc7#10.12.16.00.00#Bird and fowl food#10.12.00.00.00
-unspsc7#10.12.16.01.00#Live food for birds#10.12.16.00.00
-unspsc7#10.12.16.02.00#Bird seed#10.12.16.00.00
-unspsc7#10.12.16.03.00#Bird treats or snacks#10.12.16.00.00
-unspsc7#10.12.16.04.00#Poultry food#10.12.16.00.00
-unspsc7#10.12.17.00.00#Fish food#10.12.00.00.00
-unspsc7#10.12.17.01.00#Fresh or frozen brine#10.12.17.00.00
-unspsc7#10.12.17.02.00#Fish food pellets#10.12.17.00.00
-unspsc7#10.12.17.03.00#Fish food flakes#10.12.17.00.00
-unspsc7#10.12.18.00.00#Dog and cat food#10.12.00.00.00
-unspsc7#10.12.18.01.00#Dry food for dogs#10.12.18.00.00
-unspsc7#10.12.18.02.00#Moist food for dogs#10.12.18.00.00
-unspsc7#10.12.18.03.00#Milk for dogs or cats#10.12.18.00.00
-unspsc7#10.12.18.04.00#Dry food for cats#10.12.18.00.00
-unspsc7#10.12.18.05.00#Moist food for cats#10.12.18.00.00
-unspsc7#10.12.18.06.00#Treats or snacks for cats or dogs#10.12.18.00.00
-unspsc7#10.12.19.00.00#Rodent food#10.12.00.00.00
-unspsc7#10.12.19.01.00#Pelletized food for rodents#10.12.19.00.00
-unspsc7#10.12.20.00.00#Reptile food#10.12.00.00.00
-unspsc7#10.12.20.01.00#Pelletized food for reptiles#10.12.20.00.00
-unspsc7#10.12.20.02.00#Moist food for reptiles#10.12.20.00.00
-unspsc7#10.12.20.03.00#Live food for reptiles#10.12.20.00.00
-unspsc7#10.13.00.00.00#Animal containment and habitats#10.00.00.00.00
-unspsc7#10.13.15.00.00#Animal shelters#10.13.00.00.00
-unspsc7#10.13.15.06.00#Livestock stables#10.13.15.00.00
-unspsc7#10.13.15.07.00#Domesticized pet houses#10.13.15.00.00
-unspsc7#10.13.15.08.00#Pet beds#10.13.15.00.00
-unspsc7#10.13.16.00.00#Animal containment#10.13.00.00.00
-unspsc7#10.13.16.01.00#Cages#10.13.16.00.00
-unspsc7#10.13.16.02.00#Kennels#10.13.16.00.00
-unspsc7#10.13.16.03.00#Animal carrying cases#10.13.16.00.00
-unspsc7#10.13.16.04.00#Dog runs#10.13.16.00.00
-unspsc7#10.13.17.00.00#Animal habitats#10.13.00.00.00
-unspsc7#10.13.17.01.00#Terrariums#10.13.17.00.00
-unspsc7#10.13.17.02.00#Aquariums#10.13.17.00.00
-unspsc7#10.14.00.00.00#Saddlery and harness goods#10.00.00.00.00
-unspsc7#10.14.15.00.00#Saddlery#10.14.00.00.00
-unspsc7#10.14.15.01.00#Saddles#10.14.15.00.00
-unspsc7#10.14.15.02.00#Whips#10.14.15.00.00
-unspsc7#10.14.16.00.00#Harness goods#10.14.00.00.00
-unspsc7#10.14.16.01.00#Bridles#10.14.16.00.00
-unspsc7#10.14.16.02.00#Yokes#10.14.16.00.00
-unspsc7#10.14.16.03.00#Horse bits#10.14.16.00.00
-unspsc7#10.14.16.04.00#Reins#10.14.16.00.00
-unspsc7#10.14.16.05.00#Stirrups#10.14.16.00.00
-unspsc7#10.14.16.06.00#Leashes or leads#10.14.16.00.00
-unspsc7#10.14.16.07.00#Collars#10.14.16.00.00
-unspsc7#10.14.16.08.00#Harnesses#10.14.16.00.00
-unspsc7#10.14.16.09.00#Restraints#10.14.16.00.00
-unspsc7#10.15.00.00.00#Seeds and bulbs and seedlings and cuttings#10.00.00.00.00
-unspsc7#10.15.15.00.00#Vegetable seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.15.01.00#Bean seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.02.00#Carrot seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.03.00#Celery seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.04.00#Chili seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.05.00#Courgette seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.06.00#Cow pea seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.07.00#Cucumber seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.08.00#Eggplant seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.09.00#Endive seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.10.00#Garlic seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.11.00#Leek seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.12.00#Lettuce seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.13.00#Corn seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.14.00#Melon seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.15.00#Onion seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.16.00#Soya seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.17.00#Spinach seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.18.00#Tomato seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.19.00#Turnip seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.20.00#Chard seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.21.00#Sweet pepper seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.22.00#Beet seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.23.00#Cauliflower seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.15.24.00#Parsely seeds or seedlings#10.15.15.00.00
-unspsc7#10.15.16.00.00#Cereal seeds#10.15.00.00.00
-unspsc7#10.15.16.01.00#Wheat seeds#10.15.16.00.00
-unspsc7#10.15.16.02.00#Colza seeds#10.15.16.00.00
-unspsc7#10.15.16.03.00#Barley seeds#10.15.16.00.00
-unspsc7#10.15.16.04.00#Millet seeds#10.15.16.00.00
-unspsc7#10.15.16.05.00#Oat seeds#10.15.16.00.00
-unspsc7#10.15.16.06.00#Sesame seeds#10.15.16.00.00
-unspsc7#10.15.16.07.00#Linseed seeds#10.15.16.00.00
-unspsc7#10.15.16.08.00#Castor oil seeds#10.15.16.00.00
-unspsc7#10.15.16.09.00#Maize seeds#10.15.16.00.00
-unspsc7#10.15.16.10.00#Rye seeds#10.15.16.00.00
-unspsc7#10.15.16.11.00#Sorghum seeds#10.15.16.00.00
-unspsc7#10.15.17.00.00#Grass and forage seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.17.01.00#Rice seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.17.02.00#Clover seeds or seedling#10.15.17.00.00
-unspsc7#10.15.17.03.00#Alfalfa seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.17.04.00#Grass seeds or seedlings#10.15.17.00.00
-unspsc7#10.15.18.00.00#Spice crop seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.18.01.00#Pepper seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.02.00#Vanilla seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.03.00#Cinnamon seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.04.00#Clove seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.05.00#Coriander seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.06.00#Ginger seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.07.00#Saffron seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.08.00#Thyme seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.09.00#Curry seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.10.00#Mustard seeds or seedlings#10.15.18.00.00
-unspsc7#10.15.18.11.00#Ginseng roots or seedlings#10.15.18.00.00
-unspsc7#10.15.19.00.00#Flower seeds and bulbs and seedlings and cuttings#10.15.00.00.00
-unspsc7#10.15.19.01.00#Tulip seeds or bulbs or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.02.00#Rose seeds or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.03.00#Daffodil seeds or bulbs or seedlings or cuttings#10.15.19.00.00
-unspsc7#10.15.19.04.00#Sunflower seeds#10.15.19.00.00
-unspsc7#10.15.19.05.00#Hyacinth bulbs or shoots#10.15.19.00.00
-unspsc7#10.15.19.06.00#Lily Bulbs#10.15.19.00.00
-unspsc7#10.15.20.00.00#Tree and shrub seeds and cuttings#10.15.00.00.00
-unspsc7#10.15.20.01.00#Fruit tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.20.02.00#Conifer tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.20.03.00#Nut tree seeds or cuttings#10.15.20.00.00
-unspsc7#10.15.21.00.00#Residues other than animal feed#10.15.00.00.00
-unspsc7#10.15.21.01.00#Residues babool seed extraction#10.15.21.00.00
-unspsc7#10.15.21.02.00#Residues of rape seeds#10.15.21.00.00
-unspsc7#10.15.21.03.00#Residue of linseed#10.15.21.00.00
-unspsc7#10.15.21.04.00#Oil cake of neem#10.15.21.00.00
-unspsc7#10.15.22.00.00#Fibrous crop seeds and seedlings#10.15.00.00.00
-unspsc7#10.15.22.01.00#Cotton seeds or seedlings#10.15.22.00.00
-unspsc7#10.16.00.00.00#Floriculture and silviculture products#10.00.00.00.00
-unspsc7#10.16.15.00.00#Trees and shrubs#10.16.00.00.00
-unspsc7#10.16.15.01.00#Olive trees#10.16.15.00.00
-unspsc7#10.16.15.02.00#Coffee shrubs#10.16.15.00.00
-unspsc7#10.16.15.03.00#Cocoa trees#10.16.15.00.00
-unspsc7#10.16.15.04.00#Apple trees#10.16.15.00.00
-unspsc7#10.16.15.05.00#Peach trees#10.16.15.00.00
-unspsc7#10.16.15.06.00#Orange trees#10.16.15.00.00
-unspsc7#10.16.15.07.00#Rhodendron shrubs#10.16.15.00.00
-unspsc7#10.16.15.08.00#Tea shrubs#10.16.15.00.00
-unspsc7#10.16.15.09.00#Conifer trees#10.16.15.00.00
-unspsc7#10.16.15.10.00#Spruce trees#10.16.15.00.00
-unspsc7#10.16.15.11.00#Pine trees#10.16.15.00.00
-unspsc7#10.16.15.12.00#Fir trees#10.16.15.00.00
-unspsc7#10.16.16.00.00#Floral plants#10.16.00.00.00
-unspsc7#10.16.16.01.00#Rose plants#10.16.16.00.00
-unspsc7#10.16.16.02.00#Poinsettias plants#10.16.16.00.00
-unspsc7#10.16.16.03.00#Orchids plants#10.16.16.00.00
-unspsc7#10.16.16.04.00#Azaleas plants#10.16.16.00.00
-unspsc7#10.16.16.05.00#Cactus plants#10.16.16.00.00
-unspsc7#10.16.17.00.00#Cut flowers#10.16.00.00.00
-unspsc7#10.16.17.01.00#Cut gladiolus#10.16.17.00.00
-unspsc7#10.16.17.02.00#Cut lilies#10.16.17.00.00
-unspsc7#10.16.17.03.00#Cut carnations#10.16.17.00.00
-unspsc7#10.16.17.04.00#Cut tulips#10.16.17.00.00
-unspsc7#10.16.17.05.00#Cut roses#10.16.17.00.00
-unspsc7#10.16.18.00.00#Non flowering plants#10.16.00.00.00
-unspsc7#10.16.18.01.00#Ferns#10.16.18.00.00
-unspsc7#10.16.18.02.00#Ivies#10.16.18.00.00
-unspsc7#10.16.18.03.00#Philodendrons#10.16.18.00.00
-unspsc7#10.16.19.00.00#Dried floral products#10.16.00.00.00
-unspsc7#10.16.19.01.00#Dried pods#10.16.19.00.00
-unspsc7#10.16.19.02.00#Dried leafy greenery#10.16.19.00.00
-unspsc7#10.16.19.03.00#Dried fern greenery#10.16.19.00.00
-unspsc7#10.16.19.04.00#Dried full flowers#10.16.19.00.00
-unspsc7#10.16.19.05.00#Dried twigs or sticks#10.16.19.00.00
-unspsc7#10.16.19.06.00#Dried grass plumes#10.16.19.00.00
-unspsc7#10.16.19.07.00#Dried pressed flowers#10.16.19.00.00
-unspsc7#10.16.19.08.00#Dried flower petals#10.16.19.00.00
-unspsc7#10.17.00.00.00#Fertilizers and plant nutrients and herbicides#10.00.00.00.00
-unspsc7#10.17.15.00.00#Organic fertilizers and plant nutrients#10.17.00.00.00
-unspsc7#10.17.15.01.00#Manure or guano#10.17.15.00.00
-unspsc7#10.17.15.02.00#Plant hormones#10.17.15.00.00
-unspsc7#10.17.15.03.00#Fish meal#10.17.15.00.00
-unspsc7#10.17.16.00.00#Chemical fertilizers and plant nutrients#10.17.00.00.00
-unspsc7#10.17.16.01.00#Nitrogenous fertilizer#10.17.16.00.00
-unspsc7#10.17.16.02.00#Potassic fertilizer#10.17.16.00.00
-unspsc7#10.17.16.03.00#Phosphatic fertilizer#10.17.16.00.00
-unspsc7#10.17.16.04.00#Sulphuric fertilizer#10.17.16.00.00
-unspsc7#10.17.16.05.00#Nitrogen Phosphorous Potassium Mixtures (NPK)#10.17.16.00.00
-unspsc7#10.17.17.00.00#Herbicides#10.17.00.00.00
-unspsc7#10.17.17.01.00#Weed killer#10.17.17.00.00
-unspsc7#10.17.17.02.00#Fungicides#10.17.17.00.00
-unspsc7#10.19.00.00.00#Pest control products#10.00.00.00.00
-unspsc7#10.19.15.00.00#Insecticides and insect control traps#10.19.00.00.00
-unspsc7#10.19.15.01.00#Spray insecticides#10.19.15.00.00
-unspsc7#10.19.15.02.00#Bait insecticides#10.19.15.00.00
-unspsc7#10.19.15.03.00#Silicic acid#10.19.15.00.00
-unspsc7#10.19.15.04.00#Flying insect control traps#10.19.15.00.00
-unspsc7#10.19.16.00.00#Rodenticides#10.19.00.00.00
-unspsc7#10.19.16.01.00#Extruded baits#10.19.16.00.00
-unspsc7#10.19.16.02.00#Meal or pellet or seed baits#10.19.16.00.00
-unspsc7#10.19.16.03.00#Liquid baits#10.19.16.00.00
-unspsc7#10.19.16.04.00#Tracking powders#10.19.16.00.00
-unspsc7#10.19.17.00.00#Animal control traps#10.19.00.00.00
-unspsc7#10.19.17.01.00#Mouse or rat traps#10.19.17.00.00
-unspsc7#10.19.17.02.00#Wire cage traps#10.19.17.00.00
-unspsc7#11.00.00.00.00#Mineral and Textile and Inedible Plant and Animal Materials#11.00.00.00.00
-unspsc7#11.10.00.00.00#Minerals and ores and metals#11.00.00.00.00
-unspsc7#11.10.15.00.00#Minerals#11.10.00.00.00
-unspsc7#11.10.15.01.00#Mica#11.10.15.00.00
-unspsc7#11.10.15.02.00#Emery#11.10.15.00.00
-unspsc7#11.10.15.03.00#Quartz#11.10.15.00.00
-unspsc7#11.10.15.04.00#Pyrite#11.10.15.00.00
-unspsc7#11.10.15.05.00#Sulphur#11.10.15.00.00
-unspsc7#11.10.15.06.00#Chalk#11.10.15.00.00
-unspsc7#11.10.15.07.00#Graphite#11.10.15.00.00
-unspsc7#11.10.15.08.00#Dolomite#11.10.15.00.00
-unspsc7#11.10.15.09.00#Magnesite#11.10.15.00.00
-unspsc7#11.10.15.10.00#Asbestos#11.10.15.00.00
-unspsc7#11.10.15.11.00#Calcium#11.10.15.00.00
-unspsc7#11.10.15.12.00#Borate#11.10.15.00.00
-unspsc7#11.10.15.13.00#Cryolite#11.10.15.00.00
-unspsc7#11.10.15.14.00#Feldspar#11.10.15.00.00
-unspsc7#11.10.15.15.00#Leucite#11.10.15.00.00
-unspsc7#11.10.15.16.00#Nephelite#11.10.15.00.00
-unspsc7#11.10.15.17.00#Steatite#11.10.15.00.00
-unspsc7#11.10.15.18.00#Talc#11.10.15.00.00
-unspsc7#11.10.15.19.00#Diamonds#11.10.15.00.00
-unspsc7#11.10.15.20.00#Garnets#11.10.15.00.00
-unspsc7#11.10.15.21.00#Silicon carbide#11.10.15.00.00
-unspsc7#11.10.15.22.00#Activated carbon#11.10.15.00.00
-unspsc7#11.10.15.23.00#Mulite#11.10.15.00.00
-unspsc7#11.10.15.24.00#Flourospar#11.10.15.00.00
-unspsc7#11.10.15.25.00#Keiserite#11.10.15.00.00
-unspsc7#11.10.15.26.00#Carnallite#11.10.15.00.00
-unspsc7#11.10.16.00.00#Ores#11.10.00.00.00
-unspsc7#11.10.16.01.00#Iron ore#11.10.16.00.00
-unspsc7#11.10.16.02.00#Titanium ore#11.10.16.00.00
-unspsc7#11.10.16.03.00#Uranium ore#11.10.16.00.00
-unspsc7#11.10.16.04.00#Copper ore#11.10.16.00.00
-unspsc7#11.10.16.05.00#Aluminum ore#11.10.16.00.00
-unspsc7#11.10.16.06.00#Nickel ore#11.10.16.00.00
-unspsc7#11.10.16.07.00#Silver ore#11.10.16.00.00
-unspsc7#11.10.16.08.00#Lead ore#11.10.16.00.00
-unspsc7#11.10.16.09.00#Zinc ore#11.10.16.00.00
-unspsc7#11.10.16.10.00#Tin ore#11.10.16.00.00
-unspsc7#11.10.16.11.00#Manganese ore#11.10.16.00.00
-unspsc7#11.10.16.12.00#Chromium ore#11.10.16.00.00
-unspsc7#11.10.16.13.00#Tungsten or wolfram ore#11.10.16.00.00
-unspsc7#11.10.16.14.00#Molybdenum ore#11.10.16.00.00
-unspsc7#11.10.16.15.00#Cobalt ore#11.10.16.00.00
-unspsc7#11.10.16.16.00#Gold ore#11.10.16.00.00
-unspsc7#11.10.16.17.00#Tantalum ore#11.10.16.00.00
-unspsc7#11.10.16.18.00#Platinum ore#11.10.16.00.00
-unspsc7#11.10.16.19.00#Vermiculite ore#11.10.16.00.00
-unspsc7#11.10.16.20.00#Thorium ore#11.10.16.00.00
-unspsc7#11.10.16.21.00#Kyanite ore#11.10.16.00.00
-unspsc7#11.10.16.22.00#Antimony ores#11.10.16.00.00
-unspsc7#11.10.16.23.00#Zirconium ores#11.10.16.00.00
-unspsc7#11.10.17.00.00#Base metals#11.10.00.00.00
-unspsc7#11.10.17.01.00#Slag or ash#11.10.17.00.00
-unspsc7#11.10.17.02.00#Natural graphite#11.10.17.00.00
-unspsc7#11.10.17.03.00#Titanium#11.10.17.00.00
-unspsc7#11.10.17.04.00#Steel#11.10.17.00.00
-unspsc7#11.10.17.05.00#Aluminum#11.10.17.00.00
-unspsc7#11.10.17.06.00#Nickel#11.10.17.00.00
-unspsc7#11.10.17.07.00#Magnesium#11.10.17.00.00
-unspsc7#11.10.17.08.00#Bismuth#11.10.17.00.00
-unspsc7#11.10.17.09.00#Antimony#11.10.17.00.00
-unspsc7#11.10.17.10.00#Cadmium#11.10.17.00.00
-unspsc7#11.10.17.11.00#Non ferrous alloy#11.10.17.00.00
-unspsc7#11.10.17.12.00#Ferrous alloy#11.10.17.00.00
-unspsc7#11.10.17.13.00#Iron#11.10.17.00.00
-unspsc7#11.10.17.14.00#Lead#11.10.17.00.00
-unspsc7#11.10.17.15.00#Copper#11.10.17.00.00
-unspsc7#11.10.18.00.00#Precious metals#11.10.00.00.00
-unspsc7#11.10.18.01.00#Gold#11.10.18.00.00
-unspsc7#11.10.18.02.00#Silver#11.10.18.00.00
-unspsc7#11.10.18.03.00#Platinum#11.10.18.00.00
-unspsc7#11.11.00.00.00#Earth and stone#11.00.00.00.00
-unspsc7#11.11.15.00.00#Dirt and soil#11.11.00.00.00
-unspsc7#11.11.15.01.00#Soil#11.11.15.00.00
-unspsc7#11.11.15.02.00#Fill dirt#11.11.15.00.00
-unspsc7#11.11.15.03.00#Topsoil#11.11.15.00.00
-unspsc7#11.11.16.00.00#Stone#11.11.00.00.00
-unspsc7#11.11.16.01.00#Gypsum#11.11.16.00.00
-unspsc7#11.11.16.02.00#Travertine#11.11.16.00.00
-unspsc7#11.11.16.03.00#Ecaussine or alabaster#11.11.16.00.00
-unspsc7#11.11.16.04.00#Granite#11.11.16.00.00
-unspsc7#11.11.16.05.00#Marble#11.11.16.00.00
-unspsc7#11.11.16.06.00#Slate#11.11.16.00.00
-unspsc7#11.11.16.07.00#Sandstone#11.11.16.00.00
-unspsc7#11.11.16.08.00#Limestone#11.11.16.00.00
-unspsc7#11.11.16.09.00#Basalt#11.11.16.00.00
-unspsc7#11.11.16.10.00#Pumice stone#11.11.16.00.00
-unspsc7#11.11.17.00.00#Sand#11.11.00.00.00
-unspsc7#11.11.17.01.00#Silica sand#11.11.17.00.00
-unspsc7#11.11.18.00.00#Clays#11.11.00.00.00
-unspsc7#11.11.18.01.00#Terra cotta#11.11.18.00.00
-unspsc7#11.11.18.02.00#Fireclay#11.11.18.00.00
-unspsc7#11.11.18.03.00#Kaolin or other kaolinic clays#11.11.18.00.00
-unspsc7#11.11.18.04.00#Bentonite#11.11.18.00.00
-unspsc7#11.11.18.05.00#Andalusite#11.11.18.00.00
-unspsc7#11.11.18.06.00#Mullite#11.11.18.00.00
-unspsc7#11.11.18.07.00#Chamotte#11.11.18.00.00
-unspsc7#11.11.18.08.00#Common clay#11.11.18.00.00
-unspsc7#11.11.18.09.00#Ball clay#11.11.18.00.00
-unspsc7#11.11.18.10.00#Fullers earth#11.11.18.00.00
-unspsc7#11.12.00.00.00#Non edible plant and forestry products#11.00.00.00.00
-unspsc7#11.12.15.00.00#Sap#11.12.00.00.00
-unspsc7#11.12.15.02.00#Rosin#11.12.15.00.00
-unspsc7#11.12.15.03.00#Lac#11.12.15.00.00
-unspsc7#11.12.16.00.00#Wood#11.12.00.00.00
-unspsc7#11.12.16.03.00#Logs#11.12.16.00.00
-unspsc7#11.12.16.04.00#Soft timber#11.12.16.00.00
-unspsc7#11.12.16.05.00#Rattan#11.12.16.00.00
-unspsc7#11.12.16.06.00#Cork#11.12.16.00.00
-unspsc7#11.12.16.07.00#Wood pulp#11.12.16.00.00
-unspsc7#11.12.16.08.00#Bamboo#11.12.16.00.00
-unspsc7#11.12.16.09.00#Plywood#11.12.16.00.00
-unspsc7#11.12.16.10.00#Hardwoods#11.12.16.00.00
-unspsc7#11.12.17.00.00#Forestry by products#11.12.00.00.00
-unspsc7#11.12.17.01.00#Saw dust#11.12.17.00.00
-unspsc7#11.12.17.02.00#Wood chips#11.12.17.00.00
-unspsc7#11.12.17.03.00#Peat moss#11.12.17.00.00
-unspsc7#11.12.17.04.00#Wood shavings#11.12.17.00.00
-unspsc7#11.12.17.05.00#Bark#11.12.17.00.00
-unspsc7#11.12.17.06.00#Mulch#11.12.17.00.00
-unspsc7#11.12.17.07.00#Wood wool#11.12.17.00.00
-unspsc7#11.12.17.08.00#Wood flour#11.12.17.00.00
-unspsc7#11.12.17.09.00#Balsams#11.12.17.00.00
-unspsc7#11.12.18.00.00#Plant fibers#11.12.00.00.00
-unspsc7#11.12.18.01.00#Hemp#11.12.18.00.00
-unspsc7#11.12.18.02.00#Cotton#11.12.18.00.00
-unspsc7#11.12.18.03.00#Flax#11.12.18.00.00
-unspsc7#11.12.18.04.00#Jute#11.12.18.00.00
-unspsc7#11.12.18.05.00#Sisal#11.12.18.00.00
-unspsc7#11.12.18.06.00#Coconut fibres or coir#11.12.18.00.00
-unspsc7#11.12.18.07.00#Abaca fibers#11.12.18.00.00
-unspsc7#11.12.18.08.00#Ramie#11.12.18.00.00
-unspsc7#11.12.18.09.00#Straw#11.12.18.00.00
-unspsc7#11.12.18.10.00#Broom corn or istle or piassava#11.12.18.00.00
-unspsc7#11.12.19.00.00#Perfumery products#11.12.00.00.00
-unspsc7#11.12.19.01.00#Licorice roots#11.12.19.00.00
-unspsc7#11.13.00.00.00#Non edible animal products#11.00.00.00.00
-unspsc7#11.13.15.00.00#Animal hides and skins and animal textile materials#11.13.00.00.00
-unspsc7#11.13.15.01.00#Feathers#11.13.15.00.00
-unspsc7#11.13.15.02.00#Furs#11.13.15.00.00
-unspsc7#11.13.15.03.00#Animal hair#11.13.15.00.00
-unspsc7#11.13.15.04.00#Hides#11.13.15.00.00
-unspsc7#11.13.15.05.00#Unprocessed mohair#11.13.15.00.00
-unspsc7#11.13.15.06.00#Unprocessed wool#11.13.15.00.00
-unspsc7#11.13.15.07.00#Suede#11.13.15.00.00
-unspsc7#11.13.15.08.00#Full grain leather#11.13.15.00.00
-unspsc7#11.13.16.00.00#Other animal products#11.13.00.00.00
-unspsc7#11.13.16.01.00#Ivory#11.13.16.00.00
-unspsc7#11.13.16.02.00#Semen#11.13.16.00.00
-unspsc7#11.13.16.03.00#Excretions#11.13.16.00.00
-unspsc7#11.13.16.04.00#Fish eggs#11.13.16.00.00
-unspsc7#11.13.16.05.00#Bones#11.13.16.00.00
-unspsc7#11.13.16.06.00#Animal horns#11.13.16.00.00
-unspsc7#11.13.16.07.00#Embryos#11.13.16.00.00
-unspsc7#11.13.16.08.00#Shell articles#11.13.16.00.00
-unspsc7#11.14.00.00.00#Scrap and waste materials#11.00.00.00.00
-unspsc7#11.14.15.00.00#Metal waste and scrap#11.14.00.00.00
-unspsc7#11.14.15.01.00#Ferrous metal waste or scrap#11.14.15.00.00
-unspsc7#11.14.15.02.00#Non ferrous metal waste or scrap#11.14.15.00.00
-unspsc7#11.14.15.03.00#Automotive wrecking for waste or scrap#11.14.15.00.00
-unspsc7#11.14.16.00.00#Non metallic waste and scrap#11.14.00.00.00
-unspsc7#11.14.16.01.00#Textile waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.02.00#Plastic waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.03.00#Oil wastes#11.14.16.00.00
-unspsc7#11.14.16.04.00#Paper wastes#11.14.16.00.00
-unspsc7#11.14.16.05.00#Glass waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.06.00#Wood waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.07.00#Rubber waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.08.00#Hazardous waste or scrap#11.14.16.00.00
-unspsc7#11.14.16.09.00#Composition leather#11.14.16.00.00
-unspsc7#11.14.16.10.00#Leather waste and scrap#11.14.16.00.00
-unspsc7#11.14.17.00.00#Food and tobacco waste and scrap#11.14.00.00.00
-unspsc7#11.14.17.01.00#Food waste or scrap#11.14.17.00.00
-unspsc7#11.14.17.02.00#Tobacco waste or scrap#11.14.17.00.00
-unspsc7#11.15.00.00.00#Fibers and threads and yarns#11.00.00.00.00
-unspsc7#11.15.15.00.00#Fibers#11.15.00.00.00
-unspsc7#11.15.15.01.00#Acetate fibers#11.15.15.00.00
-unspsc7#11.15.15.02.00#Nylon fibers#11.15.15.00.00
-unspsc7#11.15.15.03.00#Polyester fibers#11.15.15.00.00
-unspsc7#11.15.15.04.00#Acrylic fibers#11.15.15.00.00
-unspsc7#11.15.15.05.00#Viscose fibers#11.15.15.00.00
-unspsc7#11.15.15.06.00#Rayon fibers#11.15.15.00.00
-unspsc7#11.15.15.07.00#Cotton fibers#11.15.15.00.00
-unspsc7#11.15.15.08.00#Wool fibers#11.15.15.00.00
-unspsc7#11.15.15.09.00#Silk fibers#11.15.15.00.00
-unspsc7#11.15.15.10.00#Vegetable fibers#11.15.15.00.00
-unspsc7#11.15.15.11.00#Polypropylene fibers#11.15.15.00.00
-unspsc7#11.15.15.12.00#Glass fibers#11.15.15.00.00
-unspsc7#11.15.15.13.00#Ceramic fibers#11.15.15.00.00
-unspsc7#11.15.15.14.00#Polymer aramid fibers#11.15.15.00.00
-unspsc7#11.15.15.15.00#Asbestos fibers#11.15.15.00.00
-unspsc7#11.15.16.00.00#Threads#11.15.00.00.00
-unspsc7#11.15.16.01.00#Cotton thread#11.15.16.00.00
-unspsc7#11.15.16.02.00#Silk thread#11.15.16.00.00
-unspsc7#11.15.16.03.00#Polyester thread#11.15.16.00.00
-unspsc7#11.15.16.04.00#Polyamide thread#11.15.16.00.00
-unspsc7#11.15.16.05.00#Bismalemide thread#11.15.16.00.00
-unspsc7#11.15.16.06.00#Fiberglass thread#11.15.16.00.00
-unspsc7#11.15.16.07.00#Graphite thread#11.15.16.00.00
-unspsc7#11.15.16.08.00#Nylon thread#11.15.16.00.00
-unspsc7#11.15.16.09.00#Resin impregnated thread#11.15.16.00.00
-unspsc7#11.15.16.10.00#Rubber or latex thread#11.15.16.00.00
-unspsc7#11.15.16.11.00#Spandex thread#11.15.16.00.00
-unspsc7#11.15.17.00.00#Yarns#11.15.00.00.00
-unspsc7#11.15.17.01.00#Wool yarn#11.15.17.00.00
-unspsc7#11.15.17.02.00#Cotton yarn#11.15.17.00.00
-unspsc7#11.15.17.03.00#Polyester yarn#11.15.17.00.00
-unspsc7#11.15.17.04.00#Acrylic yarn#11.15.17.00.00
-unspsc7#11.15.17.05.00#Silk yarn#11.15.17.00.00
-unspsc7#11.15.17.06.00#Ramie yarn#11.15.17.00.00
-unspsc7#11.15.17.07.00#Flax yarn#11.15.17.00.00
-unspsc7#11.15.17.08.00#Animal hair yarn#11.15.17.00.00
-unspsc7#11.15.17.09.00#Synthetic yarn#11.15.17.00.00
-unspsc7#11.15.17.10.00#Jute yarn#11.15.17.00.00
-unspsc7#11.15.17.11.00#Coir yarn#11.15.17.00.00
-unspsc7#11.15.17.12.00#Paper yarn#11.15.17.00.00
-unspsc7#11.15.17.13.00#Hemp yarn#11.15.17.00.00
-unspsc7#11.16.00.00.00#Fabrics and leather materials#11.00.00.00.00
-unspsc7#11.16.15.00.00#Silk fabrics#11.16.00.00.00
-unspsc7#11.16.15.01.00#Plain weave silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.02.00#Jacquard weave silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.03.00#Knit silk fabrics#11.16.15.00.00
-unspsc7#11.16.15.04.00#Silk velvets fabrics#11.16.15.00.00
-unspsc7#11.16.16.00.00#Wool fabrics#11.16.00.00.00
-unspsc7#11.16.16.01.00#Plain weave wool fabrics#11.16.16.00.00
-unspsc7#11.16.16.02.00#Jacquard weave wool fabrics#11.16.16.00.00
-unspsc7#11.16.16.03.00#Knit wool fabrics#11.16.16.00.00
-unspsc7#11.16.17.00.00#Cotton fabrics#11.16.00.00.00
-unspsc7#11.16.17.01.00#Plain weave cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.02.00#Twill weave cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.03.00#Cotton oxford cloths#11.16.17.00.00
-unspsc7#11.16.17.04.00#Knit cotton fabrics#11.16.17.00.00
-unspsc7#11.16.17.05.00#Cotton velvet fabrics#11.16.17.00.00
-unspsc7#11.16.18.00.00#Synthetic fabrics#11.16.00.00.00
-unspsc7#11.16.18.01.00#Plain weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.02.00#Jacquard weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.03.00#Dobby weave synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.04.00#Knit synthetic fabrics#11.16.18.00.00
-unspsc7#11.16.18.05.00#Synthetic velvet fabrics#11.16.18.00.00
-unspsc7#11.16.19.00.00#Artificial fabrics#11.16.00.00.00
-unspsc7#11.16.19.01.00#Plain weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.02.00#Jacquard weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.03.00#Dobby weave artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.04.00#Knit artificial fabrics#11.16.19.00.00
-unspsc7#11.16.19.05.00#Artifical velvet fabrics#11.16.19.00.00
-unspsc7#11.16.20.00.00#Fabrics of vegetable material other than cotton#11.16.00.00.00
-unspsc7#11.16.20.01.00#Plain weave non cotton vegetable fiber fabrics#11.16.20.00.00
-unspsc7#11.16.20.02.00#Knit non cotton vegetable fiber fabrics#11.16.20.00.00
-unspsc7#11.16.20.03.00#Hessian or hemp or jute cloth#11.16.20.00.00
-unspsc7#11.16.21.00.00#Specialty fabrics or cloth#11.16.00.00.00
-unspsc7#11.16.21.01.00#Cheese cloth or fabric#11.16.21.00.00
-unspsc7#11.16.21.02.00#Bismalemide fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.03.00#Fiberglass fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.04.00#Graphite fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.05.00#Glass fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.07.00#Resin impregnated fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.08.00#Wire mesh fabric or cloth#11.16.21.00.00
-unspsc7#11.16.21.09.00#Lace#11.16.21.00.00
-unspsc7#11.16.21.10.00#Netting#11.16.21.00.00
-unspsc7#11.16.21.11.00#Mesh#11.16.21.00.00
-unspsc7#11.16.21.12.00#Coated fabrics#11.16.21.00.00
-unspsc7#11.16.21.13.00#Upholstery fabrics#11.16.21.00.00
-unspsc7#11.16.21.14.00#Hook and loop fabrics or tapes#11.16.21.00.00
-unspsc7#11.16.21.15.00#Elastic braid#11.16.21.00.00
-unspsc7#11.16.21.16.00#Burlap cloth#11.16.21.00.00
-unspsc7#11.16.21.17.00#Rubber fabrics#11.16.21.00.00
-unspsc7#11.16.21.18.00#Paper yarn fabric#11.16.21.00.00
-unspsc7#11.16.21.19.00#Tracing cloth#11.16.21.00.00
-unspsc7#11.16.21.20.00#Bolting cloth#11.16.21.00.00
-unspsc7#11.16.21.21.00#Ornamental trimmings#11.16.21.00.00
-unspsc7#11.16.22.00.00#Nonwoven fabrics#11.16.00.00.00
-unspsc7#11.16.22.01.00#Spunbonded nonwovens#11.16.22.00.00
-unspsc7#11.16.22.02.00#Spunlaced nonwovens#11.16.22.00.00
-unspsc7#11.16.23.00.00#Leathers#11.16.00.00.00
-unspsc7#11.16.23.01.00#Chamois leather#11.16.23.00.00
-unspsc7#11.16.23.02.00#Goat leather#11.16.23.00.00
-unspsc7#11.16.23.03.00#Sheep leather#11.16.23.00.00
-unspsc7#11.16.23.04.00#Patent leather#11.16.23.00.00
-unspsc7#11.16.23.05.00#Cow leather#11.16.23.00.00
-unspsc7#11.16.23.06.00#Pig leather#11.16.23.00.00
-unspsc7#11.16.23.07.00#Synthetic or imitation leather#11.16.23.00.00
-unspsc7#11.16.23.08.00#Buffalo leather#11.16.23.00.00
-unspsc7#11.16.23.09.00#Reptile leather#11.16.23.00.00
-unspsc7#12.00.00.00.00#Chemicals including Bio Chemicals and Gas Materials#12.00.00.00.00
-unspsc7#12.10.00.00.00#Organic chemicals#12.00.00.00.00
-unspsc7#12.10.15.00.00#Alcohol#12.10.00.00.00
-unspsc7#12.10.15.01.00#Saturated monohydric alcohol#12.10.15.00.00
-unspsc7#12.10.15.02.00#Isopropyl alcohol#12.10.15.00.00
-unspsc7#12.10.15.03.00#Unsaturated monohydric alcohol#12.10.15.00.00
-unspsc7#12.10.15.04.00#Cyclic alcohol or their halogenated or sulphonated or nitrated derivatives#12.10.15.00.00
-unspsc7#12.10.15.05.00#Phenol alcohol#12.10.15.00.00
-unspsc7#12.10.15.06.00#Halogenated or sulphonated or nitrated or nitrosated derivatives of phenols#12.10.15.00.00
-unspsc7#12.10.15.07.00#Methylated spirit#12.10.15.00.00
-unspsc7#12.10.16.00.00#Ethers and alcohol peroxides and ether peroxides and other organic compounds#12.10.00.00.00
-unspsc7#12.10.16.01.00#Acyclic ethers#12.10.16.00.00
-unspsc7#12.10.16.02.00#Cyclonic or cyclenic or cycloterpenic ethers#12.10.16.00.00
-unspsc7#12.10.16.03.00#Ether or aromatic ether#12.10.16.00.00
-unspsc7#12.10.16.04.00#Ether alcohol#12.10.16.00.00
-unspsc7#12.10.16.05.00#Ether phenols or ether alcohol phenols#12.10.16.00.00
-unspsc7#12.10.16.06.00#Alcohol peroxides#12.10.16.00.00
-unspsc7#12.10.16.07.00#Oxirane or ethylene oxide#12.10.16.00.00
-unspsc7#12.10.16.08.00#Epichlorohydrin or 1 chloro 2 or 3 epoxypropane#12.10.16.00.00
-unspsc7#12.10.16.09.00#Epoxides or epoxyalcohols or epoxyphenols or epoxyethers#12.10.16.00.00
-unspsc7#12.10.16.10.00#Acetals or kemiacetals#12.10.16.00.00
-unspsc7#12.10.16.11.00#Acyclic aldehydes without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.12.00#Cyclic aldehydes without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.13.00#Alcohol aldehyde#12.10.16.00.00
-unspsc7#12.10.16.14.00#Paraformaldehyde#12.10.16.00.00
-unspsc7#12.10.16.15.00#Aldehydes#12.10.16.00.00
-unspsc7#12.10.16.16.00#Acyclic ketones without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.17.00#Cyclonic or cyclenic or cycloterpenic ketones without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.18.00#Ketones or aromatic without other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.19.00#Ketone alcohol or ketone aldehydes#12.10.16.00.00
-unspsc7#12.10.16.20.00#Ketone phenols or ketones with other oxygen function#12.10.16.00.00
-unspsc7#12.10.16.21.00#Quinones#12.10.16.00.00
-unspsc7#12.10.16.22.00#Rennet tablets#12.10.16.00.00
-unspsc7#12.10.16.23.00#Enzymes#12.10.16.00.00
-unspsc7#12.10.17.00.00#Monocarboxylic fatty acids or industrial acid oils from refining#12.10.00.00.00
-unspsc7#12.10.17.01.00#Oleic acid#12.10.17.00.00
-unspsc7#12.10.17.02.00#Industrial fatty alcohols#12.10.17.00.00
-unspsc7#12.10.17.03.00#Stearic acid#12.10.17.00.00
-unspsc7#12.10.17.04.00#Tall oil fatty acids#12.10.17.00.00
-unspsc7#12.10.17.05.00#Acid oils from refining#12.10.17.00.00
-unspsc7#12.10.18.00.00#Carboxylic acids and their anhydrides and halides and peroxides and peroxyacids#12.10.00.00.00
-unspsc7#12.10.18.01.00#Formic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.02.00#Acetic acid or its salts or acetic anhydride#12.10.18.00.00
-unspsc7#12.10.18.03.00#Esters of acetic acid#12.10.18.00.00
-unspsc7#12.10.18.04.00#Mono or di trichloracetic acid or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.05.00#Propionic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.06.00#Butyric acids or valeric acids or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.07.00#Palmitic acids or stearic acids or their salts or esters#12.10.18.00.00
-unspsc7#12.10.18.08.00#Saturated acrylic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.09.00#Unsaturated acyclic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.10.00#Cyclonic or cyclenic or cycloterpenic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.11.00#Aromatic monocarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.12.00#Acyclic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.13.00#Cyclonic or cyclenic or cycloterpenic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.14.00#Aromatic polycarboxylic acids#12.10.18.00.00
-unspsc7#12.10.18.15.00#Lactic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.16.00#Tartaric acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.17.00#Atric acid or ts salts or esters#12.10.18.00.00
-unspsc7#12.10.18.18.00#Glucaric acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.19.00#Phenylglyocolic acid or mandelic acid or its salts or esters#12.10.18.00.00
-unspsc7#12.10.18.20.00#Carboxylic acids with alcohol function but without other oxygen function#12.10.18.00.00
-unspsc7#12.10.18.21.00#Carboxylic acids with phenol function but without other oxygen function#12.10.18.00.00
-unspsc7#12.10.18.22.00#Carboxylic acids with aldehyde or ketone function#12.10.18.00.00
-unspsc7#12.10.19.00.00#Amine and oxygen function amino compounds and ureines#12.10.00.00.00
-unspsc7#12.10.19.01.00#Glutamic acid or its salts#12.10.19.00.00
-unspsc7#12.10.20.00.00#Organo sulfur compounds and other organo inorganic compounds#12.10.00.00.00
-unspsc7#12.10.20.01.00#Organo sulfur compounds#12.10.20.00.00
-unspsc7#12.10.20.02.00#Other organo inorganic compounds#12.10.20.00.00
-unspsc7#12.10.20.03.00#Compounds containing an unfused furan ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.04.00#Lactines#12.10.20.00.00
-unspsc7#12.10.20.05.00#Compounds containing an unfused imidazole ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.06.00#Compounds containing an unfused pyridine ring in the structure#12.10.20.00.00
-unspsc7#12.10.20.07.00#Compounds containing a quinoline or isoquinoline ring system#12.10.20.00.00
-unspsc7#12.10.20.08.00#Lactams#12.10.20.00.00
-unspsc7#12.10.20.09.00#Heterocyclic compounds with nitrogen hetero atom only#12.10.20.00.00
-unspsc7#12.10.20.10.00#Compounds containing an unfused thiazole ring in the structure#12.10.20.00.00
-unspsc7#12.10.21.00.00#Hydrocarbons and their halogenated and sulphonated and nitrosated derivatives#12.10.00.00.00
-unspsc7#12.10.21.01.00#Saturated acyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.02.00#Unsaturated acyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.03.00#Cyclic hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.04.00#Halogentated derivatives of hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.05.00#Refrigerants#12.10.21.00.00
-unspsc7#12.10.21.06.00#Sulphonated or nitrated or nitrosated derivatives of hydrocarbons#12.10.21.00.00
-unspsc7#12.10.21.07.00#Paraffin#12.10.21.00.00
-unspsc7#12.10.22.00.00#Phosphoric esters and their salts and esters of other organic acids#12.10.00.00.00
-unspsc7#12.10.22.01.00#Phosphoric esters or their salts#12.10.22.00.00
-unspsc7#12.11.00.00.00#Inorganic chemicals#12.00.00.00.00
-unspsc7#12.11.16.00.00#Chemical elements#12.11.00.00.00
-unspsc7#12.11.16.01.00#Chlorine#12.11.16.00.00
-unspsc7#12.11.16.02.00#Fluorine or bromine#12.11.16.00.00
-unspsc7#12.11.16.03.00#Chlorine liquid gas#12.11.16.00.00
-unspsc7#12.11.16.04.00#Sublimes or precipitated sulphur or colloidal sulphur#12.11.16.00.00
-unspsc7#12.11.16.05.00#Boron or tellurium#12.11.16.00.00
-unspsc7#12.11.16.06.00#Silicon#12.11.16.00.00
-unspsc7#12.11.16.07.00#Alkali metals#12.11.16.00.00
-unspsc7#12.11.16.08.00#Alkaline earth metals#12.11.16.00.00
-unspsc7#12.11.16.09.00#Mercury#12.11.16.00.00
-unspsc7#12.11.16.10.00#Hydrogen chloride or hydrochloric acid#12.11.16.00.00
-unspsc7#12.11.16.11.00#Chlorosulfuric acid#12.11.16.00.00
-unspsc7#12.11.16.12.00#Sulphuric acid#12.11.16.00.00
-unspsc7#12.11.16.13.00#Phosphorus pentaoxide or phosphoric acid or polyphosphoric acids#12.11.16.00.00
-unspsc7#12.11.16.14.00#Oxides of boron or boric acids#12.11.16.00.00
-unspsc7#12.11.16.15.00#Hydrogen fluoride or hydrofluoric acid#12.11.16.00.00
-unspsc7#12.11.16.16.00#Silicon dioxide#12.11.16.00.00
-unspsc7#12.11.16.17.00#Sulphur dioxide#12.11.16.00.00
-unspsc7#12.11.16.18.00#Hydrocyanic acid#12.11.16.00.00
-unspsc7#12.11.16.19.00#Halides or halide oxides of non metals#12.11.16.00.00
-unspsc7#12.11.16.20.00#Sulphides of non metals#12.11.16.00.00
-unspsc7#12.11.16.21.00#Sodium or potassium hydroxide#12.11.16.00.00
-unspsc7#12.11.16.22.00#Hydroxide or peroxide of magnesium or oxides#12.11.16.00.00
-unspsc7#12.11.16.23.00#Aluminum hydroxide#12.11.16.00.00
-unspsc7#12.11.16.24.00#Hydroxide or hydroxylamine or their inorganic salts#12.11.16.00.00
-unspsc7#12.11.17.00.00#Metal oxides and hydroxides and peroxides#12.11.00.00.00
-unspsc7#12.11.17.01.00#Zinc oxide or zinc peroxide#12.11.17.00.00
-unspsc7#12.11.17.02.00#Chromium oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.03.00#Manganese oxides#12.11.17.00.00
-unspsc7#12.11.17.04.00#Iron oxides or hydroxides or earth colours#12.11.17.00.00
-unspsc7#12.11.17.05.00#Cobalt oxides or hydroxides or commercial cobalt oxides#12.11.17.00.00
-unspsc7#12.11.17.06.00#Titanium oxides#12.11.17.00.00
-unspsc7#12.11.17.07.00#Lead oxides or red lead or orange lead#12.11.17.00.00
-unspsc7#12.11.17.08.00#Lithium oxide or hydroxide#12.11.17.00.00
-unspsc7#12.11.17.09.00#Vanadium oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.10.00#Nickel oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.11.00#Copper oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.12.00#Germanium oxides or zirconium dioxide#12.11.17.00.00
-unspsc7#12.11.17.13.00#Molybdenum oxides or hydroxides#12.11.17.00.00
-unspsc7#12.11.17.14.00#Antimony oxides#12.11.17.00.00
-unspsc7#12.11.18.00.00#Salts of oxometallic and peroxometallic acids and other inorganic acids#12.11.00.00.00
-unspsc7#12.11.18.01.00#Aluminates#12.11.18.00.00
-unspsc7#12.11.18.02.00#Zinc or lead chromate#12.11.18.00.00
-unspsc7#12.11.18.03.00#Sodium dichromate#12.11.18.00.00
-unspsc7#12.11.18.04.00#Potassium dichromate#12.11.18.00.00
-unspsc7#12.11.18.05.00#Other chromate or dichromate or peroxochromates#12.11.18.00.00
-unspsc7#12.11.18.06.00#Manganites or manganates or permanganates#12.11.18.00.00
-unspsc7#12.11.18.07.00#Molybdates#12.11.18.00.00
-unspsc7#12.11.18.08.00#Tungstates or wolframates#12.11.18.00.00
-unspsc7#12.11.18.09.00#Silver compounds#12.11.18.00.00
-unspsc7#12.11.18.10.00#Gold compounds#12.11.18.00.00
-unspsc7#12.11.18.11.00#Other compounds or amalgams#12.11.18.00.00
-unspsc7#12.11.18.12.00#Amalgams other than amalgams of precious metals#12.11.18.00.00
-unspsc7#12.11.19.00.00#Salts and peroxysalts of inorganic acids and metal#12.11.00.00.00
-unspsc7#12.11.19.01.00#Fluorides or fluorosilicates or fluoroaluminates#12.11.19.00.00
-unspsc7#12.11.19.02.00#Chlorides#12.11.19.00.00
-unspsc7#12.11.19.03.00#Sodium chloride#12.11.19.00.00
-unspsc7#12.11.19.04.00#Sal ammoniac blocks#12.11.19.00.00
-unspsc7#12.11.19.05.00#Potassium iodinate#12.11.19.00.00
-unspsc7#12.11.19.06.00#Sulphides or polysulfides or dithionites or sulfoxylates#12.11.19.00.00
-unspsc7#12.11.19.07.00#Sulphites or thiosulfates#12.11.19.00.00
-unspsc7#12.11.19.08.00#Aluminum sulphate#12.11.19.00.00
-unspsc7#12.11.19.09.00#Colloidal precious metals#12.11.19.00.00
-unspsc7#12.11.19.10.00#Ferrous sulphate#12.11.19.00.00
-unspsc7#12.11.19.11.00#Silver nitrate#12.11.19.00.00
-unspsc7#12.11.19.12.00#Sodium dihydrogernorthophosphate#12.11.19.00.00
-unspsc7#12.11.19.13.00#Sodium phosphate dibasic#12.11.19.00.00
-unspsc7#12.11.19.14.00#Sodium bicarbonate#12.11.19.00.00
-unspsc7#12.11.19.15.00#Tri sodium citrate di hydrate#12.11.19.00.00
-unspsc7#12.11.19.16.00#Sodium carbonate#12.11.19.00.00
-unspsc7#12.11.19.17.00#Metallic sodium#12.11.19.00.00
-unspsc7#12.11.19.18.00#Sodium silicate liquids#12.11.19.00.00
-unspsc7#12.11.19.19.00#Sodium silicate binders#12.11.19.00.00
-unspsc7#12.11.20.00.00#Hydrogen peroxide and hydrides and nitrides and asides and silicides and borides#12.11.00.00.00
-unspsc7#12.11.20.01.00#Hydrogen peroxide#12.11.20.00.00
-unspsc7#12.11.20.02.00#Phosphides#12.11.20.00.00
-unspsc7#12.11.20.03.00#Carbides#12.11.20.00.00
-unspsc7#12.11.20.04.00#Calcium carbide#12.11.20.00.00
-unspsc7#12.11.20.05.00#Bromides#12.11.20.00.00
-unspsc7#12.11.21.00.00#Isotopes and their compounds inorganic and organic#12.11.00.00.00
-unspsc7#12.11.21.01.00#Deuterium#12.11.21.00.00
-unspsc7#12.11.21.02.00#Deuterated solvents#12.11.21.00.00
-unspsc7#12.11.21.03.00#Heavy water#12.11.21.00.00
-unspsc7#12.11.21.04.00#Alpha sources#12.11.21.00.00
-unspsc7#12.11.21.05.00#Beta sources#12.11.21.00.00
-unspsc7#12.11.21.06.00#Cobalt sources#12.11.21.00.00
-unspsc7#12.11.21.07.00#Gamma sources#12.11.21.00.00
-unspsc7#12.11.21.08.00#Neutron sources#12.11.21.00.00
-unspsc7#12.11.21.09.00#Radioisotope sources#12.11.21.00.00
-unspsc7#12.11.21.10.00#Calibration sources#12.11.21.00.00
-unspsc7#12.11.21.11.00#In vivo products#12.11.21.00.00
-unspsc7#12.11.21.12.00#Radiochemical isotopes#12.11.21.00.00
-unspsc7#12.11.21.13.00#Radiographic source#12.11.21.00.00
-unspsc7#12.11.21.14.00#Radioimmunoassay isotopes#12.11.21.00.00
-unspsc7#12.11.21.15.00#Tritium targets#12.11.21.00.00
-unspsc7#12.11.21.16.00#Excitation source or annular#12.11.21.00.00
-unspsc7#12.11.21.17.00#Radiopharmaceutical compounds for labelling#12.11.21.00.00
-unspsc7#12.11.21.18.00#Chemicals labelled C14#12.11.21.00.00
-unspsc7#12.11.21.19.00#Fissionable isotopes#12.11.21.00.00
-unspsc7#12.11.21.20.00#In vivo radioactive isotope products#12.11.21.00.00
-unspsc7#12.11.22.00.00#Cyanides#12.11.00.00.00
-unspsc7#12.11.22.01.00#Cyanides or cyanide oxides of sodium#12.11.22.00.00
-unspsc7#12.11.22.02.00#Complex cyanides or thiocyanates#12.11.22.00.00
-unspsc7#12.11.22.03.00#Cyanides or cyanide oxides#12.11.22.00.00
-unspsc7#12.12.00.00.00#Gases#12.00.00.00.00
-unspsc7#12.12.15.00.00#Industrial gases#12.12.00.00.00
-unspsc7#12.12.15.01.00#Nitrous oxide gas#12.12.15.00.00
-unspsc7#12.12.15.02.00#Helium gas#12.12.15.00.00
-unspsc7#12.12.15.04.00#Carbon monoxide#12.12.15.00.00
-unspsc7#12.12.15.05.00#Hydrogen gas#12.12.15.00.00
-unspsc7#12.12.15.06.00#Carbon dioxide#12.12.15.00.00
-unspsc7#12.12.15.07.00#Nitrogen gas#12.12.15.00.00
-unspsc7#12.12.15.08.00#Neon gas#12.12.15.00.00
-unspsc7#12.12.15.10.00#Oxygen#12.12.15.00.00
-unspsc7#12.12.16.00.00#Rare gases#12.12.00.00.00
-unspsc7#12.12.16.01.00#Xenon gas#12.12.16.00.00
-unspsc7#12.12.16.02.00#Radon gas#12.12.16.00.00
-unspsc7#12.12.16.03.00#Krypton gas#12.12.16.00.00
-unspsc7#12.12.16.04.00#Argon gas#12.12.16.00.00
-unspsc7#12.12.16.09.00#Xenon gas#12.12.16.00.00
-unspsc7#12.12.16.10.00#Radon gas#12.12.16.00.00
-unspsc7#12.12.16.11.00#Krypton gas#12.12.16.00.00
-unspsc7#12.12.16.12.00#Argon gas#12.12.16.00.00
-unspsc7#12.13.00.00.00#Explosive materials#12.00.00.00.00
-unspsc7#12.13.15.00.00#Explosives#12.13.00.00.00
-unspsc7#12.13.15.01.00#Dynamite#12.13.15.00.00
-unspsc7#12.13.15.02.00#Explosive cartridges#12.13.15.00.00
-unspsc7#12.13.15.03.00#Propellant explosives#12.13.15.00.00
-unspsc7#12.13.15.04.00#Explosive charges#12.13.15.00.00
-unspsc7#12.13.15.05.00#Plastic explosives#12.13.15.00.00
-unspsc7#12.13.15.06.00#Aluminized explosives#12.13.15.00.00
-unspsc7#12.13.15.07.00#Ammonium nitrate explosives#12.13.15.00.00
-unspsc7#12.13.15.08.00#Nitroglycerin powder explosives#12.13.15.00.00
-unspsc7#12.13.16.00.00#Pyrotechnics#12.13.00.00.00
-unspsc7#12.13.16.01.00#Fireworks#12.13.16.00.00
-unspsc7#12.13.16.02.00#Fog signals#12.13.16.00.00
-unspsc7#12.13.16.03.00#Rain rockets#12.13.16.00.00
-unspsc7#12.13.16.04.00#Flares#12.13.16.00.00
-unspsc7#12.13.16.05.00#Pyrotechnic materials for theater or television#12.13.16.00.00
-unspsc7#12.13.17.00.00#Igniters#12.13.00.00.00
-unspsc7#12.13.17.01.00#Blasting caps#12.13.17.00.00
-unspsc7#12.13.17.02.00#Detonators#12.13.17.00.00
-unspsc7#12.13.17.03.00#Explosives fuses#12.13.17.00.00
-unspsc7#12.13.17.04.00#Explosive initiators#12.13.17.00.00
-unspsc7#12.13.17.05.00#Explosive primers#12.13.17.00.00
-unspsc7#12.13.17.06.00#Matches#12.13.17.00.00
-unspsc7#12.13.17.07.00#Lighters#12.13.17.00.00
-unspsc7#12.13.18.00.00#Propellants#12.13.00.00.00
-unspsc7#12.13.18.01.00#Powder propellants#12.13.18.00.00
-unspsc7#12.13.18.02.00#Solid propellants#12.13.18.00.00
-unspsc7#12.13.18.03.00#Gun propellants#12.13.18.00.00
-unspsc7#12.13.18.04.00#High energy propellants#12.13.18.00.00
-unspsc7#12.13.18.05.00#Gelled propellants#12.13.18.00.00
-unspsc7#12.13.18.06.00#Hybrid propellants#12.13.18.00.00
-unspsc7#12.14.00.00.00#Elements and gases#12.00.00.00.00
-unspsc7#12.14.15.00.00#Earth metals#12.14.00.00.00
-unspsc7#12.14.15.01.00#Beryllium (Be)#12.14.15.00.00
-unspsc7#12.14.15.02.00#Magnesium (Mg)#12.14.15.00.00
-unspsc7#12.14.15.03.00#Calcium (Ca)#12.14.15.00.00
-unspsc7#12.14.15.04.00#Strontium (Sr)#12.14.15.00.00
-unspsc7#12.14.15.05.00#Barium (Ba)#12.14.15.00.00
-unspsc7#12.14.15.06.00#Radium (Ra)#12.14.15.00.00
-unspsc7#12.14.16.00.00#Rare earth metals#12.14.00.00.00
-unspsc7#12.14.16.01.00#Cerium (Ce)#12.14.16.00.00
-unspsc7#12.14.16.02.00#Dysprosium (Dy)#12.14.16.00.00
-unspsc7#12.14.16.03.00#Erbium (Er)#12.14.16.00.00
-unspsc7#12.14.16.04.00#Europium (Eu)#12.14.16.00.00
-unspsc7#12.14.16.05.00#Gadolinium (Gd)#12.14.16.00.00
-unspsc7#12.14.16.06.00#Holmium (Ho)#12.14.16.00.00
-unspsc7#12.14.16.07.00#Lanthanum (La)#12.14.16.00.00
-unspsc7#12.14.16.08.00#Lutetium (Lu)#12.14.16.00.00
-unspsc7#12.14.16.09.00#Neodymium (Nd)#12.14.16.00.00
-unspsc7#12.14.16.10.00#Praseodymium (Pr)#12.14.16.00.00
-unspsc7#12.14.16.11.00#Promethium (Pr)#12.14.16.00.00
-unspsc7#12.14.16.12.00#Samarium (Sm)#12.14.16.00.00
-unspsc7#12.14.16.13.00#Scandium (Sc)#12.14.16.00.00
-unspsc7#12.14.16.14.00#Terbium (Tb)#12.14.16.00.00
-unspsc7#12.14.16.15.00#Thulium (Tm)#12.14.16.00.00
-unspsc7#12.14.16.16.00#Ytterbium (Yb)#12.14.16.00.00
-unspsc7#12.14.16.17.00#Yttrium (Y)#12.14.16.00.00
-unspsc7#12.14.17.00.00#Transition metals#12.14.00.00.00
-unspsc7#12.14.17.01.00#Actinium (Ac)#12.14.17.00.00
-unspsc7#12.14.17.02.00#Aluminum (Al)#12.14.17.00.00
-unspsc7#12.14.17.03.00#Americium (Am)#12.14.17.00.00
-unspsc7#12.14.17.04.00#Antimony (Sb)#12.14.17.00.00
-unspsc7#12.14.17.05.00#Berkelium (Bk)#12.14.17.00.00
-unspsc7#12.14.17.06.00#Bismuth (Bi)#12.14.17.00.00
-unspsc7#12.14.17.07.00#Cadmium (Ca)#12.14.17.00.00
-unspsc7#12.14.17.08.00#Californium (Cf)#12.14.17.00.00
-unspsc7#12.14.17.09.00#Chromium (Cr)#12.14.17.00.00
-unspsc7#12.14.17.10.00#Cobalt (Co)#12.14.17.00.00
-unspsc7#12.14.17.11.00#Copper (Cu)#12.14.17.00.00
-unspsc7#12.14.17.12.00#Curium (Cm)#12.14.17.00.00
-unspsc7#12.14.17.13.00#Einsteinium (Es)#12.14.17.00.00
-unspsc7#12.14.17.14.00#Fermium (Fm)#12.14.17.00.00
-unspsc7#12.14.17.15.00#Gallium (Ga)#12.14.17.00.00
-unspsc7#12.14.17.16.00#Germanium (Ge)#12.14.17.00.00
-unspsc7#12.14.17.17.00#Gold (Au)#12.14.17.00.00
-unspsc7#12.14.17.18.00#Hafnium (Hf)#12.14.17.00.00
-unspsc7#12.14.17.19.00#Indium (In)#12.14.17.00.00
-unspsc7#12.14.17.20.00#Iridium (Ir)#12.14.17.00.00
-unspsc7#12.14.17.21.00#Iron (Fe)#12.14.17.00.00
-unspsc7#12.14.17.22.00#Lawrencium (Lr)#12.14.17.00.00
-unspsc7#12.14.17.23.00#Lead (Pb)#12.14.17.00.00
-unspsc7#12.14.17.24.00#Manganese (Mn)#12.14.17.00.00
-unspsc7#12.14.17.25.00#Mendelevium (Md)#12.14.17.00.00
-unspsc7#12.14.17.26.00#Mercury (Hg)#12.14.17.00.00
-unspsc7#12.14.17.27.00#Molybdenum (Mo)#12.14.17.00.00
-unspsc7#12.14.17.28.00#Neptunium (Np)#12.14.17.00.00
-unspsc7#12.14.17.29.00#Nickel (Ni)#12.14.17.00.00
-unspsc7#12.14.17.30.00#Niobium (Nb)#12.14.17.00.00
-unspsc7#12.14.17.31.00#Nobelium (No)#12.14.17.00.00
-unspsc7#12.14.17.32.00#Osmium (Os)#12.14.17.00.00
-unspsc7#12.14.17.33.00#Palladium (Pd)#12.14.17.00.00
-unspsc7#12.14.17.34.00#Platinum (Pt)#12.14.17.00.00
-unspsc7#12.14.17.35.00#Plutonium (Pu)#12.14.17.00.00
-unspsc7#12.14.17.36.00#Protactinium (Pa)#12.14.17.00.00
-unspsc7#12.14.17.37.00#Rhenium (Re)#12.14.17.00.00
-unspsc7#12.14.17.38.00#Rhodium (Rh)#12.14.17.00.00
-unspsc7#12.14.17.39.00#Ruthenium (Ru)#12.14.17.00.00
-unspsc7#12.14.17.40.00#Silver (Ag)#12.14.17.00.00
-unspsc7#12.14.17.41.00#Tantalum (Ta)#12.14.17.00.00
-unspsc7#12.14.17.42.00#Technetium (Te)#12.14.17.00.00
-unspsc7#12.14.17.43.00#Thallium (Tl)#12.14.17.00.00
-unspsc7#12.14.17.44.00#Thorium (Th)#12.14.17.00.00
-unspsc7#12.14.17.45.00#Tin (Sn)#12.14.17.00.00
-unspsc7#12.14.17.46.00#Titanium (Ti)#12.14.17.00.00
-unspsc7#12.14.17.47.00#Tungsten (W)#12.14.17.00.00
-unspsc7#12.14.17.48.00#Uranium (U)#12.14.17.00.00
-unspsc7#12.14.17.49.00#Vanadium (V)#12.14.17.00.00
-unspsc7#12.14.17.50.00#Zinc (Zn)#12.14.17.00.00
-unspsc7#12.14.17.51.00#Zirconium (Zr)#12.14.17.00.00
-unspsc7#12.14.17.52.00#Bohrium (Bh)#12.14.17.00.00
-unspsc7#12.14.17.53.00#Dubnium (Db)#12.14.17.00.00
-unspsc7#12.14.17.54.00#Hassium (Hs)#12.14.17.00.00
-unspsc7#12.14.17.55.00#Rutherfordium (Rf)#12.14.17.00.00
-unspsc7#12.14.17.56.00#Seaborgium (Sg)#12.14.17.00.00
-unspsc7#12.14.17.57.00#Ununnilium (Uum)#12.14.17.00.00
-unspsc7#12.14.17.58.00#Unununium (Uuu)#12.14.17.00.00
-unspsc7#12.14.17.59.00#Ununbium (Uub)#12.14.17.00.00
-unspsc7#12.14.17.60.00#Polonium ((Po)#12.14.17.00.00
-unspsc7#12.14.18.00.00#Alkali metals#12.14.00.00.00
-unspsc7#12.14.18.01.00#Cesium (Cs)#12.14.18.00.00
-unspsc7#12.14.18.02.00#Francium (Fm)#12.14.18.00.00
-unspsc7#12.14.18.03.00#Lithium (Li)#12.14.18.00.00
-unspsc7#12.14.18.04.00#Potassium (K)#12.14.18.00.00
-unspsc7#12.14.18.05.00#Rubidium (Rb)#12.14.18.00.00
-unspsc7#12.14.18.06.00#Sodium (Na)#12.14.18.00.00
-unspsc7#12.14.19.00.00#Non metals and pure and elemental gases#12.14.00.00.00
-unspsc7#12.14.19.01.00#Chlorine (Cl)#12.14.19.00.00
-unspsc7#12.14.19.02.00#Hydrogen (H)#12.14.19.00.00
-unspsc7#12.14.19.03.00#Nitrogen (N)#12.14.19.00.00
-unspsc7#12.14.19.04.00#Oxygen (O)#12.14.19.00.00
-unspsc7#12.14.19.05.00#Fluorine (F)#12.14.19.00.00
-unspsc7#12.14.19.06.00#Arsenic (As)#12.14.19.00.00
-unspsc7#12.14.19.07.00#Boron (Bh)#12.14.19.00.00
-unspsc7#12.14.19.08.00#Carbon (C)#12.14.19.00.00
-unspsc7#12.14.19.09.00#Phosphorus (P)#12.14.19.00.00
-unspsc7#12.14.19.10.00#Selenium (Se)#12.14.19.00.00
-unspsc7#12.14.19.11.00#Silicon (Si)#12.14.19.00.00
-unspsc7#12.14.19.12.00#Sulfur (S)#12.14.19.00.00
-unspsc7#12.14.19.13.00#Tellurium (Te)#12.14.19.00.00
-unspsc7#12.14.19.14.00#Astatine (At)#12.14.19.00.00
-unspsc7#12.14.19.15.00#Bromine Br#12.14.19.00.00
-unspsc7#12.14.19.16.00#Iodine (I)#12.14.19.00.00
-unspsc7#12.14.20.00.00#Noble gases#12.14.00.00.00
-unspsc7#12.14.20.01.00#Xenon gas (Xe)#12.14.20.00.00
-unspsc7#12.14.20.02.00#Radon gas (Rn)#12.14.20.00.00
-unspsc7#12.14.20.03.00#Krypton gas (Kr)#12.14.20.00.00
-unspsc7#12.14.20.04.00#Argon gas (Ar)#12.14.20.00.00
-unspsc7#12.14.20.05.00#Helium gas (He)#12.14.20.00.00
-unspsc7#12.14.20.06.00#Neon gas (Ne)#12.14.20.00.00
-unspsc7#12.14.21.00.00#Industrial use gases#12.14.00.00.00
-unspsc7#12.14.21.01.00#Hydrogen compound gases#12.14.21.00.00
-unspsc7#12.14.21.02.00#Chlorinated mixed gases#12.14.21.00.00
-unspsc7#12.14.21.03.00#Ammonia#12.14.21.00.00
-unspsc7#12.14.21.04.00#Carbon dioxide gas (CO2)#12.14.21.00.00
-unspsc7#12.14.21.05.00#Industrial air#12.14.21.00.00
-unspsc7#12.14.21.06.00#Inert gas mixtures#12.14.21.00.00
-unspsc7#12.15.00.00.00#Acids and their salts and esters#12.00.00.00.00
-unspsc7#12.15.15.00.00#Carboxylic acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.15.01.00#Acetic acid or its salts#12.15.15.00.00
-unspsc7#12.15.15.02.00#Acyclic acids#12.15.15.00.00
-unspsc7#12.15.15.03.00#Aldehydic acids#12.15.15.00.00
-unspsc7#12.15.15.04.00#Butyric acids#12.15.15.00.00
-unspsc7#12.15.15.05.00#Carbocylic acids#12.15.15.00.00
-unspsc7#12.15.15.06.00#Hydroxy acids#12.15.15.00.00
-unspsc7#12.15.15.07.00#Keto acids#12.15.15.00.00
-unspsc7#12.15.15.08.00#Propionic acids#12.15.15.00.00
-unspsc7#12.15.15.09.00#Acrylic acid esters#12.15.15.00.00
-unspsc7#12.15.15.10.00#Esters of methacrylic acid#12.15.15.00.00
-unspsc7#12.15.16.00.00#Heterocyclic acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.16.01.00#Indoleacetic acids#12.15.16.00.00
-unspsc7#12.15.16.02.00#Isonicotinic acids#12.15.16.00.00
-unspsc7#12.15.16.03.00#Isonipecotic acids#12.15.16.00.00
-unspsc7#12.15.16.04.00#Nicotinic acids#12.15.16.00.00
-unspsc7#12.15.16.05.00#Nipecotic acids#12.15.16.00.00
-unspsc7#12.15.16.06.00#Orotic acids#12.15.16.00.00
-unspsc7#12.15.16.07.00#Picolinic acids#12.15.16.00.00
-unspsc7#12.15.16.08.00#Pipecolic acids#12.15.16.00.00
-unspsc7#12.15.17.00.00#Fatty acids and their salts and esters#12.15.00.00.00
-unspsc7#12.15.17.01.00#Decanoic acids#12.15.17.00.00
-unspsc7#12.15.17.02.00#Unsaturated fatty acids#12.15.17.00.00
-unspsc7#12.15.17.03.00#Volatile fatty acids#12.15.17.00.00
-unspsc7#12.15.17.04.00#Heptanoic acids#12.15.17.00.00
-unspsc7#12.15.17.05.00#Lauric acids#12.15.17.00.00
-unspsc7#12.15.17.06.00#Mycolic acids#12.15.17.00.00
-unspsc7#12.15.17.07.00#Myristic acids#12.15.17.00.00
-unspsc7#12.15.17.08.00#Palmitic acids#12.15.17.00.00
-unspsc7#12.15.17.09.00#Stearic acids#12.15.17.00.00
-unspsc7#12.15.18.00.00#Non carboxylic acids and their salts#12.15.00.00.00
-unspsc7#12.15.18.01.00#Carbonic acids#12.15.18.00.00
-unspsc7#12.15.18.02.00#Nitric acids#12.15.18.00.00
-unspsc7#12.15.18.03.00#Phosphorous acids#12.15.18.00.00
-unspsc7#12.15.18.04.00#Sulfur acids#12.15.18.00.00
-unspsc7#12.15.18.05.00#Chlorides#12.15.18.00.00
-unspsc7#12.15.18.06.00#Hydrochlorides#12.15.18.00.00
-unspsc7#12.15.18.07.00#Nitrates or nitrites#12.15.18.00.00
-unspsc7#12.15.18.08.00#Silicates#12.15.18.00.00
-unspsc7#12.15.18.09.00#Phosphates or phosphides#12.15.18.00.00
-unspsc7#12.15.18.10.00#Bicarbonates or carbides or carbonates#12.15.18.00.00
-unspsc7#12.15.18.11.00#Fluorides#12.15.18.00.00
-unspsc7#12.15.18.12.00#Bromides or bromates#12.15.18.00.00
-unspsc7#12.15.18.13.00#Iodides or iodates#12.15.18.00.00
-unspsc7#12.15.19.00.00#Inorganic sulfur compounds#12.15.00.00.00
-unspsc7#12.15.19.01.00#Hydrogen sulfide#12.15.19.00.00
-unspsc7#12.15.19.02.00#Sulfuric Acid#12.15.19.00.00
-unspsc7#12.15.19.03.00#Sodium sulfate#12.15.19.00.00
-unspsc7#12.16.00.00.00#Additives#12.00.00.00.00
-unspsc7#12.16.15.00.00#Indicators and Reagents#12.16.00.00.00
-unspsc7#12.16.15.01.00#Affinity labels#12.16.15.00.00
-unspsc7#12.16.15.02.00#Cross linking agents#12.16.15.00.00
-unspsc7#12.16.15.03.00#Reagent kits#12.16.15.00.00
-unspsc7#12.16.15.04.00#Sulfhydryl reagents#12.16.15.00.00
-unspsc7#12.16.15.05.00#Intercalating agents#12.16.15.00.00
-unspsc7#12.16.15.06.00#Diverting agents#12.16.15.00.00
-unspsc7#12.16.16.00.00#Catalysts#12.16.00.00.00
-unspsc7#12.16.16.01.00#Acid catalysts#12.16.16.00.00
-unspsc7#12.16.16.02.00#Combustion catalysts#12.16.16.00.00
-unspsc7#12.16.16.03.00#Custom catalysts#12.16.16.00.00
-unspsc7#12.16.16.04.00#Cracking catalysts#12.16.16.00.00
-unspsc7#12.16.17.00.00#Buffers#12.16.00.00.00
-unspsc7#12.16.17.01.00#Ampholyte mixtures#12.16.17.00.00
-unspsc7#12.16.17.02.00#Bicarbonate buffers#12.16.17.00.00
-unspsc7#12.16.17.03.00#Other buffers#12.16.17.00.00
-unspsc7#12.16.17.04.00#Acid buffers#12.16.17.00.00
-unspsc7#12.16.17.05.00#Basic buffers#12.16.17.00.00
-unspsc7#12.16.17.06.00#Neutral buffers#12.16.17.00.00
-unspsc7#12.16.18.00.00#Colloids#12.16.00.00.00
-unspsc7#12.16.18.01.00#Gels#12.16.18.00.00
-unspsc7#12.16.18.02.00#Suspensions#12.16.18.00.00
-unspsc7#12.16.18.03.00#Aerosols#12.16.18.00.00
-unspsc7#12.16.18.04.00#Emulsions#12.16.18.00.00
-unspsc7#12.16.18.05.00#Natural gelling agents#12.16.18.00.00
-unspsc7#12.16.18.06.00#Synthetic gelling agents#12.16.18.00.00
-unspsc7#12.16.18.07.00#Gel stabilizers#12.16.18.00.00
-unspsc7#12.16.18.08.00#Suspending agents#12.16.18.00.00
-unspsc7#12.16.19.00.00#Surfactants#12.16.00.00.00
-unspsc7#12.16.19.01.00#Anti foaming agents#12.16.19.00.00
-unspsc7#12.16.19.02.00#Detergent surfactants#12.16.19.00.00
-unspsc7#12.16.19.03.00#Foaming agents#12.16.19.00.00
-unspsc7#12.16.19.04.00#Dispersing agents#12.16.19.00.00
-unspsc7#12.16.19.05.00#Flushes#12.16.19.00.00
-unspsc7#12.16.19.06.00#Wetting agents#12.16.19.00.00
-unspsc7#12.16.19.07.00#Water flood additives#12.16.19.00.00
-unspsc7#12.16.20.00.00#Plasticizers#12.16.00.00.00
-unspsc7#12.16.20.01.00#Phthalates#12.16.20.00.00
-unspsc7#12.16.20.02.00#Polymerics#12.16.20.00.00
-unspsc7#12.16.20.03.00#Agricultural oils#12.16.20.00.00
-unspsc7#12.16.20.04.00#Sulfonamides#12.16.20.00.00
-unspsc7#12.16.20.05.00#Glutarates#12.16.20.00.00
-unspsc7#12.16.21.00.00#Flame retardants#12.16.00.00.00
-unspsc7#12.16.21.01.00#Brominated#12.16.21.00.00
-unspsc7#12.16.22.00.00#Anti oxidants#12.16.00.00.00
-unspsc7#12.16.22.01.00#Ascorbic acid#12.16.22.00.00
-unspsc7#12.16.22.02.00#Beta carotene#12.16.22.00.00
-unspsc7#12.16.22.03.00#Butylated hydroxyanisole#12.16.22.00.00
-unspsc7#12.16.22.04.00#Butylated hydroxytoluene#12.16.22.00.00
-unspsc7#12.16.22.05.00#Calcium citrate#12.16.22.00.00
-unspsc7#12.16.22.06.00#Canthaxanthin#12.16.22.00.00
-unspsc7#12.16.22.07.00#Melatonin#12.16.22.00.00
-unspsc7#12.16.22.08.00#Nordihydroguaiaretic acid#12.16.22.00.00
-unspsc7#12.16.22.09.00#Propyl gallate#12.16.22.00.00
-unspsc7#12.16.22.10.00#Silymarin#12.16.22.00.00
-unspsc7#12.16.22.11.00#Sulfur dioxide#12.16.22.00.00
-unspsc7#12.16.23.00.00#Curing agents#12.16.00.00.00
-unspsc7#12.16.23.01.00#Waterborne curing agents#12.16.23.00.00
-unspsc7#12.16.23.02.00#Cement accelerators#12.16.23.00.00
-unspsc7#12.16.23.03.00#Cement retarders#12.16.23.00.00
-unspsc7#12.16.24.00.00#Polymer breakers#12.16.00.00.00
-unspsc7#12.16.24.01.00#Acidic polymer breakers#12.16.24.00.00
-unspsc7#12.16.24.02.00#Organic polymer breakers#12.16.24.00.00
-unspsc7#12.16.25.00.00#Emulsion breakers#12.16.00.00.00
-unspsc7#12.16.25.01.00#Water in oil emulsion breakers#12.16.25.00.00
-unspsc7#12.16.25.02.00#Oil in water emulsion breakers#12.16.25.00.00
-unspsc7#12.16.25.03.00#Flotation aids#12.16.25.00.00
-unspsc7#12.16.26.00.00#Clay stabilizers#12.16.00.00.00
-unspsc7#12.16.26.01.00#Inorganic clay stabilizers#12.16.26.00.00
-unspsc7#12.16.26.02.00#Organic clay stabilizers#12.16.26.00.00
-unspsc7#12.16.27.00.00#Fluid loss additives#12.16.00.00.00
-unspsc7#12.16.27.01.00#Natural polymer fluid loss additives#12.16.27.00.00
-unspsc7#12.16.27.02.00#Modified polymer fluid loss additives#12.16.27.00.00
-unspsc7#12.16.28.00.00#Friction reducers#12.16.00.00.00
-unspsc7#12.16.28.01.00#Anionic friction reducers#12.16.28.00.00
-unspsc7#12.16.28.02.00#Cationic friction reducers#12.16.28.00.00
-unspsc7#12.16.29.00.00#Paraffin asphaltene control agents#12.16.00.00.00
-unspsc7#12.16.29.01.00#Solvent type paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.29.02.00#Crystal modified paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.29.03.00#Dispersant type paraffin asphaltene control agents#12.16.29.00.00
-unspsc7#12.16.30.00.00#Mud removal mixtures#12.16.00.00.00
-unspsc7#12.16.30.01.00#Mud cleanout agents#12.16.30.00.00
-unspsc7#12.16.31.00.00#Anti sludgers#12.16.00.00.00
-unspsc7#12.16.31.01.00#Anti sludge additives#12.16.31.00.00
-unspsc7#12.16.32.00.00#Anti gas migration agents#12.16.00.00.00
-unspsc7#12.16.32.01.00#Anti gas migration additives#12.16.32.00.00
-unspsc7#12.16.33.00.00#Expanding agents#12.16.00.00.00
-unspsc7#12.16.33.01.00#Cement expanding agents#12.16.33.00.00
-unspsc7#12.16.34.00.00#Extenders#12.16.00.00.00
-unspsc7#12.16.34.01.00#Cement extenders#12.16.34.00.00
-unspsc7#12.16.35.00.00#Oil well sealants#12.16.00.00.00
-unspsc7#12.16.35.01.00#Cementing sealants#12.16.35.00.00
-unspsc7#12.16.36.00.00#Corrosion inhibitors#12.16.00.00.00
-unspsc7#12.16.36.01.00#Oil production corrosion inhibitors#12.16.36.00.00
-unspsc7#12.16.36.02.00#Gas production corrosion inhibitors#12.16.36.00.00
-unspsc7#12.16.37.00.00#Gas hydrate controllers#12.16.00.00.00
-unspsc7#12.16.37.01.00#Kinetic hydrate controllers#12.16.37.00.00
-unspsc7#12.16.38.00.00#Scavengers#12.16.00.00.00
-unspsc7#12.16.38.01.00#Hydrogen sulfide scavengers#12.16.38.00.00
-unspsc7#12.16.38.02.00#Oxygen scavengers#12.16.38.00.00
-unspsc7#12.16.39.00.00#Scale controllers#12.16.00.00.00
-unspsc7#12.16.39.01.00#Scale inhibitor#12.16.39.00.00
-unspsc7#12.16.39.02.00#Scale removers and converters#12.16.39.00.00
-unspsc7#12.16.40.00.00#Bactericides#12.16.00.00.00
-unspsc7#12.16.40.01.00#Registered microbiocides#12.16.40.00.00
-unspsc7#12.16.41.00.00#In situ#12.16.00.00.00
-unspsc7#12.16.41.01.00#In situ additives#12.16.41.00.00
-unspsc7#12.16.41.02.00#Acid additives#12.16.41.00.00
-unspsc7#12.16.42.00.00#Retarders#12.16.00.00.00
-unspsc7#12.16.42.01.00#Acid corrosion inhibitors#12.16.42.00.00
-unspsc7#12.16.43.00.00#Iron controllers#12.16.00.00.00
-unspsc7#12.16.43.01.00#Iron control additives#12.16.43.00.00
-unspsc7#12.16.44.00.00#Non emulsifiers#12.16.00.00.00
-unspsc7#12.16.44.01.00#Non emulsifying additives#12.16.44.00.00
-unspsc7#12.17.00.00.00#Colorants#12.00.00.00.00
-unspsc7#12.17.15.00.00#Dyes#12.17.00.00.00
-unspsc7#12.17.15.01.00#Fluorescent dyes#12.17.15.00.00
-unspsc7#12.17.15.02.00#Phthalein dyes#12.17.15.00.00
-unspsc7#12.17.15.03.00#Rosaniline dyes#12.17.15.00.00
-unspsc7#12.17.15.04.00#Food or drug or cosmetic safe (FDC) dyes#12.17.15.00.00
-unspsc7#12.17.15.05.00#Laked#12.17.15.00.00
-unspsc7#12.17.15.06.00#Natural dyes#12.17.15.00.00
-unspsc7#12.17.16.00.00#Pigments#12.17.00.00.00
-unspsc7#12.17.16.01.00#Natural pigments#12.17.16.00.00
-unspsc7#12.17.16.02.00#Inorganic metal oxides#12.17.16.00.00
-unspsc7#12.17.16.03.00#Carbon black#12.17.16.00.00
-unspsc7#12.17.16.04.00#Titanium dioxide#12.17.16.00.00
-unspsc7#12.17.16.05.00#Organic pigments#12.17.16.00.00
-unspsc7#12.17.17.00.00#Color compounds and dispersions#12.17.00.00.00
-unspsc7#12.17.17.01.00#Polymer masterbatches#12.17.17.00.00
-unspsc7#12.17.17.02.00#Pigment dispersions#12.17.17.00.00
-unspsc7#12.17.17.03.00#Inks#12.17.17.00.00
-unspsc7#12.18.00.00.00#Waxes and oils#12.00.00.00.00
-unspsc7#12.18.15.00.00#Waxes#12.18.00.00.00
-unspsc7#12.18.15.01.00#Synthetic waxes#12.18.15.00.00
-unspsc7#12.18.15.02.00#Natural waxes#12.18.15.00.00
-unspsc7#12.18.15.03.00#Paraffins#12.18.15.00.00
-unspsc7#12.18.15.04.00#Petrolatums#12.18.15.00.00
-unspsc7#12.18.16.00.00#Oils#12.18.00.00.00
-unspsc7#12.18.16.01.00#Synthetic oils#12.18.16.00.00
-unspsc7#12.18.16.02.00#Natural oils#12.18.16.00.00
-unspsc7#12.19.00.00.00#Solvents#12.00.00.00.00
-unspsc7#12.19.15.00.00#Hydrocarbonated solvents#12.19.00.00.00
-unspsc7#12.19.15.01.00#Aromatic solvents#12.19.15.00.00
-unspsc7#12.19.15.02.00#Aliphatic solvents#12.19.15.00.00
-unspsc7#12.19.16.00.00#Oxygenated solvents#12.19.00.00.00
-unspsc7#12.19.16.01.00#Alcohol solvents#12.19.16.00.00
-unspsc7#12.19.16.02.00#Active solvents#12.19.16.00.00
-unspsc7#12.20.00.00.00#Chemical intermediates and fixatives#12.00.00.00.00
-unspsc7#12.20.15.00.00#Intermediates#12.20.00.00.00
-unspsc7#12.20.15.01.00#Ether intermediates#12.20.15.00.00
-unspsc7#12.20.15.02.00#Ketone intermediates#12.20.15.00.00
-unspsc7#12.20.15.03.00#Aldehyde intermediates#12.20.15.00.00
-unspsc7#12.20.15.04.00#Peroxide intermediates#12.20.15.00.00
-unspsc7#12.20.15.05.00#Acrylate or methacrylate intermediates#12.20.15.00.00
-unspsc7#12.20.16.00.00#Fixatives#12.20.00.00.00
-unspsc7#12.20.16.01.00#Formaldehydes#12.20.16.00.00
-unspsc7#12.20.16.02.00#Glutrals#12.20.16.00.00
-unspsc7#12.20.16.03.00#Tannins#12.20.16.00.00
-unspsc7#12.20.17.00.00#Amines and amides and imines and imides#12.20.00.00.00
-unspsc7#12.20.17.01.00#Primary#12.20.17.00.00
-unspsc7#12.20.17.02.00#Secondary#12.20.17.00.00
-unspsc7#12.20.17.03.00#Tertiary#12.20.17.00.00
-unspsc7#12.20.17.04.00#Specialty#12.20.17.00.00
-unspsc7#12.20.17.05.00#Sulphonated#12.20.17.00.00
-unspsc7#12.21.00.00.00#Carbon based chemicals and compounded chemicals#12.00.00.00.00
-unspsc7#12.21.15.00.00#Alcohols#12.21.00.00.00
-unspsc7#12.21.15.01.00#Amino alcohols#12.21.15.00.00
-unspsc7#12.21.15.02.00#Benzyl alcohols#12.21.15.00.00
-unspsc7#12.21.15.03.00#Chlorohydrins#12.21.15.00.00
-unspsc7#12.21.15.04.00#Ethanol#12.21.15.00.00
-unspsc7#12.21.15.05.00#Fatty alcohols#12.21.15.00.00
-unspsc7#12.21.15.06.00#Glycols#12.21.15.00.00
-unspsc7#12.21.15.07.00#Hexanols#12.21.15.00.00
-unspsc7#12.21.15.08.00#Methanol#12.21.15.00.00
-unspsc7#12.21.15.09.00#Poly vinyl or PV alcohol#12.21.15.00.00
-unspsc7#12.21.15.10.00#Propanols#12.21.15.00.00
-unspsc7#12.21.15.11.00#Sugar alcohols#12.21.15.00.00
-unspsc7#12.21.15.12.00#Butyl alcohols#12.21.15.00.00
-unspsc7#12.21.15.13.00#Isopropyl alcohol#12.21.15.00.00
-unspsc7#12.21.16.00.00#Hydrocarbons#12.21.00.00.00
-unspsc7#12.21.16.01.00#Acyclic or cyclic or polycyclic hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.02.00#Halogenated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.03.00#Sulphonated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.16.04.00#Nitrosated hydrocarbons#12.21.16.00.00
-unspsc7#12.21.17.00.00#Aldehydes#12.21.00.00.00
-unspsc7#12.21.17.01.00#Acetalaldehyes#12.21.17.00.00
-unspsc7#12.21.17.02.00#Glyoxals#12.21.17.00.00
-unspsc7#12.21.18.00.00#Ethers#12.21.00.00.00
-unspsc7#12.21.18.01.00#Acetal ethers#12.21.18.00.00
-unspsc7#12.21.18.02.00#Ethyl ethers#12.21.18.00.00
-unspsc7#12.21.18.03.00#Methyl ethers#12.21.18.00.00
-unspsc7#12.21.18.04.00#Phenyl ethers#12.21.18.00.00
-unspsc7#12.21.18.05.00#Methyl tetra butyl ether#12.21.18.00.00
-unspsc7#12.21.19.00.00#Ketones#12.21.00.00.00
-unspsc7#12.21.19.01.00#Acetones#12.21.19.00.00
-unspsc7#12.21.19.02.00#Camphors#12.21.19.00.00
-unspsc7#12.21.19.03.00#Ketone bodies#12.21.19.00.00
-unspsc7#12.21.19.04.00#Mannich bases#12.21.19.00.00
-unspsc7#12.21.20.00.00#Phenols#12.21.00.00.00
-unspsc7#12.21.20.01.00#Bromphenol blue#12.21.20.00.00
-unspsc7#12.21.20.02.00#Cresols#12.21.20.00.00
-unspsc7#12.21.21.00.00#Carbohydrates#12.21.00.00.00
-unspsc7#12.21.21.01.00#Simple sugars or its derivatives#12.21.21.00.00
-unspsc7#12.21.21.02.00#Gum resins#12.21.21.00.00
-unspsc7#12.21.21.03.00#Starches#12.21.21.00.00
-unspsc7#12.21.22.00.00#Compounds#12.21.00.00.00
-unspsc7#12.21.22.01.00#Chemical alloys#12.21.22.00.00
-unspsc7#12.21.22.02.00#Cyanides or cyanates#12.21.22.00.00
-unspsc7#12.21.22.03.00#Aluminum compounds#12.21.22.00.00
-unspsc7#12.21.22.04.00#Barium compounds#12.21.22.00.00
-unspsc7#12.21.22.05.00#Boron compounds#12.21.22.00.00
-unspsc7#12.21.22.06.00#Bromine compounds#12.21.22.00.00
-unspsc7#12.21.22.07.00#Calcium compounds#12.21.22.00.00
-unspsc7#12.21.22.08.00#Carbon compounds#12.21.22.00.00
-unspsc7#12.21.22.09.00#Chlorine compounds#12.21.22.00.00
-unspsc7#12.21.22.10.00#Fluorine compounds#12.21.22.00.00
-unspsc7#12.21.22.11.00#Gold compounds#12.21.22.00.00
-unspsc7#12.21.22.12.00#Iodine compounds#12.21.22.00.00
-unspsc7#12.21.22.13.00#Iron compounds#12.21.22.00.00
-unspsc7#12.21.22.14.00#Magnesium compounds#12.21.22.00.00
-unspsc7#12.21.22.15.00#Nitrogen compounds#12.21.22.00.00
-unspsc7#12.21.22.16.00#Nitrile compounds#12.21.22.00.00
-unspsc7#12.21.22.17.00#Oxygen compounds#12.21.22.00.00
-unspsc7#12.21.22.18.00#Phosphorous compounds#12.21.22.00.00
-unspsc7#12.21.22.19.00#Potassium compounds#12.21.22.00.00
-unspsc7#12.21.22.20.00#Selenium compounds#12.21.22.00.00
-unspsc7#12.21.22.21.00#Silicon or silicone or silicane compounds#12.21.22.00.00
-unspsc7#12.21.22.22.00#Sodium compounds#12.21.22.00.00
-unspsc7#12.21.22.23.00#Sulfur compounds#12.21.22.00.00
-unspsc7#12.21.22.24.00#Tin compounds#12.21.22.00.00
-unspsc7#12.21.22.25.00#Zinc compounds#12.21.22.00.00
-unspsc7#12.21.22.26.00#Heterocyclic compounds#12.21.22.00.00
-unspsc7#12.21.22.27.00#Cobalt compounds#12.21.22.00.00
-unspsc7#12.21.22.28.00#Antimony compounds#12.21.22.00.00
-unspsc7#12.21.22.29.00#Titanium compounds#12.21.22.00.00
-unspsc7#12.21.23.00.00#Oxides includes all oxided substances#12.21.00.00.00
-unspsc7#12.21.23.01.00#Aluminum oxides#12.21.23.00.00
-unspsc7#12.21.23.02.00#Carbon oxides#12.21.23.00.00
-unspsc7#12.21.23.03.00#Hypochlorous acid#12.21.23.00.00
-unspsc7#12.21.23.04.00#Magnesium oxides#12.21.23.00.00
-unspsc7#12.21.23.05.00#Nitrogen oxides#12.21.23.00.00
-unspsc7#12.21.23.06.00#Osmium oxides#12.21.23.00.00
-unspsc7#12.21.23.07.00#Peroxides#12.21.23.00.00
-unspsc7#12.21.23.08.00#Silicon oxides#12.21.23.00.00
-unspsc7#12.21.23.09.00#Sulfur oxides#12.21.23.00.00
-unspsc7#12.21.23.10.00#Thorium oxides#12.21.23.00.00
-unspsc7#12.21.23.11.00#Water oxides#12.21.23.00.00
-unspsc7#12.21.23.12.00#Zinc oxides#12.21.23.00.00
-unspsc7#12.21.23.13.00#Hydroxides#12.21.23.00.00
-unspsc7#12.21.23.14.00#Metal oxides#12.21.23.00.00
-unspsc7#12.21.23.15.00#Non metal oxides#12.21.23.00.00
-unspsc7#12.21.23.16.00#Ethylene oxide#12.21.23.00.00
-unspsc7#12.21.24.00.00#Isotopes#12.21.00.00.00
-unspsc7#12.21.24.01.00#Deuterated solvents#12.21.24.00.00
-unspsc7#12.21.24.02.00#Heavy water#12.21.24.00.00
-unspsc7#12.21.24.03.00#Alpha sources#12.21.24.00.00
-unspsc7#12.21.24.04.00#Beta sources#12.21.24.00.00
-unspsc7#12.21.24.05.00#Cobalt sources#12.21.24.00.00
-unspsc7#12.21.24.06.00#Gamma sources#12.21.24.00.00
-unspsc7#12.21.24.07.00#Radioisotope sources#12.21.24.00.00
-unspsc7#12.21.24.08.00#Calibration sources#12.21.24.00.00
-unspsc7#12.22.00.00.00#Bio chemicals#12.00.00.00.00
-unspsc7#12.22.15.00.00#Proteins#12.22.00.00.00
-unspsc7#12.22.15.01.00#Albumins#12.22.15.00.00
-unspsc7#12.22.15.02.00#Bacterial proteins#12.22.15.00.00
-unspsc7#12.22.15.03.00#Blood proteins#12.22.15.00.00
-unspsc7#12.22.15.04.00#Bone morphogenetic proteins#12.22.15.00.00
-unspsc7#12.22.15.05.00#Carrier proteins#12.22.15.00.00
-unspsc7#12.22.15.06.00#Contractile proteins#12.22.15.00.00
-unspsc7#12.22.15.07.00#Dietary proteins#12.22.15.00.00
-unspsc7#12.22.15.08.00#Deoxyribonucleic acid (DNA) binding proteins#12.22.15.00.00
-unspsc7#12.22.15.09.00#Egg proteins#12.22.15.00.00
-unspsc7#12.22.15.10.00#Globulins#12.22.15.00.00
-unspsc7#12.22.15.11.00#Glycoproteins#12.22.15.00.00
-unspsc7#12.22.15.12.00#Hemeproteins#12.22.15.00.00
-unspsc7#12.22.15.13.00#Interferons#12.22.15.00.00
-unspsc7#12.22.15.14.00#Lectins#12.22.15.00.00
-unspsc7#12.22.15.15.00#Lipoproteins#12.22.15.00.00
-unspsc7#12.22.15.16.00#Membrane proteins#12.22.15.00.00
-unspsc7#12.22.15.17.00#Metalloproteins#12.22.15.00.00
-unspsc7#12.22.15.18.00#Nerve tissue proteins#12.22.15.00.00
-unspsc7#12.22.15.19.00#Neculeoproteins#12.22.15.00.00
-unspsc7#12.22.15.20.00#Peptones#12.22.15.00.00
-unspsc7#12.22.15.21.00#Plant proteins#12.22.15.00.00
-unspsc7#12.22.15.22.00#Prions#12.22.15.00.00
-unspsc7#12.22.15.23.00#Cytoplasmic or nuclear receptors#12.22.15.00.00
-unspsc7#12.22.15.24.00#Recombinant proteins#12.22.15.00.00
-unspsc7#12.22.15.25.00#Serpins#12.22.15.00.00
-unspsc7#12.22.15.26.00#Transcription factors#12.22.15.00.00
-unspsc7#12.22.15.27.00#Viral proteins#12.22.15.00.00
-unspsc7#12.22.15.28.00#Scleroprotein#12.22.15.00.00
-unspsc7#12.22.16.00.00#Antibodies#12.22.00.00.00
-unspsc7#12.22.16.01.00#Viral antibodies#12.22.16.00.00
-unspsc7#12.22.16.02.00#Antitoxins#12.22.16.00.00
-unspsc7#12.22.16.03.00#Bacterial antibodies#12.22.16.00.00
-unspsc7#12.22.16.04.00#Autoantibodies#12.22.16.00.00
-unspsc7#12.22.16.05.00#Immune sera#12.22.16.00.00
-unspsc7#12.22.16.06.00#Immunoglobulins#12.22.16.00.00
-unspsc7#12.22.17.00.00#Nutrients#12.22.00.00.00
-unspsc7#12.22.17.01.00#Vitamins#12.22.17.00.00
-unspsc7#12.22.18.00.00#Enzymes#12.22.00.00.00
-unspsc7#12.22.18.01.00#Hydrolases#12.22.18.00.00
-unspsc7#12.22.18.02.00#Isoenzymes#12.22.18.00.00
-unspsc7#12.22.18.03.00#Isomerases#12.22.18.00.00
-unspsc7#12.22.18.04.00#Ligases#12.22.18.00.00
-unspsc7#12.22.18.05.00#Lyases#12.22.18.00.00
-unspsc7#12.22.18.06.00#Multienzyme complexes#12.22.18.00.00
-unspsc7#12.22.18.07.00#Oxidoreductases#12.22.18.00.00
-unspsc7#12.22.18.08.00#Permeases#12.22.18.00.00
-unspsc7#12.22.18.09.00#Transfereases#12.22.18.00.00
-unspsc7#12.22.18.10.00#Catalase#12.22.18.00.00
-unspsc7#12.22.19.00.00#Tissues#12.22.00.00.00
-unspsc7#12.22.19.01.00#Connective tissues#12.22.19.00.00
-unspsc7#12.22.19.02.00#Epitheliums#12.22.19.00.00
-unspsc7#12.22.19.03.00#Exocrine glands#12.22.19.00.00
-unspsc7#12.22.19.04.00#Lymphoid tissues#12.22.19.00.00
-unspsc7#12.22.19.05.00#Membranes#12.22.19.00.00
-unspsc7#12.22.19.06.00#Muscles#12.22.19.00.00
-unspsc7#12.22.19.07.00#Nerve tissues#12.22.19.00.00
-unspsc7#12.22.20.00.00#Cultures and fluids#12.22.00.00.00
-unspsc7#12.22.20.01.00#Agar#12.22.20.00.00
-unspsc7#12.22.20.02.00#Broth#12.22.20.00.00
-unspsc7#12.22.20.03.00#Serum free culture media#12.22.20.00.00
-unspsc7#12.22.20.04.00#Conditioned culture media#12.22.20.00.00
-unspsc7#12.22.20.05.00#Bacteria cultures#12.22.20.00.00
-unspsc7#12.22.20.06.00#Blood#12.22.20.00.00
-unspsc7#12.22.20.07.00#Urea#12.22.20.00.00
-unspsc7#12.22.20.08.00#Bile#12.22.20.00.00
-unspsc7#12.22.20.09.00#Plasma#12.22.20.00.00
-unspsc7#12.22.20.10.00#Semen cultures#12.22.20.00.00
-unspsc7#12.22.21.00.00#Nucleic acids#12.22.00.00.00
-unspsc7#12.22.21.01.00#Ribonucleic acid (RNA)#12.22.21.00.00
-unspsc7#12.22.21.02.00#Deoxyribonucleic acid (DNA)#12.22.21.00.00
-unspsc7#12.22.22.00.00#Amino acids#12.22.00.00.00
-unspsc7#12.22.22.01.00#Branched chain amino acids#12.22.22.00.00
-unspsc7#12.22.22.02.00#Cyclic amino acids#12.22.22.00.00
-unspsc7#12.22.22.03.00#Diamino amino acids#12.22.22.00.00
-unspsc7#12.22.22.04.00#Dicarboxylic amino acids#12.22.22.00.00
-unspsc7#12.22.22.05.00#Essential amino acids#12.22.22.00.00
-unspsc7#12.22.22.06.00#Sulfur amino acids#12.22.22.00.00
-unspsc7#12.22.22.07.00#Aminobutyric acids#12.22.22.00.00
-unspsc7#12.22.22.08.00#Aminocaproic acids#12.22.22.00.00
-unspsc7#12.22.22.09.00#Oxamic acids#12.22.22.00.00
-unspsc7#12.22.22.10.00#Phosphoamino acids#12.22.22.00.00
-unspsc7#12.22.22.11.00#Quisqualic acids#12.22.22.00.00
-unspsc7#12.22.23.00.00#Amines and amides and imines and imides#12.22.00.00.00
-unspsc7#12.22.23.01.00#Primary#12.22.23.00.00
-unspsc7#12.22.23.02.00#Secondary#12.22.23.00.00
-unspsc7#12.22.23.03.00#Tertiary#12.22.23.00.00
-unspsc7#12.22.23.04.00#Specialty#12.22.23.00.00
-unspsc7#12.22.23.05.00#Sulphonated#12.22.23.00.00
-unspsc7#12.23.00.00.00#Inorganic compounds#12.00.00.00.00
-unspsc7#12.23.10.00.00#Mineral acids#12.23.00.00.00
-unspsc7#12.23.10.01.00#Hydrofloric acid#12.23.10.00.00
-unspsc7#12.23.10.02.00#Hydrofluorosilicic acid#12.23.10.00.00
-unspsc7#12.23.10.03.00#Hydroflouric acid#12.23.10.00.00
-unspsc7#12.23.11.00.00#Bases#12.23.00.00.00
-unspsc7#12.23.11.01.00#Sodium hydroxide#12.23.11.00.00
-unspsc7#12.23.11.02.00#Potassium hydroxide#12.23.11.00.00
-unspsc7#12.23.12.00.00#Salts#12.23.00.00.00
-unspsc7#12.23.12.01.00#Ammonium nitrate#12.23.12.00.00
-unspsc7#12.23.13.00.00#Sulphates#12.23.00.00.00
-unspsc7#12.23.13.01.00#Ferric sulphate#12.23.13.00.00
-unspsc7#12.23.13.02.00#Copper sulphate#12.23.13.00.00
-unspsc7#12.23.13.03.00#Aluminium sulphate#12.23.13.00.00
-unspsc7#12.23.13.04.00#Sodium sulphate#12.23.13.00.00
-unspsc7#12.23.13.05.00#Sodium thiosulphate#12.23.13.00.00
-unspsc7#12.23.14.00.00#Chlorides chlorates and perchlorates#12.23.00.00.00
-unspsc7#12.23.14.01.00#Sodium chlorite#12.23.14.00.00
-unspsc7#12.23.14.02.00#Ferric Chloride#12.23.14.00.00
-unspsc7#12.23.14.03.00#Aluminium chloride#12.23.14.00.00
-unspsc7#12.23.14.04.00#Poly aluminium chloride#12.23.14.00.00
-unspsc7#12.23.14.05.00#Aluminium chlorohydrate#12.23.14.00.00
-unspsc7#12.23.14.06.00#Sodium hypochlorite#12.23.14.00.00
-unspsc7#12.23.15.00.00#Borides and borates#12.23.00.00.00
-unspsc7#12.23.15.01.00#Sodium borate#12.23.15.00.00
-unspsc7#12.23.16.00.00#Hydrides#12.23.00.00.00
-unspsc7#12.23.16.01.00#Aluminium hydrite#12.23.16.00.00
-unspsc7#12.23.16.02.00#Magnesium hydrite#12.23.16.00.00
-unspsc7#12.23.17.00.00#Sulphides#12.23.00.00.00
-unspsc7#12.23.17.01.00#Hydrogen sulphide#12.23.17.00.00
-unspsc7#12.23.17.02.00#Poly sulphide#12.23.17.00.00
-unspsc7#12.23.17.03.00#Sodium sulphide#12.23.17.00.00
-unspsc7#12.23.17.04.00#Iron sulphide#12.23.17.00.00
-unspsc7#12.23.18.00.00#Inorganic oxidising agents#12.23.00.00.00
-unspsc7#12.23.18.01.00#Potassium permanganate#12.23.18.00.00
-unspsc7#12.23.18.02.00#Potassium dichromate#12.23.18.00.00
-unspsc7#12.23.18.03.00#Manganese dioxide#12.23.18.00.00
-unspsc7#12.24.00.00.00#Alcohols#12.00.00.00.00
-unspsc7#12.24.10.00.00#Monohydric alcohols#12.24.00.00.00
-unspsc7#12.24.10.01.00#Ethanol#12.24.10.00.00
-unspsc7#12.24.10.02.00#Isopropanol#12.24.10.00.00
-unspsc7#12.24.10.03.00#Methanol#12.24.10.00.00
-unspsc7#12.24.10.04.00#Pentanols#12.24.10.00.00
-unspsc7#12.24.10.05.00#Octanols#12.24.10.00.00
-unspsc7#12.24.10.06.00#Inositols#12.24.10.00.00
-unspsc7#12.24.10.07.00#Fatty alcohols#12.24.10.00.00
-unspsc7#12.24.10.08.00#Allyl alcohol#12.24.10.00.00
-unspsc7#12.24.11.00.00#Polyhydric alcohols#12.24.00.00.00
-unspsc7#12.24.11.01.00#Glycol#12.24.11.00.00
-unspsc7#12.24.11.02.00#Glycerol#12.24.11.00.00
-unspsc7#12.24.12.00.00#Thio alcohols#12.24.00.00.00
-unspsc7#12.24.12.01.00#Ethane thiol#12.24.12.00.00
-unspsc7#12.24.12.02.00#Methane thiol#12.24.12.00.00
-unspsc7#12.25.00.00.00#Alkanes Alkenes Alkynes and Aromatics#12.00.00.00.00
-unspsc7#12.25.10.00.00#Alkanes#12.25.00.00.00
-unspsc7#12.25.10.01.00#Pentane#12.25.10.00.00
-unspsc7#12.25.10.02.00#Hexane#12.25.10.00.00
-unspsc7#12.25.11.00.00#Cyclic hydrocarbons#12.25.00.00.00
-unspsc7#12.25.11.01.00#Toluene#12.25.11.00.00
-unspsc7#12.25.11.02.00#Xylenes#12.25.11.00.00
-unspsc7#12.25.11.03.00#Benzene#12.25.11.00.00
-unspsc7#12.25.12.00.00#Alkenes#12.25.00.00.00
-unspsc7#12.25.12.01.00#Propene#12.25.12.00.00
-unspsc7#12.25.12.02.00#Butene#12.25.12.00.00
-unspsc7#12.25.12.03.00#Styrene#12.25.12.00.00
-unspsc7#12.25.13.00.00#Alkynes#12.25.00.00.00
-unspsc7#12.25.13.01.00#Acytelene#12.25.13.00.00
-unspsc7#12.26.00.00.00#Aromatic derivatives#12.00.00.00.00
-unspsc7#12.26.10.00.00#Aromatic sulphonic acids#12.26.00.00.00
-unspsc7#12.26.10.01.00#Benzene sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.02.00#Halogenated sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.03.00#Nitrosulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.04.00#Amino sulphonic acids#12.26.10.00.00
-unspsc7#12.26.10.05.00#Sulphonyl chlorides#12.26.10.00.00
-unspsc7#12.26.11.00.00#Aromatic nitro compounds#12.26.00.00.00
-unspsc7#12.26.11.01.00#Nitro benzenes#12.26.11.00.00
-unspsc7#12.26.11.02.00#Nitro toluenes#12.26.11.00.00
-unspsc7#12.26.11.03.00#Caprolactam#12.26.11.00.00
-unspsc7#12.26.12.00.00#Cyclic alcohols#12.26.00.00.00
-unspsc7#12.26.12.01.00#Hexanols#12.26.12.00.00
-unspsc7#12.26.12.02.00#Napthols#12.26.12.00.00
-unspsc7#12.26.12.03.00#Xylenols#12.26.12.00.00
-unspsc7#12.26.12.04.00#Benzyl alcohols#12.26.12.00.00
-unspsc7#12.26.13.00.00#Phthalates#12.26.00.00.00
-unspsc7#12.26.13.01.00#Di octyl Phthalate#12.26.13.00.00
-unspsc7#12.26.13.02.00#Di ethyl phthalates#12.26.13.00.00
-unspsc7#13.00.00.00.00#Resin and Rosin and Rubber and Foam and Film and Elastomeric Materials#13.00.00.00.00
-unspsc7#13.10.00.00.00#Rubber and elastomers#13.00.00.00.00
-unspsc7#13.10.15.00.00#Natural rubber#13.10.00.00.00
-unspsc7#13.10.15.01.00#Latex rubber#13.10.15.00.00
-unspsc7#13.10.15.02.00#Crepe rubber#13.10.15.00.00
-unspsc7#13.10.15.03.00#Smoked sheet rubber#13.10.15.00.00
-unspsc7#13.10.15.04.00#Natural foam rubber#13.10.15.00.00
-unspsc7#13.10.15.05.00#Block or crumb rubber#13.10.15.00.00
-unspsc7#13.10.16.00.00#Processed and synthetic rubber#13.10.00.00.00
-unspsc7#13.10.16.01.00#Vulcanized rubber#13.10.16.00.00
-unspsc7#13.10.16.02.00#Chlorinated rubber#13.10.16.00.00
-unspsc7#13.10.16.03.00#Hydrochloride rubber#13.10.16.00.00
-unspsc7#13.10.16.04.00#Cyclized rubber#13.10.16.00.00
-unspsc7#13.10.16.05.00#Isomerized rubber#13.10.16.00.00
-unspsc7#13.10.16.06.00#Thermplastic rubber#13.10.16.00.00
-unspsc7#13.10.16.07.00#Rubber compound#13.10.16.00.00
-unspsc7#13.10.17.00.00#Elastomers#13.10.00.00.00
-unspsc7#13.10.17.01.00#Acrylonitrile butadiene (NBR)#13.10.17.00.00
-unspsc7#13.10.17.02.00#Highly saturated nitrile (HNBR)#13.10.17.00.00
-unspsc7#13.10.17.03.00#Fluorocarbon (FKM)#13.10.17.00.00
-unspsc7#13.10.17.04.00#Ethylene propylene (EP)#13.10.17.00.00
-unspsc7#13.10.17.05.00#Styrene butadiene (SBR)#13.10.17.00.00
-unspsc7#13.10.17.06.00#Chloroprene (CR)#13.10.17.00.00
-unspsc7#13.10.17.07.00#Isobutylene isoprene (IIR/XIIR)#13.10.17.00.00
-unspsc7#13.10.17.08.00#Silicone (VMQ and PMQ and PVMQ)#13.10.17.00.00
-unspsc7#13.10.17.09.00#Fluorosilicone (FVMQ)#13.10.17.00.00
-unspsc7#13.10.17.10.00#Polyacrylate (ACM)#13.10.17.00.00
-unspsc7#13.10.17.11.00#Ethylene acrylic (AEM)#13.10.17.00.00
-unspsc7#13.10.17.12.00#Chlorosulfonated polyethylene (CSM)#13.10.17.00.00
-unspsc7#13.10.17.13.00#Chloropolyethylene (CM)#13.10.17.00.00
-unspsc7#13.10.17.14.00#Epichlorohydrin (ECO)#13.10.17.00.00
-unspsc7#13.10.17.15.00#Natural polyisoprene (NR)#13.10.17.00.00
-unspsc7#13.10.17.16.00#Synthetic polyisoprene (IR)#13.10.17.00.00
-unspsc7#13.10.17.17.00#Polyester urethane (AU)#13.10.17.00.00
-unspsc7#13.10.17.18.00#Polyether urethane (EU)#13.10.17.00.00
-unspsc7#13.10.17.19.00#Polybutadiene (BR)#13.10.17.00.00
-unspsc7#13.10.17.20.00#Polyether block amide (PEBA)#13.10.17.00.00
-unspsc7#13.10.17.21.00#Styrene block coploymer (TES)#13.10.17.00.00
-unspsc7#13.10.17.22.00#Copolyester#13.10.17.00.00
-unspsc7#13.10.17.23.00#Thermoplastic#13.10.17.00.00
-unspsc7#13.10.17.24.00#Polyolenfinic#13.10.17.00.00
-unspsc7#13.10.18.00.00#Thermoplastic elastomers#13.10.00.00.00
-unspsc7#13.10.18.01.00#Polyether block amide (PEBA)#13.10.18.00.00
-unspsc7#13.10.18.02.00#Polyolenfinic (TPO)#13.10.18.00.00
-unspsc7#13.10.18.03.00#Ether ester block coploymer (TEEE)#13.10.18.00.00
-unspsc7#13.10.18.04.00#Thermoplastic elastomer polyurethane (TPUR)#13.10.18.00.00
-unspsc7#13.10.18.05.00#Styrene block coploymer (TES)#13.10.18.00.00
-unspsc7#13.10.19.00.00#Thermoset plastics#13.10.00.00.00
-unspsc7#13.10.19.01.00#Epoxy (EP)#13.10.19.00.00
-unspsc7#13.10.19.02.00#Phenolic (PF)#13.10.19.00.00
-unspsc7#13.10.19.03.00#Unsaturate polyester (UP)#13.10.19.00.00
-unspsc7#13.10.19.04.00#Urea (UF)#13.10.19.00.00
-unspsc7#13.10.19.05.00#Melamine (MF)#13.10.19.00.00
-unspsc7#13.10.19.06.00#Thermoset polyurethane (PUR)#13.10.19.00.00
-unspsc7#13.10.20.00.00#Thermoplastic plastics#13.10.00.00.00
-unspsc7#13.10.20.01.00#Acrylonitrile butadiene styrene (ABS)#13.10.20.00.00
-unspsc7#13.10.20.02.00#Acrylonitrile butadiene styrene (ABS) alloys#13.10.20.00.00
-unspsc7#13.10.20.03.00#Acetal polymer#13.10.20.00.00
-unspsc7#13.10.20.04.00#Acrylic#13.10.20.00.00
-unspsc7#13.10.20.05.00#Acrylonitrile styrene acrylic (ASA)#13.10.20.00.00
-unspsc7#13.10.20.06.00#Acrylonitrile styrene acrylic (ASA) alloys#13.10.20.00.00
-unspsc7#13.10.20.07.00#Cellulosics#13.10.20.00.00
-unspsc7#13.10.20.08.00#Fluoropolymers (PTFE)#13.10.20.00.00
-unspsc7#13.10.20.09.00#Ethylene vinyl acetate (EVA)#13.10.20.00.00
-unspsc7#13.10.20.10.00#Liquid crystal polymer (LCP)#13.10.20.00.00
-unspsc7#13.10.20.11.00#Polyamide nylons (PA)#13.10.20.00.00
-unspsc7#13.10.20.12.00#Polybutylene terepthalate (PBT)#13.10.20.00.00
-unspsc7#13.10.20.13.00#Polycarbonate (PC)#13.10.20.00.00
-unspsc7#13.10.20.14.00#Polyetheretherketone (PEEK)#13.10.20.00.00
-unspsc7#13.10.20.15.00#Polyetherimid (PEI)#13.10.20.00.00
-unspsc7#13.10.20.16.00#Polyethersulfone (PES)#13.10.20.00.00
-unspsc7#13.10.20.17.00#High density polyethylene (HDPE)#13.10.20.00.00
-unspsc7#13.10.20.18.00#Low density polyethylene (LDPE)#13.10.20.00.00
-unspsc7#13.10.20.19.00#Medium density polyethylene (MDPE)#13.10.20.00.00
-unspsc7#13.10.20.20.00#Polyethylene terepthalate (PET)#13.10.20.00.00
-unspsc7#13.10.20.21.00#Polyimide (PI)#13.10.20.00.00
-unspsc7#13.10.20.22.00#Polypropylene (PP)#13.10.20.00.00
-unspsc7#13.10.20.23.00#Polyphthalamide (PPA)#13.10.20.00.00
-unspsc7#13.10.20.24.00#Polythenylene oxide (PPO)#13.10.20.00.00
-unspsc7#13.10.20.25.00#Polyphenylene sulfide (PPS)#13.10.20.00.00
-unspsc7#13.10.20.26.00#Polystyrene (PS)#13.10.20.00.00
-unspsc7#13.10.20.27.00#High impact polystyrene (HIPS)#13.10.20.00.00
-unspsc7#13.10.20.28.00#Polysulfone (PSU)#13.10.20.00.00
-unspsc7#13.10.20.29.00#Rigid thermoplastic polyurethane (RPTU)#13.10.20.00.00
-unspsc7#13.10.20.30.00#Polyvinyl chloride (PVC)#13.10.20.00.00
-unspsc7#13.10.20.31.00#Styrene acrylonitrile (SAN)#13.10.20.00.00
-unspsc7#13.10.21.00.00#Resins#13.10.00.00.00
-unspsc7#13.10.21.01.00#Plastic resins#13.10.21.00.00
-unspsc7#13.10.21.02.00#Indene resins#13.10.21.00.00
-unspsc7#13.10.21.03.00#Urea resins#13.10.21.00.00
-unspsc7#13.10.21.04.00#Phenolic resins#13.10.21.00.00
-unspsc7#13.10.21.05.00#Thermoplastic resins#13.10.21.00.00
-unspsc7#13.10.21.06.00#Alkyd resins#13.10.21.00.00
-unspsc7#13.10.21.07.00#Melamine resins#13.10.21.00.00
-unspsc7#13.10.21.08.00#Polyacetal resins#13.10.21.00.00
-unspsc7#13.10.21.09.00#Polyamide resins#13.10.21.00.00
-unspsc7#13.10.21.10.00#Polycarbonate resins#13.10.21.00.00
-unspsc7#13.10.21.11.00#Polyethylene terephthalate resins#13.10.21.00.00
-unspsc7#13.10.21.12.00#Polyether resins#13.10.21.00.00
-unspsc7#13.10.21.13.00#Allyl resins#13.10.21.00.00
-unspsc7#13.10.21.14.00#Polyurethane resins#13.10.21.00.00
-unspsc7#13.10.21.15.00#Epoxy resins#13.10.21.00.00
-unspsc7#13.10.21.16.00#Petroleum resins#13.10.21.00.00
-unspsc7#13.10.22.00.00#Plastic films#13.10.00.00.00
-unspsc7#13.10.22.01.00#Polyurethane films#13.10.22.00.00
-unspsc7#13.10.22.02.00#Silicone coated films#13.10.22.00.00
-unspsc7#13.11.00.00.00#Resins and rosins and other resin derived materials#13.00.00.00.00
-unspsc7#13.11.10.00.00#Resins#13.11.00.00.00
-unspsc7#13.11.10.01.00#Epoxy#13.11.10.00.00
-unspsc7#13.11.10.02.00#Phenolic#13.11.10.00.00
-unspsc7#13.11.10.03.00#Unsaturated polyester#13.11.10.00.00
-unspsc7#13.11.10.04.00#Acrylonitrile butadiene styrene#13.11.10.00.00
-unspsc7#13.11.10.05.00#Acrylonitrile styrene acrylic#13.11.10.00.00
-unspsc7#13.11.10.06.00#Acrylonitrile styrene acrylic alloys#13.11.10.00.00
-unspsc7#13.11.10.07.00#Fluoropolymers#13.11.10.00.00
-unspsc7#13.11.10.08.00#Ethylene vinyl acetate#13.11.10.00.00
-unspsc7#13.11.10.09.00#Liquid crystal polymer#13.11.10.00.00
-unspsc7#13.11.10.10.00#Nylon#13.11.10.00.00
-unspsc7#13.11.10.11.00#Polybutylene terepthatlate#13.11.10.00.00
-unspsc7#13.11.10.12.00#Polycarbonate#13.11.10.00.00
-unspsc7#13.11.10.13.00#Polyetheretherketone#13.11.10.00.00
-unspsc7#13.11.10.14.00#Polyetherimide#13.11.10.00.00
-unspsc7#13.11.10.15.00#Polyethersulfone#13.11.10.00.00
-unspsc7#13.11.10.16.00#Polyethylene#13.11.10.00.00
-unspsc7#13.11.10.17.00#Polyethylene terpthalate#13.11.10.00.00
-unspsc7#13.11.10.18.00#Polyimide#13.11.10.00.00
-unspsc7#13.11.10.19.00#Polypropylene#13.11.10.00.00
-unspsc7#13.11.10.20.00#Polyphthalamide#13.11.10.00.00
-unspsc7#13.11.10.21.00#Polyethylene oxide#13.11.10.00.00
-unspsc7#13.11.10.22.00#Polyphenylene sulfide#13.11.10.00.00
-unspsc7#13.11.10.23.00#Polystyrene#13.11.10.00.00
-unspsc7#13.11.10.24.00#Polysulfone#13.11.10.00.00
-unspsc7#13.11.10.25.00#Polyvinyl chloride#13.11.10.00.00
-unspsc7#13.11.10.26.00#Styrene acrylonitrile#13.11.10.00.00
-unspsc7#13.11.10.27.00#Urea formaldehyde#13.11.10.00.00
-unspsc7#13.11.10.28.00#Alkyd#13.11.10.00.00
-unspsc7#13.11.10.29.00#Melamine formaldehyde#13.11.10.00.00
-unspsc7#13.11.10.30.00#Polyacetal#13.11.10.00.00
-unspsc7#13.11.10.31.00#Polyamide#13.11.10.00.00
-unspsc7#13.11.10.32.00#Allyl#13.11.10.00.00
-unspsc7#13.11.10.33.00#Ethylene acrylic acid#13.11.10.00.00
-unspsc7#13.11.10.34.00#Polyvinyl chloride compound#13.11.10.00.00
-unspsc7#13.11.10.35.00#Solution vinyl#13.11.10.00.00
-unspsc7#13.11.10.36.00#Phenoxy#13.11.10.00.00
-unspsc7#13.11.10.37.00#Compounded resins#13.11.10.00.00
-unspsc7#13.11.10.38.00#Polyvinly pyrolidine#13.11.10.00.00
-unspsc7#13.11.10.39.00#Polyethylene terephthalate or glycol modified#13.11.10.00.00
-unspsc7#13.11.10.40.00#Hydrocarbon tackifier#13.11.10.00.00
-unspsc7#13.11.10.41.00#Polycarbonate blends#13.11.10.00.00
-unspsc7#13.11.10.42.00#Polyvinyl alcohol#13.11.10.00.00
-unspsc7#13.11.10.43.00#Polyvinyl butyral#13.11.10.00.00
-unspsc7#13.11.10.44.00#Polyester molding compounds#13.11.10.00.00
-unspsc7#13.11.10.45.00#Polyvinyl acetate#13.11.10.00.00
-unspsc7#13.11.10.46.00#Polyvinyl ether#13.11.10.00.00
-unspsc7#13.11.10.47.00#Polyvinyl formal#13.11.10.00.00
-unspsc7#13.11.10.48.00#Styrene acrylic#13.11.10.00.00
-unspsc7#13.11.10.49.00#Ethylene propylene polymers#13.11.10.00.00
-unspsc7#13.11.10.50.00#Polypropylene oxide#13.11.10.00.00
-unspsc7#13.11.10.51.00#Polypropylene ether#13.11.10.00.00
-unspsc7#13.11.10.52.00#Polypropylene sulfone#13.11.10.00.00
-unspsc7#13.11.10.53.00#Polymethylacrylate#13.11.10.00.00
-unspsc7#13.11.10.54.00#Styrene maleic anhydride#13.11.10.00.00
-unspsc7#13.11.10.55.00#Syndiotatic polystyrene#13.11.10.00.00
-unspsc7#13.11.10.56.00#Chlorinated polyvinyl chloride#13.11.10.00.00
-unspsc7#13.11.10.57.00#Thermoplastic polyester#13.11.10.00.00
-unspsc7#13.11.10.58.00#Indene resins#13.11.10.00.00
-unspsc7#13.11.10.59.00#Plastic resins#13.11.10.00.00
-unspsc7#13.11.10.60.00#Petroleum resins#13.11.10.00.00
-unspsc7#13.11.10.61.00#Polyurethane resins#13.11.10.00.00
-unspsc7#13.11.10.62.00#Polyether resins#13.11.10.00.00
-unspsc7#13.11.11.00.00#Rosins#13.11.00.00.00
-unspsc7#13.11.11.01.00#Wood rosin#13.11.11.00.00
-unspsc7#13.11.11.02.00#Gum rosin#13.11.11.00.00
-unspsc7#13.11.11.03.00#Tall oil rosin#13.11.11.00.00
-unspsc7#13.11.12.00.00#Films#13.11.00.00.00
-unspsc7#13.11.12.01.00#Polyethylene films#13.11.12.00.00
-unspsc7#13.11.12.02.00#Polyurethane films#13.11.12.00.00
-unspsc7#13.11.12.03.00#Acetate films#13.11.12.00.00
-unspsc7#13.11.12.04.00#Acrylic films#13.11.12.00.00
-unspsc7#13.11.12.05.00#Coextruded films#13.11.12.00.00
-unspsc7#13.11.12.06.00#Flouropolymer films#13.11.12.00.00
-unspsc7#13.11.12.07.00#Metalized films#13.11.12.00.00
-unspsc7#13.11.12.08.00#Nylon films#13.11.12.00.00
-unspsc7#13.11.12.09.00#Polycarbonate films#13.11.12.00.00
-unspsc7#13.11.12.10.00#Polyester films#13.11.12.00.00
-unspsc7#13.11.12.11.00#Polypropylene films#13.11.12.00.00
-unspsc7#13.11.12.12.00#Biaxially orientated polypropylene#13.11.12.00.00
-unspsc7#13.11.12.13.00#Polymide films#13.11.12.00.00
-unspsc7#13.11.12.14.00#Polystyrene films#13.11.12.00.00
-unspsc7#13.11.12.15.00#Flexible polyvinyl chloride film#13.11.12.00.00
-unspsc7#13.11.12.16.00#Rigid polyvinyl chloride film#13.11.12.00.00
-unspsc7#13.11.12.17.00#Ethylene vinyl alcohol film#13.11.12.00.00
-unspsc7#13.11.12.18.00#Polyvinylidene chloride#13.11.12.00.00
-unspsc7#13.11.12.19.00#Polyvinyl alcohol films#13.11.12.00.00
-unspsc7#13.11.13.00.00#Foams#13.11.00.00.00
-unspsc7#13.11.13.01.00#Polyolefin foam#13.11.13.00.00
-unspsc7#13.11.13.02.00#Polyether foam#13.11.13.00.00
-unspsc7#13.11.13.03.00#Silicone foam#13.11.13.00.00
-unspsc7#13.11.13.04.00#Ethylene propylene terpolymer foam#13.11.13.00.00
-unspsc7#13.11.13.05.00#Neoprene foam#13.11.13.00.00
-unspsc7#13.11.13.06.00#Polyvinyl chloride foam#13.11.13.00.00
-unspsc7#13.11.13.07.00#Rubber foam#13.11.13.00.00
-unspsc7#13.11.13.08.00#Polystyrene foam#13.11.13.00.00
-unspsc7#14.00.00.00.00#Paper Materials and Products#14.00.00.00.00
-unspsc7#14.10.00.00.00#Paper materials#14.00.00.00.00
-unspsc7#14.10.15.00.00#Raw materials#14.10.00.00.00
-unspsc7#14.10.15.01.00#Paper pulp#14.10.15.00.00
-unspsc7#14.11.00.00.00#Paper products#14.00.00.00.00
-unspsc7#14.11.15.00.00#Printing and writing paper#14.11.00.00.00
-unspsc7#14.11.15.01.00#Onion skin paper#14.11.15.00.00
-unspsc7#14.11.15.02.00#Vellum paper#14.11.15.00.00
-unspsc7#14.11.15.03.00#Parchment paper#14.11.15.00.00
-unspsc7#14.11.15.04.00#Tractor feed paper#14.11.15.00.00
-unspsc7#14.11.15.05.00#Mimeograph paper#14.11.15.00.00
-unspsc7#14.11.15.06.00#Computer printout paper#14.11.15.00.00
-unspsc7#14.11.15.07.00#Printer or copier paper#14.11.15.00.00
-unspsc7#14.11.15.08.00#Facsimile paper#14.11.15.00.00
-unspsc7#14.11.15.09.00#Stationery#14.11.15.00.00
-unspsc7#14.11.15.10.00#Plotter paper#14.11.15.00.00
-unspsc7#14.11.15.11.00#Writing paper#14.11.15.00.00
-unspsc7#14.11.15.12.00#Graph paper#14.11.15.00.00
-unspsc7#14.11.15.13.00#Ledger paper#14.11.15.00.00
-unspsc7#14.11.15.14.00#Paper pads or notebooks#14.11.15.00.00
-unspsc7#14.11.15.15.00#Calculator or cash register paper#14.11.15.00.00
-unspsc7#14.11.15.16.00#Notebook filler paper#14.11.15.00.00
-unspsc7#14.11.15.17.00#Business forms#14.11.15.00.00
-unspsc7#14.11.15.18.00#Index cards#14.11.15.00.00
-unspsc7#14.11.15.19.00#Cardstock papers#14.11.15.00.00
-unspsc7#14.11.15.20.00#Blotter paper#14.11.15.00.00
-unspsc7#14.11.15.21.00#Laser paper#14.11.15.00.00
-unspsc7#14.11.15.22.00#Inkjet paper#14.11.15.00.00
-unspsc7#14.11.15.23.00#Tracing paper#14.11.15.00.00
-unspsc7#14.11.15.24.00#Foolscap sheets#14.11.15.00.00
-unspsc7#14.11.15.25.00#Multipurpose paper#14.11.15.00.00
-unspsc7#14.11.15.26.00#Telephone message pads or books#14.11.15.00.00
-unspsc7#14.11.15.28.00#Magnet paper#14.11.15.00.00
-unspsc7#14.11.15.29.00#Telex rolls#14.11.15.00.00
-unspsc7#14.11.15.30.00#Self adhesive note paper#14.11.15.00.00
-unspsc7#14.11.16.00.00#Novelty paper#14.11.00.00.00
-unspsc7#14.11.16.01.00#Gift wrapping paper or bags or boxes#14.11.16.00.00
-unspsc7#14.11.16.04.00#Business cards#14.11.16.00.00
-unspsc7#14.11.16.05.00#Greeting or note or post cards#14.11.16.00.00
-unspsc7#14.11.16.06.00#Art or craft paper#14.11.16.00.00
-unspsc7#14.11.16.07.00#Poster boards#14.11.16.00.00
-unspsc7#14.11.16.08.00#Gift certificate#14.11.16.00.00
-unspsc7#14.11.16.09.00#Cover paper#14.11.16.00.00
-unspsc7#14.11.17.00.00#Personal paper products#14.11.00.00.00
-unspsc7#14.11.17.01.00#Facial tissues#14.11.17.00.00
-unspsc7#14.11.17.02.00#Toilet seat covers#14.11.17.00.00
-unspsc7#14.11.17.03.00#Paper towels#14.11.17.00.00
-unspsc7#14.11.17.04.00#Toilet tissue#14.11.17.00.00
-unspsc7#14.11.17.05.00#Paper napkins or serviettes#14.11.17.00.00
-unspsc7#14.11.17.06.00#Paper table cloth#14.11.17.00.00
-unspsc7#14.11.18.00.00#Business use papers#14.11.00.00.00
-unspsc7#14.11.18.01.00#Tickets or ticket rolls#14.11.18.00.00
-unspsc7#14.11.18.02.00#Receipts or receipt books#14.11.18.00.00
-unspsc7#14.11.18.03.00#Vouchers#14.11.18.00.00
-unspsc7#14.11.18.04.00#Bills or bill books#14.11.18.00.00
-unspsc7#14.11.18.05.00#Checks or check books#14.11.18.00.00
-unspsc7#14.12.00.00.00#Industrial use papers#14.00.00.00.00
-unspsc7#14.12.15.00.00#Paperboard and packaging papers#14.12.00.00.00
-unspsc7#14.12.15.01.00#Bleached paperboard#14.12.15.00.00
-unspsc7#14.12.15.02.00#Unbleached paperboard#14.12.15.00.00
-unspsc7#14.12.15.03.00#Cardboard#14.12.15.00.00
-unspsc7#14.12.15.04.00#Packaging paper#14.12.15.00.00
-unspsc7#14.12.16.00.00#Tissue papers#14.12.00.00.00
-unspsc7#14.12.16.01.00#Unbleached crepe papers#14.12.16.00.00
-unspsc7#14.12.16.02.00#Semi bleached crepe papers#14.12.16.00.00
-unspsc7#14.12.16.03.00#Wet strength tissue papers#14.12.16.00.00
-unspsc7#14.12.16.04.00#Acid free tissue papers#14.12.16.00.00
-unspsc7#14.12.16.05.00#Kraft tissue paper#14.12.16.00.00
-unspsc7#14.12.17.00.00#Laminated papers#14.12.00.00.00
-unspsc7#14.12.17.01.00#Papers bonded with film#14.12.17.00.00
-unspsc7#14.12.17.02.00#Cylinder papers or multi layer heavyweight paper#14.12.17.00.00
-unspsc7#14.12.18.00.00#Coated papers#14.12.00.00.00
-unspsc7#14.12.18.01.00#Clay coated papers#14.12.18.00.00
-unspsc7#14.12.18.02.00#Polyethylene coated papers#14.12.18.00.00
-unspsc7#14.12.18.03.00#Polyester coated papers#14.12.18.00.00
-unspsc7#14.12.18.04.00#Silicone coated papers#14.12.18.00.00
-unspsc7#14.12.18.05.00#Latex treated coated paper#14.12.18.00.00
-unspsc7#14.12.18.06.00#Waxed paper#14.12.18.00.00
-unspsc7#14.12.18.07.00#Butcher papers#14.12.18.00.00
-unspsc7#14.12.18.08.00#Freezer paper#14.12.18.00.00
-unspsc7#14.12.18.09.00#Masking paper#14.12.18.00.00
-unspsc7#14.12.18.10.00#Carbon papers#14.12.18.00.00
-unspsc7#14.12.19.00.00#Newsprint and offset papers#14.12.00.00.00
-unspsc7#14.12.19.01.00#Standard newsprint#14.12.19.00.00
-unspsc7#14.12.19.02.00#Colored newsprint#14.12.19.00.00
-unspsc7#14.12.19.03.00#High brightness newsprint#14.12.19.00.00
-unspsc7#14.12.19.04.00#Offset paper#14.12.19.00.00
-unspsc7#14.12.20.00.00#Specialty coated papers#14.12.00.00.00
-unspsc7#14.12.20.01.00#Butcher papers#14.12.20.00.00
-unspsc7#14.12.20.02.00#Freezer paper#14.12.20.00.00
-unspsc7#14.12.21.00.00#Uncoated base papers#14.12.00.00.00
-unspsc7#14.12.21.01.00#Super calendared kraft paper#14.12.21.00.00
-unspsc7#14.12.21.02.00#Machine finished or glazed kraft paper#14.12.21.00.00
-unspsc7#14.12.21.03.00#Non treated uncoated paper#14.12.21.00.00
-unspsc7#14.12.21.04.00#Non treated crepe paper#14.12.21.00.00
-unspsc7#14.12.21.05.00#Latex treated crepe paper#14.12.21.00.00
-unspsc7#14.12.21.06.00#Latex treated uncoated paper#14.12.21.00.00
-unspsc7#15.00.00.00.00#Fuels and Fuel Additives and Lubricants and Anti corrosive Materials#15.00.00.00.00
-unspsc7#15.10.00.00.00#Fuels#15.00.00.00.00
-unspsc7#15.10.15.00.00#Petroleum and distillates#15.10.00.00.00
-unspsc7#15.10.15.01.00#Fuel oil#15.10.15.00.00
-unspsc7#15.10.15.02.00#Kerosene#15.10.15.00.00
-unspsc7#15.10.15.03.00#Naphtha#15.10.15.00.00
-unspsc7#15.10.15.04.00#Aviation fuel#15.10.15.00.00
-unspsc7#15.10.15.05.00#Diesel fuel#15.10.15.00.00
-unspsc7#15.10.15.06.00#Gasoline#15.10.15.00.00
-unspsc7#15.10.15.07.00#Petrol#15.10.15.00.00
-unspsc7#15.10.15.08.00#Crude oil#15.10.15.00.00
-unspsc7#15.10.15.09.00#Marine fuel#15.10.15.00.00
-unspsc7#15.10.15.10.00#Condensate#15.10.15.00.00
-unspsc7#15.10.16.00.00#Coal and lignite and peat#15.10.00.00.00
-unspsc7#15.10.16.01.00#Coal#15.10.16.00.00
-unspsc7#15.10.16.02.00#Lignite#15.10.16.00.00
-unspsc7#15.10.16.03.00#Peat#15.10.16.00.00
-unspsc7#15.10.16.04.00#Coke#15.10.16.00.00
-unspsc7#15.10.16.05.00#Charcoal#15.10.16.00.00
-unspsc7#15.11.00.00.00#Gaseous fuels and additives#15.00.00.00.00
-unspsc7#15.11.15.00.00#Gaseous fuels#15.11.00.00.00
-unspsc7#15.11.15.01.00#Propane#15.11.15.00.00
-unspsc7#15.11.15.02.00#Methane#15.11.15.00.00
-unspsc7#15.11.15.03.00#Propylene#15.11.15.00.00
-unspsc7#15.11.15.04.00#Ethylene#15.11.15.00.00
-unspsc7#15.11.15.05.00#Butane#15.11.15.00.00
-unspsc7#15.11.15.06.00#Acetylene#15.11.15.00.00
-unspsc7#15.11.15.07.00#Water gas or producer gas#15.11.15.00.00
-unspsc7#15.11.15.08.00#Coal gas#15.11.15.00.00
-unspsc7#15.11.15.09.00#Liquified petroleum gas#15.11.15.00.00
-unspsc7#15.11.15.10.00#Fuel additives#15.11.15.00.00
-unspsc7#15.11.16.00.00#Fuel additives#15.11.00.00.00
-unspsc7#15.11.16.01.00#Ethanol#15.11.16.00.00
-unspsc7#15.11.16.02.00#Methanol#15.11.16.00.00
-unspsc7#15.12.00.00.00#Lubricants and oils and greases and anti corrosives#15.00.00.00.00
-unspsc7#15.12.15.00.00#Lubricating preparations#15.12.00.00.00
-unspsc7#15.12.15.01.00#Engine oil#15.12.15.00.00
-unspsc7#15.12.15.02.00#Cutting oil#15.12.15.00.00
-unspsc7#15.12.15.03.00#Gear oil#15.12.15.00.00
-unspsc7#15.12.15.04.00#Hydraulic oil#15.12.15.00.00
-unspsc7#15.12.15.05.00#Transformer oil#15.12.15.00.00
-unspsc7#15.12.15.07.00#Lithium grease#15.12.15.00.00
-unspsc7#15.12.15.08.00#Transmission oil#15.12.15.00.00
-unspsc7#15.12.15.09.00#Brake oil#15.12.15.00.00
-unspsc7#15.12.15.10.00#Antigalling#15.12.15.00.00
-unspsc7#15.12.15.11.00#Assembly pastes#15.12.15.00.00
-unspsc7#15.12.15.12.00#Anti adhesives#15.12.15.00.00
-unspsc7#15.12.15.13.00#Graphite lubricants#15.12.15.00.00
-unspsc7#15.12.15.14.00#Spray lubricants#15.12.15.00.00
-unspsc7#15.12.15.15.00#Anti seize or anti stain compounds#15.12.15.00.00
-unspsc7#15.12.15.16.00#Leak stop#15.12.15.00.00
-unspsc7#15.12.16.00.00#Waxes#15.12.00.00.00
-unspsc7#15.12.16.01.00#Paraffin wax#15.12.16.00.00
-unspsc7#15.12.16.02.00#Sealing wax#15.12.16.00.00
-unspsc7#15.12.16.03.00#Olefin wax#15.12.16.00.00
-unspsc7#15.12.17.00.00#Specialty lubricants#15.12.00.00.00
-unspsc7#15.12.17.01.00#Petrolatum#15.12.17.00.00
-unspsc7#15.12.18.00.00#Anti corrosives#15.12.00.00.00
-unspsc7#15.12.18.01.00#Moisture repellent#15.12.18.00.00
-unspsc7#15.12.18.02.00#Anti corrosion lubricant#15.12.18.00.00
-unspsc7#15.12.18.03.00#Rust remover#15.12.18.00.00
-unspsc7#15.12.18.04.00#Rust proofing preparation#15.12.18.00.00
-unspsc7#15.12.18.05.00#Anti weld pastes#15.12.18.00.00
-unspsc7#15.12.19.00.00#Greases#15.12.00.00.00
-unspsc7#15.12.19.01.00#Silicone grease#15.12.19.00.00
-unspsc7#15.12.19.02.00#Grease#15.12.19.00.00
-unspsc7#15.12.19.03.00#Teflon grease#15.12.19.00.00
-unspsc7#15.12.19.04.00#Wool grease#15.12.19.00.00
-unspsc7#15.13.00.00.00#Fuel for nuclear reactors#15.00.00.00.00
-unspsc7#15.13.15.00.00#Nuclear fuel#15.13.00.00.00
-unspsc7#15.13.15.02.00#Depleted uranium#15.13.15.00.00
-unspsc7#15.13.15.03.00#Enriched uranium#15.13.15.00.00
-unspsc7#15.13.15.04.00#Iridium#15.13.15.00.00
-unspsc7#15.13.15.05.00#Enriched plutonium#15.13.15.00.00
-unspsc7#15.13.15.06.00#Depleted plutonium#15.13.15.00.00
-unspsc7#15.13.16.00.00#Fission fuel assemblies#15.13.00.00.00
-unspsc7#15.13.16.01.00#Nuclear fuel rod#15.13.16.00.00
-unspsc7#20.00.00.00.00#Mining Machinery and Accessories#20.00.00.00.00
-unspsc7#20.10.00.00.00#Mining and quarrying machinery and equipment#20.00.00.00.00
-unspsc7#20.10.15.00.00#Cutting equipment#20.10.00.00.00
-unspsc7#20.10.15.01.00#Continuous mining equipment#20.10.15.00.00
-unspsc7#20.10.15.02.00#Longwall shears#20.10.15.00.00
-unspsc7#20.10.15.03.00#Coal cutters#20.10.15.00.00
-unspsc7#20.10.15.04.00#Rock cutters#20.10.15.00.00
-unspsc7#20.10.16.00.00#Screens and feeding equipment#20.10.00.00.00
-unspsc7#20.10.16.01.00#Screens#20.10.16.00.00
-unspsc7#20.10.16.02.00#Feeders#20.10.16.00.00
-unspsc7#20.10.17.00.00#Crushers and breakers and grinders#20.10.00.00.00
-unspsc7#20.10.17.01.00#Rock crushers#20.10.17.00.00
-unspsc7#20.10.17.02.00#Roll crushers#20.10.17.00.00
-unspsc7#20.10.17.03.00#Cone crushers#20.10.17.00.00
-unspsc7#20.10.17.04.00#Gyratory crushers#20.10.17.00.00
-unspsc7#20.10.17.05.00#Impact crushers#20.10.17.00.00
-unspsc7#20.10.17.06.00#Jaw crushers#20.10.17.00.00
-unspsc7#20.10.17.07.00#Crushing plants#20.10.17.00.00
-unspsc7#20.10.17.08.00#Rod mills#20.10.17.00.00
-unspsc7#20.10.17.09.00#Ball mills#20.10.17.00.00
-unspsc7#20.10.17.10.00#Pulverizing machinery#20.10.17.00.00
-unspsc7#20.10.17.11.00#Rock breakers#20.10.17.00.00
-unspsc7#20.10.17.12.00#Earth grinders#20.10.17.00.00
-unspsc7#20.10.17.13.00#Cyclone or vortex grinders#20.10.17.00.00
-unspsc7#20.11.00.00.00#Well drilling and operation equipment#20.00.00.00.00
-unspsc7#20.11.15.00.00#Drilling and exploration equipment#20.11.00.00.00
-unspsc7#20.11.15.01.00#Gas well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.02.00#Oil well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.03.00#Subsea system equipment#20.11.15.00.00
-unspsc7#20.11.15.04.00#Water well drilling equipment#20.11.15.00.00
-unspsc7#20.11.15.05.00#Uranium exploration equipment#20.11.15.00.00
-unspsc7#20.11.15.06.00#Wellhead equipment#20.11.15.00.00
-unspsc7#20.11.15.07.00#Mud or workover fluid equipment#20.11.15.00.00
-unspsc7#20.11.15.08.00#Seismic equipment#20.11.15.00.00
-unspsc7#20.11.16.00.00#Drilling and operation machinery#20.11.00.00.00
-unspsc7#20.11.16.01.00#Boring or sinking machinery#20.11.16.00.00
-unspsc7#20.11.16.02.00#Downhole assembly machinery#20.11.16.00.00
-unspsc7#20.11.16.03.00#Hammer drills#20.11.16.00.00
-unspsc7#20.11.16.04.00#Crawler drills#20.11.16.00.00
-unspsc7#20.11.16.05.00#Rock drills#20.11.16.00.00
-unspsc7#20.11.16.06.00#Pneumatic vibrators#20.11.16.00.00
-unspsc7#20.11.16.07.00#Tunneling machinery#20.11.16.00.00
-unspsc7#20.11.16.08.00#Striking hammers#20.11.16.00.00
-unspsc7#20.11.16.09.00#Sinker drills#20.11.16.00.00
-unspsc7#20.11.16.10.00#Sewer inspection machinery#20.11.16.00.00
-unspsc7#20.11.16.11.00#Rotary drills#20.11.16.00.00
-unspsc7#20.11.16.12.00#Drilling rigs#20.11.16.00.00
-unspsc7#20.11.16.13.00#Long hole drills#20.11.16.00.00
-unspsc7#20.11.16.14.00#Industrial drill bits#20.11.16.00.00
-unspsc7#20.11.16.15.00#Drifters#20.11.16.00.00
-unspsc7#20.11.16.16.00#Derricks#20.11.16.00.00
-unspsc7#20.11.16.17.00#Drilling carriages#20.11.16.00.00
-unspsc7#20.11.16.18.00#Downhole fishing poles#20.11.16.00.00
-unspsc7#20.11.16.19.00#Well drilling bit cones#20.11.16.00.00
-unspsc7#20.11.17.00.00#Drilling and operation accessories#20.11.00.00.00
-unspsc7#20.11.17.01.00#Audio visual instruments for well inspection#20.11.17.00.00
-unspsc7#20.11.17.02.00#Packers or tubing anchors#20.11.17.00.00
-unspsc7#20.11.17.03.00#Drilling casings#20.11.17.00.00
-unspsc7#20.11.17.04.00#Drilling screens#20.11.17.00.00
-unspsc7#20.12.00.00.00#Oil and gas drilling and exploration equipment#20.00.00.00.00
-unspsc7#20.12.10.00.00#Acidizing equipment#20.12.00.00.00
-unspsc7#20.12.10.01.00#Acidizing blending units#20.12.10.00.00
-unspsc7#20.12.10.02.00#Acidizing density sensors#20.12.10.00.00
-unspsc7#20.12.10.03.00#Acidizing pumping units#20.12.10.00.00
-unspsc7#20.12.10.04.00#Acidizing units#20.12.10.00.00
-unspsc7#20.12.10.05.00#Acidizing air piping#20.12.10.00.00
-unspsc7#20.12.10.06.00#Acidizing ball injectors#20.12.10.00.00
-unspsc7#20.12.10.07.00#Bulk liquid acid equipment#20.12.10.00.00
-unspsc7#20.12.10.08.00#Acidizing drop boxes#20.12.10.00.00
-unspsc7#20.12.10.09.00#Acidizing flow meters#20.12.10.00.00
-unspsc7#20.12.10.10.00#Acidizing junction boxes#20.12.10.00.00
-unspsc7#20.12.10.11.00#Acidizing pressure sensors#20.12.10.00.00
-unspsc7#20.12.10.12.00#Acidizing process piping#20.12.10.00.00
-unspsc7#20.12.10.13.00#Acidizing straight joints#20.12.10.00.00
-unspsc7#20.12.10.14.00#Acidizing swivels#20.12.10.00.00
-unspsc7#20.12.10.15.00#Acidizing treating irons#20.12.10.00.00
-unspsc7#20.12.10.16.00#Acidizing tree savers#20.12.10.00.00
-unspsc7#20.12.11.00.00#Cementing equipment#20.12.00.00.00
-unspsc7#20.12.11.01.00#Blending units#20.12.11.00.00
-unspsc7#20.12.11.02.00#Bridge plugs#20.12.11.00.00
-unspsc7#20.12.11.03.00#Bulk liquid cement equipment#20.12.11.00.00
-unspsc7#20.12.11.04.00#Cement bulk material equipment#20.12.11.00.00
-unspsc7#20.12.11.05.00#Cement density sensors#20.12.11.00.00
-unspsc7#20.12.11.06.00#Cement floating bulk units#20.12.11.00.00
-unspsc7#20.12.11.07.00#Cement floating equipment stage tools#20.12.11.00.00
-unspsc7#20.12.11.08.00#Cement floating equipment wiper plugs#20.12.11.00.00
-unspsc7#20.12.11.09.00#Cement pumping units#20.12.11.00.00
-unspsc7#20.12.11.10.00#Cement retainers#20.12.11.00.00
-unspsc7#20.12.11.11.00#Centralizers#20.12.11.00.00
-unspsc7#20.12.11.12.00#Express latch couplers#20.12.11.00.00
-unspsc7#20.12.11.13.00#Float collars#20.12.11.00.00
-unspsc7#20.12.11.14.00#Float shoes#20.12.11.00.00
-unspsc7#20.12.11.15.00#Oilfield cementing tools#20.12.11.00.00
-unspsc7#20.12.11.16.00#Retrievable cementing packers#20.12.11.00.00
-unspsc7#20.12.11.17.00#Safety slings#20.12.11.00.00
-unspsc7#20.12.11.18.00#Subsea cement heads#20.12.11.00.00
-unspsc7#20.12.11.19.00#Surface cement heads#20.12.11.00.00
-unspsc7#20.12.12.00.00#Fracturing equipment#20.12.00.00.00
-unspsc7#20.12.12.01.00#Bulk liquid fracturing equipment#20.12.12.00.00
-unspsc7#20.12.12.02.00#Fracturing bulk proppant equipment#20.12.12.00.00
-unspsc7#20.12.12.03.00#Fracturing control units#20.12.12.00.00
-unspsc7#20.12.12.04.00#Fracturing density sensors#20.12.12.00.00
-unspsc7#20.12.12.05.00#Fracturing manifold units#20.12.12.00.00
-unspsc7#20.12.12.06.00#Fracturing proppant conveying equipment#20.12.12.00.00
-unspsc7#20.12.12.07.00#Fracturing pumping units#20.12.12.00.00
-unspsc7#20.12.12.08.00#Fracturing slurry blending units#20.12.12.00.00
-unspsc7#20.12.12.09.00#Gel blending units#20.12.12.00.00
-unspsc7#20.12.12.10.00#Fracturing missiles#20.12.12.00.00
-unspsc7#20.12.12.11.00#Pump integrity monitors#20.12.12.00.00
-unspsc7#20.12.12.12.00#Fracturing service packers#20.12.12.00.00
-unspsc7#20.12.12.13.00#Stimulation pumping units#20.12.12.00.00
-unspsc7#20.12.13.00.00#Sand control equipment#20.12.00.00.00
-unspsc7#20.12.13.01.00#Blanking plugs#20.12.13.00.00
-unspsc7#20.12.13.02.00#Floaters#20.12.13.00.00
-unspsc7#20.12.13.03.00#Frac pack systems#20.12.13.00.00
-unspsc7#20.12.13.04.00#Gravel pack systems#20.12.13.00.00
-unspsc7#20.12.13.05.00#Guide shoes#20.12.13.00.00
-unspsc7#20.12.13.06.00#Hook up nipples#20.12.13.00.00
-unspsc7#20.12.13.07.00#Make up subs#20.12.13.00.00
-unspsc7#20.12.13.08.00#Production tubing overshots#20.12.13.00.00
-unspsc7#20.12.13.09.00#Sand control blanks#20.12.13.00.00
-unspsc7#20.12.13.10.00#Sand control bulk liquid equipment#20.12.13.00.00
-unspsc7#20.12.13.11.00#Sand control bulk proppant equipment#20.12.13.00.00
-unspsc7#20.12.13.12.00#Sand control density sensors#20.12.13.00.00
-unspsc7#20.12.13.13.00#Sand control manifold units#20.12.13.00.00
-unspsc7#20.12.13.14.00#Sand control proppant conveying equipment#20.12.13.00.00
-unspsc7#20.12.13.15.00#Sand control pumping units#20.12.13.00.00
-unspsc7#20.12.13.16.00#Sand control screens#20.12.13.00.00
-unspsc7#20.12.13.17.00#Sand control slurry blending units#20.12.13.00.00
-unspsc7#20.12.13.18.00#Sand detectors#20.12.13.00.00
-unspsc7#20.12.13.19.00#Seal assembly locators#20.12.13.00.00
-unspsc7#20.12.13.20.00#Shear joints#20.12.13.00.00
-unspsc7#20.12.13.21.00#Sleeve shifting tools#20.12.13.00.00
-unspsc7#20.12.13.22.00#Sliding sleeves#20.12.13.00.00
-unspsc7#20.12.13.23.00#Velocity strings#20.12.13.00.00
-unspsc7#20.12.14.00.00#Completion tools and equipment#20.12.00.00.00
-unspsc7#20.12.14.01.00#Ball catcher subs#20.12.14.00.00
-unspsc7#20.12.14.02.00#Blast joints#20.12.14.00.00
-unspsc7#20.12.14.03.00#Blast nipples#20.12.14.00.00
-unspsc7#20.12.14.04.00#Completion bull plugs#20.12.14.00.00
-unspsc7#20.12.14.05.00#Circulation production devices#20.12.14.00.00
-unspsc7#20.12.14.06.00#Completion test equipment#20.12.14.00.00
-unspsc7#20.12.14.07.00#Control line protectors#20.12.14.00.00
-unspsc7#20.12.14.08.00#Deflection tools#20.12.14.00.00
-unspsc7#20.12.14.09.00#Completion expansion joints#20.12.14.00.00
-unspsc7#20.12.14.10.00#Flow couplings#20.12.14.00.00
-unspsc7#20.12.14.11.00#Gas lift equipment#20.12.14.00.00
-unspsc7#20.12.14.12.00#Hanger landing tools#20.12.14.00.00
-unspsc7#20.12.14.13.00#Completion hydraulic pumps#20.12.14.00.00
-unspsc7#20.12.14.14.00#Hydraulic setting tools#20.12.14.00.00
-unspsc7#20.12.14.15.00#Injection systems#20.12.14.00.00
-unspsc7#20.12.14.16.00#Landing nipples#20.12.14.00.00
-unspsc7#20.12.14.17.00#Liner hangers#20.12.14.00.00
-unspsc7#20.12.14.18.00#Packer pulling tools#20.12.14.00.00
-unspsc7#20.12.14.19.00#Packer running tools#20.12.14.00.00
-unspsc7#20.12.14.20.00#Production packers#20.12.14.00.00
-unspsc7#20.12.14.21.00#Pump down through flow line equipment#20.12.14.00.00
-unspsc7#20.12.14.22.00#Completion safety joints#20.12.14.00.00
-unspsc7#20.12.14.23.00#Completion seal assemblies#20.12.14.00.00
-unspsc7#20.12.14.24.00#Seal bores or polished bores#20.12.14.00.00
-unspsc7#20.12.14.25.00#Side pocket mandrels#20.12.14.00.00
-unspsc7#20.12.14.26.00#Sliding sleeves#20.12.14.00.00
-unspsc7#20.12.14.27.00#Subsurface safety valves#20.12.14.00.00
-unspsc7#20.12.14.28.00#Travel joints#20.12.14.00.00
-unspsc7#20.12.14.29.00#Tubing anchors#20.12.14.00.00
-unspsc7#20.12.14.30.00#Twin flow assemblies#20.12.14.00.00
-unspsc7#20.12.15.00.00#Conventional drilling tools#20.12.00.00.00
-unspsc7#20.12.15.01.00#Blowout preventers#20.12.15.00.00
-unspsc7#20.12.15.02.00#Blowout preventer controls#20.12.15.00.00
-unspsc7#20.12.15.03.00#Casing scrapers#20.12.15.00.00
-unspsc7#20.12.15.04.00#Drill collars#20.12.15.00.00
-unspsc7#20.12.15.05.00#Coring equipment#20.12.15.00.00
-unspsc7#20.12.15.06.00#Drill pipe thread protectors#20.12.15.00.00
-unspsc7#20.12.15.07.00#Drill pipe tool joints#20.12.15.00.00
-unspsc7#20.12.15.08.00#Drill pipe#20.12.15.00.00
-unspsc7#20.12.15.09.00#Gauge rings#20.12.15.00.00
-unspsc7#20.12.15.10.00#Hole openers#20.12.15.00.00
-unspsc7#20.12.15.11.00#Hole reamers#20.12.15.00.00
-unspsc7#20.12.15.12.00#Fishing jars#20.12.15.00.00
-unspsc7#20.12.15.13.00#Downhole shock absorbers#20.12.15.00.00
-unspsc7#20.12.15.14.00#Downhole stabilizers#20.12.15.00.00
-unspsc7#20.12.15.15.00#Drilling subs#20.12.15.00.00
-unspsc7#20.12.15.16.00#Thrusters#20.12.15.00.00
-unspsc7#20.12.16.00.00#Drilling bits#20.12.00.00.00
-unspsc7#20.12.16.01.00#Fixed cutter drill bits#20.12.16.00.00
-unspsc7#20.12.16.02.00#Natural diamond drill bits#20.12.16.00.00
-unspsc7#20.12.16.03.00#Nozzle drill bits#20.12.16.00.00
-unspsc7#20.12.16.04.00#PDC bits#20.12.16.00.00
-unspsc7#20.12.16.05.00#Roller cone button insert drill bits#20.12.16.00.00
-unspsc7#20.12.16.06.00#Roller steel tooth drill bits#20.12.16.00.00
-unspsc7#20.12.17.00.00#Fishing tools#20.12.00.00.00
-unspsc7#20.12.17.01.00#Bumper subs#20.12.17.00.00
-unspsc7#20.12.17.02.00#Casing patches#20.12.17.00.00
-unspsc7#20.12.17.03.00#Jar boosters#20.12.17.00.00
-unspsc7#20.12.17.04.00#Junk subs#20.12.17.00.00
-unspsc7#20.12.17.05.00#Mills or burning shoes#20.12.17.00.00
-unspsc7#20.12.17.06.00#Overshots#20.12.17.00.00
-unspsc7#20.12.17.07.00#Oilfield fishing spears#20.12.17.00.00
-unspsc7#20.12.17.08.00#Unspecified fishing tools#20.12.17.00.00
-unspsc7#20.12.18.00.00#Directional drilling equipment#20.12.00.00.00
-unspsc7#20.12.18.01.00#Geosteering tools#20.12.18.00.00
-unspsc7#20.12.18.02.00#Mud motors#20.12.18.00.00
-unspsc7#20.12.18.03.00#Rotary steerable tools#20.12.18.00.00
-unspsc7#20.12.18.04.00#Directional drilling surface control systems#20.12.18.00.00
-unspsc7#20.12.18.05.00#Straight hole directional drilling tools#20.12.18.00.00
-unspsc7#20.12.19.00.00#Well measurement and logging equipment#20.12.00.00.00
-unspsc7#20.12.19.01.00#Acoustic tools#20.12.19.00.00
-unspsc7#20.12.19.02.00#Drilling or mud control instruments#20.12.19.00.00
-unspsc7#20.12.19.03.00#Drilling performance measurement tools#20.12.19.00.00
-unspsc7#20.12.19.04.00#Flow measurement equipment#20.12.19.00.00
-unspsc7#20.12.19.05.00#Nuclear magnetic resonance tools#20.12.19.00.00
-unspsc7#20.12.19.06.00#Nuclear tools#20.12.19.00.00
-unspsc7#20.12.19.07.00#Production logging equipment#20.12.19.00.00
-unspsc7#20.12.19.08.00#Resistivity tools#20.12.19.00.00
-unspsc7#20.12.19.09.00#Surveying systems#20.12.19.00.00
-unspsc7#20.12.19.10.00#Telemetry systems#20.12.19.00.00
-unspsc7#20.12.19.11.00#Ultrasonic tools#20.12.19.00.00
-unspsc7#20.12.19.12.00#Well logging bottom hole pressure equipment#20.12.19.00.00
-unspsc7#20.12.19.13.00#Well logging downhole test equipment#20.12.19.00.00
-unspsc7#20.12.19.14.00#Well logging units#20.12.19.00.00
-unspsc7#20.12.20.00.00#Fixturing and test equipment#20.12.00.00.00
-unspsc7#20.12.20.01.00#Drift bars#20.12.20.00.00
-unspsc7#20.12.20.02.00#Drift sleeves#20.12.20.00.00
-unspsc7#20.12.20.03.00#Drift rabbits#20.12.20.00.00
-unspsc7#20.12.20.04.00#Test fixtures#20.12.20.00.00
-unspsc7#20.12.20.05.00#Test nipples#20.12.20.00.00
-unspsc7#20.12.20.06.00#Test plugs#20.12.20.00.00
-unspsc7#20.12.21.00.00#Perforating equipment#20.12.00.00.00
-unspsc7#20.12.21.01.00#Capsule guns#20.12.21.00.00
-unspsc7#20.12.21.02.00#Casing guns#20.12.21.00.00
-unspsc7#20.12.21.03.00#Deployment heads#20.12.21.00.00
-unspsc7#20.12.21.04.00#Perforating explosives#20.12.21.00.00
-unspsc7#20.12.21.05.00#Firing heads#20.12.21.00.00
-unspsc7#20.12.21.06.00#Gun adapters#20.12.21.00.00
-unspsc7#20.12.21.07.00#High shot density guns#20.12.21.00.00
-unspsc7#20.12.21.08.00#Perforating bull plugs#20.12.21.00.00
-unspsc7#20.12.21.09.00#Plug setting tools#20.12.21.00.00
-unspsc7#20.12.21.10.00#Perforating positioning equipment#20.12.21.00.00
-unspsc7#20.12.21.11.00#Scalloped guns#20.12.21.00.00
-unspsc7#20.12.21.12.00#Tandem subs#20.12.21.00.00
-unspsc7#20.12.21.13.00#Through tubing perforation gun accessories#20.12.21.00.00
-unspsc7#20.12.21.14.00#Through tubing perforation guns#20.12.21.00.00
-unspsc7#20.12.21.15.00#Under balance vent subs#20.12.21.00.00
-unspsc7#20.12.22.00.00#Well testing equipment#20.12.00.00.00
-unspsc7#20.12.22.01.00#Flare booms#20.12.22.00.00
-unspsc7#20.12.22.02.00#Flare burners#20.12.22.00.00
-unspsc7#20.12.22.03.00#Cased hole test tools#20.12.22.00.00
-unspsc7#20.12.22.04.00#Choke manifolds#20.12.22.00.00
-unspsc7#20.12.22.05.00#Diverting manifolds#20.12.22.00.00
-unspsc7#20.12.22.06.00#Flowhead baskets#20.12.22.00.00
-unspsc7#20.12.22.07.00#Flowhead swivels#20.12.22.00.00
-unspsc7#20.12.22.08.00#Flowheads#20.12.22.00.00
-unspsc7#20.12.22.09.00#Formation shut in tools#20.12.22.00.00
-unspsc7#20.12.22.10.00#Gas flares#20.12.22.00.00
-unspsc7#20.12.22.11.00#Mud gas analyzers#20.12.22.00.00
-unspsc7#20.12.22.12.00#Oil samplers#20.12.22.00.00
-unspsc7#20.12.22.13.00#Well testing separators#20.12.22.00.00
-unspsc7#20.12.22.14.00#Well testing surface piping#20.12.22.00.00
-unspsc7#20.12.22.15.00#Surge tanks#20.12.22.00.00
-unspsc7#20.12.22.16.00#Well testing downhole tools#20.12.22.00.00
-unspsc7#20.12.23.00.00#Slickline equipment#20.12.00.00.00
-unspsc7#20.12.23.01.00#Slickline adapter heads#20.12.23.00.00
-unspsc7#20.12.23.02.00#Slickline backoffs#20.12.23.00.00
-unspsc7#20.12.23.03.00#Slickline bell guides#20.12.23.00.00
-unspsc7#20.12.23.04.00#Slickline blind boxes#20.12.23.00.00
-unspsc7#20.12.23.05.00#Slickline bottom hole pressure equipment#20.12.23.00.00
-unspsc7#20.12.23.06.00#Slickline caliper tools#20.12.23.00.00
-unspsc7#20.12.23.07.00#Slickline cement dump bailing equipment#20.12.23.00.00
-unspsc7#20.12.23.08.00#Slickline chemical cutters#20.12.23.00.00
-unspsc7#20.12.23.09.00#Slickline clamp on tool string centralizers#20.12.23.00.00
-unspsc7#20.12.23.10.00#Slickline clamp on wireline centralizers#20.12.23.00.00
-unspsc7#20.12.23.11.00#Slickline collar locators#20.12.23.00.00
-unspsc7#20.12.23.12.00#Slickline collectors#20.12.23.00.00
-unspsc7#20.12.23.13.00#Slickline colliding tools#20.12.23.00.00
-unspsc7#20.12.23.14.00#Slickline crossovers#20.12.23.00.00
-unspsc7#20.12.23.15.00#Slickline depth measurement equipment#20.12.23.00.00
-unspsc7#20.12.23.16.00#Slickline dewar flasks#20.12.23.00.00
-unspsc7#20.12.23.17.00#Slickline dipmeter tools#20.12.23.00.00
-unspsc7#20.12.23.18.00#Slickline directional tools#20.12.23.00.00
-unspsc7#20.12.23.19.00#Slickline go devil tools#20.12.23.00.00
-unspsc7#20.12.23.20.00#Slickline hole punchers#20.12.23.00.00
-unspsc7#20.12.23.21.00#Slickline jet cutters#20.12.23.00.00
-unspsc7#20.12.23.22.00#Slickline junk shots#20.12.23.00.00
-unspsc7#20.12.23.23.00#Slickline kickover tools#20.12.23.00.00
-unspsc7#20.12.23.24.00#Slickline knuckle joints#20.12.23.00.00
-unspsc7#20.12.23.25.00#Slickline lead impression blocks#20.12.23.00.00
-unspsc7#20.12.23.26.00#Slickline locator mandrels#20.12.23.00.00
-unspsc7#20.12.23.27.00#Slickline lock mandrels#20.12.23.00.00
-unspsc7#20.12.23.28.00#Slickline lubricators#20.12.23.00.00
-unspsc7#20.12.23.29.00#Slickline mechanical bailers#20.12.23.00.00
-unspsc7#20.12.23.30.00#Slickline mechanical plugbacks#20.12.23.00.00
-unspsc7#20.12.23.31.00#Other Slickline Tools#20.12.23.00.00
-unspsc7#20.12.23.32.00#Slickline paraffin scrappers#20.12.23.00.00
-unspsc7#20.12.23.33.00#Slickline rope sockets#20.12.23.00.00
-unspsc7#20.12.23.34.00#Slickline running or pulling prongs#20.12.23.00.00
-unspsc7#20.12.23.35.00#Slickline severing tools#20.12.23.00.00
-unspsc7#20.12.23.36.00#Slickline sheaves or floor blocks#20.12.23.00.00
-unspsc7#20.12.23.37.00#Slickline bottom hole pressure equipment#20.12.23.00.00
-unspsc7#20.12.23.38.00#Slickline pulling tool accessories#20.12.23.00.00
-unspsc7#20.12.23.39.00#Slickline pulling tools#20.12.23.00.00
-unspsc7#20.12.23.40.00#Slickline running tools#20.12.23.00.00
-unspsc7#20.12.23.41.00#Slickline units#20.12.23.00.00
-unspsc7#20.12.23.42.00#Slickline wire#20.12.23.00.00
-unspsc7#20.12.23.43.00#Slickline sonic tools#20.12.23.00.00
-unspsc7#20.12.23.44.00#Slickline spacer bars#20.12.23.00.00
-unspsc7#20.12.23.45.00#Slickline swages#20.12.23.00.00
-unspsc7#20.12.23.46.00#Slickline tension devices#20.12.23.00.00
-unspsc7#20.12.23.47.00#Slickline tubing plugs#20.12.23.00.00
-unspsc7#20.12.23.48.00#Slickline ultrasonic tools#20.12.23.00.00
-unspsc7#20.12.23.49.00#Wireline Grabs#20.12.23.00.00
-unspsc7#20.12.23.50.00#Wireline Jars#20.12.23.00.00
-unspsc7#20.12.23.51.00#Wireline Scrapers#20.12.23.00.00
-unspsc7#20.12.23.52.00#Wireline Spear#20.12.23.00.00
-unspsc7#20.12.23.53.00#Wireline Stems#20.12.23.00.00
-unspsc7#20.12.23.54.00#Wireline Valves#20.12.23.00.00
-unspsc7#20.12.24.00.00#Production systems equipment#20.12.00.00.00
-unspsc7#20.12.24.01.00#Cable thumpers#20.12.24.00.00
-unspsc7#20.12.24.02.00#Oilfield production evaporators#20.12.24.00.00
-unspsc7#20.12.24.03.00#Hipot testers#20.12.24.00.00
-unspsc7#20.12.24.04.00#Oilfield lapping machines#20.12.24.00.00
-unspsc7#20.12.24.05.00#Motor end lifts#20.12.24.00.00
-unspsc7#20.12.24.06.00#Oil dielectric testers#20.12.24.00.00
-unspsc7#20.12.24.07.00#Oil vacuum filling units#20.12.24.00.00
-unspsc7#20.12.24.08.00#Oilfield production shaft straighteners#20.12.24.00.00
-unspsc7#20.12.24.09.00#Oilfield production spoolers#20.12.24.00.00
-unspsc7#20.12.24.10.00#Vibration analyzers#20.12.24.00.00
-unspsc7#20.12.25.00.00#Coiled tubing equipment#20.12.00.00.00
-unspsc7#20.12.25.01.00#Blaster tools#20.12.25.00.00
-unspsc7#20.12.25.02.00#Coiled tubing truck crane units#20.12.25.00.00
-unspsc7#20.12.25.03.00#Coiled tubing units#20.12.25.00.00
-unspsc7#20.12.25.04.00#Coiled tubing hose packages#20.12.25.00.00
-unspsc7#20.12.25.05.00#Coiled tubing inflatable systems#20.12.25.00.00
-unspsc7#20.12.25.06.00#Coiled tubing injector heads#20.12.25.00.00
-unspsc7#20.12.25.07.00#Coiled tubing lifting equipment#20.12.25.00.00
-unspsc7#20.12.25.08.00#Operator houses#20.12.25.00.00
-unspsc7#20.12.25.09.00#Coiled tubing power packs#20.12.25.00.00
-unspsc7#20.12.25.10.00#Coiled tubing reels#20.12.25.00.00
-unspsc7#20.12.25.11.00#Coiled tubing spooling reels#20.12.25.00.00
-unspsc7#20.12.25.12.00#Tubing guides#20.12.25.00.00
-unspsc7#20.12.25.13.00#Wellhead hookups#20.12.25.00.00
-unspsc7#20.12.25.14.00#Wellhead support structures#20.12.25.00.00
-unspsc7#20.12.25.15.00#Oilfield coiled tubing#20.12.25.00.00
-unspsc7#20.12.26.00.00#Seismic equipment#20.12.00.00.00
-unspsc7#20.12.26.01.00#Seismic analog sensors#20.12.26.00.00
-unspsc7#20.12.26.02.00#Seismic arrays#20.12.26.00.00
-unspsc7#20.12.26.03.00#Seismic streamer cable birds#20.12.26.00.00
-unspsc7#20.12.26.04.00#Seismic drill tankers#20.12.26.00.00
-unspsc7#20.12.26.05.00#Seismic geophones#20.12.26.00.00
-unspsc7#20.12.26.06.00#Seismic gravity systems#20.12.26.00.00
-unspsc7#20.12.26.07.00#Seismic gun winch systems#20.12.26.00.00
-unspsc7#20.12.26.08.00#Seismic hydrophones#20.12.26.00.00
-unspsc7#20.12.26.09.00#Seismic impulse sources#20.12.26.00.00
-unspsc7#20.12.26.10.00#Seismic marine streamer cables#20.12.26.00.00
-unspsc7#20.12.26.11.00#Seismic ocean bottom cables#20.12.26.00.00
-unspsc7#20.12.26.12.00#Seismic magnetic systems#20.12.26.00.00
-unspsc7#20.12.26.13.00#Seismic positioning equipment#20.12.26.00.00
-unspsc7#20.12.26.14.00#Seismic rams#20.12.26.00.00
-unspsc7#20.12.26.15.00#Seismic receivers#20.12.26.00.00
-unspsc7#20.12.26.16.00#Seismic refraction systems#20.12.26.00.00
-unspsc7#20.12.26.17.00#Seismic source controllers#20.12.26.00.00
-unspsc7#20.12.26.18.00#Seismic spooling devices#20.12.26.00.00
-unspsc7#20.12.26.19.00#Seismic tow blocks#20.12.26.00.00
-unspsc7#20.12.26.20.00#Seismic tow points#20.12.26.00.00
-unspsc7#20.12.26.21.00#Seismic vibrators#20.12.26.00.00
-unspsc7#20.12.26.22.00#Seismic recording systems#20.12.26.00.00
-unspsc7#20.12.26.23.00#Seismic data processing systems#20.12.26.00.00
-unspsc7#20.12.27.00.00#Oil country tubular goods#20.12.00.00.00
-unspsc7#20.12.27.01.00#Oil country casing#20.12.27.00.00
-unspsc7#20.12.27.02.00#Oil country couplings#20.12.27.00.00
-unspsc7#20.12.27.03.00#Oil country pup joints#20.12.27.00.00
-unspsc7#20.12.27.04.00#Oil country tubing#20.12.27.00.00
-unspsc7#20.12.27.05.00#Oil country pipe coatings#20.12.27.00.00
-unspsc7#20.12.27.06.00#Conductor casing#20.12.27.00.00
-unspsc7#20.12.27.07.00#Conductor casing running equipment#20.12.27.00.00
-unspsc7#20.12.27.08.00#Drill pipe crossovers#20.12.27.00.00
-unspsc7#20.12.27.09.00#Oil country thread protectors#20.12.27.00.00
-unspsc7#20.12.28.00.00#Drilling and workover rigs and equipment#20.12.00.00.00
-unspsc7#20.12.28.01.00#Mud agitators#20.12.28.00.00
-unspsc7#20.12.28.02.00#Mud tanks#20.12.28.00.00
-unspsc7#20.12.28.03.00#Air drilling equipment#20.12.28.00.00
-unspsc7#20.12.28.04.00#Barge rigs#20.12.28.00.00
-unspsc7#20.12.28.05.00#Blow out preventers#20.12.28.00.00
-unspsc7#20.12.28.06.00#Fluid diverters#20.12.28.00.00
-unspsc7#20.12.28.07.00#Drawworks#20.12.28.00.00
-unspsc7#20.12.28.08.00#Drill floor equipment#20.12.28.00.00
-unspsc7#20.12.28.09.00#Drill swivels#20.12.28.00.00
-unspsc7#20.12.28.10.00#Drilling rig ships#20.12.28.00.00
-unspsc7#20.12.28.11.00#Drill rig elevators#20.12.28.00.00
-unspsc7#20.12.28.12.00#Drill rig bails#20.12.28.00.00
-unspsc7#20.12.28.13.00#Hydraulic workover units#20.12.28.00.00
-unspsc7#20.12.28.14.00#Drill rig jacking systems#20.12.28.00.00
-unspsc7#20.12.28.15.00#Jackup marine drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.16.00#Kelly bushings#20.12.28.00.00
-unspsc7#20.12.28.17.00#Kelly valves#20.12.28.00.00
-unspsc7#20.12.28.18.00#Kelly wipers#20.12.28.00.00
-unspsc7#20.12.28.19.00#Kellys#20.12.28.00.00
-unspsc7#20.12.28.20.00#Land drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.21.00#Mud cleaning equipment#20.12.28.00.00
-unspsc7#20.12.28.22.00#Mud manifolds#20.12.28.00.00
-unspsc7#20.12.28.23.00#Mud mixers#20.12.28.00.00
-unspsc7#20.12.28.24.00#Pipe handling equipment#20.12.28.00.00
-unspsc7#20.12.28.25.00#Platform drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.26.00#Power swivel or top drives#20.12.28.00.00
-unspsc7#20.12.28.27.00#Rig skids#20.12.28.00.00
-unspsc7#20.12.28.28.00#Drill rig risers#20.12.28.00.00
-unspsc7#20.12.28.29.00#Drill rig rotary tables#20.12.28.00.00
-unspsc7#20.12.28.30.00#Self elevating workover platforms#20.12.28.00.00
-unspsc7#20.12.28.31.00#Semi submersible drilling rigs#20.12.28.00.00
-unspsc7#20.12.28.32.00#Drill floor slips#20.12.28.00.00
-unspsc7#20.12.28.33.00#Makeup tongs#20.12.28.00.00
-unspsc7#20.12.28.34.00#Iron roughnecks#20.12.28.00.00
-unspsc7#20.12.28.35.00#Traveling equipment#20.12.28.00.00
-unspsc7#20.12.28.36.00#Workover boats#20.12.28.00.00
-unspsc7#20.12.28.37.00#Workover rigs#20.12.28.00.00
-unspsc7#20.12.29.00.00#Surface data logging equipment#20.12.00.00.00
-unspsc7#20.12.29.01.00#Surface data logging conduits#20.12.29.00.00
-unspsc7#20.12.29.02.00#Surface data logging sensors#20.12.29.00.00
-unspsc7#20.12.29.03.00#Surface data logging units#20.12.29.00.00
-unspsc7#20.12.30.00.00#Multilateral equipment#20.12.00.00.00
-unspsc7#20.12.30.01.00#Multilateral casing#20.12.30.00.00
-unspsc7#20.12.30.02.00#Multilateral junctions#20.12.30.00.00
-unspsc7#20.12.30.03.00#Multilateral packers#20.12.30.00.00
-unspsc7#20.13.00.00.00#Oil and gas drilling and operation materials#20.00.00.00.00
-unspsc7#20.13.10.00.00#Drilling mud and materials#20.13.00.00.00
-unspsc7#20.13.10.01.00#Filtration control agents#20.13.10.00.00
-unspsc7#20.13.10.02.00#Fluid spacers#20.13.10.00.00
-unspsc7#20.13.10.03.00#Lost circulation agents#20.13.10.00.00
-unspsc7#20.13.10.04.00#Oil based muds#20.13.10.00.00
-unspsc7#20.13.10.05.00#Rate of penetration enhancers#20.13.10.00.00
-unspsc7#20.13.10.06.00#Spotting fluids#20.13.10.00.00
-unspsc7#20.13.10.07.00#Synthetic based muds#20.13.10.00.00
-unspsc7#20.13.10.08.00#Mud thinning agents#20.13.10.00.00
-unspsc7#20.13.10.09.00#Water based muds#20.13.10.00.00
-unspsc7#20.13.10.10.00#Mud weighting agents#20.13.10.00.00
-unspsc7#20.13.11.00.00#Well fracturing proppants#20.13.00.00.00
-unspsc7#20.13.11.01.00#Ceramic proppants#20.13.11.00.00
-unspsc7#20.13.11.02.00#Fracturing sands#20.13.11.00.00
-unspsc7#20.13.11.03.00#Resin coated ceramic proppants#20.13.11.00.00
-unspsc7#20.13.11.04.00#Resin coated fracturing sands#20.13.11.00.00
-unspsc7#20.13.11.05.00#Resin coated sintered bauxites#20.13.11.00.00
-unspsc7#20.13.11.06.00#Sintered bauxites#20.13.11.00.00
-unspsc7#20.13.12.00.00#Completion fluids#20.13.00.00.00
-unspsc7#20.13.12.01.00#Divalent brines#20.13.12.00.00
-unspsc7#20.13.12.02.00#Monovalent brines#20.13.12.00.00
-unspsc7#20.13.13.00.00#Oil well cement#20.13.00.00.00
-unspsc7#20.13.13.01.00#Oil well bulk cement#20.13.13.00.00
-unspsc7#20.13.13.02.00#Oil well class a type I cement#20.13.13.00.00
-unspsc7#20.13.13.03.00#Oil well class b type II cement#20.13.13.00.00
-unspsc7#20.13.13.04.00#Oil well class c cement#20.13.13.00.00
-unspsc7#20.13.13.05.00#Oil well class g cement#20.13.13.00.00
-unspsc7#20.13.13.06.00#Oil well class h cement#20.13.13.00.00
-unspsc7#20.13.13.07.00#Oil well lightweight cement#20.13.13.00.00
-unspsc7#20.13.13.08.00#Oil well standard fine type III cement#20.13.13.00.00
-unspsc7#20.14.00.00.00#Oil and gas operating and production equipment#20.00.00.00.00
-unspsc7#20.14.10.00.00#Wellhead equipment#20.14.00.00.00
-unspsc7#20.14.10.01.00#Wellhead actuators#20.14.10.00.00
-unspsc7#20.14.10.02.00#Wellhead beam pumps#20.14.10.00.00
-unspsc7#20.14.10.03.00#Wellhead flow lines#20.14.10.00.00
-unspsc7#20.14.10.04.00#Wellhead gate valves#20.14.10.00.00
-unspsc7#20.14.10.05.00#Wellhead production chokes#20.14.10.00.00
-unspsc7#20.14.10.06.00#Wellhead sub surface flow or christmas trees#20.14.10.00.00
-unspsc7#20.14.10.07.00#Wellhead surface flow or christmas trees#20.14.10.00.00
-unspsc7#20.14.10.08.00#Wellhead surface safety valves#20.14.10.00.00
-unspsc7#20.14.11.00.00#Chemical injection systems#20.14.00.00.00
-unspsc7#20.14.11.01.00#Paraffin injection systems#20.14.11.00.00
-unspsc7#20.14.12.00.00#Desanding equipment#20.14.00.00.00
-unspsc7#20.14.12.01.00#Production desanding equipment#20.14.12.00.00
-unspsc7#20.14.13.00.00#Downhole jet pumps and anchors#20.14.00.00.00
-unspsc7#20.14.13.01.00#Downhole jet pumps#20.14.13.00.00
-unspsc7#20.14.14.00.00#Downhole production accessories#20.14.00.00.00
-unspsc7#20.14.14.01.00#Tubing stops#20.14.14.00.00
-unspsc7#20.14.15.00.00#Downhole pumps#20.14.00.00.00
-unspsc7#20.14.15.01.00#Electric downhole pumps#20.14.15.00.00
-unspsc7#20.14.16.00.00#Export pumps#20.14.00.00.00
-unspsc7#20.14.16.01.00#Pneumatic export pumps#20.14.16.00.00
-unspsc7#20.14.17.00.00#Offshore production and storage platforms#20.14.00.00.00
-unspsc7#20.14.17.01.00#Fixed offshore production platforms#20.14.17.00.00
-unspsc7#20.14.17.02.00#Floating offshore production platforms#20.14.17.00.00
-unspsc7#20.14.17.03.00#Floating offshore storage platforms#20.14.17.00.00
-unspsc7#20.14.17.04.00#Floating offshore tension leg production platforms#20.14.17.00.00
-unspsc7#20.14.17.05.00#Floating offshore tension leg storage platforms#20.14.17.00.00
-unspsc7#20.14.18.00.00#Well production flow measurement meters#20.14.00.00.00
-unspsc7#20.14.18.01.00#Well production gas turbine meters#20.14.18.00.00
-unspsc7#20.14.19.00.00#Gas treating equipment#20.14.00.00.00
-unspsc7#20.14.19.01.00#Oil well production gas treating equipment#20.14.19.00.00
-unspsc7#20.14.20.00.00#Glycol regenerators#20.14.00.00.00
-unspsc7#20.14.20.01.00#Oil well glycol regenerators#20.14.20.00.00
-unspsc7#20.14.21.00.00#Heater treaters#20.14.00.00.00
-unspsc7#20.14.21.01.00#Oil well heater treaters#20.14.21.00.00
-unspsc7#20.14.22.00.00#Line heaters#20.14.00.00.00
-unspsc7#20.14.22.01.00#Electrical line heaters#20.14.22.00.00
-unspsc7#20.14.23.00.00#Production injection skids#20.14.00.00.00
-unspsc7#20.14.23.01.00#Pneumatic methanol injections skids#20.14.23.00.00
-unspsc7#20.14.24.00.00#Ocean floor equipment#20.14.00.00.00
-unspsc7#20.14.24.01.00#Subsea production wellhead equipment#20.14.24.00.00
-unspsc7#20.14.25.00.00#Produced water treating equipment#20.14.00.00.00
-unspsc7#20.14.25.01.00#Oil field water oil centrifuges#20.14.25.00.00
-unspsc7#20.14.26.00.00#Production control system instrumentation#20.14.00.00.00
-unspsc7#20.14.26.01.00#Wireless production control systems#20.14.26.00.00
-unspsc7#20.14.27.00.00#Pumping units#20.14.00.00.00
-unspsc7#20.14.27.01.00#Sucker rod pump jacks#20.14.27.00.00
-unspsc7#20.14.27.02.00#Rod pumps#20.14.27.00.00
-unspsc7#20.14.27.03.00#Mechanical rod pumps#20.14.27.00.00
-unspsc7#20.14.28.00.00#Production separators#20.14.00.00.00
-unspsc7#20.14.28.01.00#Oil water separators#20.14.28.00.00
-unspsc7#20.14.29.00.00#Storage vessels and tanks#20.14.00.00.00
-unspsc7#20.14.29.01.00#Oil storage tanks#20.14.29.00.00
-unspsc7#20.14.30.00.00#Sucker rods#20.14.00.00.00
-unspsc7#20.14.30.01.00#Alloy steel sucker rods#20.14.30.00.00
-unspsc7#20.14.30.02.00#Pony rods#20.14.30.00.00
-unspsc7#21.00.00.00.00#Farming and Fishing and Forestry and Wildlife Machinery and Accessories#21.00.00.00.00
-unspsc7#21.10.00.00.00#Agricultural and forestry and landscape machinery and equipment#21.00.00.00.00
-unspsc7#21.10.15.00.00#Agricultural machinery for soil preparation#21.10.00.00.00
-unspsc7#21.10.15.01.00#Ploughs#21.10.15.00.00
-unspsc7#21.10.15.02.00#Harrows#21.10.15.00.00
-unspsc7#21.10.15.03.00#Cultivators#21.10.15.00.00
-unspsc7#21.10.15.04.00#Weeders#21.10.15.00.00
-unspsc7#21.10.15.05.00#Hoeing machines#21.10.15.00.00
-unspsc7#21.10.15.06.00#Graders or land levelers#21.10.15.00.00
-unspsc7#21.10.15.07.00#Agricultural rollers#21.10.15.00.00
-unspsc7#21.10.15.08.00#Rollers for lawn or sports grounds#21.10.15.00.00
-unspsc7#21.10.15.09.00#Trencher drainage machine#21.10.15.00.00
-unspsc7#21.10.15.10.00#Irrigation pipes or tubes#21.10.15.00.00
-unspsc7#21.10.15.11.00#Irrigation trickles#21.10.15.00.00
-unspsc7#21.10.15.12.00#Irrigation overheads#21.10.15.00.00
-unspsc7#21.10.15.13.00#Disks#21.10.15.00.00
-unspsc7#21.10.15.14.00#Subsoilers#21.10.15.00.00
-unspsc7#21.10.15.15.00#Hedge clippers#21.10.15.00.00
-unspsc7#21.10.15.16.00#Dibblers#21.10.15.00.00
-unspsc7#21.10.16.00.00#Agricultural machinery for planting and seeding#21.10.00.00.00
-unspsc7#21.10.16.01.00#Planters#21.10.16.00.00
-unspsc7#21.10.16.02.00#Transplanters#21.10.16.00.00
-unspsc7#21.10.16.03.00#Grain drills#21.10.16.00.00
-unspsc7#21.10.16.04.00#Seed drills#21.10.16.00.00
-unspsc7#21.10.16.05.00#Seed treating equipment#21.10.16.00.00
-unspsc7#21.10.16.06.00#Hole diggers#21.10.16.00.00
-unspsc7#21.10.17.00.00#Agricultural machinery for harvesting#21.10.00.00.00
-unspsc7#21.10.17.01.00#Mowers#21.10.17.00.00
-unspsc7#21.10.17.02.00#Haymaking machinery#21.10.17.00.00
-unspsc7#21.10.17.03.00#Harvesters#21.10.17.00.00
-unspsc7#21.10.17.04.00#Combine harvesters#21.10.17.00.00
-unspsc7#21.10.17.05.00#Threshing machines#21.10.17.00.00
-unspsc7#21.10.18.00.00#Dispersing and spraying appliances for agriculture#21.10.00.00.00
-unspsc7#21.10.18.01.00#Sprayers#21.10.18.00.00
-unspsc7#21.10.18.02.00#Dusters#21.10.18.00.00
-unspsc7#21.10.18.03.00#Water sprinklers#21.10.18.00.00
-unspsc7#21.10.18.04.00#Fertilizer spreaders or distributors#21.10.18.00.00
-unspsc7#21.10.18.05.00#Fog or mist generators#21.10.18.00.00
-unspsc7#21.10.18.06.00#Composter#21.10.18.00.00
-unspsc7#21.10.18.07.00#Pollination equipment or supplies#21.10.18.00.00
-unspsc7#21.10.18.08.00#Frost protection equipment#21.10.18.00.00
-unspsc7#21.10.19.00.00#Poultry and livestock equipment#21.10.00.00.00
-unspsc7#21.10.19.01.00#Milking machines#21.10.19.00.00
-unspsc7#21.10.19.02.00#Animal husbandry equipment#21.10.19.00.00
-unspsc7#21.10.19.03.00#Incubators or brooders for poultry#21.10.19.00.00
-unspsc7#21.10.19.04.00#Feed mixers#21.10.19.00.00
-unspsc7#21.10.19.05.00#Livestock identification equipment#21.10.19.00.00
-unspsc7#21.10.19.06.00#Egg inspection or collecting equipment#21.10.19.00.00
-unspsc7#21.10.19.07.00#Animal watering machines#21.10.19.00.00
-unspsc7#21.10.19.08.00#Milk cooling tanks#21.10.19.00.00
-unspsc7#21.10.19.09.00#Animal shearing or clipping equipment#21.10.19.00.00
-unspsc7#21.10.20.00.00#Agricultural machinery for cleaning and sorting and grading#21.10.00.00.00
-unspsc7#21.10.20.01.00#Cleaning machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.02.00#Sorting machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.03.00#Grading machines for seed or grain or dried leguminous vegetables#21.10.20.00.00
-unspsc7#21.10.20.04.00#Rice cleaning or hulling equipment#21.10.20.00.00
-unspsc7#21.10.20.05.00#Grinding mills#21.10.20.00.00
-unspsc7#21.10.20.06.00#Hammer mills#21.10.20.00.00
-unspsc7#21.10.21.00.00#Agricultural processing machinery and equipment#21.10.00.00.00
-unspsc7#21.10.21.01.00#Agricultural briquetting or pelting machines#21.10.21.00.00
-unspsc7#21.10.22.00.00#Forestry machinery and equipment#21.10.00.00.00
-unspsc7#21.10.22.01.00#Decorticators#21.10.22.00.00
-unspsc7#21.10.22.02.00#Lumbering equipment#21.10.22.00.00
-unspsc7#21.10.22.03.00#Reforestation equipment#21.10.22.00.00
-unspsc7#21.10.22.04.00#Forestry saws#21.10.22.00.00
-unspsc7#21.10.22.05.00#Forestry skidders#21.10.22.00.00
-unspsc7#21.10.22.06.00#Forestry increment borers#21.10.22.00.00
-unspsc7#21.10.22.07.00#Forestry ipsometer#21.10.22.00.00
-unspsc7#21.10.23.00.00#Greenhouse equipment#21.10.00.00.00
-unspsc7#21.10.23.01.00#Greenhouse irrigation equipment#21.10.23.00.00
-unspsc7#21.10.23.02.00#Greenhouse pots#21.10.23.00.00
-unspsc7#21.10.23.03.00#Greenhouse ventilation equipment#21.10.23.00.00
-unspsc7#21.10.23.04.00#Greenhouse isolation equipment#21.10.23.00.00
-unspsc7#21.10.24.00.00#Insect equipment#21.10.00.00.00
-unspsc7#21.10.24.01.00#Beekeeping equipment#21.10.24.00.00
-unspsc7#21.10.24.02.00#Silkworm equipment#21.10.24.00.00
-unspsc7#21.10.24.03.00#Butterfly breeding equipment#21.10.24.00.00
-unspsc7#21.10.24.04.00#Beetle breeding equipment#21.10.24.00.00
-unspsc7#21.11.00.00.00#Fishing and aquaculture equipment#21.00.00.00.00
-unspsc7#21.11.15.00.00#Commercial fishing equipment#21.11.00.00.00
-unspsc7#21.11.15.01.00#Commercial fish hooks#21.11.15.00.00
-unspsc7#21.11.15.02.00#Commercial fishing reels#21.11.15.00.00
-unspsc7#21.11.15.03.00#Commercial fishing line tackle#21.11.15.00.00
-unspsc7#21.11.15.04.00#Commercial fishing nets#21.11.15.00.00
-unspsc7#21.11.15.06.00#Commercial fishing floats#21.11.15.00.00
-unspsc7#21.11.15.07.00#Commercial sinkers or weights#21.11.15.00.00
-unspsc7#21.11.15.08.00#Fishing net haulers#21.11.15.00.00
-unspsc7#21.11.16.00.00#Aquaculture equipment#21.11.00.00.00
-unspsc7#21.11.16.01.00#Marine hatchery equipment#21.11.16.00.00
-unspsc7#21.11.16.02.00#Pisciculture supplies#21.11.16.00.00
-unspsc7#22.00.00.00.00#Building and Construction Machinery and Accessories#22.00.00.00.00
-unspsc7#22.10.00.00.00#Heavy construction machinery and equipment#22.00.00.00.00
-unspsc7#22.10.15.00.00#Earth moving machinery#22.10.00.00.00
-unspsc7#22.10.15.01.00#Front end loaders#22.10.15.00.00
-unspsc7#22.10.15.02.00#Graders#22.10.15.00.00
-unspsc7#22.10.15.03.00#Loaders#22.10.15.00.00
-unspsc7#22.10.15.04.00#Pile drivers#22.10.15.00.00
-unspsc7#22.10.15.05.00#Rollers#22.10.15.00.00
-unspsc7#22.10.15.06.00#Earthmoving scrapers#22.10.15.00.00
-unspsc7#22.10.15.07.00#Tampers#22.10.15.00.00
-unspsc7#22.10.15.08.00#Trenching machines#22.10.15.00.00
-unspsc7#22.10.15.09.00#Backhoes#22.10.15.00.00
-unspsc7#22.10.15.10.00#Bulldozers#22.10.15.00.00
-unspsc7#22.10.15.11.00#Compactors#22.10.15.00.00
-unspsc7#22.10.15.13.00#Draglines#22.10.15.00.00
-unspsc7#22.10.15.14.00#Dredgers#22.10.15.00.00
-unspsc7#22.10.15.15.00#Excavators#22.10.15.00.00
-unspsc7#22.10.15.16.00#Ditchers#22.10.15.00.00
-unspsc7#22.10.15.17.00#Cherry pickers#22.10.15.00.00
-unspsc7#22.10.15.18.00#Elevating scrapers#22.10.15.00.00
-unspsc7#22.10.15.19.00#Twin engine open bowl scrapers#22.10.15.00.00
-unspsc7#22.10.15.20.00#Twin engine elevating scrapers#22.10.15.00.00
-unspsc7#22.10.15.21.00#Pulled scrapers#22.10.15.00.00
-unspsc7#22.10.15.22.00#Track bulldozers#22.10.15.00.00
-unspsc7#22.10.15.23.00#Wheel bulldozers#22.10.15.00.00
-unspsc7#22.10.15.24.00#Mobile excavators#22.10.15.00.00
-unspsc7#22.10.15.25.00#Wheel excavators#22.10.15.00.00
-unspsc7#22.10.15.26.00#Track excavators#22.10.15.00.00
-unspsc7#22.10.15.27.00#Integrated tool carriers#22.10.15.00.00
-unspsc7#22.10.15.28.00#Wheel loaders#22.10.15.00.00
-unspsc7#22.10.15.29.00#Skid steer loaders#22.10.15.00.00
-unspsc7#22.10.15.30.00#Open bowl scrapers#22.10.15.00.00
-unspsc7#22.10.15.31.00#Snow blowers#22.10.15.00.00
-unspsc7#22.10.15.32.00#Track loaders#22.10.15.00.00
-unspsc7#22.10.16.00.00#Paving equipment#22.10.00.00.00
-unspsc7#22.10.16.02.00#Ramming equipment#22.10.16.00.00
-unspsc7#22.10.16.03.00#Road wideners#22.10.16.00.00
-unspsc7#22.10.16.04.00#Vibratory plates#22.10.16.00.00
-unspsc7#22.10.16.05.00#Asphalt finishers#22.10.16.00.00
-unspsc7#22.10.16.06.00#Chip Spreaders#22.10.16.00.00
-unspsc7#22.10.17.00.00#Heavy equipment components#22.10.00.00.00
-unspsc7#22.10.17.01.00#Earthmoving shovels#22.10.17.00.00
-unspsc7#22.10.17.02.00#Earthmoving buckets#22.10.17.00.00
-unspsc7#22.10.17.03.00#Earthmoving blades#22.10.17.00.00
-unspsc7#22.10.17.04.00#Scarifiers#22.10.17.00.00
-unspsc7#22.10.18.00.00#Aerial lifts#22.10.00.00.00
-unspsc7#22.10.18.01.00#Manlift or personnel lift#22.10.18.00.00
-unspsc7#22.10.18.02.00#Platform lift#22.10.18.00.00
-unspsc7#22.10.18.03.00#Articulating boom lift#22.10.18.00.00
-unspsc7#22.10.18.04.00#Telescoping boom lift#22.10.18.00.00
-unspsc7#23.00.00.00.00#Industrial Manufacturing and Processing Machinery and Accessories#23.00.00.00.00
-unspsc7#23.10.00.00.00#Raw materials processing machinery#23.00.00.00.00
-unspsc7#23.10.15.00.00#Machinery for working wood and stone and ceramic and the like#23.10.00.00.00
-unspsc7#23.10.15.01.00#Coping machines#23.10.15.00.00
-unspsc7#23.10.15.02.00#Drilling machines#23.10.15.00.00
-unspsc7#23.10.15.03.00#Broaching machines#23.10.15.00.00
-unspsc7#23.10.15.04.00#Bending machines#23.10.15.00.00
-unspsc7#23.10.15.05.00#Boring machines#23.10.15.00.00
-unspsc7#23.10.15.06.00#Grinding machines#23.10.15.00.00
-unspsc7#23.10.15.07.00#Molding machines#23.10.15.00.00
-unspsc7#23.10.15.08.00#Cutting machines#23.10.15.00.00
-unspsc7#23.10.15.09.00#Sanding machines#23.10.15.00.00
-unspsc7#23.10.15.10.00#Polishing machines#23.10.15.00.00
-unspsc7#23.10.15.11.00#Turning machines#23.10.15.00.00
-unspsc7#23.10.15.12.00#Sawing machines#23.10.15.00.00
-unspsc7#23.10.15.13.00#Milling machines#23.10.15.00.00
-unspsc7#23.10.15.14.00#Planing machines#23.10.15.00.00
-unspsc7#23.10.15.15.00#Engraving machines#23.10.15.00.00
-unspsc7#23.10.15.16.00#Glass bead peener machines#23.10.15.00.00
-unspsc7#23.10.15.17.00#Grit blast machines#23.10.15.00.00
-unspsc7#23.10.15.18.00#Shot peen machine#23.10.15.00.00
-unspsc7#23.10.15.19.00#Robot machines#23.10.15.00.00
-unspsc7#23.10.15.20.00#Ram electro discharge machines#23.10.15.00.00
-unspsc7#23.10.15.21.00#Wire cathode electrode discharge machine#23.10.15.00.00
-unspsc7#23.10.15.22.00#Chip breaker#23.10.15.00.00
-unspsc7#23.11.00.00.00#Petroleum processing machinery#23.00.00.00.00
-unspsc7#23.11.15.00.00#Petroleum distilling and processing machinery and equipment#23.11.00.00.00
-unspsc7#23.11.15.01.00#Distillate hydroprocessing equipment#23.11.15.00.00
-unspsc7#23.11.15.02.00#Crude distilling machinery#23.11.15.00.00
-unspsc7#23.11.15.03.00#Catalytic cracking equipment#23.11.15.00.00
-unspsc7#23.11.15.04.00#Hydrocracking equipment#23.11.15.00.00
-unspsc7#23.11.15.05.00#Isomerization machinery#23.11.15.00.00
-unspsc7#23.11.15.06.00#Coking machinery#23.11.15.00.00
-unspsc7#23.11.15.07.00#Gas recovery machinery#23.11.15.00.00
-unspsc7#23.11.16.00.00#Hydrotreating machinery#23.11.00.00.00
-unspsc7#23.11.16.01.00#Naptha hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.02.00#Distillate hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.03.00#Catalytic feed hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.04.00#Lube hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.05.00#Gasoline hydrotreater#23.11.16.00.00
-unspsc7#23.11.16.06.00#Resid hydrotreater#23.11.16.00.00
-unspsc7#23.12.00.00.00#Textile and fabric machinery and accessories#23.00.00.00.00
-unspsc7#23.12.15.00.00#Textile processing machinery and accessories#23.12.00.00.00
-unspsc7#23.12.15.01.00#Embroidery making machines#23.12.15.00.00
-unspsc7#23.12.15.02.00#Felting machines#23.12.15.00.00
-unspsc7#23.12.15.03.00#Winding or reeling or spooling machines#23.12.15.00.00
-unspsc7#23.12.15.04.00#Twisting machines#23.12.15.00.00
-unspsc7#23.12.15.05.00#Stitch bonding machines#23.12.15.00.00
-unspsc7#23.12.15.06.00#Knitting machines#23.12.15.00.00
-unspsc7#23.12.15.07.00#Weaving machines#23.12.15.00.00
-unspsc7#23.12.15.08.00#Finishing machines#23.12.15.00.00
-unspsc7#23.12.15.09.00#Spinning machines#23.12.15.00.00
-unspsc7#23.12.15.10.00#Lace making machines#23.12.15.00.00
-unspsc7#23.12.16.00.00#Textile working machinery and equipment and accessories#23.12.00.00.00
-unspsc7#23.12.16.01.00#Button covering machines#23.12.16.00.00
-unspsc7#23.12.16.02.00#Button sewing machines#23.12.16.00.00
-unspsc7#23.12.16.03.00#Buttonhole machines#23.12.16.00.00
-unspsc7#23.12.16.04.00#Cloth cutting machines#23.12.16.00.00
-unspsc7#23.12.16.05.00#Cushion filling machines#23.12.16.00.00
-unspsc7#23.12.16.06.00#Folding or rewinding machines#23.12.16.00.00
-unspsc7#23.12.16.07.00#Bleaching machines#23.12.16.00.00
-unspsc7#23.12.16.08.00#Fabric or cloth folding machines#23.12.16.00.00
-unspsc7#23.12.16.09.00#Reeling or unreeling machines#23.12.16.00.00
-unspsc7#23.12.16.10.00#Dyeing machines#23.12.16.00.00
-unspsc7#23.12.16.11.00#Cutting or pinking machines#23.12.16.00.00
-unspsc7#23.12.16.12.00#Sewing machine needles#23.12.16.00.00
-unspsc7#23.12.16.13.00#Silk processing machines#23.12.16.00.00
-unspsc7#23.12.16.14.00#Sewing machines#23.12.16.00.00
-unspsc7#23.12.16.15.00#Fabric cutting tables#23.12.16.00.00
-unspsc7#23.13.00.00.00#Lapidary machinery and equipment#23.00.00.00.00
-unspsc7#23.13.15.00.00#Grinding and sanding and polishing equipment and supplies#23.13.00.00.00
-unspsc7#23.13.15.01.00#Abrasive compounds#23.13.15.00.00
-unspsc7#23.13.15.02.00#Felt wheels#23.13.15.00.00
-unspsc7#23.13.15.03.00#Grinding wheels#23.13.15.00.00
-unspsc7#23.13.15.04.00#Polishing compounds#23.13.15.00.00
-unspsc7#23.13.15.05.00#Polishing heads#23.13.15.00.00
-unspsc7#23.13.15.06.00#Polishing wheels#23.13.15.00.00
-unspsc7#23.13.15.07.00#Sanding cloths#23.13.15.00.00
-unspsc7#23.13.15.08.00#Sanding drums#23.13.15.00.00
-unspsc7#23.13.15.09.00#Tumblers or polishers#23.13.15.00.00
-unspsc7#23.13.15.10.00#Tumbling supplies or media#23.13.15.00.00
-unspsc7#23.13.15.11.00#Water swivels#23.13.15.00.00
-unspsc7#23.13.15.12.00#Water trays#23.13.15.00.00
-unspsc7#23.13.15.13.00#Sanding blocks#23.13.15.00.00
-unspsc7#23.13.15.14.00#Mounted stones#23.13.15.00.00
-unspsc7#23.13.15.15.00#Grinding wheel dressers#23.13.15.00.00
-unspsc7#23.13.16.00.00#Faceting equipment and accessories#23.13.00.00.00
-unspsc7#23.13.16.01.00#Faceting accessories#23.13.16.00.00
-unspsc7#23.13.16.02.00#Faceting machines#23.13.16.00.00
-unspsc7#23.13.16.03.00#Faceting laps#23.13.16.00.00
-unspsc7#23.13.16.04.00#Faceting saws#23.13.16.00.00
-unspsc7#23.13.17.00.00#Cabbing equipment#23.13.00.00.00
-unspsc7#23.13.17.01.00#Cabbing accessories#23.13.17.00.00
-unspsc7#23.13.17.02.00#Cabbing belts#23.13.17.00.00
-unspsc7#23.13.17.03.00#Cabbing discs#23.13.17.00.00
-unspsc7#23.13.17.04.00#Cabochon machines#23.13.17.00.00
-unspsc7#23.14.00.00.00#Leatherworking repairing machinery and equipment#23.00.00.00.00
-unspsc7#23.14.16.00.00#Leather preparing machinery and accessories#23.14.00.00.00
-unspsc7#23.14.16.01.00#Leather fleshing machines#23.14.16.00.00
-unspsc7#23.14.16.02.00#Leather tanning machines#23.14.16.00.00
-unspsc7#23.14.16.03.00#Leather dyeing machines#23.14.16.00.00
-unspsc7#23.14.16.04.00#Leather degreasing machines#23.14.16.00.00
-unspsc7#23.14.16.05.00#Leather presses#23.14.16.00.00
-unspsc7#23.14.17.00.00#Leather working and repairing machinery and accessories#23.14.00.00.00
-unspsc7#23.14.17.01.00#Leather cutting machines#23.14.17.00.00
-unspsc7#23.14.17.02.00#Leather riveting machines#23.14.17.00.00
-unspsc7#23.14.17.03.00#Leather nailing machines#23.14.17.00.00
-unspsc7#23.14.17.04.00#Leatherworking workshop equipment#23.14.17.00.00
-unspsc7#23.15.00.00.00#Industrial process machinery and equipment and supplies#23.00.00.00.00
-unspsc7#23.15.15.00.00#Rubber and plastic processing machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.15.01.00#Blow molding machines#23.15.15.00.00
-unspsc7#23.15.15.02.00#Coating machines#23.15.15.00.00
-unspsc7#23.15.15.03.00#Extruders#23.15.15.00.00
-unspsc7#23.15.15.04.00#Injection molding machines#23.15.15.00.00
-unspsc7#23.15.15.05.00#Rubber or plastic mixers#23.15.15.00.00
-unspsc7#23.15.15.06.00#Rubber or plastic presses#23.15.15.00.00
-unspsc7#23.15.15.07.00#Thermo forming machines#23.15.15.00.00
-unspsc7#23.15.15.08.00#Vacuum molding machines#23.15.15.00.00
-unspsc7#23.15.15.09.00#Vulcanizing machines#23.15.15.00.00
-unspsc7#23.15.15.10.00#Plastic cutting machinery#23.15.15.00.00
-unspsc7#23.15.15.11.00#Plastic grinding machinery#23.15.15.00.00
-unspsc7#23.15.15.12.00#Rubber or plastic mills#23.15.15.00.00
-unspsc7#23.15.15.13.00#Rubber or plastic extrusion dies#23.15.15.00.00
-unspsc7#23.15.15.14.00#Plastic injection molds#23.15.15.00.00
-unspsc7#23.15.15.15.00#Thermoforming molds#23.15.15.00.00
-unspsc7#23.15.15.16.00#Ejector pins#23.15.15.00.00
-unspsc7#23.15.16.00.00#Cement and ceramics and glass industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.16.01.00#Blowers or dryers#23.15.16.00.00
-unspsc7#23.15.16.02.00#Crushers#23.15.16.00.00
-unspsc7#23.15.16.03.00#Fusion welding or glass drawing machines#23.15.16.00.00
-unspsc7#23.15.16.04.00#Grinding or polishing machines#23.15.16.00.00
-unspsc7#23.15.16.05.00#Mixing or kneading machines#23.15.16.00.00
-unspsc7#23.15.16.06.00#Cement or ceramic or glass or similar material molding machines#23.15.16.00.00
-unspsc7#23.15.16.07.00#Presses#23.15.16.00.00
-unspsc7#23.15.16.08.00#Sifters#23.15.16.00.00
-unspsc7#23.15.17.00.00#Optical industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.17.01.00#Lens grinding machines#23.15.17.00.00
-unspsc7#23.15.17.02.00#Lens measuring equipment#23.15.17.00.00
-unspsc7#23.15.17.03.00#Lens polishing equipment#23.15.17.00.00
-unspsc7#23.15.17.04.00#Lens testing equipment#23.15.17.00.00
-unspsc7#23.15.17.05.00#Optical vacuum coating equipment#23.15.17.00.00
-unspsc7#23.15.18.00.00#Pharmaceutical industry machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.18.01.00#Ampoule filling equipment#23.15.18.00.00
-unspsc7#23.15.18.02.00#Bottle cappers or cotton inserters or safety seal applicators#23.15.18.00.00
-unspsc7#23.15.18.03.00#Capsulating machines#23.15.18.00.00
-unspsc7#23.15.18.04.00#Reactors or fermenters or digesters#23.15.18.00.00
-unspsc7#23.15.18.05.00#Filling or sealing auger dose machines#23.15.18.00.00
-unspsc7#23.15.18.06.00#Pharmaceutical filters or ultra filters#23.15.18.00.00
-unspsc7#23.15.18.07.00#Freezedryers or lyophilzers#23.15.18.00.00
-unspsc7#23.15.18.08.00#Pharmaceutical granulators#23.15.18.00.00
-unspsc7#23.15.18.09.00#Phamaceutical sieve or screening machines#23.15.18.00.00
-unspsc7#23.15.18.10.00#Sterile or aseptic processing or filling machines#23.15.18.00.00
-unspsc7#23.15.18.11.00#Tablet or capsule testing machines#23.15.18.00.00
-unspsc7#23.15.18.12.00#Tablet counters#23.15.18.00.00
-unspsc7#23.15.18.13.00#Tabletting machines#23.15.18.00.00
-unspsc7#23.15.18.14.00#Vaccine production equipment#23.15.18.00.00
-unspsc7#23.15.18.15.00#Vessel mixers#23.15.18.00.00
-unspsc7#23.15.19.00.00#Paper making and paper processing machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.19.01.00#Cutters#23.15.19.00.00
-unspsc7#23.15.19.02.00#Slitters#23.15.19.00.00
-unspsc7#23.15.19.03.00#Washing or dewatering machines#23.15.19.00.00
-unspsc7#23.15.19.04.00#Winders#23.15.19.00.00
-unspsc7#23.15.19.05.00#Wood pulp or dissolver machines#23.15.19.00.00
-unspsc7#23.15.19.06.00#Calenders for paper or cardboard making#23.15.19.00.00
-unspsc7#23.15.20.00.00#Web handling and control machinery and equipment and supplies#23.15.00.00.00
-unspsc7#23.15.20.01.00#Corona treaters#23.15.20.00.00
-unspsc7#23.15.20.02.00#Flame treaters#23.15.20.00.00
-unspsc7#23.15.21.00.00#Separation machinery and equipment#23.15.00.00.00
-unspsc7#23.15.21.01.00#Vibratory separation equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.02.00#Stationary separation equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.03.00#Air classification equipment and parts and screens#23.15.21.00.00
-unspsc7#23.15.21.04.00#Centifugal separation equipment or parts or screens#23.15.21.00.00
-unspsc7#23.15.22.00.00#Manufacturing tables and stands#23.15.00.00.00
-unspsc7#23.15.22.01.00#Rotary tables#23.15.22.00.00
-unspsc7#23.15.22.02.00#Stack stands#23.15.22.00.00
-unspsc7#23.15.22.03.00#Engine and component test stands#23.15.22.00.00
-unspsc7#23.15.22.04.00#Machine guarding#23.15.22.00.00
-unspsc7#23.15.23.00.00#Rotary tables#23.15.00.00.00
-unspsc7#23.15.24.00.00#Stack stands#23.15.00.00.00
-unspsc7#23.15.25.00.00#Engine and component test stands#23.15.00.00.00
-unspsc7#23.15.26.00.00#Machine guarding#23.15.00.00.00
-unspsc7#23.15.27.00.00#Air classification equipment and parts and screens#23.15.00.00.00
-unspsc7#23.15.28.00.00#Centifugal separation equipment or parts or screens#23.15.00.00.00
-unspsc7#23.15.29.00.00#Packaging machinery#23.15.00.00.00
-unspsc7#23.15.29.01.00#Wrapping machinery#23.15.29.00.00
-unspsc7#23.15.29.02.00#Form or fill or seal machinery#23.15.29.00.00
-unspsc7#23.15.29.03.00#Packaging vacuum#23.15.29.00.00
-unspsc7#23.15.30.00.00#Holding and positioning and guiding systems and devices#23.15.00.00.00
-unspsc7#23.15.30.01.00#Calibration jig#23.15.30.00.00
-unspsc7#23.15.30.02.00#Guide jig#23.15.30.00.00
-unspsc7#23.15.30.03.00#Master jig#23.15.30.00.00
-unspsc7#23.15.30.04.00#Needle jig#23.15.30.00.00
-unspsc7#23.15.30.05.00#Shaft jig#23.15.30.00.00
-unspsc7#23.15.30.06.00#Checking jig#23.15.30.00.00
-unspsc7#23.15.30.07.00#Setting jig#23.15.30.00.00
-unspsc7#23.15.30.08.00#Camera jig#23.15.30.00.00
-unspsc7#23.15.30.09.00#Pickup jig#23.15.30.00.00
-unspsc7#23.15.30.10.00#Removal jig#23.15.30.00.00
-unspsc7#23.15.30.11.00#Nozzle jig#23.15.30.00.00
-unspsc7#23.15.30.12.00#Sliding jig#23.15.30.00.00
-unspsc7#23.15.30.13.00#Centering jig#23.15.30.00.00
-unspsc7#23.15.30.14.00#Inspecting jig#23.15.30.00.00
-unspsc7#23.15.30.15.00#Feeder jig#23.15.30.00.00
-unspsc7#23.15.30.16.00#Clutch jig#23.15.30.00.00
-unspsc7#23.15.30.17.00#Alignment jig#23.15.30.00.00
-unspsc7#23.15.30.18.00#Positioning jig#23.15.30.00.00
-unspsc7#23.15.30.19.00#Lifter plate#23.15.30.00.00
-unspsc7#23.15.30.20.00#Tape guide#23.15.30.00.00
-unspsc7#23.15.30.21.00#Tape feed jaw#23.15.30.00.00
-unspsc7#23.15.30.22.00#Power feeder#23.15.30.00.00
-unspsc7#23.15.30.23.00#Feeder harness#23.15.30.00.00
-unspsc7#23.15.30.24.00#Feed jaw#23.15.30.00.00
-unspsc7#23.15.30.25.00#Mechanical gripper#23.15.30.00.00
-unspsc7#23.15.30.26.00#Holder jaw#23.15.30.00.00
-unspsc7#23.15.30.27.00#Jaw assembly#23.15.30.00.00
-unspsc7#23.15.30.28.00#Stationary jaw#23.15.30.00.00
-unspsc7#23.15.30.29.00#Jig block#23.15.30.00.00
-unspsc7#23.15.30.30.00#Linear motion guides#23.15.30.00.00
-unspsc7#23.15.30.31.00#Measuring jigs#23.15.30.00.00
-unspsc7#23.15.30.32.00#Ring jigs#23.15.30.00.00
-unspsc7#23.15.31.00.00#Industrial machinery components#23.15.00.00.00
-unspsc7#23.15.31.01.00#Pitch stopper#23.15.31.00.00
-unspsc7#23.15.31.02.00#Paper stopper#23.15.31.00.00
-unspsc7#23.15.31.03.00#Stopper pad#23.15.31.00.00
-unspsc7#23.16.00.00.00#Foundry machines and equipment and supplies#23.00.00.00.00
-unspsc7#23.16.15.00.00#Foundry machines and equipment#23.16.00.00.00
-unspsc7#23.16.15.01.00#Foundry blowers#23.16.15.00.00
-unspsc7#23.16.15.02.00#Foundry burners#23.16.15.00.00
-unspsc7#23.16.15.03.00#Core drying ovens#23.16.15.00.00
-unspsc7#23.16.15.04.00#Forging presses#23.16.15.00.00
-unspsc7#23.16.15.05.00#Hot metal mixers#23.16.15.00.00
-unspsc7#23.16.15.06.00#Foundry crucibles#23.16.15.00.00
-unspsc7#23.16.15.07.00#Foundry converters#23.16.15.00.00
-unspsc7#23.16.15.08.00#Open die forging press#23.16.15.00.00
-unspsc7#23.16.15.09.00#Forging stamping machines#23.16.15.00.00
-unspsc7#23.16.15.10.00#Casting machines#23.16.15.00.00
-unspsc7#23.16.15.11.00#Forging rolls#23.16.15.00.00
-unspsc7#23.16.15.12.00#Radial forging machines#23.16.15.00.00
-unspsc7#23.16.15.13.00#Cold forming presses#23.16.15.00.00
-unspsc7#23.16.15.14.00#Sizing or embossing presses#23.16.15.00.00
-unspsc7#23.16.15.15.00#End forging machines#23.16.15.00.00
-unspsc7#23.16.16.00.00#Foundry supplies#23.16.00.00.00
-unspsc7#23.16.16.01.00#Foundry bellows#23.16.16.00.00
-unspsc7#23.16.16.02.00#Foundry clays#23.16.16.00.00
-unspsc7#23.16.16.03.00#Foundry flasks#23.16.16.00.00
-unspsc7#23.16.16.04.00#Foundry fluxes#23.16.16.00.00
-unspsc7#23.16.16.05.00#Foundry ladles#23.16.16.00.00
-unspsc7#23.16.16.06.00#Foundry molds#23.16.16.00.00
-unspsc7#23.16.16.07.00#Foundry sand#23.16.16.00.00
-unspsc7#23.16.16.08.00#Foundry shovels#23.16.16.00.00
-unspsc7#23.17.00.00.00#Workshop machinery and equipment and supplies#23.00.00.00.00
-unspsc7#23.17.15.00.00#Soldering and brazing and welding machinery and supplies#23.17.00.00.00
-unspsc7#23.17.15.01.00#Anti spatter sprays#23.17.15.00.00
-unspsc7#23.17.15.02.00#Gas welding or brazing rods#23.17.15.00.00
-unspsc7#23.17.15.03.00#Filler metal#23.17.15.00.00
-unspsc7#23.17.15.04.00#Blow pipes#23.17.15.00.00
-unspsc7#23.17.15.05.00#Iron powder#23.17.15.00.00
-unspsc7#23.17.15.06.00#Soldering fluid#23.17.15.00.00
-unspsc7#23.17.15.07.00#Soldering irons or guns#23.17.15.00.00
-unspsc7#23.17.15.08.00#Welders#23.17.15.00.00
-unspsc7#23.17.15.09.00#Solder#23.17.15.00.00
-unspsc7#23.17.15.10.00#Welding wire#23.17.15.00.00
-unspsc7#23.17.15.11.00#Welding tools#23.17.15.00.00
-unspsc7#23.17.15.12.00#Welding rods#23.17.15.00.00
-unspsc7#23.17.15.13.00#Welding rectifiers#23.17.15.00.00
-unspsc7#23.17.15.14.00#Welding generators#23.17.15.00.00
-unspsc7#23.17.15.15.00#Welding electrodes#23.17.15.00.00
-unspsc7#23.17.15.17.00#Blow torches#23.17.15.00.00
-unspsc7#23.17.15.18.00#Plasma welding machinery#23.17.15.00.00
-unspsc7#23.17.15.19.00#Tungsten inert gas (TIG) welding machinery#23.17.15.00.00
-unspsc7#23.17.15.20.00#Ultrasound welding machinery#23.17.15.00.00
-unspsc7#23.17.15.21.00#Laser welding machinery#23.17.15.00.00
-unspsc7#23.17.15.22.00#Soldering fluxes#23.17.15.00.00
-unspsc7#23.17.15.23.00#Temperature indicating sticks#23.17.15.00.00
-unspsc7#23.17.15.24.00#Braze rings#23.17.15.00.00
-unspsc7#23.17.15.25.00#Soldering tips#23.17.15.00.00
-unspsc7#23.17.15.26.00#Desoldering tips#23.17.15.00.00
-unspsc7#23.17.15.27.00#Desoldering braid#23.17.15.00.00
-unspsc7#23.17.15.28.00#Welding screens or curtains#23.17.15.00.00
-unspsc7#23.17.15.29.00#Welding or soldering kit#23.17.15.00.00
-unspsc7#23.17.15.30.00#Soldering or desoldering or combined stations#23.17.15.00.00
-unspsc7#23.17.15.31.00#Desoldering Gun#23.17.15.00.00
-unspsc7#23.17.16.00.00#Machine tools#23.17.00.00.00
-unspsc7#23.17.16.01.00#Boring tools#23.17.16.00.00
-unspsc7#23.17.16.02.00#Bar or rod cutters#23.17.16.00.00
-unspsc7#23.17.16.03.00#Pipe or tube cutters#23.17.16.00.00
-unspsc7#23.17.16.04.00#Wire or cable cutters#23.17.16.00.00
-unspsc7#23.17.16.05.00#Deburring equipment#23.17.16.00.00
-unspsc7#23.17.16.06.00#Lathes#23.17.16.00.00
-unspsc7#23.17.16.07.00#Lathe tools or dies#23.17.16.00.00
-unspsc7#23.17.16.08.00#Laser cutting tools#23.17.16.00.00
-unspsc7#23.17.16.09.00#Twist drills#23.17.16.00.00
-unspsc7#23.17.16.10.00#Reamers#23.17.16.00.00
-unspsc7#23.17.16.11.00#Counterbores#23.17.16.00.00
-unspsc7#23.17.16.12.00#Milling cutters#23.17.16.00.00
-unspsc7#23.17.16.13.00#Hobs#23.17.16.00.00
-unspsc7#23.17.16.14.00#Gear shapers#23.17.16.00.00
-unspsc7#23.17.16.15.00#Shaving cutters#23.17.16.00.00
-unspsc7#23.17.16.16.00#Water jet cutting machines#23.17.16.00.00
-unspsc7#23.17.16.17.00#Broaching tools#23.17.16.00.00
-unspsc7#23.17.16.18.00#Indexable inserts#23.17.16.00.00
-unspsc7#23.17.16.19.00#Boring tools#23.17.16.00.00
-unspsc7#23.17.16.20.00#Broaches#23.17.16.00.00
-unspsc7#23.17.16.21.00#Insertion tools#23.17.16.00.00
-unspsc7#23.17.16.22.00#Workshop presses#23.17.16.00.00
-unspsc7#23.17.17.00.00#Metal bending and forming machinery#23.17.00.00.00
-unspsc7#23.17.17.01.00#Tangent benders#23.17.17.00.00
-unspsc7#23.17.17.02.00#Wing benders#23.17.17.00.00
-unspsc7#23.17.17.03.00#Tube bending machinery#23.17.17.00.00
-unspsc7#23.17.17.04.00#Pipe bending mandrels#23.17.17.00.00
-unspsc7#23.17.17.05.00#Die bends#23.17.17.00.00
-unspsc7#23.17.17.06.00#Sequential forming machines#23.17.17.00.00
-unspsc7#23.17.17.07.00#Tube end finishers#23.17.17.00.00
-unspsc7#23.17.17.08.00#Machine mounting#23.17.17.00.00
-unspsc7#23.17.18.00.00#Metal fabricating dies#23.17.00.00.00
-unspsc7#23.17.18.01.00#Stamping or forming dies#23.17.18.00.00
-unspsc7#23.17.18.02.00#Die casting dies#23.17.18.00.00
-unspsc7#23.17.18.03.00#Metal extrusion dies#23.17.18.00.00
-unspsc7#23.17.18.04.00#Cutting dies or tooling#23.17.18.00.00
-unspsc7#23.17.18.05.00#Rotary dies#23.17.18.00.00
-unspsc7#23.17.18.06.00#Steel rule dies#23.17.18.00.00
-unspsc7#23.17.19.00.00#Special tooling fixtures#23.17.00.00.00
-unspsc7#23.17.19.01.00#Holding fixtures#23.17.19.00.00
-unspsc7#23.17.19.02.00#Gauges and inspection fixtures#23.17.19.00.00
-unspsc7#23.17.19.03.00#Fabricated tooling fixtures#23.17.19.00.00
-unspsc7#23.17.19.04.00#Casting tooling#23.17.19.00.00
-unspsc7#23.17.19.05.00#Forging tooling#23.17.19.00.00
-unspsc7#23.17.19.06.00#Assembly or disassembly tooling#23.17.19.00.00
-unspsc7#23.17.20.00.00#Metal working machinery attachments#23.17.00.00.00
-unspsc7#23.17.20.01.00#Burrs#23.17.20.00.00
-unspsc7#23.17.20.02.00#Form Relief#23.17.20.00.00
-unspsc7#23.17.20.03.00#Machine threading taps#23.17.20.00.00
-unspsc7#23.17.20.04.00#Machine threading dies#23.17.20.00.00
-unspsc7#23.17.20.05.00#Machine end mills#23.17.20.00.00
-unspsc7#23.17.20.06.00#Metal stamps or punches#23.17.20.00.00
-unspsc7#23.17.20.07.00#Metal cutting band saw blades#23.17.20.00.00
-unspsc7#23.17.20.08.00#Metal cutting circular saw blades#23.17.20.00.00
-unspsc7#23.17.20.09.00#Carbide inserts#23.17.20.00.00
-unspsc7#23.17.20.10.00#Ceramic inserts#23.17.20.00.00
-unspsc7#23.17.20.11.00#Steel inserts#23.17.20.00.00
-unspsc7#23.17.20.12.00#Diamond inserts#23.17.20.00.00
-unspsc7#23.17.20.13.00#Threading mills#23.17.20.00.00
-unspsc7#23.17.21.00.00#Holding fixtures#23.17.00.00.00
-unspsc7#23.17.22.00.00#Gauges and inspection fixtures#23.17.00.00.00
-unspsc7#23.17.23.00.00#Fabricated tooling fixtures#23.17.00.00.00
-unspsc7#23.17.24.00.00#Casting tooling#23.17.00.00.00
-unspsc7#23.17.25.00.00#Forging tooling#23.17.00.00.00
-unspsc7#23.17.26.00.00#Assembly or disassembly tooling#23.17.00.00.00
-unspsc7#23.18.00.00.00#Industrial food and beverage equipment#23.00.00.00.00
-unspsc7#23.18.15.00.00#Food preparation machinery#23.18.00.00.00
-unspsc7#23.18.15.01.00#Filling machinery#23.18.15.00.00
-unspsc7#23.18.15.02.00#Milling machinery#23.18.15.00.00
-unspsc7#23.18.15.03.00#Mixing machinery#23.18.15.00.00
-unspsc7#23.18.15.04.00#Sifting machinery#23.18.15.00.00
-unspsc7#23.18.15.05.00#Dehydrating machinery#23.18.15.00.00
-unspsc7#23.18.15.06.00#Washing machinery#23.18.15.00.00
-unspsc7#23.18.15.07.00#Crushing machinery#23.18.15.00.00
-unspsc7#23.18.15.08.00#Blanching machinery#23.18.15.00.00
-unspsc7#23.18.15.09.00#Sorting machinery#23.18.15.00.00
-unspsc7#23.18.15.10.00#Meat tyers#23.18.15.00.00
-unspsc7#23.18.16.00.00#Food cutting machinery#23.18.00.00.00
-unspsc7#23.18.16.01.00#Dicing machinery#23.18.16.00.00
-unspsc7#23.18.16.02.00#Slicing machinery#23.18.16.00.00
-unspsc7#23.18.16.03.00#Chopping machinery#23.18.16.00.00
-unspsc7#23.18.16.04.00#Cutting machinery#23.18.16.00.00
-unspsc7#23.18.16.05.00#Grating machinery#23.18.16.00.00
-unspsc7#23.18.16.06.00#Peeling machinery#23.18.16.00.00
-unspsc7#23.18.17.00.00#Food cooking and smoking machinery#23.18.00.00.00
-unspsc7#23.18.17.01.00#Smoking machinery#23.18.17.00.00
-unspsc7#23.18.17.02.00#Roasting machinery#23.18.17.00.00
-unspsc7#23.18.17.03.00#Cooking machinery#23.18.17.00.00
-unspsc7#23.18.17.04.00#Steaming machinery#23.18.17.00.00
-unspsc7#23.18.18.00.00#Industrial beverage processing machinery#23.18.00.00.00
-unspsc7#23.18.18.01.00#Coffee brewing equipment or supplies#23.18.18.00.00
-unspsc7#23.18.18.02.00#Juicing machinery#23.18.18.00.00
-unspsc7#23.18.18.03.00#Ice making machines#23.18.18.00.00
-unspsc7#23.18.18.04.00#Ice cream machines#23.18.18.00.00
-unspsc7#23.19.00.00.00#Mixers and their parts and accessories#23.00.00.00.00
-unspsc7#23.19.10.00.00#Batch mixers#23.19.00.00.00
-unspsc7#23.19.10.01.00#Change can mixers#23.19.10.00.00
-unspsc7#23.19.10.02.00#Helical blade mixer#23.19.10.00.00
-unspsc7#23.19.10.03.00#Double arm kneading mixers#23.19.10.00.00
-unspsc7#23.19.10.04.00#Intensive mixers#23.19.10.00.00
-unspsc7#23.19.10.05.00#Roll mixers#23.19.10.00.00
-unspsc7#23.19.11.00.00#Continuous mixers#23.19.00.00.00
-unspsc7#23.19.11.01.00#Single screw mixers#23.19.11.00.00
-unspsc7#23.19.11.02.00#Twin screw extruder#23.19.11.00.00
-unspsc7#23.20.00.00.00#Mass transfer equipment#23.00.00.00.00
-unspsc7#23.20.10.00.00#Gas liquid contacting systems#23.20.00.00.00
-unspsc7#23.20.10.01.00#Plate columns#23.20.10.00.00
-unspsc7#23.20.10.02.00#Packed columns#23.20.10.00.00
-unspsc7#23.20.10.03.00#Liquid dispersed contactor#23.20.10.00.00
-unspsc7#23.20.10.04.00#Wetted wall column#23.20.10.00.00
-unspsc7#23.20.10.05.00#Bubble columns#23.20.10.00.00
-unspsc7#23.20.11.00.00#Adsorption and ion exchange#23.20.00.00.00
-unspsc7#23.20.11.01.00#Adsorber vessel#23.20.11.00.00
-unspsc7#23.20.11.02.00#Ambient pressure adsorber vessel#23.20.11.00.00
-unspsc7#23.21.00.00.00#Electronic manufacturing machinery and equipment and accessories#23.00.00.00.00
-unspsc7#23.21.10.00.00#Electronic assembly machinery and support equipment#23.21.00.00.00
-unspsc7#23.21.10.01.00#Chip placers#23.21.10.00.00
-unspsc7#23.21.10.02.00#Glue dispensing machinery#23.21.10.00.00
-unspsc7#24.00.00.00.00#Material Handling and Conditioning and Storage Machinery and their Accessories and Supplies#24.00.00.00.00
-unspsc7#24.10.00.00.00#Material handling machinery and equipment#24.00.00.00.00
-unspsc7#24.10.15.00.00#Industrial trucks#24.10.00.00.00
-unspsc7#24.10.15.01.00#Carts#24.10.15.00.00
-unspsc7#24.10.15.02.00#Bulk transporters#24.10.15.00.00
-unspsc7#24.10.15.03.00#Dollies#24.10.15.00.00
-unspsc7#24.10.15.04.00#Hand trucks or accessories#24.10.15.00.00
-unspsc7#24.10.15.05.00#Pallet trucks#24.10.15.00.00
-unspsc7#24.10.15.06.00#Pushcarts#24.10.15.00.00
-unspsc7#24.10.15.07.00#Wheelbarrows#24.10.15.00.00
-unspsc7#24.10.15.08.00#Creepers#24.10.15.00.00
-unspsc7#24.10.15.09.00#Wagons#24.10.15.00.00
-unspsc7#24.10.15.10.00#Tilt trucks#24.10.15.00.00
-unspsc7#24.10.15.11.00#Shelf trolleys#24.10.15.00.00
-unspsc7#24.10.16.00.00#Lifting equipment and accessories#24.10.00.00.00
-unspsc7#24.10.16.01.00#Elevators#24.10.16.00.00
-unspsc7#24.10.16.02.00#Hoists#24.10.16.00.00
-unspsc7#24.10.16.03.00#Forklifts#24.10.16.00.00
-unspsc7#24.10.16.04.00#Lifts#24.10.16.00.00
-unspsc7#24.10.16.05.00#Loading equipment#24.10.16.00.00
-unspsc7#24.10.16.06.00#Stackers#24.10.16.00.00
-unspsc7#24.10.16.07.00#Cranes#24.10.16.00.00
-unspsc7#24.10.16.08.00#Winches#24.10.16.00.00
-unspsc7#24.10.16.09.00#Tilts#24.10.16.00.00
-unspsc7#24.10.16.10.00#Manipulators#24.10.16.00.00
-unspsc7#24.10.16.11.00#Slings#24.10.16.00.00
-unspsc7#24.10.16.12.00#Jacks#24.10.16.00.00
-unspsc7#24.10.16.13.00#Blocks or pulleys#24.10.16.00.00
-unspsc7#24.10.16.14.00#Air bags for loading#24.10.16.00.00
-unspsc7#24.10.16.15.00#Loading ramps#24.10.16.00.00
-unspsc7#24.10.16.16.00#Below the hook device#24.10.16.00.00
-unspsc7#24.10.16.17.00#Scissor lift#24.10.16.00.00
-unspsc7#24.10.16.18.00#Pipe layer#24.10.16.00.00
-unspsc7#24.10.16.19.00#Bridge cranes#24.10.16.00.00
-unspsc7#24.10.16.20.00#Track cranes#24.10.16.00.00
-unspsc7#24.10.16.21.00#All terrain cranes#24.10.16.00.00
-unspsc7#24.10.16.22.00#Rough terrain cranes#24.10.16.00.00
-unspsc7#24.10.16.23.00#Tower cranes#24.10.16.00.00
-unspsc7#24.10.16.24.00#Hydraulic truck cranes#24.10.16.00.00
-unspsc7#24.10.16.25.00#Conventional truck cranes#24.10.16.00.00
-unspsc7#24.10.16.26.00#Escalator or walkways#24.10.16.00.00
-unspsc7#24.10.16.27.00#Girder trolleys#24.10.16.00.00
-unspsc7#24.10.16.28.00#Adjustable forks#24.10.16.00.00
-unspsc7#24.10.16.29.00#Forklift accessories or supplies#24.10.16.00.00
-unspsc7#24.10.16.30.00#Workshop cranes#24.10.16.00.00
-unspsc7#24.10.16.31.00#Suction cups#24.10.16.00.00
-unspsc7#24.10.16.32.00#Side shifts#24.10.16.00.00
-unspsc7#24.10.17.00.00#Conveyors and accessories#24.10.00.00.00
-unspsc7#24.10.17.01.00#Conveyor roller#24.10.17.00.00
-unspsc7#24.10.17.02.00#Ball transfer tables#24.10.17.00.00
-unspsc7#24.10.17.03.00#Rock bins#24.10.17.00.00
-unspsc7#24.10.17.04.00#Conveyor feeders#24.10.17.00.00
-unspsc7#24.10.17.05.00#Conveyor screw#24.10.17.00.00
-unspsc7#24.10.17.06.00#Trolleys or accessories#24.10.17.00.00
-unspsc7#24.10.17.07.00#Conveyor rails#24.10.17.00.00
-unspsc7#24.10.17.08.00#Extendable conveyors#24.10.17.00.00
-unspsc7#24.10.17.09.00#Roller conveyors#24.10.17.00.00
-unspsc7#24.10.17.10.00#Package stops#24.10.17.00.00
-unspsc7#24.10.17.11.00#Turntables#24.10.17.00.00
-unspsc7#24.10.17.12.00#Belt conveyors#24.10.17.00.00
-unspsc7#24.10.17.13.00#Bucket conveyors#24.10.17.00.00
-unspsc7#24.10.17.14.00#Air conveyors#24.10.17.00.00
-unspsc7#24.10.17.15.00#Conveyor belting#24.10.17.00.00
-unspsc7#24.10.17.16.00#Conveyor pulleys#24.10.17.00.00
-unspsc7#24.10.17.17.00#Conveyor idlers#24.10.17.00.00
-unspsc7#24.10.17.18.00#Conveyor belt lacing or fasteners#24.10.17.00.00
-unspsc7#24.10.17.19.00#Conveyor belt brushes#24.10.17.00.00
-unspsc7#24.10.17.20.00#Wear strips#24.10.17.00.00
-unspsc7#24.10.17.21.00#Trolley lid#24.10.17.00.00
-unspsc7#24.10.17.22.00#Chain conveyors#24.10.17.00.00
-unspsc7#24.10.18.00.00#Dock equipment#24.10.00.00.00
-unspsc7#24.10.18.01.00#Dock levelers#24.10.18.00.00
-unspsc7#24.10.18.02.00#Dock seals#24.10.18.00.00
-unspsc7#24.10.18.03.00#Dock ramps#24.10.18.00.00
-unspsc7#24.10.18.04.00#Strip doors#24.10.18.00.00
-unspsc7#24.10.18.05.00#Dock bumpers#24.10.18.00.00
-unspsc7#24.10.18.06.00#Dock ladders#24.10.18.00.00
-unspsc7#24.10.18.07.00#Dock plates#24.10.18.00.00
-unspsc7#24.10.18.08.00#Wheel chocks#24.10.18.00.00
-unspsc7#24.10.18.09.00#Dock rails and accessories#24.10.18.00.00
-unspsc7#24.10.19.00.00#Drum handling equipment#24.10.00.00.00
-unspsc7#24.10.19.01.00#Drum openers#24.10.19.00.00
-unspsc7#24.10.19.02.00#Drum grabs#24.10.19.00.00
-unspsc7#24.10.19.03.00#Drum lifters#24.10.19.00.00
-unspsc7#24.10.19.04.00#Drum cradles#24.10.19.00.00
-unspsc7#24.10.19.05.00#Spill deck#24.10.19.00.00
-unspsc7#24.10.19.06.00#Drum recuperators#24.10.19.00.00
-unspsc7#24.10.19.07.00#Spill containment supports#24.10.19.00.00
-unspsc7#24.10.20.00.00#Shelving and storage#24.10.00.00.00
-unspsc7#24.10.20.01.00#Rack systems for rack mount electronic equipment#24.10.20.00.00
-unspsc7#24.10.20.02.00#Bin handlers#24.10.20.00.00
-unspsc7#24.10.20.03.00#Pallets#24.10.20.00.00
-unspsc7#24.10.20.04.00#Storage racks or shelves#24.10.20.00.00
-unspsc7#24.10.20.05.00#Automated storage or retrieval systems#24.10.20.00.00
-unspsc7#24.10.20.06.00#Work benches#24.10.20.00.00
-unspsc7#24.10.20.07.00#Reel storage shelves#24.10.20.00.00
-unspsc7#24.10.20.08.00#Portable reel holders#24.10.20.00.00
-unspsc7#24.10.21.00.00#Warehousing equipment and supplies#24.10.00.00.00
-unspsc7#24.10.21.01.00#Cargo handling equipment#24.10.21.00.00
-unspsc7#24.10.21.02.00#Warehouse carousels#24.10.21.00.00
-unspsc7#24.10.21.03.00#Warehouse casers#24.10.21.00.00
-unspsc7#24.10.21.04.00#Depalletizers#24.10.21.00.00
-unspsc7#24.10.21.05.00#Palletizers#24.10.21.00.00
-unspsc7#24.10.21.06.00#Industrial shrink wrap equipment#24.10.21.00.00
-unspsc7#24.10.21.07.00#Cartoning machinery#24.10.21.00.00
-unspsc7#24.10.21.08.00#Packaging compactors#24.10.21.00.00
-unspsc7#24.10.22.00.00#Packing tools#24.10.00.00.00
-unspsc7#24.10.22.01.00#Stretch film dispensers#24.10.22.00.00
-unspsc7#24.10.22.02.00#Box sealing tape dispensers#24.10.22.00.00
-unspsc7#24.10.22.03.00#Bag sealing tools and equipment#24.10.22.00.00
-unspsc7#24.10.22.04.00#Strapping dispenser#24.10.22.00.00
-unspsc7#24.10.22.05.00#Strapping tensioners or sealers#24.10.22.00.00
-unspsc7#24.10.22.06.00#Carton forming machines#24.10.22.00.00
-unspsc7#24.10.22.07.00#Taping machines#24.10.22.00.00
-unspsc7#24.11.00.00.00#Containers and storage#24.00.00.00.00
-unspsc7#24.11.15.00.00#Bags#24.11.00.00.00
-unspsc7#24.11.15.01.00#Canvas bags#24.11.15.00.00
-unspsc7#24.11.15.02.00#Paper bags#24.11.15.00.00
-unspsc7#24.11.15.03.00#Plastic bags#24.11.15.00.00
-unspsc7#24.11.15.04.00#Pouches#24.11.15.00.00
-unspsc7#24.11.15.05.00#Flexible intermediate bulk containers#24.11.15.00.00
-unspsc7#24.11.15.06.00#Laundry nets or bags#24.11.15.00.00
-unspsc7#24.11.15.07.00#Tool bags#24.11.15.00.00
-unspsc7#24.11.15.08.00#Tent bag#24.11.15.00.00
-unspsc7#24.11.16.00.00#Covers and caps#24.11.00.00.00
-unspsc7#24.11.18.00.00#Tanks and cylinders and their accessories#24.11.00.00.00
-unspsc7#24.11.18.01.00#Reservoirs#24.11.18.00.00
-unspsc7#24.11.18.02.00#Air or gas tanks or cylinders#24.11.18.00.00
-unspsc7#24.11.18.03.00#Storage tanks#24.11.18.00.00
-unspsc7#24.11.18.04.00#Calibrating tanks#24.11.18.00.00
-unspsc7#24.11.18.05.00#Chemical tanks#24.11.18.00.00
-unspsc7#24.11.18.06.00#Dip tanks#24.11.18.00.00
-unspsc7#24.11.18.07.00#Expansion tanks#24.11.18.00.00
-unspsc7#24.11.18.08.00#Fuel storage tanks#24.11.18.00.00
-unspsc7#24.11.18.09.00#Processing tanks#24.11.18.00.00
-unspsc7#24.11.18.10.00#Water storage tanks#24.11.18.00.00
-unspsc7#24.11.18.11.00#Carboys#24.11.18.00.00
-unspsc7#24.11.18.12.00#Containment basin#24.11.18.00.00
-unspsc7#24.11.18.13.00#Rinse tanks#24.11.18.00.00
-unspsc7#24.11.20.00.00#Bins and baskets#24.11.00.00.00
-unspsc7#24.11.20.01.00#Bins#24.11.20.00.00
-unspsc7#24.11.20.02.00#Baskets#24.11.20.00.00
-unspsc7#24.11.20.03.00#Non metallic bins#24.11.20.00.00
-unspsc7#24.11.20.04.00#Metallic bins#24.11.20.00.00
-unspsc7#24.11.20.05.00#Metallic baskets#24.11.20.00.00
-unspsc7#24.11.20.06.00#Non metallic baskets#24.11.20.00.00
-unspsc7#24.11.21.00.00#Casks and barrels and drums#24.11.00.00.00
-unspsc7#24.11.21.01.00#Casks#24.11.21.00.00
-unspsc7#24.11.21.02.00#Barrels#24.11.21.00.00
-unspsc7#24.11.21.03.00#Stainless steel drums#24.11.21.00.00
-unspsc7#24.11.21.04.00#Steel drums#24.11.21.00.00
-unspsc7#24.11.21.05.00#Polyethylene drums#24.11.21.00.00
-unspsc7#24.11.21.06.00#Composite drums#24.11.21.00.00
-unspsc7#24.11.21.07.00#Fiber drums#24.11.21.00.00
-unspsc7#24.11.21.08.00#Metallic drums#24.11.21.00.00
-unspsc7#24.11.21.09.00#Non metallic drums#24.11.21.00.00
-unspsc7#24.11.21.10.00#Intermediate bulk containers#24.11.21.00.00
-unspsc7#24.11.21.11.00#Stabilizer#24.11.21.00.00
-unspsc7#24.11.21.12.00#Drum lid#24.11.21.00.00
-unspsc7#24.11.22.00.00#Cans and pails#24.11.00.00.00
-unspsc7#24.11.22.01.00#Steel pails#24.11.22.00.00
-unspsc7#24.11.22.02.00#Gasoline cans#24.11.22.00.00
-unspsc7#24.11.22.03.00#Plastic pails#24.11.22.00.00
-unspsc7#24.11.22.04.00#Metallic pails#24.11.22.00.00
-unspsc7#24.11.22.05.00#Non metallic pails#24.11.22.00.00
-unspsc7#24.11.22.06.00#Metallic flammable liquid cans#24.11.22.00.00
-unspsc7#24.11.22.07.00#Non metallic flammable liquid cans#24.11.22.00.00
-unspsc7#24.11.22.08.00#Spray kit#24.11.22.00.00
-unspsc7#24.11.22.09.00#Jerrycans#24.11.22.00.00
-unspsc7#24.11.24.00.00#Storage chests and cabinets and trunks#24.11.00.00.00
-unspsc7#24.11.24.01.00#Tool chests or boxes or cabinets#24.11.24.00.00
-unspsc7#24.11.24.02.00#Hazardous materials cabinets#24.11.24.00.00
-unspsc7#24.11.24.03.00#Tool belts#24.11.24.00.00
-unspsc7#24.11.24.04.00#Box#24.11.24.00.00
-unspsc7#24.11.24.05.00#Drawers#24.11.24.00.00
-unspsc7#24.11.24.06.00#Box or shelf partitions#24.11.24.00.00
-unspsc7#24.11.24.07.00#Mail boxes#24.11.24.00.00
-unspsc7#24.11.24.08.00#Antistatic boxes#24.11.24.00.00
-unspsc7#24.11.24.09.00#Box lids#24.11.24.00.00
-unspsc7#24.11.25.00.00#Corrugated and other boxes for distribution#24.11.00.00.00
-unspsc7#24.11.25.01.00#Slotted corrugated cartons#24.11.25.00.00
-unspsc7#24.11.25.02.00#One piece die cut shipping cartons#24.11.25.00.00
-unspsc7#24.11.25.03.00#Die cut corrugated shipping cartons with separate lids#24.11.25.00.00
-unspsc7#24.11.25.04.00#Molded boxes#24.11.25.00.00
-unspsc7#24.11.25.05.00#Rigid boxes#24.11.25.00.00
-unspsc7#24.11.25.06.00#Flexible intermediate bulk containers#24.11.25.00.00
-unspsc7#24.11.25.07.00#Intermediate bulk containers#24.11.25.00.00
-unspsc7#24.11.26.00.00#Liquid containers#24.11.00.00.00
-unspsc7#24.11.26.01.00#Jugs#24.11.26.00.00
-unspsc7#24.11.26.02.00#Jars#24.11.26.00.00
-unspsc7#24.12.00.00.00#Packaging materials#24.00.00.00.00
-unspsc7#24.12.15.00.00#Packaging boxes and bags and pouches#24.12.00.00.00
-unspsc7#24.12.15.01.00#Poly bags#24.12.15.00.00
-unspsc7#24.12.15.02.00#Packaging pouches or bags#24.12.15.00.00
-unspsc7#24.12.15.03.00#Packaging boxes#24.12.15.00.00
-unspsc7#24.12.15.04.00#Carded packaging#24.12.15.00.00
-unspsc7#24.12.15.05.00#Tarpaulins#24.12.15.00.00
-unspsc7#24.12.15.06.00#Conductive boxes#24.12.15.00.00
-unspsc7#24.12.15.07.00#Rigid set up boxes#24.12.15.00.00
-unspsc7#24.12.15.08.00#Egg trays#24.12.15.00.00
-unspsc7#24.12.18.00.00#Packaging cans#24.12.00.00.00
-unspsc7#24.12.18.01.00#Aerosol cans#24.12.18.00.00
-unspsc7#24.12.18.02.00#Paint or varnish cans#24.12.18.00.00
-unspsc7#24.12.18.03.00#Beverage cans#24.12.18.00.00
-unspsc7#24.12.18.04.00#Food cans#24.12.18.00.00
-unspsc7#24.12.18.05.00#Steel cans#24.12.18.00.00
-unspsc7#24.12.18.06.00#Aluminum cans#24.12.18.00.00
-unspsc7#24.12.20.00.00#Bottles#24.12.00.00.00
-unspsc7#24.12.20.01.00#Squeeze bottles#24.12.20.00.00
-unspsc7#24.12.20.02.00#Plastic bottles#24.12.20.00.00
-unspsc7#24.12.20.03.00#Glass bottles#24.12.20.00.00
-unspsc7#24.12.20.04.00#Caps or tops#24.12.20.00.00
-unspsc7#24.12.20.05.00#Applicator bottles#24.12.20.00.00
-unspsc7#24.12.20.06.00#Applicators#24.12.20.00.00
-unspsc7#24.13.00.00.00#Industrial refrigeration#24.00.00.00.00
-unspsc7#24.13.15.00.00#Industrial refrigerators#24.13.00.00.00
-unspsc7#24.13.15.01.00#Combined refrigerator freezers#24.13.15.00.00
-unspsc7#24.13.15.02.00#Liquid nitrogen refrigerators#24.13.15.00.00
-unspsc7#24.13.15.03.00#Walk in refrigerators#24.13.15.00.00
-unspsc7#24.13.15.04.00#Refrigerated containers#24.13.15.00.00
-unspsc7#24.13.15.05.00#Refrigerated vessels#24.13.15.00.00
-unspsc7#24.13.15.06.00#Refrigerated tanks#24.13.15.00.00
-unspsc7#24.13.16.00.00#Industrial freezers#24.13.00.00.00
-unspsc7#24.13.16.01.00#Chest freezers#24.13.16.00.00
-unspsc7#24.13.16.02.00#Upright freezers#24.13.16.00.00
-unspsc7#24.13.16.03.00#Low temperature freezers#24.13.16.00.00
-unspsc7#24.13.16.04.00#Freeze drying equipment#24.13.16.00.00
-unspsc7#24.13.16.05.00#Walk in freezers#24.13.16.00.00
-unspsc7#24.13.16.06.00#Plate freezers#24.13.16.00.00
-unspsc7#24.13.16.07.00#Blast freezers#24.13.16.00.00
-unspsc7#24.13.19.00.00#Ice makers#24.13.00.00.00
-unspsc7#24.13.19.01.00#Ice cube makers#24.13.19.00.00
-unspsc7#24.13.19.02.00#Ice block makers#24.13.19.00.00
-unspsc7#24.14.00.00.00#Packing supplies#24.00.00.00.00
-unspsc7#24.14.15.00.00#Securing and protecting supplies#24.14.00.00.00
-unspsc7#24.14.15.01.00#Stretch wrap films#24.14.15.00.00
-unspsc7#24.14.15.02.00#Shrink wrap films#24.14.15.00.00
-unspsc7#24.14.15.03.00#Polyethylene films#24.14.15.00.00
-unspsc7#24.14.15.04.00#Tamper proof or security seals#24.14.15.00.00
-unspsc7#24.14.15.05.00#Polyethylene films#24.14.15.00.00
-unspsc7#24.14.15.06.00#Tarpaulins#24.14.15.00.00
-unspsc7#24.14.15.07.00#Anti static packaging films#24.14.15.00.00
-unspsc7#24.14.15.08.00#Carton corner support#24.14.15.00.00
-unspsc7#24.14.15.09.00#Rubber cord#24.14.15.00.00
-unspsc7#24.14.15.10.00#Cable protectors#24.14.15.00.00
-unspsc7#24.14.15.11.00#Load binders#24.14.15.00.00
-unspsc7#24.14.16.00.00#Cushioning supplies#24.14.00.00.00
-unspsc7#24.14.16.01.00#Bubble wrap#24.14.16.00.00
-unspsc7#24.14.16.02.00#Thermoforming materials#24.14.16.00.00
-unspsc7#24.14.16.03.00#Cushioning#24.14.16.00.00
-unspsc7#24.14.16.04.00#Wadding materials#24.14.16.00.00
-unspsc7#24.14.16.05.00#Air filled packing materials#24.14.16.00.00
-unspsc7#24.14.16.06.00#Packing peanuts#24.14.16.00.00
-unspsc7#24.14.16.07.00#Cardboard inserts#24.14.16.00.00
-unspsc7#24.14.16.08.00#Protective ends#24.14.16.00.00
-unspsc7#24.14.17.00.00#Packaging tubes and cores and labels and accessories#24.14.00.00.00
-unspsc7#24.14.17.01.00#Paper tubes or cores#24.14.17.00.00
-unspsc7#24.14.17.02.00#Tube or core end plugs#24.14.17.00.00
-unspsc7#24.14.17.03.00#Paper pieces#24.14.17.00.00
-unspsc7#24.14.17.04.00#Printed inserts or instructions#24.14.17.00.00
-unspsc7#24.14.17.05.00#Collapsible tubes#24.14.17.00.00
-unspsc7#24.14.17.06.00#Spool#24.14.17.00.00
-unspsc7#24.14.17.07.00#Reel#24.14.17.00.00
-unspsc7#25.00.00.00.00#Commercial and Military and Private Vehicles and their Accessories and Components#25.00.00.00.00
-unspsc7#25.10.00.00.00#Motor vehicles#25.00.00.00.00
-unspsc7#25.10.15.00.00#Passenger motor vehicles#25.10.00.00.00
-unspsc7#25.10.15.01.00#Minibuses#25.10.15.00.00
-unspsc7#25.10.15.02.00#Busses#25.10.15.00.00
-unspsc7#25.10.15.03.00#Automobiles or cars#25.10.15.00.00
-unspsc7#25.10.15.04.00#Station wagons#25.10.15.00.00
-unspsc7#25.10.15.05.00#Minivans or vans#25.10.15.00.00
-unspsc7#25.10.15.06.00#Limousines#25.10.15.00.00
-unspsc7#25.10.15.07.00#Light trucks or sport utility vehicles#25.10.15.00.00
-unspsc7#25.10.16.00.00#Product and material transport vehicles#25.10.00.00.00
-unspsc7#25.10.16.01.00#Dump trucks#25.10.16.00.00
-unspsc7#25.10.16.02.00#Tow trucks#25.10.16.00.00
-unspsc7#25.10.16.04.00#Delivery trucks#25.10.16.00.00
-unspsc7#25.10.16.09.00#Sludge or sewage handling trucks#25.10.16.00.00
-unspsc7#25.10.17.00.00#Safety and rescue vehicles#25.10.00.00.00
-unspsc7#25.10.17.01.00#Fire or rescue trucks#25.10.17.00.00
-unspsc7#25.10.17.02.00#Police vehicles#25.10.17.00.00
-unspsc7#25.10.17.03.00#Ambulances#25.10.17.00.00
-unspsc7#25.10.18.00.00#Motorized cycles#25.10.00.00.00
-unspsc7#25.10.18.01.00#Motorcycles#25.10.18.00.00
-unspsc7#25.10.18.02.00#Scooters#25.10.18.00.00
-unspsc7#25.10.18.03.00#Mopeds#25.10.18.00.00
-unspsc7#25.10.19.00.00#Specialized and recreational vehicles#25.10.00.00.00
-unspsc7#25.10.19.01.00#Agricultural tractors#25.10.19.00.00
-unspsc7#25.10.19.02.00#Motor homes#25.10.19.00.00
-unspsc7#25.10.19.03.00#Snowmobiles or snow scooter#25.10.19.00.00
-unspsc7#25.10.19.04.00#Golf carts#25.10.19.00.00
-unspsc7#25.10.19.05.00#All terrain vehicles tracked or wheeled#25.10.19.00.00
-unspsc7#25.10.19.06.00#Go cart#25.10.19.00.00
-unspsc7#25.10.20.00.00#War vehicles#25.10.00.00.00
-unspsc7#25.10.20.01.00#Tanks#25.10.20.00.00
-unspsc7#25.10.20.02.00#Armored fighting vehicles#25.10.20.00.00
-unspsc7#25.10.20.03.00#Self propelled artillery#25.10.20.00.00
-unspsc7#25.10.21.00.00#Truck tractors#25.10.00.00.00
-unspsc7#25.10.21.01.00#Low cab forward tractors#25.10.21.00.00
-unspsc7#25.10.21.02.00#Long nose tractors with sleeper#25.10.21.00.00
-unspsc7#25.10.21.03.00#Long nose tractors without sleeper#25.10.21.00.00
-unspsc7#25.10.21.04.00#Cab over engine tractors with sleeper#25.10.21.00.00
-unspsc7#25.10.21.05.00#Cab over engine tractors without sleeper#25.10.21.00.00
-unspsc7#25.11.00.00.00#Marine transport#25.00.00.00.00
-unspsc7#25.11.15.00.00#Commercial marine craft#25.11.00.00.00
-unspsc7#25.11.15.01.00#Trawlers#25.11.15.00.00
-unspsc7#25.11.15.02.00#Fishing boats#25.11.15.00.00
-unspsc7#25.11.15.03.00#Cargo or container ships#25.11.15.00.00
-unspsc7#25.11.15.04.00#Dredging craft#25.11.15.00.00
-unspsc7#25.11.15.05.00#Tankers#25.11.15.00.00
-unspsc7#25.11.15.06.00#Tug boats#25.11.15.00.00
-unspsc7#25.11.15.07.00#Barges#25.11.15.00.00
-unspsc7#25.11.15.08.00#Passenger or automobile ferries#25.11.15.00.00
-unspsc7#25.11.15.09.00#Cruise ships#25.11.15.00.00
-unspsc7#25.11.15.10.00#Salvage ships#25.11.15.00.00
-unspsc7#25.11.15.11.00#Oil or gas crew boat#25.11.15.00.00
-unspsc7#25.11.15.12.00#Oil or gas workboat#25.11.15.00.00
-unspsc7#25.11.15.13.00#Seismic vessel#25.11.15.00.00
-unspsc7#25.11.16.00.00#Safety and rescue water craft#25.11.00.00.00
-unspsc7#25.11.16.01.00#Lifeboats or liferafts#25.11.16.00.00
-unspsc7#25.11.16.02.00#Fire fighting watercraft#25.11.16.00.00
-unspsc7#25.11.16.03.00#Rescue ships or boats#25.11.16.00.00
-unspsc7#25.11.17.00.00#Military watercraft#25.11.00.00.00
-unspsc7#25.11.17.01.00#Submarines#25.11.17.00.00
-unspsc7#25.11.17.02.00#Aircraft carriers#25.11.17.00.00
-unspsc7#25.11.17.03.00#Ammunition ships#25.11.17.00.00
-unspsc7#25.11.17.04.00#Amphibious assault ships#25.11.17.00.00
-unspsc7#25.11.17.05.00#Amphibious transport docks#25.11.17.00.00
-unspsc7#25.11.17.06.00#Amphibious command ships#25.11.17.00.00
-unspsc7#25.11.17.07.00#Command ships#25.11.17.00.00
-unspsc7#25.11.17.08.00#Cruisers#25.11.17.00.00
-unspsc7#25.11.17.09.00#Destroyers#25.11.17.00.00
-unspsc7#25.11.17.10.00#Dock landing ships#25.11.17.00.00
-unspsc7#25.11.17.11.00#Fast combat support ships#25.11.17.00.00
-unspsc7#25.11.17.12.00#Frigates#25.11.17.00.00
-unspsc7#25.11.17.13.00#Fleet oilers#25.11.17.00.00
-unspsc7#25.11.17.14.00#Utility landing watercraft#25.11.17.00.00
-unspsc7#25.11.17.15.00#Mechanized or utility watercraft#25.11.17.00.00
-unspsc7#25.11.17.16.00#Mine hunting ships#25.11.17.00.00
-unspsc7#25.11.17.17.00#Mine countermeasures ships#25.11.17.00.00
-unspsc7#25.11.17.18.00#Coastal patrol watercraft#25.11.17.00.00
-unspsc7#25.11.17.19.00#Submarine tenders#25.11.17.00.00
-unspsc7#25.11.17.20.00#Tank landing ships#25.11.17.00.00
-unspsc7#25.11.17.21.00#Air cushioned landing watercraft#25.11.17.00.00
-unspsc7#25.11.18.00.00#Recreational watercraft#25.11.00.00.00
-unspsc7#25.11.18.01.00#Recreational sailboats#25.11.18.00.00
-unspsc7#25.11.18.02.00#Recreational motorboats#25.11.18.00.00
-unspsc7#25.11.18.03.00#Recreational rowboats#25.11.18.00.00
-unspsc7#25.11.18.04.00#Canoes or kayaks#25.11.18.00.00
-unspsc7#25.11.18.05.00#Personal motorized watercraft#25.11.18.00.00
-unspsc7#25.11.18.06.00#Rafts#25.11.18.00.00
-unspsc7#25.11.19.00.00#Marine craft systems and subassemblies#25.11.00.00.00
-unspsc7#25.11.19.01.00#Marine craft communications systems#25.11.19.00.00
-unspsc7#25.11.19.02.00#Marine propellers#25.11.19.00.00
-unspsc7#25.11.19.03.00#Sails#25.11.19.00.00
-unspsc7#25.11.19.04.00#Paddles#25.11.19.00.00
-unspsc7#25.11.19.05.00#Marine ballast systems#25.11.19.00.00
-unspsc7#25.12.00.00.00#Railway and tramway machinery and equipment#25.00.00.00.00
-unspsc7#25.12.15.00.00#Locomotives and electric trolleys#25.12.00.00.00
-unspsc7#25.12.15.01.00#Diesel freight locomotives#25.12.15.00.00
-unspsc7#25.12.15.02.00#Electric freight locomotives#25.12.15.00.00
-unspsc7#25.12.15.03.00#Diesel passenger locomotives#25.12.15.00.00
-unspsc7#25.12.15.04.00#Electric passenger locomotives#25.12.15.00.00
-unspsc7#25.12.16.00.00#Railway and tramway cars#25.12.00.00.00
-unspsc7#25.12.16.01.00#Freight rail cars#25.12.16.00.00
-unspsc7#25.12.16.02.00#Tanker rail cars#25.12.16.00.00
-unspsc7#25.12.16.03.00#Passenger rail cars#25.12.16.00.00
-unspsc7#25.12.16.04.00#Hopper rail cars#25.12.16.00.00
-unspsc7#25.12.16.05.00#Streetcars or tramway cars#25.12.16.00.00
-unspsc7#25.12.17.00.00#Railroad support equipment and systems#25.12.00.00.00
-unspsc7#25.12.17.01.00#Rail switching systems#25.12.17.00.00
-unspsc7#25.12.17.02.00#Railway sleepers#25.12.17.00.00
-unspsc7#25.12.17.03.00#Railway tracks#25.12.17.00.00
-unspsc7#25.12.17.04.00#Railway frogs or fish plates#25.12.17.00.00
-unspsc7#25.13.00.00.00#Aircraft#25.00.00.00.00
-unspsc7#25.13.15.00.00#Powered fixed wing aircraft#25.13.00.00.00
-unspsc7#25.13.15.01.00#Fixed wing agricultural aircraft#25.13.15.00.00
-unspsc7#25.13.15.02.00#Cargo propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.03.00#Seaplanes#25.13.15.00.00
-unspsc7#25.13.15.04.00#Commercial passenger propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.05.00#Cargo jet aircraft#25.13.15.00.00
-unspsc7#25.13.15.06.00#Commercial passenger jet aircraft#25.13.15.00.00
-unspsc7#25.13.15.07.00#Private or business propeller aircraft#25.13.15.00.00
-unspsc7#25.13.15.08.00#Private or business jet aircraft#25.13.15.00.00
-unspsc7#25.13.16.00.00#Civilian and commercial rotary wing aircraft#25.13.00.00.00
-unspsc7#25.13.16.01.00#Passenger transport helicopters#25.13.16.00.00
-unspsc7#25.13.16.02.00#Cargo transport helicopters#25.13.16.00.00
-unspsc7#25.13.16.03.00#Agricultural helicopters#25.13.16.00.00
-unspsc7#25.13.16.04.00#Medical or rescue helicopters#25.13.16.00.00
-unspsc7#25.13.17.00.00#Military fixed wing aircraft#25.13.00.00.00
-unspsc7#25.13.17.01.00#Bomber aircraft#25.13.17.00.00
-unspsc7#25.13.17.02.00#Fighter bomber aircraft#25.13.17.00.00
-unspsc7#25.13.17.03.00#Fighter aircraft#25.13.17.00.00
-unspsc7#25.13.17.04.00#Attack aircraft#25.13.17.00.00
-unspsc7#25.13.17.05.00#Target or reconnaissance drones#25.13.17.00.00
-unspsc7#25.13.17.06.00#Military seaplanes#25.13.17.00.00
-unspsc7#25.13.17.07.00#Reconnaissance or surveillance aircraft#25.13.17.00.00
-unspsc7#25.13.17.08.00#Anti submarine aircraft#25.13.17.00.00
-unspsc7#25.13.17.09.00#Military transport aircraft#25.13.17.00.00
-unspsc7#25.13.18.00.00#Specialty aircraft#25.13.00.00.00
-unspsc7#25.13.18.01.00#Airships#25.13.18.00.00
-unspsc7#25.13.19.00.00#Military rotary wing aircraft#25.13.00.00.00
-unspsc7#25.13.19.02.00#Military transport helicopters#25.13.19.00.00
-unspsc7#25.13.19.03.00#Attack helicopters#25.13.19.00.00
-unspsc7#25.13.19.04.00#Reconnaissance helicopters#25.13.19.00.00
-unspsc7#25.13.19.05.00#Anti submarine helicopters#25.13.19.00.00
-unspsc7#25.13.19.06.00#Tilt rotor wing aircraft#25.13.19.00.00
-unspsc7#25.13.20.00.00#Recreational aircraft#25.13.00.00.00
-unspsc7#25.13.20.01.00#Hang gliders#25.13.20.00.00
-unspsc7#25.13.20.02.00#Hot air balloons#25.13.20.00.00
-unspsc7#25.13.20.03.00#Gliders#25.13.20.00.00
-unspsc7#25.13.20.04.00#Paragliders#25.13.20.00.00
-unspsc7#25.13.20.05.00#Ultra light aircraft#25.13.20.00.00
-unspsc7#25.13.21.00.00#Aircraft management services#25.13.00.00.00
-unspsc7#25.13.21.01.00#Aircraft pilots#25.13.21.00.00
-unspsc7#25.13.21.02.00#Aircraft maintenance or services#25.13.21.00.00
-unspsc7#25.15.00.00.00#Spacecraft#25.00.00.00.00
-unspsc7#25.15.15.00.00#Spaceships#25.15.00.00.00
-unspsc7#25.15.15.01.00#Manned spacecraft#25.15.15.00.00
-unspsc7#25.15.15.02.00#Spacecraft structures#25.15.15.00.00
-unspsc7#25.15.17.00.00#Satellites#25.15.00.00.00
-unspsc7#25.15.17.01.00#Communication satellites#25.15.17.00.00
-unspsc7#25.15.17.02.00#Weather satellites#25.15.17.00.00
-unspsc7#25.15.17.03.00#Military satellites#25.15.17.00.00
-unspsc7#25.15.17.04.00#Scientific or research satellites#25.15.17.00.00
-unspsc7#25.15.17.05.00#Navigation satellites#25.15.17.00.00
-unspsc7#25.15.17.06.00#Geostationary satellites#25.15.17.00.00
-unspsc7#25.15.17.07.00#Low earth orbit satellites#25.15.17.00.00
-unspsc7#25.15.17.08.00#Sun synchronous orbit satellites#25.15.17.00.00
-unspsc7#25.15.17.09.00#Geosynchronous satellites#25.15.17.00.00
-unspsc7#25.16.00.00.00#Non motorized cycles#25.00.00.00.00
-unspsc7#25.16.15.00.00#Pedal powered vehicles#25.16.00.00.00
-unspsc7#25.16.15.01.00#Touring bicycles#25.16.15.00.00
-unspsc7#25.16.15.02.00#Unicycles#25.16.15.00.00
-unspsc7#25.16.15.03.00#Tricycles#25.16.15.00.00
-unspsc7#25.16.15.04.00#Tandem bicycles#25.16.15.00.00
-unspsc7#25.16.15.05.00#Mountain bicycles#25.16.15.00.00
-unspsc7#25.16.15.06.00#Racing bicycles#25.16.15.00.00
-unspsc7#25.16.15.07.00#Bicycles#25.16.15.00.00
-unspsc7#25.16.15.08.00#Recumbent bicycles#25.16.15.00.00
-unspsc7#25.16.15.09.00#Childrens bicycles#25.16.15.00.00
-unspsc7#25.17.00.00.00#Transportation components and systems#25.00.00.00.00
-unspsc7#25.17.15.00.00#Windshield wipers#25.17.00.00.00
-unspsc7#25.17.15.01.00#Aircraft windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.02.00#Automotive windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.03.00#Locomotive windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.04.00#Marine windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.05.00#Truck windshield wipers#25.17.15.00.00
-unspsc7#25.17.15.06.00#Windshield wiper pump#25.17.15.00.00
-unspsc7#25.17.16.00.00#Defrosting and defogging systems#25.17.00.00.00
-unspsc7#25.17.16.01.00#Aircraft onboard defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.16.02.00#Automotive defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.16.03.00#Train defrosting or defogging systems#25.17.16.00.00
-unspsc7#25.17.17.00.00#Braking systems and components#25.17.00.00.00
-unspsc7#25.17.17.01.00#Aircraft braking systems#25.17.17.00.00
-unspsc7#25.17.17.02.00#Automotive braking systems#25.17.17.00.00
-unspsc7#25.17.17.03.00#Train braking systems#25.17.17.00.00
-unspsc7#25.17.17.04.00#Drag chutes#25.17.17.00.00
-unspsc7#25.17.17.05.00#Rotors#25.17.17.00.00
-unspsc7#25.17.17.06.00#Brake calipers#25.17.17.00.00
-unspsc7#25.17.17.07.00#Drum brake#25.17.17.00.00
-unspsc7#25.17.17.08.00#Disc brake#25.17.17.00.00
-unspsc7#25.17.17.09.00#Liquid cooled brake#25.17.17.00.00
-unspsc7#25.17.17.10.00#Master cylindars#25.17.17.00.00
-unspsc7#25.17.17.11.00#Slave cylinders#25.17.17.00.00
-unspsc7#25.17.17.12.00#Drum brake shoes#25.17.17.00.00
-unspsc7#25.17.17.13.00#Disc brake pads#25.17.17.00.00
-unspsc7#25.17.17.14.00#Brake drum#25.17.17.00.00
-unspsc7#25.17.17.15.00#Disc brake rotors#25.17.17.00.00
-unspsc7#25.17.17.16.00#Brake lines#25.17.17.00.00
-unspsc7#25.17.19.00.00#Wheels and wheel trims#25.17.00.00.00
-unspsc7#25.17.19.01.00#Automobile rims or wheels#25.17.19.00.00
-unspsc7#25.17.19.02.00#Train wheels#25.17.19.00.00
-unspsc7#25.17.19.03.00#Truck rims or wheels#25.17.19.00.00
-unspsc7#25.17.19.04.00#Aircraft wheels#25.17.19.00.00
-unspsc7#25.17.19.05.00#Tire valves#25.17.19.00.00
-unspsc7#25.17.20.00.00#Suspension system components#25.17.00.00.00
-unspsc7#25.17.20.01.00#Automobile suspension systems#25.17.20.00.00
-unspsc7#25.17.20.02.00#Truck suspension systems#25.17.20.00.00
-unspsc7#25.17.20.03.00#Truck shock absorbers#25.17.20.00.00
-unspsc7#25.17.20.04.00#Automobile shock absorbers#25.17.20.00.00
-unspsc7#25.17.20.05.00#Train suspension systems#25.17.20.00.00
-unspsc7#25.17.20.06.00#Steering systems#25.17.20.00.00
-unspsc7#25.17.20.07.00#Struts#25.17.20.00.00
-unspsc7#25.17.20.08.00#Ball joints#25.17.20.00.00
-unspsc7#25.17.20.09.00#Automotive bushings#25.17.20.00.00
-unspsc7#25.17.20.10.00#Sway bars#25.17.20.00.00
-unspsc7#25.17.20.11.00#Shock absorber#25.17.20.00.00
-unspsc7#25.17.21.00.00#Vehicle safety systems and components#25.17.00.00.00
-unspsc7#25.17.21.01.00#Airbags#25.17.21.00.00
-unspsc7#25.17.21.02.00#Aircraft lapbelts#25.17.21.00.00
-unspsc7#25.17.21.03.00#Aircraft harness restraints#25.17.21.00.00
-unspsc7#25.17.21.04.00#Seatbelts#25.17.21.00.00
-unspsc7#25.17.21.05.00#Collision avoidance systems#25.17.21.00.00
-unspsc7#25.17.21.06.00#Impact sensing systems#25.17.21.00.00
-unspsc7#25.17.21.07.00#Automotive seatbelts#25.17.21.00.00
-unspsc7#25.17.21.08.00#Head restraints#25.17.21.00.00
-unspsc7#25.17.22.00.00#Vehicle doors#25.17.00.00.00
-unspsc7#25.17.22.01.00#Removable automotive doors#25.17.22.00.00
-unspsc7#25.17.22.02.00#Aircraft doors#25.17.22.00.00
-unspsc7#25.17.22.03.00#Automotive doors#25.17.22.00.00
-unspsc7#25.17.22.04.00#Roll up truck doors#25.17.22.00.00
-unspsc7#25.17.22.05.00#Tailgates or liftgates#25.17.22.00.00
-unspsc7#25.17.23.00.00#Vehicle windows and windshields#25.17.00.00.00
-unspsc7#25.17.23.01.00#Automotive windshields#25.17.23.00.00
-unspsc7#25.17.23.02.00#Aircraft windows#25.17.23.00.00
-unspsc7#25.17.23.03.00#Automotive windows#25.17.23.00.00
-unspsc7#25.17.23.04.00#Aircraft windshields#25.17.23.00.00
-unspsc7#25.17.24.00.00#Fuel tanks and systems#25.17.00.00.00
-unspsc7#25.17.24.01.00#Aircraft internal fuel tanks#25.17.24.00.00
-unspsc7#25.17.24.02.00#Aircraft fuel drop tanks#25.17.24.00.00
-unspsc7#25.17.24.03.00#Aircraft propellent tanks#25.17.24.00.00
-unspsc7#25.17.24.04.00#Hybrid fuel storage systems#25.17.24.00.00
-unspsc7#25.17.24.05.00#Fuel injection systems#25.17.24.00.00
-unspsc7#25.17.24.06.00#Fuel tanks#25.17.24.00.00
-unspsc7#25.17.24.07.00#Breather elements#25.17.24.00.00
-unspsc7#25.17.24.08.00#Fuel or oil caps#25.17.24.00.00
-unspsc7#25.17.25.00.00#Tires and tire tubes#25.17.00.00.00
-unspsc7#25.17.25.01.00#Aircraft tires#25.17.25.00.00
-unspsc7#25.17.25.02.00#Automobile tire tubes#25.17.25.00.00
-unspsc7#25.17.25.03.00#Heavy truck tires#25.17.25.00.00
-unspsc7#25.17.25.04.00#Automobile or light truck tires#25.17.25.00.00
-unspsc7#25.17.25.05.00#Bicycle tubes#25.17.25.00.00
-unspsc7#25.17.25.06.00#Bicycle tires#25.17.25.00.00
-unspsc7#25.17.25.07.00#Tire cord#25.17.25.00.00
-unspsc7#25.17.25.08.00#Tire treads#25.17.25.00.00
-unspsc7#25.17.26.00.00#Vehicle trim and exterior covering#25.17.00.00.00
-unspsc7#25.17.26.01.00#Automotive trim#25.17.26.00.00
-unspsc7#25.17.26.02.00#Automotive fenders#25.17.26.00.00
-unspsc7#25.17.26.03.00#Vehicle bumpers#25.17.26.00.00
-unspsc7#25.17.26.04.00#Vehicle mirrors#25.17.26.00.00
-unspsc7#25.17.26.05.00#Vehicle grilles#25.17.26.00.00
-unspsc7#25.17.26.06.00#Vehicle hoods#25.17.26.00.00
-unspsc7#25.17.26.07.00#Vehicle side panels#25.17.26.00.00
-unspsc7#25.17.26.08.00#Fascias#25.17.26.00.00
-unspsc7#25.17.27.00.00#Environmental control systems#25.17.00.00.00
-unspsc7#25.17.27.01.00#Aircraft environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.02.00#Space environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.03.00#Marine environmental control systems#25.17.27.00.00
-unspsc7#25.17.27.04.00#Vehicle climate control systems#25.17.27.00.00
-unspsc7#25.17.28.00.00#Hydraulic systems and components#25.17.00.00.00
-unspsc7#25.17.28.01.00#Aircraft hydraulic systems#25.17.28.00.00
-unspsc7#25.17.28.02.00#Automotive hydraulic systems#25.17.28.00.00
-unspsc7#25.17.28.03.00#Marine hydraulic systems#25.17.28.00.00
-unspsc7#25.17.29.00.00#Exterior vehicle lighting#25.17.00.00.00
-unspsc7#25.17.29.01.00#Exterior automobile lighting#25.17.29.00.00
-unspsc7#25.17.29.02.00#Exterior aircraft lighting#25.17.29.00.00
-unspsc7#25.17.29.03.00#Exterior railcar lighting#25.17.29.00.00
-unspsc7#25.17.29.04.00#Exterior ship or boat lighting#25.17.29.00.00
-unspsc7#25.17.29.05.00#Headlamp wiper or washer systems#25.17.29.00.00
-unspsc7#25.17.29.06.00#Reflectors#25.17.29.00.00
-unspsc7#25.17.30.00.00#Interior vehicle lighting#25.17.00.00.00
-unspsc7#25.17.30.01.00#Interior automobile lighting#25.17.30.00.00
-unspsc7#25.17.30.02.00#Interior aircraft lighting#25.17.30.00.00
-unspsc7#25.17.30.03.00#Interior railcar lighting#25.17.30.00.00
-unspsc7#25.17.30.04.00#Interior ship or boat lighting#25.17.30.00.00
-unspsc7#25.17.30.05.00#Light plate assemblies#25.17.30.00.00
-unspsc7#25.17.31.00.00#Location and navigation systems and components#25.17.00.00.00
-unspsc7#25.17.31.01.00#Aircraft digital altitude control systems#25.17.31.00.00
-unspsc7#25.17.31.02.00#Aircraft navigation beacons#25.17.31.00.00
-unspsc7#25.17.31.03.00#Terrain following systems#25.17.31.00.00
-unspsc7#25.17.31.04.00#Aircraft guidance systems#25.17.31.00.00
-unspsc7#25.17.31.05.00#Aircraft steering controls#25.17.31.00.00
-unspsc7#25.17.31.06.00#Spacecraft attitude control systems#25.17.31.00.00
-unspsc7#25.17.31.07.00#Vehicular global positioning systems#25.17.31.00.00
-unspsc7#25.17.32.00.00#Communications related systems#25.17.00.00.00
-unspsc7#25.17.32.01.00#Aircraft communication systems#25.17.32.00.00
-unspsc7#25.17.32.02.00#Flight recorders#25.17.32.00.00
-unspsc7#25.17.32.03.00#Aircraft countermeasures#25.17.32.00.00
-unspsc7#25.17.32.04.00#Aircraft encryption or decryption systems#25.17.32.00.00
-unspsc7#25.17.32.05.00#Aircraft telemetry systems#25.17.32.00.00
-unspsc7#25.17.32.06.00#Aircraft interface electronics#25.17.32.00.00
-unspsc7#25.17.33.00.00#Master control systems#25.17.00.00.00
-unspsc7#25.17.33.01.00#Flight computer systems#25.17.33.00.00
-unspsc7#25.17.33.02.00#Spacecraft command modules#25.17.33.00.00
-unspsc7#25.17.33.03.00#Automotive computer systems#25.17.33.00.00
-unspsc7#25.17.33.04.00#Electronic ignition systems#25.17.33.00.00
-unspsc7#25.17.34.00.00#Vehicle emergency systems#25.17.00.00.00
-unspsc7#25.17.34.01.00#Aircraft fire control or extinguishing systems#25.17.34.00.00
-unspsc7#25.17.34.02.00#Aircraft escape or ejection systems#25.17.34.00.00
-unspsc7#25.17.34.03.00#Aircraft warning systems#25.17.34.00.00
-unspsc7#25.17.35.00.00#Vehicle power systems#25.17.00.00.00
-unspsc7#25.17.35.01.00#Spacecraft solar cells#25.17.35.00.00
-unspsc7#25.17.35.02.00#Spacecraft solar arrays#25.17.35.00.00
-unspsc7#25.17.36.00.00#Vehicle instrumentation#25.17.00.00.00
-unspsc7#25.17.36.01.00#Aircraft cockpit displays#25.17.36.00.00
-unspsc7#25.17.37.00.00#Exhaust and emission controls#25.17.00.00.00
-unspsc7#25.17.37.01.00#Catalytic converters#25.17.37.00.00
-unspsc7#25.17.37.02.00#Mufflers#25.17.37.00.00
-unspsc7#25.17.37.03.00#Exhaust manifolds#25.17.37.00.00
-unspsc7#25.17.38.00.00#Drivetrain systems#25.17.00.00.00
-unspsc7#25.17.38.01.00#Driving axles#25.17.38.00.00
-unspsc7#25.17.38.02.00#Non driving axles#25.17.38.00.00
-unspsc7#25.17.38.03.00#Axle housings#25.17.38.00.00
-unspsc7#25.17.38.04.00#Axle spindles#25.17.38.00.00
-unspsc7#25.17.38.05.00#Differentials#25.17.38.00.00
-unspsc7#25.17.38.06.00#Constant velocity joints#25.17.38.00.00
-unspsc7#25.17.38.07.00#Axle shafts#25.17.38.00.00
-unspsc7#25.17.38.08.00#Axle repair kits#25.17.38.00.00
-unspsc7#25.17.38.09.00#Axle hubs#25.17.38.00.00
-unspsc7#25.17.38.10.00#Universal joints#25.17.38.00.00
-unspsc7#25.17.38.11.00#Drive shafts#25.17.38.00.00
-unspsc7#25.17.38.12.00#Manual transmissions#25.17.38.00.00
-unspsc7#25.17.38.13.00#Automatic transmissions#25.17.38.00.00
-unspsc7#25.17.38.14.00#Power take offs#25.17.38.00.00
-unspsc7#25.17.38.15.00#Clutch cables#25.17.38.00.00
-unspsc7#25.17.38.16.00#Hydraulic clutch parts#25.17.38.00.00
-unspsc7#25.17.38.17.00#Drivetrain chains#25.17.38.00.00
-unspsc7#25.17.39.00.00#Electrical components#25.17.00.00.00
-unspsc7#25.17.39.01.00#Ignition#25.17.39.00.00
-unspsc7#25.17.40.00.00#Engine coolant system#25.17.00.00.00
-unspsc7#25.17.40.01.00#Fan#25.17.40.00.00
-unspsc7#25.17.40.02.00#Vehicle radiators#25.17.40.00.00
-unspsc7#25.17.40.03.00#Radiator caps#25.17.40.00.00
-unspsc7#25.17.40.04.00#Engine coolant#25.17.40.00.00
-unspsc7#25.17.41.00.00#Roof systems#25.17.00.00.00
-unspsc7#25.17.41.01.00#Emergency vehicle exits#25.17.41.00.00
-unspsc7#25.17.41.02.00#Permanent convertible roof tops#25.17.41.00.00
-unspsc7#25.17.41.03.00#Removable hard roof tops#25.17.41.00.00
-unspsc7#25.17.41.04.00#Removable soft roof tops#25.17.41.00.00
-unspsc7#25.17.41.05.00#Roof rack systems#25.17.41.00.00
-unspsc7#25.17.41.06.00#Sunroofs or moonroofs#25.17.41.00.00
-unspsc7#25.17.41.07.00#Wind deflectors#25.17.41.00.00
-unspsc7#25.17.42.00.00#Steering system#25.17.00.00.00
-unspsc7#25.17.42.01.00#Steering sacks#25.17.42.00.00
-unspsc7#25.17.42.02.00#Steering suspension#25.17.42.00.00
-unspsc7#25.17.42.03.00#Ball joint#25.17.42.00.00
-unspsc7#25.17.42.04.00#Power steering system#25.17.42.00.00
-unspsc7#25.17.42.05.00#Tie Rods#25.17.42.00.00
-unspsc7#25.17.42.06.00#Drag link#25.17.42.00.00
-unspsc7#25.17.42.07.00#Steering linkage#25.17.42.00.00
-unspsc7#25.17.42.08.00#Hublock#25.17.42.00.00
-unspsc7#25.17.42.09.00#Pinions#25.17.42.00.00
-unspsc7#25.17.42.10.00#Power steering tuning cable#25.17.42.00.00
-unspsc7#25.17.43.00.00#Vehicle exhaust systems#25.17.00.00.00
-unspsc7#25.17.43.01.00#Catalytic converters#25.17.43.00.00
-unspsc7#25.17.43.02.00#Mufflers or resonators#25.17.43.00.00
-unspsc7#25.17.44.00.00#Vehicle interior systems#25.17.00.00.00
-unspsc7#25.17.44.01.00#Bezels#25.17.44.00.00
-unspsc7#25.17.44.02.00#Consoles#25.17.44.00.00
-unspsc7#25.17.44.03.00#Door panels#25.17.44.00.00
-unspsc7#25.17.44.04.00#Headliners#25.17.44.00.00
-unspsc7#25.17.44.05.00#Instrument clusters#25.17.44.00.00
-unspsc7#25.17.44.06.00#Instrument panels#25.17.44.00.00
-unspsc7#25.17.44.07.00#Pedals#25.17.44.00.00
-unspsc7#25.17.44.08.00#Power ports or lighters#25.17.44.00.00
-unspsc7#25.17.44.09.00#Sun visors#25.17.44.00.00
-unspsc7#25.17.45.00.00#Vehicle safety and security systems#25.17.00.00.00
-unspsc7#25.17.45.01.00#Air bag propellant canisters#25.17.45.00.00
-unspsc7#25.17.45.02.00#Air bags#25.17.45.00.00
-unspsc7#25.17.45.03.00#Vehicle horns#25.17.45.00.00
-unspsc7#25.17.45.04.00#Remote locking system#25.17.45.00.00
-unspsc7#25.17.45.05.00#Vehicle stability control systems#25.17.45.00.00
-unspsc7#25.17.45.06.00#Vehicle traction control systems#25.17.45.00.00
-unspsc7#25.17.45.07.00#Vehicle navigation systems#25.17.45.00.00
-unspsc7#25.17.45.08.00#Wheel clamps#25.17.45.00.00
-unspsc7#25.17.46.00.00#Vehicle seating systems#25.17.00.00.00
-unspsc7#25.17.46.01.00#Seat covers#25.17.46.00.00
-unspsc7#25.17.46.02.00#Seat cushions or bolsters#25.17.46.00.00
-unspsc7#25.17.46.03.00#Seat frames#25.17.46.00.00
-unspsc7#25.18.00.00.00#Vehicle bodies and trailers#25.00.00.00.00
-unspsc7#25.18.15.00.00#Aircraft fuselage and components#25.18.00.00.00
-unspsc7#25.18.15.01.00#Aircraft spoilers#25.18.15.00.00
-unspsc7#25.18.15.02.00#Aircraft fins#25.18.15.00.00
-unspsc7#25.18.15.03.00#Aircraft horizontal stabilizers#25.18.15.00.00
-unspsc7#25.18.15.04.00#Aircraft canards#25.18.15.00.00
-unspsc7#25.18.15.05.00#Aircraft slats#25.18.15.00.00
-unspsc7#25.18.15.06.00#Aircraft flaps#25.18.15.00.00
-unspsc7#25.18.15.07.00#Aircraft rudders#25.18.15.00.00
-unspsc7#25.18.15.08.00#Aircraft elevators#25.18.15.00.00
-unspsc7#25.18.15.09.00#Aircraft ailerons#25.18.15.00.00
-unspsc7#25.18.15.10.00#Aircraft propeller#25.18.15.00.00
-unspsc7#25.18.15.11.00#Aircraft wings#25.18.15.00.00
-unspsc7#25.18.15.12.00#Aircraft fuselage#25.18.15.00.00
-unspsc7#25.18.15.13.00#Aircraft radomes#25.18.15.00.00
-unspsc7#25.18.15.14.00#Aircraft rotors#25.18.15.00.00
-unspsc7#25.18.15.15.00#Aircraft lift fans#25.18.15.00.00
-unspsc7#25.18.15.16.00#Aircraft canopies#25.18.15.00.00
-unspsc7#25.18.15.17.00#Aircraft furnishings#25.18.15.00.00
-unspsc7#25.18.16.00.00#Automotive chassis#25.18.00.00.00
-unspsc7#25.18.16.01.00#Automobile chassis#25.18.16.00.00
-unspsc7#25.18.16.02.00#Truck chassis#25.18.16.00.00
-unspsc7#25.18.16.03.00#Motorcycle frames#25.18.16.00.00
-unspsc7#25.18.16.04.00#Truck chassis#25.18.16.00.00
-unspsc7#25.18.17.00.00#Product and material trailers#25.18.00.00.00
-unspsc7#25.18.17.01.00#Container trailers#25.18.17.00.00
-unspsc7#25.18.17.02.00#Flatbed trailers#25.18.17.00.00
-unspsc7#25.18.17.03.00#Livestock trailers#25.18.17.00.00
-unspsc7#25.18.17.04.00#Non temperature controlled tanker trailers#25.18.17.00.00
-unspsc7#25.18.17.05.00#Temperature controlled tanker trailers#25.18.17.00.00
-unspsc7#25.18.17.06.00#Temperature controlled container trailers#25.18.17.00.00
-unspsc7#25.18.17.07.00#Automobile carrier trailers#25.18.17.00.00
-unspsc7#25.18.17.08.00#Trailer hitches#25.18.17.00.00
-unspsc7#25.18.17.09.00#Skip loader#25.18.17.00.00
-unspsc7#25.18.17.10.00#Trailer end plates#25.18.17.00.00
-unspsc7#25.18.17.11.00#Snowmobile trailer#25.18.17.00.00
-unspsc7#25.18.17.12.00#Motorcycle trailer#25.18.17.00.00
-unspsc7#25.18.17.13.00#Boat Trailer#25.18.17.00.00
-unspsc7#25.19.00.00.00#Transportation services equipment#25.00.00.00.00
-unspsc7#25.19.15.00.00#Air transportation support systems and equipment#25.19.00.00.00
-unspsc7#25.19.15.01.00#Ground support training systems#25.19.15.00.00
-unspsc7#25.19.15.02.00#Ground support test or maintenance systems#25.19.15.00.00
-unspsc7#25.19.15.03.00#Integrated maintenance information systems#25.19.15.00.00
-unspsc7#25.19.15.04.00#Aircraft flight simulators or trainers#25.19.15.00.00
-unspsc7#25.19.15.05.00#Aircraft cargo handling equipment#25.19.15.00.00
-unspsc7#25.19.15.06.00#Aircraft refueling equipment#25.19.15.00.00
-unspsc7#25.19.15.07.00#Aircraft deicing equipment#25.19.15.00.00
-unspsc7#25.19.15.08.00#Jetways#25.19.15.00.00
-unspsc7#25.19.15.09.00#Aircraft pushback or tow tractors#25.19.15.00.00
-unspsc7#25.19.15.10.00#Ground power units for aircraft#25.19.15.00.00
-unspsc7#25.19.15.11.00#Lavatory service equipment for aircraft#25.19.15.00.00
-unspsc7#25.19.15.12.00#Airstairs or stair trucks#25.19.15.00.00
-unspsc7#25.19.16.00.00#Space transportation support systems and equipment#25.19.00.00.00
-unspsc7#25.19.16.01.00#Spacecraft flight simulators#25.19.16.00.00
-unspsc7#25.19.16.02.00#Payload delivery systems for spacecraft#25.19.16.00.00
-unspsc7#25.19.16.03.00#Liquid launch vehicles#25.19.16.00.00
-unspsc7#25.19.16.04.00#Solid launch vehicles#25.19.16.00.00
-unspsc7#25.19.16.05.00#Spacecraft service modules#25.19.16.00.00
-unspsc7#25.19.17.00.00#Vehicle servicing equipment#25.19.00.00.00
-unspsc7#25.19.17.01.00#Wheel balancing equipment#25.19.17.00.00
-unspsc7#25.19.17.02.00#Wheel alignment equipment#25.19.17.00.00
-unspsc7#25.19.17.03.00#Tire changing machines#25.19.17.00.00
-unspsc7#25.19.17.04.00#Engine or vehicle stands#25.19.17.00.00
-unspsc7#25.20.00.00.00#Aerospace systems and components and equipment#25.00.00.00.00
-unspsc7#25.20.15.00.00#Aircraft fuselage and components#25.20.00.00.00
-unspsc7#25.20.15.01.00#Aircraft spoilers#25.20.15.00.00
-unspsc7#25.20.15.02.00#Aircraft fins#25.20.15.00.00
-unspsc7#25.20.15.03.00#Aircraft horizontal stabilizers#25.20.15.00.00
-unspsc7#25.20.15.04.00#Aircraft canards#25.20.15.00.00
-unspsc7#25.20.15.05.00#Aircraft slats#25.20.15.00.00
-unspsc7#25.20.15.06.00#Aircraft flaps or flap drives#25.20.15.00.00
-unspsc7#25.20.15.07.00#Aircraft rudders#25.20.15.00.00
-unspsc7#25.20.15.08.00#Aircraft elevators#25.20.15.00.00
-unspsc7#25.20.15.09.00#Aircraft ailerons#25.20.15.00.00
-unspsc7#25.20.15.10.00#Aircraft propellers#25.20.15.00.00
-unspsc7#25.20.15.11.00#Aircraft wings#25.20.15.00.00
-unspsc7#25.20.15.12.00#Aircraft fuselages#25.20.15.00.00
-unspsc7#25.20.15.13.00#Aircraft radomes#25.20.15.00.00
-unspsc7#25.20.15.14.00#Aircraft rotors#25.20.15.00.00
-unspsc7#25.20.15.15.00#Aircraft lift fans#25.20.15.00.00
-unspsc7#25.20.15.16.00#Aircraft canopies#25.20.15.00.00
-unspsc7#25.20.15.17.00#Aircraft furnishings#25.20.15.00.00
-unspsc7#25.20.16.00.00#Aerospace location and navigation systems and components#25.20.00.00.00
-unspsc7#25.20.16.01.00#Aircraft digital altitude control systems#25.20.16.00.00
-unspsc7#25.20.16.02.00#Aircraft navigation beacons#25.20.16.00.00
-unspsc7#25.20.16.03.00#Air to ground terrain following systems#25.20.16.00.00
-unspsc7#25.20.16.04.00#Aircraft guidance systems#25.20.16.00.00
-unspsc7#25.20.16.05.00#Aircraft steering controls#25.20.16.00.00
-unspsc7#25.20.16.06.00#Spacecraft altitude control systems#25.20.16.00.00
-unspsc7#25.20.17.00.00#Flight communications related systems#25.20.00.00.00
-unspsc7#25.20.17.01.00#Aircraft communication systems#25.20.17.00.00
-unspsc7#25.20.17.02.00#Flight data recorders#25.20.17.00.00
-unspsc7#25.20.17.03.00#Aircraft countermeasures#25.20.17.00.00
-unspsc7#25.20.17.04.00#Encryption or decryption systems#25.20.17.00.00
-unspsc7#25.20.17.05.00#Aircraft telemetry systems#25.20.17.00.00
-unspsc7#25.20.17.06.00#Aircraft interface electronics#25.20.17.00.00
-unspsc7#25.20.17.07.00#Aircraft gyros#25.20.17.00.00
-unspsc7#25.20.17.08.00#Aircraft cameras#25.20.17.00.00
-unspsc7#25.20.17.09.00#Aircraft probes or sensors#25.20.17.00.00
-unspsc7#25.20.17.10.00#Aircraft waveguides#25.20.17.00.00
-unspsc7#25.20.18.00.00#Aircraft master control systems#25.20.00.00.00
-unspsc7#25.20.18.01.00#Flight computer systems#25.20.18.00.00
-unspsc7#25.20.18.02.00#Spacecraft command modules#25.20.18.00.00
-unspsc7#25.20.19.00.00#Aircraft emergency systems#25.20.00.00.00
-unspsc7#25.20.19.01.00#Aircraft fire control or extinguishing systems#25.20.19.00.00
-unspsc7#25.20.19.02.00#Aircraft escape or ejection systems#25.20.19.00.00
-unspsc7#25.20.19.03.00#Aircraft warning systems#25.20.19.00.00
-unspsc7#25.20.19.04.00#Parachutes#25.20.19.00.00
-unspsc7#25.20.20.00.00#Aircraft power systems#25.20.00.00.00
-unspsc7#25.20.20.01.00#Spacecraft solar cells#25.20.20.00.00
-unspsc7#25.20.20.02.00#Spacecraft solar arrays#25.20.20.00.00
-unspsc7#25.20.20.03.00#Aircraft power supply units#25.20.20.00.00
-unspsc7#25.20.20.04.00#Auxilliary power unit systems (APUs)#25.20.20.00.00
-unspsc7#25.20.21.00.00#Flight instrumentation#25.20.00.00.00
-unspsc7#25.20.21.01.00#Aerospace cockpit indicators#25.20.21.00.00
-unspsc7#25.20.21.02.00#Aerospace cockpit gauges#25.20.21.00.00
-unspsc7#25.20.21.03.00#Aerospace cockpit display panels#25.20.21.00.00
-unspsc7#25.20.21.04.00#Aerospace cockpit switch panels#25.20.21.00.00
-unspsc7#25.20.21.05.00#Aerospace head up display (HUDs)#25.20.21.00.00
-unspsc7#25.20.22.00.00#Aircraft landing and braking systems#25.20.00.00.00
-unspsc7#25.20.22.01.00#Aircraft braking systems#25.20.22.00.00
-unspsc7#25.20.22.02.00#Aircraft drag chutes#25.20.22.00.00
-unspsc7#25.20.22.03.00#Aircraft wheels#25.20.22.00.00
-unspsc7#25.20.22.04.00#Landing gear assemblies#25.20.22.00.00
-unspsc7#25.20.22.05.00#Aircraft tires#25.20.22.00.00
-unspsc7#25.20.22.06.00#Aicraft anti skid controls#25.20.22.00.00
-unspsc7#25.20.23.00.00#Aircraft passenger restraints#25.20.00.00.00
-unspsc7#25.20.23.01.00#Aircraft lapbelts#25.20.23.00.00
-unspsc7#25.20.23.02.00#Aircraft harness restraints#25.20.23.00.00
-unspsc7#25.20.24.00.00#Aircraft fuel tanks and systems#25.20.00.00.00
-unspsc7#25.20.24.01.00#Aircraft internal fuel tanks#25.20.24.00.00
-unspsc7#25.20.24.02.00#Aircraft fuel drop tanks#25.20.24.00.00
-unspsc7#25.20.24.03.00#Aircraft propellant tanks#25.20.24.00.00
-unspsc7#25.20.24.04.00#Aircraft hybrid fuel storage systems#25.20.24.00.00
-unspsc7#25.20.24.05.00#Aircraft fuel management systems#25.20.24.00.00
-unspsc7#25.20.24.06.00#Postboosters#25.20.24.00.00
-unspsc7#25.20.25.00.00#Aircraft equipment#25.20.00.00.00
-unspsc7#25.20.25.01.00#Aircraft hydraulic systems#25.20.25.00.00
-unspsc7#25.20.25.02.00#Exterior aircraft lighting#25.20.25.00.00
-unspsc7#25.20.25.03.00#Interior aircraft lighting#25.20.25.00.00
-unspsc7#25.20.25.04.00#Aircraft windshield wipers#25.20.25.00.00
-unspsc7#25.20.25.05.00#Aircraft onboard defrosting or defogging systems#25.20.25.00.00
-unspsc7#25.20.25.06.00#Aircraft doors#25.20.25.00.00
-unspsc7#25.20.25.07.00#Aircraft windows#25.20.25.00.00
-unspsc7#25.20.25.08.00#Aircraft windshields#25.20.25.00.00
-unspsc7#25.20.25.09.00#Aircraft shock mounts#25.20.25.00.00
-unspsc7#25.20.25.10.00#Aircraft slip ring assemblies#25.20.25.00.00
-unspsc7#25.20.26.00.00#Aircraft environmental control systems and components#25.20.00.00.00
-unspsc7#25.20.26.01.00#Aircraft environment controllers#25.20.26.00.00
-unspsc7#25.20.26.02.00#Aircraft environment regulators#25.20.26.00.00
-unspsc7#25.20.26.03.00#Aircraft cooling turbines#25.20.26.00.00
-unspsc7#25.20.26.04.00#Aircraft cooling fans#25.20.26.00.00
-unspsc7#25.20.26.05.00#Aircraft heat exchangers#25.20.26.00.00
-unspsc7#25.20.26.06.00#Aircraft water separators#25.20.26.00.00
-unspsc7#25.20.26.07.00#Aircraft oxygen equipment#25.20.26.00.00
-unspsc7#25.20.27.00.00#Aircraft accumulators#25.20.00.00.00
-unspsc7#25.20.27.01.00#Hydraulic aircraft accumulators#25.20.27.00.00
-unspsc7#25.20.27.02.00#Pneumatic aircraft accumulators#25.20.27.00.00
-unspsc7#26.00.00.00.00#Power Generation and Distribution Machinery and Accessories#26.00.00.00.00
-unspsc7#26.10.00.00.00#Power sources#26.00.00.00.00
-unspsc7#26.10.15.00.00#Engines#26.10.00.00.00
-unspsc7#26.10.15.01.00#Hydraulic engines#26.10.15.00.00
-unspsc7#26.10.15.02.00#Pneumatic engines#26.10.15.00.00
-unspsc7#26.10.15.03.00#Gas engines#26.10.15.00.00
-unspsc7#26.10.15.04.00#Diesel engines#26.10.15.00.00
-unspsc7#26.10.15.05.00#Steam engines#26.10.15.00.00
-unspsc7#26.10.15.06.00#Turbine engines#26.10.15.00.00
-unspsc7#26.10.15.07.00#Turbofan engines#26.10.15.00.00
-unspsc7#26.10.15.08.00#Thermal engines#26.10.15.00.00
-unspsc7#26.10.15.09.00#Hydroelectric engines#26.10.15.00.00
-unspsc7#26.10.15.10.00#Rotary engines#26.10.15.00.00
-unspsc7#26.10.15.11.00#Hydraulic turbine engines#26.10.15.00.00
-unspsc7#26.10.15.12.00#Turboprop engines#26.10.15.00.00
-unspsc7#26.10.15.13.00#Engine Repair Kit#26.10.15.00.00
-unspsc7#26.10.16.00.00#Motors#26.10.00.00.00
-unspsc7#26.10.16.01.00#Induction motors#26.10.16.00.00
-unspsc7#26.10.16.02.00#Alternating current (AC) motors#26.10.16.00.00
-unspsc7#26.10.16.03.00#Direct current (DC) motors#26.10.16.00.00
-unspsc7#26.10.16.04.00#Alternating current or direct current (AC/DC) motors#26.10.16.00.00
-unspsc7#26.10.16.05.00#Dynamotors#26.10.16.00.00
-unspsc7#26.10.16.06.00#Servomotors#26.10.16.00.00
-unspsc7#26.10.16.07.00#Torque motors#26.10.16.00.00
-unspsc7#26.10.16.08.00#Liquid rocket motors#26.10.16.00.00
-unspsc7#26.10.16.09.00#Synchronous motors#26.10.16.00.00
-unspsc7#26.10.16.10.00#Solid rocket motors#26.10.16.00.00
-unspsc7#26.10.16.11.00#Single phase motors#26.10.16.00.00
-unspsc7#26.10.16.12.00#Multi phase motors#26.10.16.00.00
-unspsc7#26.10.16.13.00#Hydraulic motors#26.10.16.00.00
-unspsc7#26.10.16.14.00#Step motors#26.10.16.00.00
-unspsc7#26.10.16.15.00#Alternators#26.10.16.00.00
-unspsc7#26.10.16.16.00#Carbon Brushes#26.10.16.00.00
-unspsc7#26.10.17.00.00#Engine components#26.10.00.00.00
-unspsc7#26.10.17.01.00#Aircraft burners#26.10.17.00.00
-unspsc7#26.10.17.02.00#Aircraft engine compressors#26.10.17.00.00
-unspsc7#26.10.17.03.00#Aircraft engine diffusers#26.10.17.00.00
-unspsc7#26.10.17.04.00#Engine mounts#26.10.17.00.00
-unspsc7#26.10.17.05.00#Aircraft drive shafts power take offs or screw jacks#26.10.17.00.00
-unspsc7#26.10.17.06.00#Aircraft transmission units#26.10.17.00.00
-unspsc7#26.10.17.07.00#Balance shafts#26.10.17.00.00
-unspsc7#26.10.17.08.00#Cam followers#26.10.17.00.00
-unspsc7#26.10.17.09.00#Camshaft lifters#26.10.17.00.00
-unspsc7#26.10.17.10.00#Carburetors#26.10.17.00.00
-unspsc7#26.10.17.11.00#Connecting rods#26.10.17.00.00
-unspsc7#26.10.17.12.00#Crankcase ventillation valves#26.10.17.00.00
-unspsc7#26.10.17.13.00#Cylinder heads#26.10.17.00.00
-unspsc7#26.10.17.14.00#Engine coolant radiators#26.10.17.00.00
-unspsc7#26.10.17.15.00#Engine covers or pans#26.10.17.00.00
-unspsc7#26.10.17.16.00#Engine forgings#26.10.17.00.00
-unspsc7#26.10.17.17.00#Engine heaters#26.10.17.00.00
-unspsc7#26.10.17.18.00#Engine ignition systems#26.10.17.00.00
-unspsc7#26.10.17.19.00#Supercharger#26.10.17.00.00
-unspsc7#26.10.17.20.00#Turbocharger#26.10.17.00.00
-unspsc7#26.10.17.21.00#Engine pulleys#26.10.17.00.00
-unspsc7#26.10.17.22.00#Fuel injection systems#26.10.17.00.00
-unspsc7#26.10.17.23.00#Fuel vapor canister#26.10.17.00.00
-unspsc7#26.10.17.24.00#Glow plugs#26.10.17.00.00
-unspsc7#26.10.17.25.00#Oil dip sticks and tubes#26.10.17.00.00
-unspsc7#26.10.17.26.00#Oil strainers#26.10.17.00.00
-unspsc7#26.10.17.27.00#Piston rings#26.10.17.00.00
-unspsc7#26.10.17.28.00#Push rod tubes#26.10.17.00.00
-unspsc7#26.10.17.29.00#Rocker arm balls#26.10.17.00.00
-unspsc7#26.10.17.30.00#Rocker arm shafts#26.10.17.00.00
-unspsc7#26.10.17.31.00#Rocker arms#26.10.17.00.00
-unspsc7#26.10.17.32.00#Spark plugs#26.10.17.00.00
-unspsc7#26.10.17.33.00#Carburetor jet#26.10.17.00.00
-unspsc7#26.10.17.34.00#Carburetor diaphragms#26.10.17.00.00
-unspsc7#26.10.17.35.00#Oil pan#26.10.17.00.00
-unspsc7#26.10.17.36.00#Pistons#26.10.17.00.00
-unspsc7#26.10.17.37.00#Timing chain#26.10.17.00.00
-unspsc7#26.10.17.38.00#Intake manifolds#26.10.17.00.00
-unspsc7#26.10.17.39.00#Exhaust manifolds#26.10.17.00.00
-unspsc7#26.10.17.40.00#Fuel injectors#26.10.17.00.00
-unspsc7#26.10.17.41.00#Engine sleeves#26.10.17.00.00
-unspsc7#26.10.17.42.00#Fuel injection manifolds#26.10.17.00.00
-unspsc7#26.10.17.43.00#Engine valves#26.10.17.00.00
-unspsc7#26.10.17.44.00#Turbocharger#26.10.17.00.00
-unspsc7#26.10.17.45.00#camshaft#26.10.17.00.00
-unspsc7#26.10.17.46.00#Cylinder head#26.10.17.00.00
-unspsc7#26.10.17.47.00#Push rods#26.10.17.00.00
-unspsc7#26.10.17.48.00#Engine flywheel#26.10.17.00.00
-unspsc7#26.10.17.49.00#Crankshaft#26.10.17.00.00
-unspsc7#26.10.17.50.00#Throttle#26.10.17.00.00
-unspsc7#26.10.17.51.00#Electronic engine controls#26.10.17.00.00
-unspsc7#26.10.17.52.00#Vibration dampers#26.10.17.00.00
-unspsc7#26.10.18.00.00#Motor or generator components#26.10.00.00.00
-unspsc7#26.10.18.01.00#Motor brushes#26.10.18.00.00
-unspsc7#26.10.18.02.00#Armatures#26.10.18.00.00
-unspsc7#26.10.18.03.00#Rotors or stators#26.10.18.00.00
-unspsc7#26.10.18.04.00#Motor mounts or bases#26.10.18.00.00
-unspsc7#26.10.19.00.00#Internal combustion engine components#26.10.00.00.00
-unspsc7#26.10.19.01.00#Crank shafts#26.10.19.00.00
-unspsc7#26.10.19.02.00#Spark plugs#26.10.19.00.00
-unspsc7#26.10.19.03.00#Camshaft#26.10.19.00.00
-unspsc7#26.10.19.04.00#Fuel injection nozzle#26.10.19.00.00
-unspsc7#26.10.19.05.00#Cylinder block#26.10.19.00.00
-unspsc7#26.11.00.00.00#Batteries and generators and kinetic power transmission#26.00.00.00.00
-unspsc7#26.11.15.00.00#Kinetic power transmission#26.11.00.00.00
-unspsc7#26.11.15.01.00#Commutators#26.11.15.00.00
-unspsc7#26.11.15.03.00#Adjustable speed drives#26.11.15.00.00
-unspsc7#26.11.15.04.00#Belt drives#26.11.15.00.00
-unspsc7#26.11.15.05.00#Chain drives#26.11.15.00.00
-unspsc7#26.11.15.06.00#Linear motion devices#26.11.15.00.00
-unspsc7#26.11.15.07.00#Clutches#26.11.15.00.00
-unspsc7#26.11.15.08.00#Power take offs#26.11.15.00.00
-unspsc7#26.11.15.09.00#Transmission yokes#26.11.15.00.00
-unspsc7#26.11.15.10.00#Transmission shafts#26.11.15.00.00
-unspsc7#26.11.15.11.00#Universal joints#26.11.15.00.00
-unspsc7#26.11.15.12.00#Axles#26.11.15.00.00
-unspsc7#26.11.15.13.00#Power transmission chains#26.11.15.00.00
-unspsc7#26.11.15.14.00#Knuckle joints#26.11.15.00.00
-unspsc7#26.11.15.15.00#Servo controller#26.11.15.00.00
-unspsc7#26.11.15.16.00#Step drive or stepper drive or step indexer#26.11.15.00.00
-unspsc7#26.11.15.17.00#Planet carrier#26.11.15.00.00
-unspsc7#26.11.15.18.00#Tension strut#26.11.15.00.00
-unspsc7#26.11.15.19.00#Torque converters#26.11.15.00.00
-unspsc7#26.11.15.20.00#Trunnions#26.11.15.00.00
-unspsc7#26.11.15.21.00#Pusher head#26.11.15.00.00
-unspsc7#26.11.15.22.00#Pusher assembly#26.11.15.00.00
-unspsc7#26.11.15.23.00#Backstops#26.11.15.00.00
-unspsc7#26.11.16.00.00#Power generators#26.11.00.00.00
-unspsc7#26.11.16.01.00#Diesel generators#26.11.16.00.00
-unspsc7#26.11.16.02.00#Hydro electric generators#26.11.16.00.00
-unspsc7#26.11.16.03.00#Wind generators#26.11.16.00.00
-unspsc7#26.11.16.04.00#Gas generators#26.11.16.00.00
-unspsc7#26.11.16.05.00#Thermal generators#26.11.16.00.00
-unspsc7#26.11.16.06.00#Hydraulic generators#26.11.16.00.00
-unspsc7#26.11.16.07.00#Solar generators#26.11.16.00.00
-unspsc7#26.11.17.00.00#Batteries and accessories#26.11.00.00.00
-unspsc7#26.11.17.01.00#Rechargeable batteries#26.11.17.00.00
-unspsc7#26.11.17.02.00#Alkaline batteries#26.11.17.00.00
-unspsc7#26.11.17.03.00#Vehicle batteries#26.11.17.00.00
-unspsc7#26.11.17.04.00#Battery chargers#26.11.17.00.00
-unspsc7#26.11.17.05.00#Dry cell batteries#26.11.17.00.00
-unspsc7#26.11.17.06.00#Electronic batteries#26.11.17.00.00
-unspsc7#26.11.17.07.00#Lead acid batteries#26.11.17.00.00
-unspsc7#26.11.17.08.00#Nickel iron batteries#26.11.17.00.00
-unspsc7#26.11.17.09.00#Nickel cadmium batteries#26.11.17.00.00
-unspsc7#26.11.17.10.00#Product specific battery packs#26.11.17.00.00
-unspsc7#26.11.17.11.00#Lithium batteries#26.11.17.00.00
-unspsc7#26.11.17.12.00#Nickel hydrogen batteries#26.11.17.00.00
-unspsc7#26.11.17.13.00#Thermal batteries#26.11.17.00.00
-unspsc7#26.11.17.14.00#Zync air#26.11.17.00.00
-unspsc7#26.11.17.15.00#Zinc coal battery#26.11.17.00.00
-unspsc7#26.11.17.16.00#Mercury oxide battery#26.11.17.00.00
-unspsc7#26.11.17.17.00#Manganese batteries#26.11.17.00.00
-unspsc7#26.11.17.18.00#Silver oxide batteries#26.11.17.00.00
-unspsc7#26.11.17.19.00#Battery testers#26.11.17.00.00
-unspsc7#26.11.18.00.00#Drive components#26.11.00.00.00
-unspsc7#26.11.18.01.00#V belts#26.11.18.00.00
-unspsc7#26.11.18.02.00#Geared timing belts#26.11.18.00.00
-unspsc7#26.11.18.03.00#Round belts#26.11.18.00.00
-unspsc7#26.11.18.04.00#Flat belts#26.11.18.00.00
-unspsc7#26.11.18.05.00#Belt tensioners#26.11.18.00.00
-unspsc7#26.11.18.06.00#Transmission pulleys#26.11.18.00.00
-unspsc7#26.11.18.07.00#Timing pulley#26.11.18.00.00
-unspsc7#26.11.18.08.00#Trantorque#26.11.18.00.00
-unspsc7#26.11.18.09.00#Belt guards#26.11.18.00.00
-unspsc7#26.11.19.00.00#Clutches#26.11.00.00.00
-unspsc7#26.11.19.01.00#Plate clutches#26.11.19.00.00
-unspsc7#26.11.19.02.00#Diaphragm clutch#26.11.19.00.00
-unspsc7#26.11.19.03.00#Centrifugal clutch#26.11.19.00.00
-unspsc7#26.11.19.04.00#Semi centrifugal clutch#26.11.19.00.00
-unspsc7#26.11.19.05.00#Free wheel clutch#26.11.19.00.00
-unspsc7#26.11.19.06.00#Torque converter#26.11.19.00.00
-unspsc7#26.11.19.07.00#Fluid coupling#26.11.19.00.00
-unspsc7#26.11.19.08.00#Cam clutches#26.11.19.00.00
-unspsc7#26.11.20.00.00#Clutch parts and accessories#26.11.00.00.00
-unspsc7#26.11.20.01.00#Pressure plate#26.11.20.00.00
-unspsc7#26.11.20.02.00#Driven plate#26.11.20.00.00
-unspsc7#26.11.20.03.00#Clutch plates#26.11.20.00.00
-unspsc7#26.11.21.00.00#Industrial braking systems#26.11.00.00.00
-unspsc7#26.11.21.01.00#Air or pneumatic braking systems#26.11.21.00.00
-unspsc7#26.11.21.02.00#Hydraulic braking systems#26.11.21.00.00
-unspsc7#26.11.21.03.00#Mechanical braking systems#26.11.21.00.00
-unspsc7#26.11.21.04.00#Braking clutch assemblies#26.11.21.00.00
-unspsc7#26.12.00.00.00#Electrical wire and cable and harness#26.00.00.00.00
-unspsc7#26.12.15.00.00#Electrical wire#26.12.00.00.00
-unspsc7#26.12.15.01.00#Heating wire#26.12.15.00.00
-unspsc7#26.12.15.05.00#Fixture wire#26.12.15.00.00
-unspsc7#26.12.15.07.00#Radio or television wire#26.12.15.00.00
-unspsc7#26.12.15.08.00#Automotive or aircraft wire#26.12.15.00.00
-unspsc7#26.12.15.09.00#Magnet wire#26.12.15.00.00
-unspsc7#26.12.15.10.00#Trolley wire#26.12.15.00.00
-unspsc7#26.12.15.14.00#Underground wire#26.12.15.00.00
-unspsc7#26.12.15.15.00#Silicon asbestos (SA) wire#26.12.15.00.00
-unspsc7#26.12.15.17.00#Copper wire#26.12.15.00.00
-unspsc7#26.12.15.19.00#Copper clad aluminum wire#26.12.15.00.00
-unspsc7#26.12.15.20.00#Copper steel wire#26.12.15.00.00
-unspsc7#26.12.15.21.00#Bronze wire#26.12.15.00.00
-unspsc7#26.12.15.22.00#Bare wire#26.12.15.00.00
-unspsc7#26.12.15.23.00#Covered but not insulated wire#26.12.15.00.00
-unspsc7#26.12.15.24.00#Insulated or covered wire#26.12.15.00.00
-unspsc7#26.12.15.32.00#Inter connect wire#26.12.15.00.00
-unspsc7#26.12.15.33.00#Kaptan wire#26.12.15.00.00
-unspsc7#26.12.15.34.00#Polymide wire#26.12.15.00.00
-unspsc7#26.12.15.35.00#Extension cord#26.12.15.00.00
-unspsc7#26.12.15.36.00#Extension cord#26.12.15.00.00
-unspsc7#26.12.15.37.00#Wire assembly#26.12.15.00.00
-unspsc7#26.12.15.38.00#Wire assembly#26.12.15.00.00
-unspsc7#26.12.16.00.00#Electrical cable#26.12.00.00.00
-unspsc7#26.12.16.01.00#Heating cable#26.12.16.00.00
-unspsc7#26.12.16.02.00#Submarine cable#26.12.16.00.00
-unspsc7#26.12.16.03.00#Control cable#26.12.16.00.00
-unspsc7#26.12.16.04.00#Signal cable#26.12.16.00.00
-unspsc7#26.12.16.05.00#Automotive or aircraft cable#26.12.16.00.00
-unspsc7#26.12.16.06.00#Coaxial cable#26.12.16.00.00
-unspsc7#26.12.16.07.00#Fiber optic cable#26.12.16.00.00
-unspsc7#26.12.16.08.00#Aerial cable#26.12.16.00.00
-unspsc7#26.12.16.09.00#Network cable#26.12.16.00.00
-unspsc7#26.12.16.10.00#Bronze cable#26.12.16.00.00
-unspsc7#26.12.16.11.00#Bare cable#26.12.16.00.00
-unspsc7#26.12.16.12.00#Covered but not insulated cable#26.12.16.00.00
-unspsc7#26.12.16.13.00#Insulated or covered cable#26.12.16.00.00
-unspsc7#26.12.16.14.00#Building cable#26.12.16.00.00
-unspsc7#26.12.16.15.00#Power cable for direct burial#26.12.16.00.00
-unspsc7#26.12.16.16.00#Telecommunications cable#26.12.16.00.00
-unspsc7#26.12.16.17.00#Triaxial cable#26.12.16.00.00
-unspsc7#26.12.16.18.00#Crosslinked polykaene cable#26.12.16.00.00
-unspsc7#26.12.16.19.00#Floropolymer cable#26.12.16.00.00
-unspsc7#26.12.16.20.00#Inter connect cable#26.12.16.00.00
-unspsc7#26.12.16.21.00#Kaptan cable#26.12.16.00.00
-unspsc7#26.12.16.22.00#Polymide cable#26.12.16.00.00
-unspsc7#26.12.16.23.00#Radio frequency (RF) cable#26.12.16.00.00
-unspsc7#26.12.16.24.00#Ribbon or flat cable#26.12.16.00.00
-unspsc7#26.12.16.25.00#Copper cable#26.12.16.00.00
-unspsc7#26.12.17.00.00#Wiring harness#26.12.00.00.00
-unspsc7#26.12.17.01.00#Panel wiring harness#26.12.17.00.00
-unspsc7#26.12.17.02.00#Trunk wiring harness#26.12.17.00.00
-unspsc7#26.12.17.03.00#Communication wiring harness#26.12.17.00.00
-unspsc7#26.12.17.04.00#Specialty wiring harness#26.12.17.00.00
-unspsc7#26.13.00.00.00#Power generation#26.00.00.00.00
-unspsc7#26.13.15.00.00#Power plants#26.13.00.00.00
-unspsc7#26.13.15.01.00#Diesel power plants#26.13.15.00.00
-unspsc7#26.13.15.02.00#Geothermal power plants#26.13.15.00.00
-unspsc7#26.13.15.03.00#Hydro power plants#26.13.15.00.00
-unspsc7#26.13.15.04.00#Gas power plants#26.13.15.00.00
-unspsc7#26.13.15.05.00#Marine power plants#26.13.15.00.00
-unspsc7#26.13.15.06.00#Petrol power plants#26.13.15.00.00
-unspsc7#26.13.15.07.00#Solar power plants#26.13.15.00.00
-unspsc7#26.13.15.08.00#Steam power plants#26.13.15.00.00
-unspsc7#26.13.15.09.00#Wind power plants#26.13.15.00.00
-unspsc7#26.13.15.10.00#Thermal power plants#26.13.15.00.00
-unspsc7#26.14.00.00.00#Atomic and nuclear energy machinery and equipment#26.00.00.00.00
-unspsc7#26.14.16.00.00#Subcritical assembly equipment#26.14.00.00.00
-unspsc7#26.14.16.01.00#Subcritical assembly fuel#26.14.16.00.00
-unspsc7#26.14.16.02.00#Subcritical assembly components#26.14.16.00.00
-unspsc7#26.14.16.03.00#Subcritical assembly moderator#26.14.16.00.00
-unspsc7#26.14.17.00.00#Dosimetry equipment#26.14.00.00.00
-unspsc7#26.14.17.01.00#Ionization chamber dosimeters#26.14.17.00.00
-unspsc7#26.14.17.02.00#Dosimeters#26.14.17.00.00
-unspsc7#26.14.17.03.00#Secondary standard dosimetry systems#26.14.17.00.00
-unspsc7#26.14.17.04.00#Phantom dosimeters#26.14.17.00.00
-unspsc7#26.14.18.00.00#Hot cell devices#26.14.00.00.00
-unspsc7#26.14.18.01.00#Hot cell remote handling equipment#26.14.18.00.00
-unspsc7#26.14.18.02.00#Hot cell remote viewing device#26.14.18.00.00
-unspsc7#26.14.18.03.00#Hot cell shielding doors#26.14.18.00.00
-unspsc7#26.14.18.04.00#Hot cell samplers#26.14.18.00.00
-unspsc7#26.14.18.05.00#Hot cell sample processing equipment#26.14.18.00.00
-unspsc7#26.14.18.06.00#Hot cell special tools#26.14.18.00.00
-unspsc7#26.14.18.07.00#Hot cell lead glass windows#26.14.18.00.00
-unspsc7#26.14.18.08.00#Hot cell decontamination systems#26.14.18.00.00
-unspsc7#26.14.18.09.00#Hot cell penetration devices#26.14.18.00.00
-unspsc7#26.14.19.00.00#Industrial nucleonic instruments#26.14.00.00.00
-unspsc7#26.14.19.01.00#Industrial nucleonic airborne dust measuring systems#26.14.19.00.00
-unspsc7#26.14.19.02.00#Beta gauge measuring systems#26.14.19.00.00
-unspsc7#26.14.19.04.00#Industrial nucleonic liquid level gauges#26.14.19.00.00
-unspsc7#26.14.19.05.00#Industrial nucleonic mass per unit ore measuring systems#26.14.19.00.00
-unspsc7#26.14.19.06.00#Industrial nucleonic moisture measuring systems#26.14.19.00.00
-unspsc7#26.14.19.07.00#Industrial nucleonic thickness measuring systems#26.14.19.00.00
-unspsc7#26.14.19.08.00#Industrial nucleonic flow measuring systems#26.14.19.00.00
-unspsc7#26.14.19.09.00#Isotope separators#26.14.19.00.00
-unspsc7#26.14.19.10.00#Isotope production facilities#26.14.19.00.00
-unspsc7#26.14.19.11.00#Isotope calibrator activity meters#26.14.19.00.00
-unspsc7#26.14.20.00.00#Irradiation equipment#26.14.00.00.00
-unspsc7#26.14.20.01.00#Irradiation gamma sources#26.14.20.00.00
-unspsc7#26.14.20.02.00#Magnet systems#26.14.20.00.00
-unspsc7#26.14.20.03.00#NIM nuclear electronic units#26.14.20.00.00
-unspsc7#26.14.20.04.00#Neutron irradiators#26.14.20.00.00
-unspsc7#26.14.20.05.00#Irradiation testing capsules#26.14.20.00.00
-unspsc7#26.14.20.06.00#Irradiation sample transfer system#26.14.20.00.00
-unspsc7#26.14.20.07.00#Neutron generators#26.14.20.00.00
-unspsc7#26.14.21.00.00#Nuclear reactor equipment#26.14.00.00.00
-unspsc7#26.14.21.01.00#Nuclear reactor specimen irradiation containers#26.14.21.00.00
-unspsc7#26.14.21.06.00#Nuclear reactor control rod systems#26.14.21.00.00
-unspsc7#26.14.21.08.00#Nuclear reactor in core neutron flux instrumentation#26.14.21.00.00
-unspsc7#26.14.21.17.00#Nuclear reactor earthquake instrumentation#26.14.21.00.00
-unspsc7#26.14.22.00.00#Nuclear fuel equipment#26.14.00.00.00
-unspsc7#26.14.22.01.00#Nuclear fuel cladding tubes#26.14.22.00.00
-unspsc7#26.14.22.02.00#Nuclear fuel element failure detection systems#26.14.22.00.00
-unspsc7#26.14.23.00.00#Radiation shielding equipment#26.14.00.00.00
-unspsc7#26.14.23.02.00#Lead screens#26.14.23.00.00
-unspsc7#26.14.23.03.00#Film badges#26.14.23.00.00
-unspsc7#26.14.23.04.00#Radiographic equipment#26.14.23.00.00
-unspsc7#26.14.23.06.00#Shielded containers for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.07.00#Lead chambers or safes for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.08.00#Lead bricks for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.10.00#Glove boxes for radiation protection#26.14.23.00.00
-unspsc7#26.14.23.11.00#Radiation shielding windows#26.14.23.00.00
-unspsc7#26.14.23.12.00#Lead for radiation shielding#26.14.23.00.00
-unspsc7#26.14.24.00.00#Radioactive waste equipment#26.14.00.00.00
-unspsc7#26.14.24.01.00#Radioactive waste treatment compactors or incinerators#26.14.24.00.00
-unspsc7#26.14.24.02.00#Nuclear radiation absorbers#26.14.24.00.00
-unspsc7#26.14.24.03.00#Atomic energy evaporators or concentrators or dryers#26.14.24.00.00
-unspsc7#26.14.24.04.00#Door interlocking systems#26.14.24.00.00
-unspsc7#26.14.24.05.00#Radioactive waste dosage systems#26.14.24.00.00
-unspsc7#26.14.24.06.00#Radioactive waste solidification systems#26.14.24.00.00
-unspsc7#26.14.24.07.00#Radioactive waste disposal systems#26.14.24.00.00
-unspsc7#26.14.24.08.00#Radioactive waste treatment facilities#26.14.24.00.00
-unspsc7#27.00.00.00.00#Tools and General Machinery#27.00.00.00.00
-unspsc7#27.11.00.00.00#Hand tools#27.00.00.00.00
-unspsc7#27.11.15.00.00#Cutting and crimping and punching tools#27.11.00.00.00
-unspsc7#27.11.15.01.00#Knife blades#27.11.15.00.00
-unspsc7#27.11.15.02.00#Razor knives#27.11.15.00.00
-unspsc7#27.11.15.03.00#Utility knives#27.11.15.00.00
-unspsc7#27.11.15.04.00#Pocket knives#27.11.15.00.00
-unspsc7#27.11.15.05.00#Punches or nail sets or drifts#27.11.15.00.00
-unspsc7#27.11.15.06.00#Shears#27.11.15.00.00
-unspsc7#27.11.15.07.00#Metal cutters#27.11.15.00.00
-unspsc7#27.11.15.08.00#Saws#27.11.15.00.00
-unspsc7#27.11.15.09.00#Augers#27.11.15.00.00
-unspsc7#27.11.15.10.00#Stripping tools#27.11.15.00.00
-unspsc7#27.11.15.11.00#Wire cutters#27.11.15.00.00
-unspsc7#27.11.15.12.00#Bolt cutters#27.11.15.00.00
-unspsc7#27.11.15.13.00#Hose cutter#27.11.15.00.00
-unspsc7#27.11.15.14.00#Glass cutters#27.11.15.00.00
-unspsc7#27.11.15.15.00#Hand or push drill#27.11.15.00.00
-unspsc7#27.11.15.16.00#Punching pliers#27.11.15.00.00
-unspsc7#27.11.15.17.00#Knife blade sets or dispensers#27.11.15.00.00
-unspsc7#27.11.15.20.00#Nut splitters#27.11.15.00.00
-unspsc7#27.11.15.21.00#Nibblers#27.11.15.00.00
-unspsc7#27.11.16.00.00#Forming tools#27.11.00.00.00
-unspsc7#27.11.16.01.00#Mallets#27.11.16.00.00
-unspsc7#27.11.16.02.00#Hammers#27.11.16.00.00
-unspsc7#27.11.16.03.00#Anvils#27.11.16.00.00
-unspsc7#27.11.16.04.00#Hatchets#27.11.16.00.00
-unspsc7#27.11.16.05.00#Picks#27.11.16.00.00
-unspsc7#27.11.16.06.00#Bolt cutters#27.11.16.00.00
-unspsc7#27.11.16.07.00#Swaging tools#27.11.16.00.00
-unspsc7#27.11.17.00.00#Wrenches and drivers#27.11.00.00.00
-unspsc7#27.11.17.01.00#Screwdrivers#27.11.17.00.00
-unspsc7#27.11.17.02.00#Nut drivers#27.11.17.00.00
-unspsc7#27.11.17.03.00#Socket sets#27.11.17.00.00
-unspsc7#27.11.17.04.00#Sockets#27.11.17.00.00
-unspsc7#27.11.17.05.00#Box end wrenches#27.11.17.00.00
-unspsc7#27.11.17.06.00#Open end wrenches#27.11.17.00.00
-unspsc7#27.11.17.07.00#Adjustable wrenches#27.11.17.00.00
-unspsc7#27.11.17.08.00#Pipe wrenches#27.11.17.00.00
-unspsc7#27.11.17.09.00#Screw extractors#27.11.17.00.00
-unspsc7#27.11.17.10.00#Hex keys#27.11.17.00.00
-unspsc7#27.11.17.11.00#Ratchets#27.11.17.00.00
-unspsc7#27.11.17.12.00#Pullers#27.11.17.00.00
-unspsc7#27.11.17.13.00#Combination wrenches#27.11.17.00.00
-unspsc7#27.11.17.14.00#Specialty wrenches#27.11.17.00.00
-unspsc7#27.11.17.15.00#Torque wrenches#27.11.17.00.00
-unspsc7#27.11.17.16.00#Torx keys#27.11.17.00.00
-unspsc7#27.11.17.17.00#Pipe extractors#27.11.17.00.00
-unspsc7#27.11.17.18.00#Tap extractors#27.11.17.00.00
-unspsc7#27.11.17.19.00#Torque wrench#27.11.17.00.00
-unspsc7#27.11.17.20.00#T handle tap wrenches#27.11.17.00.00
-unspsc7#27.11.17.21.00#Cranks#27.11.17.00.00
-unspsc7#27.11.17.22.00#Die stocks#27.11.17.00.00
-unspsc7#27.11.17.23.00#Tube wrenches#27.11.17.00.00
-unspsc7#27.11.17.24.00#Hook wrenches#27.11.17.00.00
-unspsc7#27.11.17.25.00#Offset socket wrenches#27.11.17.00.00
-unspsc7#27.11.17.26.00#Spanner wrenches#27.11.17.00.00
-unspsc7#27.11.18.00.00#Measuring and layout tools#27.11.00.00.00
-unspsc7#27.11.18.01.00#Tape measures#27.11.18.00.00
-unspsc7#27.11.18.02.00#Levels#27.11.18.00.00
-unspsc7#27.11.18.03.00#Squares#27.11.18.00.00
-unspsc7#27.11.18.04.00#Plumb bobs#27.11.18.00.00
-unspsc7#27.11.18.05.00#Protractors#27.11.18.00.00
-unspsc7#27.11.18.06.00#Nail or router gauges#27.11.18.00.00
-unspsc7#27.11.18.07.00#Straight edges#27.11.18.00.00
-unspsc7#27.11.18.08.00#Rules#27.11.18.00.00
-unspsc7#27.11.18.09.00#Bevels#27.11.18.00.00
-unspsc7#27.11.18.10.00#Stud finders#27.11.18.00.00
-unspsc7#27.11.18.11.00#Calipers#27.11.18.00.00
-unspsc7#27.11.19.00.00#Rough and finishing tools#27.11.00.00.00
-unspsc7#27.11.19.01.00#Cold chisels#27.11.19.00.00
-unspsc7#27.11.19.02.00#Files#27.11.19.00.00
-unspsc7#27.11.19.03.00#Planes#27.11.19.00.00
-unspsc7#27.11.19.04.00#Rasps#27.11.19.00.00
-unspsc7#27.11.19.05.00#Grinders#27.11.19.00.00
-unspsc7#27.11.19.06.00#Wood chisels#27.11.19.00.00
-unspsc7#27.11.19.07.00#Wire brushes#27.11.19.00.00
-unspsc7#27.11.19.08.00#Sharpening tools or kits#27.11.19.00.00
-unspsc7#27.11.19.09.00#Spatulas#27.11.19.00.00
-unspsc7#27.11.19.11.00#Cross cut chisels#27.11.19.00.00
-unspsc7#27.11.20.00.00#Garden tools#27.11.00.00.00
-unspsc7#27.11.20.01.00#Machetes#27.11.20.00.00
-unspsc7#27.11.20.02.00#Spades#27.11.20.00.00
-unspsc7#27.11.20.03.00#Rakes#27.11.20.00.00
-unspsc7#27.11.20.04.00#Shovels#27.11.20.00.00
-unspsc7#27.11.20.05.00#Axes#27.11.20.00.00
-unspsc7#27.11.20.06.00#Scythes#27.11.20.00.00
-unspsc7#27.11.20.07.00#Secateurs or pruning shears#27.11.20.00.00
-unspsc7#27.11.20.08.00#Hoes#27.11.20.00.00
-unspsc7#27.11.20.09.00#Scrapers#27.11.20.00.00
-unspsc7#27.11.20.10.00#Garden forks#27.11.20.00.00
-unspsc7#27.11.20.11.00#Tool handles#27.11.20.00.00
-unspsc7#27.11.20.12.00#Garden riddles#27.11.20.00.00
-unspsc7#27.11.20.13.00#Post hole digger#27.11.20.00.00
-unspsc7#27.11.20.14.00#Lawnmowers#27.11.20.00.00
-unspsc7#27.11.20.15.00#Lawn scarifiers#27.11.20.00.00
-unspsc7#27.11.20.16.00#Hedge clippers#27.11.20.00.00
-unspsc7#27.11.20.17.00#Digging bars#27.11.20.00.00
-unspsc7#27.11.21.00.00#Holding and clamping tools#27.11.00.00.00
-unspsc7#27.11.21.01.00#Pipe vises#27.11.21.00.00
-unspsc7#27.11.21.02.00#Bench vises#27.11.21.00.00
-unspsc7#27.11.21.03.00#Hand clamps#27.11.21.00.00
-unspsc7#27.11.21.04.00#Tongs#27.11.21.00.00
-unspsc7#27.11.21.05.00#Tweezers#27.11.21.00.00
-unspsc7#27.11.21.06.00#Linemans pliers#27.11.21.00.00
-unspsc7#27.11.21.07.00#Adjustable widemouth pliers#27.11.21.00.00
-unspsc7#27.11.21.08.00#Needlenose pliers#27.11.21.00.00
-unspsc7#27.11.21.09.00#Magnetic tools#27.11.21.00.00
-unspsc7#27.11.21.10.00#Retaining ring pliers#27.11.21.00.00
-unspsc7#27.11.21.11.00#Alligator pliers#27.11.21.00.00
-unspsc7#27.11.21.12.00#Tongue and groove pliers#27.11.21.00.00
-unspsc7#27.11.21.13.00#Slip or groove joint pliers#27.11.21.00.00
-unspsc7#27.11.21.14.00#Diagonal cut pliers#27.11.21.00.00
-unspsc7#27.11.21.15.00#Locking pliers#27.11.21.00.00
-unspsc7#27.11.21.16.00#Fence pliers#27.11.21.00.00
-unspsc7#27.11.21.17.00#End cut pliers#27.11.21.00.00
-unspsc7#27.11.21.18.00#Wire lug crimping tool#27.11.21.00.00
-unspsc7#27.11.21.19.00#Light bulb changer#27.11.21.00.00
-unspsc7#27.11.21.20.00#C clamps#27.11.21.00.00
-unspsc7#27.11.21.21.00#Corner clamps#27.11.21.00.00
-unspsc7#27.11.21.22.00#Sheet metal pliers#27.11.21.00.00
-unspsc7#27.11.21.23.00#Bench dog#27.11.21.00.00
-unspsc7#27.11.21.24.00#Tensioners#27.11.21.00.00
-unspsc7#27.11.21.25.00#Round nose pliers#27.11.21.00.00
-unspsc7#27.11.21.26.00#Flat nose pliers#27.11.21.00.00
-unspsc7#27.11.21.27.00#Strap wrenches#27.11.21.00.00
-unspsc7#27.11.22.00.00#Masonry and concrete tools#27.11.00.00.00
-unspsc7#27.11.22.01.00#Trowels#27.11.22.00.00
-unspsc7#27.11.22.02.00#Floats#27.11.22.00.00
-unspsc7#27.11.22.03.00#Edgers#27.11.22.00.00
-unspsc7#27.11.22.04.00#Cement mixers#27.11.22.00.00
-unspsc7#27.11.23.00.00#Marking tools#27.11.00.00.00
-unspsc7#27.11.23.01.00#Branders#27.11.23.00.00
-unspsc7#27.11.23.02.00#Awls#27.11.23.00.00
-unspsc7#27.11.23.03.00#Scribers#27.11.23.00.00
-unspsc7#27.11.23.04.00#Chalk lines#27.11.23.00.00
-unspsc7#27.11.23.05.00#Metal markers or holders#27.11.23.00.00
-unspsc7#27.11.23.06.00#Metal stamps#27.11.23.00.00
-unspsc7#27.11.24.00.00#Fastener setting tools#27.11.00.00.00
-unspsc7#27.11.24.01.00#Staple guns#27.11.24.00.00
-unspsc7#27.11.24.02.00#Rivet tools#27.11.24.00.00
-unspsc7#27.11.24.03.00#Banders#27.11.24.00.00
-unspsc7#27.11.24.04.00#Anchor setting tools#27.11.24.00.00
-unspsc7#27.11.24.05.00#Bolt heaters#27.11.24.00.00
-unspsc7#27.11.25.00.00#Prying and bending tools#27.11.00.00.00
-unspsc7#27.11.25.01.00#Pipe bending tools#27.11.25.00.00
-unspsc7#27.11.25.02.00#Pry bars#27.11.25.00.00
-unspsc7#27.11.25.03.00#Conduit benders#27.11.25.00.00
-unspsc7#27.11.25.04.00#Wedges#27.11.25.00.00
-unspsc7#27.11.25.05.00#Packing hooks#27.11.25.00.00
-unspsc7#27.11.25.06.00#Hickeys#27.11.25.00.00
-unspsc7#27.11.26.00.00#Sealing tools#27.11.00.00.00
-unspsc7#27.11.26.01.00#Putty knives#27.11.26.00.00
-unspsc7#27.11.26.02.00#Caulking tools#27.11.26.00.00
-unspsc7#27.11.27.00.00#Power tools#27.11.00.00.00
-unspsc7#27.11.27.01.00#Power blowers#27.11.27.00.00
-unspsc7#27.11.27.02.00#Power buffers#27.11.27.00.00
-unspsc7#27.11.27.03.00#Power drills#27.11.27.00.00
-unspsc7#27.11.27.04.00#Power grinders#27.11.27.00.00
-unspsc7#27.11.27.05.00#Demolition hammers#27.11.27.00.00
-unspsc7#27.11.27.06.00#Power planes#27.11.27.00.00
-unspsc7#27.11.27.07.00#Power routers#27.11.27.00.00
-unspsc7#27.11.27.08.00#Power sanders#27.11.27.00.00
-unspsc7#27.11.27.09.00#Power saws#27.11.27.00.00
-unspsc7#27.11.27.10.00#Power screwguns#27.11.27.00.00
-unspsc7#27.11.27.11.00#Power staple guns#27.11.27.00.00
-unspsc7#27.11.27.12.00#Power trimmers#27.11.27.00.00
-unspsc7#27.11.27.13.00#Impact wrenches#27.11.27.00.00
-unspsc7#27.11.27.14.00#Power caulking guns#27.11.27.00.00
-unspsc7#27.11.27.15.00#Power chippers#27.11.27.00.00
-unspsc7#27.11.27.16.00#Power nail guns#27.11.27.00.00
-unspsc7#27.11.27.17.00#Heat guns#27.11.27.00.00
-unspsc7#27.11.27.18.00#Engravers#27.11.27.00.00
-unspsc7#27.11.27.19.00#Glue guns#27.11.27.00.00
-unspsc7#27.11.27.20.00#Torque tools#27.11.27.00.00
-unspsc7#27.11.27.21.00#Biscuit jointers#27.11.27.00.00
-unspsc7#27.11.28.00.00#Tool attachments#27.11.00.00.00
-unspsc7#27.11.28.01.00#Drill bits#27.11.28.00.00
-unspsc7#27.11.28.02.00#Saw blades#27.11.28.00.00
-unspsc7#27.11.28.03.00#End mills#27.11.28.00.00
-unspsc7#27.11.28.04.00#Stamping dies or punches#27.11.28.00.00
-unspsc7#27.11.28.05.00#Threading dies#27.11.28.00.00
-unspsc7#27.11.28.06.00#Threading taps#27.11.28.00.00
-unspsc7#27.11.28.07.00#Chucks#27.11.28.00.00
-unspsc7#27.11.28.08.00#Collets#27.11.28.00.00
-unspsc7#27.11.28.09.00#Tool holders#27.11.28.00.00
-unspsc7#27.11.28.10.00#Thread repair kits#27.11.28.00.00
-unspsc7#27.11.28.11.00#Arbors#27.11.28.00.00
-unspsc7#27.11.28.12.00#Countersinks#27.11.28.00.00
-unspsc7#27.11.28.13.00#Extension pole#27.11.28.00.00
-unspsc7#27.11.28.14.00#Screwdriver bits#27.11.28.00.00
-unspsc7#27.11.28.15.00#Nut driver bits#27.11.28.00.00
-unspsc7#27.11.28.16.00#Abrasive disk#27.11.28.00.00
-unspsc7#27.11.28.17.00#Hole saws#27.11.28.00.00
-unspsc7#27.11.28.18.00#Vise jaw liners or caps#27.11.28.00.00
-unspsc7#27.11.28.19.00#Skiving tool cutter blades#27.11.28.00.00
-unspsc7#27.11.28.21.00#Router bits#27.11.28.00.00
-unspsc7#27.11.29.00.00#Dispensing tools#27.11.00.00.00
-unspsc7#27.11.29.01.00#Grease guns#27.11.29.00.00
-unspsc7#27.11.29.02.00#Industrial funnels#27.11.29.00.00
-unspsc7#27.11.29.03.00#Hand sprayers#27.11.29.00.00
-unspsc7#27.11.29.04.00#Resin guns#27.11.29.00.00
-unspsc7#27.11.29.05.00#Oil can#27.11.29.00.00
-unspsc7#27.11.29.06.00#Caulking guns#27.11.29.00.00
-unspsc7#27.11.29.07.00#Broadcast spreaders#27.11.29.00.00
-unspsc7#27.11.30.00.00#Brushes#27.11.00.00.00
-unspsc7#27.11.30.01.00#Scratch brushes#27.11.30.00.00
-unspsc7#27.11.30.02.00#Tube brushes#27.11.30.00.00
-unspsc7#27.11.30.03.00#Applicator brushes#27.11.30.00.00
-unspsc7#27.11.31.00.00#Pulling tools#27.11.00.00.00
-unspsc7#27.11.31.01.00#Fish tape#27.11.31.00.00
-unspsc7#27.11.31.02.00#Fuse pullers#27.11.31.00.00
-unspsc7#27.11.32.00.00#Tool kits#27.11.00.00.00
-unspsc7#27.11.32.01.00#General tool kits#27.11.32.00.00
-unspsc7#27.11.32.02.00#Bearing fitting tool kits#27.11.32.00.00
-unspsc7#27.11.32.03.00#Computer tool kits#27.11.32.00.00
-unspsc7#27.11.32.04.00#Electrician kits#27.11.32.00.00
-unspsc7#27.12.00.00.00#Hydraulic machinery and equipment#27.00.00.00.00
-unspsc7#27.12.15.00.00#Hydraulic presses#27.12.00.00.00
-unspsc7#27.12.15.01.00#Press return springs#27.12.15.00.00
-unspsc7#27.12.16.00.00#Hydraulic cylinders and pistons#27.12.00.00.00
-unspsc7#27.12.16.01.00#Cylinder pistons#27.12.16.00.00
-unspsc7#27.12.16.02.00#Hydraulic cylinders#27.12.16.00.00
-unspsc7#27.12.17.00.00#Hydraulic hose and tube fittings#27.12.00.00.00
-unspsc7#27.12.17.01.00#Hydraulic quick connectors#27.12.17.00.00
-unspsc7#27.12.17.02.00#Hydraulic tees or crosses#27.12.17.00.00
-unspsc7#27.12.17.03.00#Ferrules#27.12.17.00.00
-unspsc7#27.12.17.04.00#Hydraulic unions#27.12.17.00.00
-unspsc7#27.12.17.05.00#Hydraulic or compression elbows#27.12.17.00.00
-unspsc7#27.12.17.06.00#Ferrule nuts#27.12.17.00.00
-unspsc7#27.12.17.07.00#Crimp connectors#27.12.17.00.00
-unspsc7#27.12.18.00.00#Hydraulic quick connectors#27.12.00.00.00
-unspsc7#27.12.19.00.00#Hydraulic tees or crosses#27.12.00.00.00
-unspsc7#27.12.20.00.00#Ferrules#27.12.00.00.00
-unspsc7#27.12.30.00.00#Hydraulic unions#27.12.00.00.00
-unspsc7#27.12.40.00.00#Hydraulic or compression elbows#27.12.00.00.00
-unspsc7#27.12.50.00.00#Ferrule nuts#27.12.00.00.00
-unspsc7#27.12.60.00.00#Crimp connectors#27.12.00.00.00
-unspsc7#27.12.61.00.00#Hydraulic tools#27.12.00.00.00
-unspsc7#27.12.61.01.00#Manhole cover lifters#27.12.61.00.00
-unspsc7#27.13.00.00.00#Pneumatic machinery and equipment#27.00.00.00.00
-unspsc7#27.13.15.00.00#Pneumatic tools#27.13.00.00.00
-unspsc7#27.13.15.01.00#Pneumatic impact wrenches#27.13.15.00.00
-unspsc7#27.13.15.02.00#Compressed air gun#27.13.15.00.00
-unspsc7#27.13.15.03.00#Pneumatic screwdriver#27.13.15.00.00
-unspsc7#27.13.15.04.00#Pneumatic hammer#27.13.15.00.00
-unspsc7#27.13.15.05.00#Pneumatic drill#27.13.15.00.00
-unspsc7#27.13.15.06.00#Pneumatic nail drivers#27.13.15.00.00
-unspsc7#27.13.15.07.00#Pneumatic sanding machines#27.13.15.00.00
-unspsc7#27.13.16.00.00#Air fittings and connectors#27.13.00.00.00
-unspsc7#27.13.16.01.00#Air manifolds#27.13.16.00.00
-unspsc7#27.13.16.02.00#Filters#27.13.16.00.00
-unspsc7#27.13.16.03.00#Regulator#27.13.16.00.00
-unspsc7#27.13.16.04.00#Lubricator#27.13.16.00.00
-unspsc7#27.13.16.05.00#Air curtain#27.13.16.00.00
-unspsc7#27.13.16.06.00#Air coupling#27.13.16.00.00
-unspsc7#30.00.00.00.00#Structures and Building and Construction and Manufacturing Components and Supplies#30.00.00.00.00
-unspsc7#30.10.00.00.00#Structural materials and basic shapes#30.00.00.00.00
-unspsc7#30.10.15.00.00#Angles#30.10.00.00.00
-unspsc7#30.10.15.01.00#Ferrous alloy angles#30.10.15.00.00
-unspsc7#30.10.15.02.00#Non ferrous alloy angles#30.10.15.00.00
-unspsc7#30.10.15.03.00#Iron angles#30.10.15.00.00
-unspsc7#30.10.15.04.00#Steel angles#30.10.15.00.00
-unspsc7#30.10.15.05.00#Stainless steel angles#30.10.15.00.00
-unspsc7#30.10.15.06.00#Aluminum angles#30.10.15.00.00
-unspsc7#30.10.15.07.00#Magnesium angles#30.10.15.00.00
-unspsc7#30.10.15.08.00#Titanium angles#30.10.15.00.00
-unspsc7#30.10.15.09.00#Copper angles#30.10.15.00.00
-unspsc7#30.10.15.10.00#Brass angles#30.10.15.00.00
-unspsc7#30.10.15.11.00#Bronze angles#30.10.15.00.00
-unspsc7#30.10.15.12.00#Zinc angles#30.10.15.00.00
-unspsc7#30.10.15.13.00#Tin angles#30.10.15.00.00
-unspsc7#30.10.15.14.00#Lead angles#30.10.15.00.00
-unspsc7#30.10.15.15.00#Plastic angles#30.10.15.00.00
-unspsc7#30.10.15.16.00#Rubber angles#30.10.15.00.00
-unspsc7#30.10.15.17.00#Precious metal angles#30.10.15.00.00
-unspsc7#30.10.16.00.00#Bar#30.10.00.00.00
-unspsc7#30.10.16.01.00#Ferrous alloy bars#30.10.16.00.00
-unspsc7#30.10.16.02.00#Non ferrous alloy bars#30.10.16.00.00
-unspsc7#30.10.16.03.00#Iron bars#30.10.16.00.00
-unspsc7#30.10.16.04.00#Steel bars#30.10.16.00.00
-unspsc7#30.10.16.05.00#Stainless steel bars#30.10.16.00.00
-unspsc7#30.10.16.06.00#Aluminum bars#30.10.16.00.00
-unspsc7#30.10.16.07.00#Magnesium bars#30.10.16.00.00
-unspsc7#30.10.16.08.00#Titanium bars#30.10.16.00.00
-unspsc7#30.10.16.09.00#Copper bars#30.10.16.00.00
-unspsc7#30.10.16.10.00#Brass bars#30.10.16.00.00
-unspsc7#30.10.16.11.00#Bronze bars#30.10.16.00.00
-unspsc7#30.10.16.12.00#Zinc bars#30.10.16.00.00
-unspsc7#30.10.16.13.00#Tin bars#30.10.16.00.00
-unspsc7#30.10.16.14.00#Lead bars#30.10.16.00.00
-unspsc7#30.10.16.15.00#Plastic bars#30.10.16.00.00
-unspsc7#30.10.16.16.00#Precious metal bars#30.10.16.00.00
-unspsc7#30.10.16.17.00#Wooden bars#30.10.16.00.00
-unspsc7#30.10.17.00.00#Beams#30.10.00.00.00
-unspsc7#30.10.17.01.00#Ferrous alloy beams#30.10.17.00.00
-unspsc7#30.10.17.02.00#Non ferrous alloy beams#30.10.17.00.00
-unspsc7#30.10.17.03.00#Iron beams#30.10.17.00.00
-unspsc7#30.10.17.04.00#Steel beams#30.10.17.00.00
-unspsc7#30.10.17.05.00#Stainless steel beams#30.10.17.00.00
-unspsc7#30.10.17.06.00#Aluminum beams#30.10.17.00.00
-unspsc7#30.10.17.07.00#Magnesium beams#30.10.17.00.00
-unspsc7#30.10.17.08.00#Titanium beams#30.10.17.00.00
-unspsc7#30.10.17.09.00#Copper beams#30.10.17.00.00
-unspsc7#30.10.17.10.00#Brass beams#30.10.17.00.00
-unspsc7#30.10.17.11.00#Bronze beams#30.10.17.00.00
-unspsc7#30.10.17.12.00#Zinc beams#30.10.17.00.00
-unspsc7#30.10.17.13.00#Tin beams#30.10.17.00.00
-unspsc7#30.10.17.14.00#Lead beams#30.10.17.00.00
-unspsc7#30.10.17.15.00#Plastic beams#30.10.17.00.00
-unspsc7#30.10.17.16.00#Rubber beams#30.10.17.00.00
-unspsc7#30.10.17.17.00#Concrete beams#30.10.17.00.00
-unspsc7#30.10.17.18.00#Precious metal beams#30.10.17.00.00
-unspsc7#30.10.18.00.00#Channels#30.10.00.00.00
-unspsc7#30.10.18.01.00#Ferrous alloy channels#30.10.18.00.00
-unspsc7#30.10.18.02.00#Non ferrous alloy channels#30.10.18.00.00
-unspsc7#30.10.18.03.00#Iron channels#30.10.18.00.00
-unspsc7#30.10.18.04.00#Steel channels#30.10.18.00.00
-unspsc7#30.10.18.05.00#Stainless steel channels#30.10.18.00.00
-unspsc7#30.10.18.06.00#Aluminum channels#30.10.18.00.00
-unspsc7#30.10.18.07.00#Magnesium channels#30.10.18.00.00
-unspsc7#30.10.18.08.00#Titanium channnels#30.10.18.00.00
-unspsc7#30.10.18.09.00#Copper channels#30.10.18.00.00
-unspsc7#30.10.18.10.00#Brass channels#30.10.18.00.00
-unspsc7#30.10.18.11.00#Bronze channels#30.10.18.00.00
-unspsc7#30.10.18.12.00#Zinc channels#30.10.18.00.00
-unspsc7#30.10.18.13.00#Tin channels#30.10.18.00.00
-unspsc7#30.10.18.14.00#Lead channels#30.10.18.00.00
-unspsc7#30.10.18.15.00#Plastic channels#30.10.18.00.00
-unspsc7#30.10.18.16.00#Rubber channels#30.10.18.00.00
-unspsc7#30.10.18.17.00#Precious metal channels#30.10.18.00.00
-unspsc7#30.10.19.00.00#Coil#30.10.00.00.00
-unspsc7#30.10.19.01.00#Ferrous alloy coil#30.10.19.00.00
-unspsc7#30.10.19.02.00#Non ferrous alloy coil#30.10.19.00.00
-unspsc7#30.10.19.03.00#Iron coil#30.10.19.00.00
-unspsc7#30.10.19.04.00#Steel coil#30.10.19.00.00
-unspsc7#30.10.19.05.00#Stainless steel coil#30.10.19.00.00
-unspsc7#30.10.19.06.00#Aluminum coil#30.10.19.00.00
-unspsc7#30.10.19.07.00#Magnesium coil#30.10.19.00.00
-unspsc7#30.10.19.08.00#Titanium coil#30.10.19.00.00
-unspsc7#30.10.19.09.00#Copper coil#30.10.19.00.00
-unspsc7#30.10.19.10.00#Brass coil#30.10.19.00.00
-unspsc7#30.10.19.11.00#Bronze coil#30.10.19.00.00
-unspsc7#30.10.19.12.00#Zinc coil#30.10.19.00.00
-unspsc7#30.10.19.13.00#Tin coil#30.10.19.00.00
-unspsc7#30.10.19.14.00#Lead coil#30.10.19.00.00
-unspsc7#30.10.19.15.00#Plastic coil#30.10.19.00.00
-unspsc7#30.10.19.16.00#Precious metal coils#30.10.19.00.00
-unspsc7#30.10.19.17.00#Non metallic coils#30.10.19.00.00
-unspsc7#30.10.19.18.00#Perforated steel#30.10.19.00.00
-unspsc7#30.10.19.19.00#Embossed steel#30.10.19.00.00
-unspsc7#30.10.19.20.00#Compressed fiber coil#30.10.19.00.00
-unspsc7#30.10.19.21.00#Fiber and rubber coil#30.10.19.00.00
-unspsc7#30.10.19.22.00#Graphite coil#30.10.19.00.00
-unspsc7#30.10.20.00.00#Foil#30.10.00.00.00
-unspsc7#30.10.20.01.00#Ferrous alloy foil#30.10.20.00.00
-unspsc7#30.10.20.02.00#Non ferrous alloy foil#30.10.20.00.00
-unspsc7#30.10.20.03.00#Iron foil#30.10.20.00.00
-unspsc7#30.10.20.04.00#Steel foil#30.10.20.00.00
-unspsc7#30.10.20.05.00#Stainless steel foil#30.10.20.00.00
-unspsc7#30.10.20.06.00#Aluminum foil#30.10.20.00.00
-unspsc7#30.10.20.07.00#Magnesium foil#30.10.20.00.00
-unspsc7#30.10.20.08.00#Titanium foil#30.10.20.00.00
-unspsc7#30.10.20.09.00#Copper foil#30.10.20.00.00
-unspsc7#30.10.20.10.00#Brass foil#30.10.20.00.00
-unspsc7#30.10.20.11.00#Bronze foil#30.10.20.00.00
-unspsc7#30.10.20.12.00#Zinc foil#30.10.20.00.00
-unspsc7#30.10.20.13.00#Tin foil#30.10.20.00.00
-unspsc7#30.10.20.14.00#Lead foil#30.10.20.00.00
-unspsc7#30.10.20.15.00#Plastic foil#30.10.20.00.00
-unspsc7#30.10.21.00.00#Pipe#30.10.00.00.00
-unspsc7#30.10.21.01.00#Ferrous alloy pipe#30.10.21.00.00
-unspsc7#30.10.21.02.00#Non ferrous alloy pipe#30.10.21.00.00
-unspsc7#30.10.21.03.00#Iron pipe#30.10.21.00.00
-unspsc7#30.10.21.04.00#Steel pipe#30.10.21.00.00
-unspsc7#30.10.21.05.00#Stainless steel pipe#30.10.21.00.00
-unspsc7#30.10.21.06.00#Aluminum pipe#30.10.21.00.00
-unspsc7#30.10.21.07.00#Magnesium pipe#30.10.21.00.00
-unspsc7#30.10.21.08.00#Titanium pipe#30.10.21.00.00
-unspsc7#30.10.21.09.00#Copper pipe#30.10.21.00.00
-unspsc7#30.10.21.10.00#Brass pipe#30.10.21.00.00
-unspsc7#30.10.21.11.00#Bronze pipe#30.10.21.00.00
-unspsc7#30.10.21.12.00#Zinc pipe#30.10.21.00.00
-unspsc7#30.10.21.13.00#Tin pipe#30.10.21.00.00
-unspsc7#30.10.21.14.00#Lead pipe#30.10.21.00.00
-unspsc7#30.10.21.15.00#Plastic pipe#30.10.21.00.00
-unspsc7#30.10.21.16.00#Rubber pipe#30.10.21.00.00
-unspsc7#30.10.21.17.00#Concrete pipe#30.10.21.00.00
-unspsc7#30.10.22.00.00#Plate#30.10.00.00.00
-unspsc7#30.10.22.01.00#Ferrous alloy plate#30.10.22.00.00
-unspsc7#30.10.22.02.00#Non ferrous plate#30.10.22.00.00
-unspsc7#30.10.22.03.00#Iron plate#30.10.22.00.00
-unspsc7#30.10.22.04.00#Steel plate#30.10.22.00.00
-unspsc7#30.10.22.05.00#Stainless steel plate#30.10.22.00.00
-unspsc7#30.10.22.06.00#Aluminum plate#30.10.22.00.00
-unspsc7#30.10.22.07.00#Magnesium plate#30.10.22.00.00
-unspsc7#30.10.22.08.00#Titanium plate#30.10.22.00.00
-unspsc7#30.10.22.09.00#Copper plate#30.10.22.00.00
-unspsc7#30.10.22.10.00#Brass plate#30.10.22.00.00
-unspsc7#30.10.22.11.00#Bronze plate#30.10.22.00.00
-unspsc7#30.10.22.12.00#Zinc plate#30.10.22.00.00
-unspsc7#30.10.22.13.00#Tin plate#30.10.22.00.00
-unspsc7#30.10.22.14.00#Lead plate#30.10.22.00.00
-unspsc7#30.10.22.15.00#Plastic plate#30.10.22.00.00
-unspsc7#30.10.22.16.00#Rubber plate#30.10.22.00.00
-unspsc7#30.10.22.17.00#Concrete plate#30.10.22.00.00
-unspsc7#30.10.22.18.00#Precious metal plate#30.10.22.00.00
-unspsc7#30.10.22.19.00#Non metallic plates#30.10.22.00.00
-unspsc7#30.10.23.00.00#Profiles#30.10.00.00.00
-unspsc7#30.10.23.01.00#Ferrous alloy profiles#30.10.23.00.00
-unspsc7#30.10.23.02.00#Non ferrous alloy profiles#30.10.23.00.00
-unspsc7#30.10.23.03.00#Iron profiles#30.10.23.00.00
-unspsc7#30.10.23.04.00#Steel profiles#30.10.23.00.00
-unspsc7#30.10.23.05.00#Stainless steel profiles#30.10.23.00.00
-unspsc7#30.10.23.06.00#Aluminum profiles#30.10.23.00.00
-unspsc7#30.10.23.07.00#Magnesium profiles#30.10.23.00.00
-unspsc7#30.10.23.08.00#Titanium profiles#30.10.23.00.00
-unspsc7#30.10.23.09.00#Copper profiles#30.10.23.00.00
-unspsc7#30.10.23.10.00#Brass profiles#30.10.23.00.00
-unspsc7#30.10.23.11.00#Bronze profiles#30.10.23.00.00
-unspsc7#30.10.23.12.00#Zinc profiles#30.10.23.00.00
-unspsc7#30.10.23.13.00#Tin profiles#30.10.23.00.00
-unspsc7#30.10.23.14.00#Lead profiles#30.10.23.00.00
-unspsc7#30.10.23.15.00#Plastic profiles#30.10.23.00.00
-unspsc7#30.10.23.16.00#Rubber profiles#30.10.23.00.00
-unspsc7#30.10.24.00.00#Rod#30.10.00.00.00
-unspsc7#30.10.24.01.00#Ferrous alloy rods#30.10.24.00.00
-unspsc7#30.10.24.02.00#Non ferrous alloy rods#30.10.24.00.00
-unspsc7#30.10.24.03.00#Iron rods#30.10.24.00.00
-unspsc7#30.10.24.04.00#Steel rods#30.10.24.00.00
-unspsc7#30.10.24.05.00#Stainless steel rods#30.10.24.00.00
-unspsc7#30.10.24.06.00#Aluminum rods#30.10.24.00.00
-unspsc7#30.10.24.07.00#Magnesium rods#30.10.24.00.00
-unspsc7#30.10.24.08.00#Titanium rods#30.10.24.00.00
-unspsc7#30.10.24.09.00#Copper rods#30.10.24.00.00
-unspsc7#30.10.24.10.00#Brass rods#30.10.24.00.00
-unspsc7#30.10.24.11.00#Bronze rods#30.10.24.00.00
-unspsc7#30.10.24.12.00#Zinc rods#30.10.24.00.00
-unspsc7#30.10.24.13.00#Tin rods#30.10.24.00.00
-unspsc7#30.10.24.14.00#Lead rods#30.10.24.00.00
-unspsc7#30.10.24.15.00#Plastic rods#30.10.24.00.00
-unspsc7#30.10.24.16.00#Rubber rods#30.10.24.00.00
-unspsc7#30.10.25.00.00#Sheet#30.10.00.00.00
-unspsc7#30.10.25.01.00#Ferrous alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.02.00#Non ferrous alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.03.00#Iron sheet#30.10.25.00.00
-unspsc7#30.10.25.04.00#Steel sheet#30.10.25.00.00
-unspsc7#30.10.25.05.00#Stainless steel sheet#30.10.25.00.00
-unspsc7#30.10.25.06.00#Aluminum sheet#30.10.25.00.00
-unspsc7#30.10.25.07.00#Magnesium sheet#30.10.25.00.00
-unspsc7#30.10.25.08.00#Titanium sheet#30.10.25.00.00
-unspsc7#30.10.25.09.00#Copper sheet#30.10.25.00.00
-unspsc7#30.10.25.10.00#Brass sheet#30.10.25.00.00
-unspsc7#30.10.25.11.00#Bronze sheet#30.10.25.00.00
-unspsc7#30.10.25.12.00#Zinc sheet#30.10.25.00.00
-unspsc7#30.10.25.13.00#Tin sheet#30.10.25.00.00
-unspsc7#30.10.25.14.00#Lead sheet#30.10.25.00.00
-unspsc7#30.10.25.15.00#Plastic sheet#30.10.25.00.00
-unspsc7#30.10.25.16.00#Rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.17.00#Armor sheet#30.10.25.00.00
-unspsc7#30.10.25.18.00#Beryllium alloy sheet#30.10.25.00.00
-unspsc7#30.10.25.19.00#Composite metal sheet#30.10.25.00.00
-unspsc7#30.10.25.20.00#Nickel sheet#30.10.25.00.00
-unspsc7#30.10.25.21.00#Foam Rubber Sheet#30.10.25.00.00
-unspsc7#30.10.25.22.00#Cork and rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.23.00#Compressed fiber sheet#30.10.25.00.00
-unspsc7#30.10.25.24.00#Metal inserted compressed fiber sheet#30.10.25.00.00
-unspsc7#30.10.25.25.00#Fiber and rubber sheet#30.10.25.00.00
-unspsc7#30.10.25.26.00#Asbestos sheets#30.10.25.00.00
-unspsc7#30.10.26.00.00#Strip#30.10.00.00.00
-unspsc7#30.10.26.01.00#Ferrous alloy strip#30.10.26.00.00
-unspsc7#30.10.26.02.00#Non ferrous alloy strip#30.10.26.00.00
-unspsc7#30.10.26.03.00#Iron strip#30.10.26.00.00
-unspsc7#30.10.26.04.00#Steel strip#30.10.26.00.00
-unspsc7#30.10.26.05.00#Stainless steel strip#30.10.26.00.00
-unspsc7#30.10.26.06.00#Aluminum strip#30.10.26.00.00
-unspsc7#30.10.26.07.00#Magnesium strip#30.10.26.00.00
-unspsc7#30.10.26.08.00#Titanium strip#30.10.26.00.00
-unspsc7#30.10.26.09.00#Copper strip#30.10.26.00.00
-unspsc7#30.10.26.10.00#Brass strip#30.10.26.00.00
-unspsc7#30.10.26.11.00#Bronze strip#30.10.26.00.00
-unspsc7#30.10.26.12.00#Zinc strip#30.10.26.00.00
-unspsc7#30.10.26.13.00#Tin strip#30.10.26.00.00
-unspsc7#30.10.26.14.00#Lead strip#30.10.26.00.00
-unspsc7#30.10.26.15.00#Plastic strip#30.10.26.00.00
-unspsc7#30.10.26.16.00#Rubber strip#30.10.26.00.00
-unspsc7#30.10.27.00.00#Tube and tubing#30.10.00.00.00
-unspsc7#30.10.27.01.00#Ferrous alloy tubing#30.10.27.00.00
-unspsc7#30.10.27.02.00#Copper tubing#30.10.27.00.00
-unspsc7#30.10.27.03.00#Titanium tubing#30.10.27.00.00
-unspsc7#30.10.27.04.00#Magnesium tubing#30.10.27.00.00
-unspsc7#30.10.27.05.00#Tin tubing#30.10.27.00.00
-unspsc7#30.10.27.06.00#Brass tubing#30.10.27.00.00
-unspsc7#30.10.27.07.00#Lead tubing#30.10.27.00.00
-unspsc7#30.10.27.08.00#Bronze tubing#30.10.27.00.00
-unspsc7#30.10.27.09.00#Zinc tubing#30.10.27.00.00
-unspsc7#30.10.27.10.00#Steel tubing#30.10.27.00.00
-unspsc7#30.10.27.11.00#Iron tubing#30.10.27.00.00
-unspsc7#30.10.27.12.00#Cement tubing#30.10.27.00.00
-unspsc7#30.10.27.13.00#Plastic tubing#30.10.27.00.00
-unspsc7#30.10.27.14.00#Rubber tubing#30.10.27.00.00
-unspsc7#30.10.27.15.00#Glass tubing#30.10.27.00.00
-unspsc7#30.10.27.16.00#Stone tubing#30.10.27.00.00
-unspsc7#30.10.27.17.00#Non ferrous alloy tubing#30.10.27.00.00
-unspsc7#30.10.27.18.00#Aluminum tubing#30.10.27.00.00
-unspsc7#30.10.27.19.00#Stainless steel tubing#30.10.27.00.00
-unspsc7#30.10.27.20.00#Precious metal tubing#30.10.27.00.00
-unspsc7#30.10.28.00.00#Piling#30.10.00.00.00
-unspsc7#30.10.28.01.00#Aluminum pilings#30.10.28.00.00
-unspsc7#30.10.28.02.00#Concrete pilings#30.10.28.00.00
-unspsc7#30.10.28.03.00#Steel pilings#30.10.28.00.00
-unspsc7#30.10.29.00.00#Post#30.10.00.00.00
-unspsc7#30.10.29.01.00#Cement or concrete posts#30.10.29.00.00
-unspsc7#30.10.29.02.00#Steel posts#30.10.29.00.00
-unspsc7#30.10.29.03.00#Metal posts#30.10.29.00.00
-unspsc7#30.10.29.04.00#Wooden posts#30.10.29.00.00
-unspsc7#30.10.29.05.00#Plastic posts#30.10.29.00.00
-unspsc7#30.10.29.06.00#Fiberglass posts#30.10.29.00.00
-unspsc7#30.10.30.00.00#Shafting#30.10.00.00.00
-unspsc7#30.10.30.01.00#Steel shafting#30.10.30.00.00
-unspsc7#30.10.30.02.00#Stainless steel shafting#30.10.30.00.00
-unspsc7#30.10.31.00.00#Rails#30.10.00.00.00
-unspsc7#30.10.31.01.00#Steel rail#30.10.31.00.00
-unspsc7#30.10.31.02.00#Aluminum rail#30.10.31.00.00
-unspsc7#30.10.31.03.00#Metal rail#30.10.31.00.00
-unspsc7#30.10.32.00.00#Grating#30.10.00.00.00
-unspsc7#30.10.32.01.00#Steel grating#30.10.32.00.00
-unspsc7#30.10.32.02.00#Stainless steel grating#30.10.32.00.00
-unspsc7#30.10.32.03.00#Aluminum grating#30.10.32.00.00
-unspsc7#30.10.32.04.00#Fiberglass grating#30.10.32.00.00
-unspsc7#30.10.32.05.00#Iron grating#30.10.32.00.00
-unspsc7#30.10.33.00.00#Billets#30.10.00.00.00
-unspsc7#30.10.33.01.00#Aluminum billet#30.10.33.00.00
-unspsc7#30.10.33.02.00#Brass billet#30.10.33.00.00
-unspsc7#30.10.33.03.00#Bronze billets#30.10.33.00.00
-unspsc7#30.10.33.04.00#Copper billets#30.10.33.00.00
-unspsc7#30.10.33.05.00#Lead billets#30.10.33.00.00
-unspsc7#30.10.33.06.00#Zinc billets#30.10.33.00.00
-unspsc7#30.10.33.07.00#Steel billets#30.10.33.00.00
-unspsc7#30.10.33.08.00#Titanium billets#30.10.33.00.00
-unspsc7#30.10.33.09.00#Magnesium billets#30.10.33.00.00
-unspsc7#30.10.33.10.00#Precious metal billets#30.10.33.00.00
-unspsc7#30.10.33.11.00#Non ferrous metal billets#30.10.33.00.00
-unspsc7#30.10.33.12.00#Ferrous metal billets#30.10.33.00.00
-unspsc7#30.10.33.13.00#Non metallic billets#30.10.33.00.00
-unspsc7#30.10.34.00.00#Ingots#30.10.00.00.00
-unspsc7#30.10.34.01.00#Aluminum ingots#30.10.34.00.00
-unspsc7#30.10.34.02.00#Brass ingots#30.10.34.00.00
-unspsc7#30.10.34.03.00#Lead ingots#30.10.34.00.00
-unspsc7#30.10.34.04.00#Zinc ingots#30.10.34.00.00
-unspsc7#30.10.34.05.00#Steel ingots#30.10.34.00.00
-unspsc7#30.10.34.06.00#Magnesium ingots#30.10.34.00.00
-unspsc7#30.10.34.07.00#Bronze ingots#30.10.34.00.00
-unspsc7#30.10.34.08.00#Copper ingots#30.10.34.00.00
-unspsc7#30.10.34.09.00#Titanium ingots#30.10.34.00.00
-unspsc7#30.10.34.10.00#Precious metal ingots#30.10.34.00.00
-unspsc7#30.10.34.11.00#Ferrous alloy extrusion ingots#30.10.34.00.00
-unspsc7#30.10.34.12.00#Non ferrous alloy extrusion ingots#30.10.34.00.00
-unspsc7#30.10.34.13.00#Non metallic ingots#30.10.34.00.00
-unspsc7#30.10.35.00.00#Honeycomb core#30.10.00.00.00
-unspsc7#30.10.35.01.00#Aluminum honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.02.00#Magnesium honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.03.00#Foam honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.04.00#Plastic honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.05.00#Wooden honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.06.00#Ferrous metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.07.00#Bronze honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.08.00#Copper honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.09.00#Steel honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.10.00#Lead honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.11.00#Zinc honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.12.00#Titanium honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.13.00#Brass honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.14.00#Non ferrous metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.35.15.00#Precious metal honeycomb core#30.10.35.00.00
-unspsc7#30.10.36.00.00#Structural products#30.10.00.00.00
-unspsc7#30.10.36.01.00#Wood beams#30.10.36.00.00
-unspsc7#30.10.36.02.00#Wood composite beams#30.10.36.00.00
-unspsc7#30.10.36.03.00#Framing lumber#30.10.36.00.00
-unspsc7#30.10.36.04.00#Wood sheathing or sheets#30.10.36.00.00
-unspsc7#30.10.36.05.00#Wood planks#30.10.36.00.00
-unspsc7#30.10.36.06.00#Wood trusses#30.10.36.00.00
-unspsc7#30.10.36.07.00#Wood joists#30.10.36.00.00
-unspsc7#30.10.37.00.00#Braid#30.10.00.00.00
-unspsc7#30.10.37.01.00#Stainless steel braid#30.10.37.00.00
-unspsc7#30.11.00.00.00#Concrete and cement and plaster#30.00.00.00.00
-unspsc7#30.11.15.00.00#Concrete and mortars#30.11.00.00.00
-unspsc7#30.11.15.01.00#Foamed concrete#30.11.15.00.00
-unspsc7#30.11.15.02.00#Conductive concrete#30.11.15.00.00
-unspsc7#30.11.15.03.00#Insulating concrete#30.11.15.00.00
-unspsc7#30.11.15.04.00#Mortars#30.11.15.00.00
-unspsc7#30.11.16.00.00#Cement and lime#30.11.00.00.00
-unspsc7#30.11.16.01.00#Cement#30.11.16.00.00
-unspsc7#30.11.16.02.00#Chlorinated lime#30.11.16.00.00
-unspsc7#30.11.16.03.00#Hydraulic lime#30.11.16.00.00
-unspsc7#30.11.16.04.00#Hydrated lime#30.11.16.00.00
-unspsc7#30.11.16.05.00#Lean lime#30.11.16.00.00
-unspsc7#30.11.16.06.00#Grout#30.11.16.00.00
-unspsc7#30.11.16.07.00#Unslaked lime#30.11.16.00.00
-unspsc7#30.11.17.00.00#Plasters#30.11.00.00.00
-unspsc7#30.11.17.01.00#Gypsum plaster#30.11.17.00.00
-unspsc7#30.12.00.00.00#Roads and landscape#30.00.00.00.00
-unspsc7#30.12.15.00.00#Bituminous derivatives#30.12.00.00.00
-unspsc7#30.12.15.01.00#Coal tar#30.12.15.00.00
-unspsc7#30.12.15.02.00#Tars#30.12.15.00.00
-unspsc7#30.12.15.03.00#Cresote#30.12.15.00.00
-unspsc7#30.12.16.00.00#Asphalts#30.12.00.00.00
-unspsc7#30.12.16.01.00#Asphalt#30.12.16.00.00
-unspsc7#30.12.16.02.00#Pitch#30.12.16.00.00
-unspsc7#30.12.16.03.00#Gilsonite#30.12.16.00.00
-unspsc7#30.12.16.04.00#Cutback products#30.12.16.00.00
-unspsc7#30.12.16.05.00#Manhole frames with covers#30.12.16.00.00
-unspsc7#30.13.00.00.00#Structural building products#30.00.00.00.00
-unspsc7#30.13.15.00.00#Blocks#30.13.00.00.00
-unspsc7#30.13.15.01.00#Cement blocks#30.13.15.00.00
-unspsc7#30.13.15.02.00#Concrete blocks#30.13.15.00.00
-unspsc7#30.13.15.03.00#Stone blocks#30.13.15.00.00
-unspsc7#30.13.15.04.00#Ceramic blocks#30.13.15.00.00
-unspsc7#30.13.16.00.00#Bricks#30.13.00.00.00
-unspsc7#30.13.16.01.00#Cement bricks#30.13.16.00.00
-unspsc7#30.13.16.02.00#Ceramic bricks#30.13.16.00.00
-unspsc7#30.13.16.03.00#Concrete bricks#30.13.16.00.00
-unspsc7#30.13.16.04.00#Stone bricks#30.13.16.00.00
-unspsc7#30.13.17.00.00#Tiles and flagstones#30.13.00.00.00
-unspsc7#30.13.17.01.00#Cement tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.02.00#Stone tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.03.00#Concrete tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.04.00#Ceramic tiles or flagstones#30.13.17.00.00
-unspsc7#30.13.17.05.00#Head stones#30.13.17.00.00
-unspsc7#30.14.00.00.00#Insulation#30.00.00.00.00
-unspsc7#30.14.15.00.00#Thermal insulation#30.14.00.00.00
-unspsc7#30.14.15.01.00#Weather stripping#30.14.15.00.00
-unspsc7#30.14.15.02.00#Insulation blankets#30.14.15.00.00
-unspsc7#30.14.15.03.00#Foam insulation#30.14.15.00.00
-unspsc7#30.14.15.04.00#Insulation batts#30.14.15.00.00
-unspsc7#30.14.15.05.00#Thermal insulation sleeving#30.14.15.00.00
-unspsc7#30.14.15.06.00#Loose fill insulation#30.14.15.00.00
-unspsc7#30.14.15.07.00#Rigid board insulation#30.14.15.00.00
-unspsc7#30.14.15.08.00#Fiber insulation#30.14.15.00.00
-unspsc7#30.14.15.09.00#Refractories#30.14.15.00.00
-unspsc7#30.14.15.10.00#Door sweep#30.14.15.00.00
-unspsc7#30.14.15.11.00#Window film#30.14.15.00.00
-unspsc7#30.14.16.00.00#Specialty insulation#30.14.00.00.00
-unspsc7#30.14.16.01.00#Acoustical insulation#30.14.16.00.00
-unspsc7#30.14.16.02.00#Non thermal insulation sleeving#30.14.16.00.00
-unspsc7#30.14.16.03.00#Heat Shields#30.14.16.00.00
-unspsc7#30.15.00.00.00#Exterior finishing materials#30.00.00.00.00
-unspsc7#30.15.15.00.00#Roofing materials#30.15.00.00.00
-unspsc7#30.15.15.01.00#Roll roofing#30.15.15.00.00
-unspsc7#30.15.15.02.00#Roof valleys#30.15.15.00.00
-unspsc7#30.15.15.03.00#Roofing fabrics#30.15.15.00.00
-unspsc7#30.15.15.04.00#Roofing felts#30.15.15.00.00
-unspsc7#30.15.15.05.00#Roofing membranes#30.15.15.00.00
-unspsc7#30.15.15.06.00#Roofing tiles#30.15.15.00.00
-unspsc7#30.15.15.07.00#Shakes#30.15.15.00.00
-unspsc7#30.15.15.08.00#Shingles#30.15.15.00.00
-unspsc7#30.15.15.09.00#Trusses#30.15.15.00.00
-unspsc7#30.15.15.10.00#Slate roofing#30.15.15.00.00
-unspsc7#30.15.16.00.00#Roofing accessories#30.15.00.00.00
-unspsc7#30.15.16.01.00#Roof fascias#30.15.16.00.00
-unspsc7#30.15.16.02.00#Flashings#30.15.16.00.00
-unspsc7#30.15.16.03.00#Gravel stops#30.15.16.00.00
-unspsc7#30.15.16.04.00#Roofing brushes#30.15.16.00.00
-unspsc7#30.15.16.05.00#Roofing drains#30.15.16.00.00
-unspsc7#30.15.16.06.00#Roofing mops#30.15.16.00.00
-unspsc7#30.15.16.07.00#Roofing vents#30.15.16.00.00
-unspsc7#30.15.16.08.00#Soffits#30.15.16.00.00
-unspsc7#30.15.16.09.00#Roof curbs#30.15.16.00.00
-unspsc7#30.15.16.10.00#Roof rippers#30.15.16.00.00
-unspsc7#30.15.17.00.00#Rain gutters and accessories#30.15.00.00.00
-unspsc7#30.15.17.01.00#Downspouts#30.15.17.00.00
-unspsc7#30.15.17.02.00#Drip caps#30.15.17.00.00
-unspsc7#30.15.17.03.00#Gutters#30.15.17.00.00
-unspsc7#30.15.17.04.00#Splashblocks#30.15.17.00.00
-unspsc7#30.15.18.00.00#Siding and exterior wall materials#30.15.00.00.00
-unspsc7#30.15.18.01.00#Shutters#30.15.18.00.00
-unspsc7#30.15.18.02.00#Siding#30.15.18.00.00
-unspsc7#30.15.18.03.00#Siding butt joints#30.15.18.00.00
-unspsc7#30.15.18.04.00#Siding corners#30.15.18.00.00
-unspsc7#30.15.18.05.00#Stucco#30.15.18.00.00
-unspsc7#30.15.18.06.00#Glass curtainwalling#30.15.18.00.00
-unspsc7#30.15.19.00.00#Finishing materials and products#30.15.00.00.00
-unspsc7#30.15.19.01.00#Awnings#30.15.19.00.00
-unspsc7#30.15.19.02.00#Exterior trim materials#30.15.19.00.00
-unspsc7#30.15.20.00.00#Fencing#30.15.00.00.00
-unspsc7#30.15.20.01.00#Metal fencing#30.15.20.00.00
-unspsc7#30.15.20.02.00#Wood fencing#30.15.20.00.00
-unspsc7#30.15.21.00.00#Surface#30.15.00.00.00
-unspsc7#30.15.21.01.00#Shot steel#30.15.21.00.00
-unspsc7#30.16.00.00.00#Interior finishing materials#30.00.00.00.00
-unspsc7#30.16.15.00.00#Wall finishing materials#30.16.00.00.00
-unspsc7#30.16.15.01.00#Wallboard#30.16.15.00.00
-unspsc7#30.16.15.02.00#Wallpapers#30.16.15.00.00
-unspsc7#30.16.15.03.00#Drywall#30.16.15.00.00
-unspsc7#30.16.15.04.00#Corner guards#30.16.15.00.00
-unspsc7#30.16.15.05.00#Panels or panelling#30.16.15.00.00
-unspsc7#30.16.15.06.00#Plaster#30.16.15.00.00
-unspsc7#30.16.15.07.00#Drywall joint compounds#30.16.15.00.00
-unspsc7#30.16.15.08.00#Wallpaper roller#30.16.15.00.00
-unspsc7#30.16.16.00.00#Ceiling materials#30.16.00.00.00
-unspsc7#30.16.16.01.00#Acoustic ceiling tiles#30.16.16.00.00
-unspsc7#30.16.16.02.00#Ceiling panels#30.16.16.00.00
-unspsc7#30.16.16.03.00#Coffers#30.16.16.00.00
-unspsc7#30.16.16.04.00#Suspended ceiling systems#30.16.16.00.00
-unspsc7#30.16.17.00.00#Flooring#30.16.00.00.00
-unspsc7#30.16.17.01.00#Carpeting#30.16.17.00.00
-unspsc7#30.16.17.02.00#Wood flooring#30.16.17.00.00
-unspsc7#30.16.17.03.00#Linoleum#30.16.17.00.00
-unspsc7#30.16.17.05.00#Rubber flooring#30.16.17.00.00
-unspsc7#30.16.17.06.00#Stone or tile flooring#30.16.17.00.00
-unspsc7#30.16.17.07.00#Vinyl flooring#30.16.17.00.00
-unspsc7#30.16.17.08.00#Knotted carpeting#30.16.17.00.00
-unspsc7#30.16.17.09.00#Tufted carpeting#30.16.17.00.00
-unspsc7#30.16.17.10.00#Laminate flooring#30.16.17.00.00
-unspsc7#30.16.17.11.00#Outdoor carpeting#30.16.17.00.00
-unspsc7#30.16.17.12.00#Flooring joists#30.16.17.00.00
-unspsc7#30.16.17.13.00#Carpet pads#30.16.17.00.00
-unspsc7#30.16.17.14.00#Cork flooring#30.16.17.00.00
-unspsc7#30.16.17.15.00#Duckboards#30.16.17.00.00
-unspsc7#30.16.17.16.00#Tile spacers#30.16.17.00.00
-unspsc7#30.16.18.00.00#Cabinetry#30.16.00.00.00
-unspsc7#30.16.18.01.00#Cabinets#30.16.18.00.00
-unspsc7#30.16.18.02.00#Countertops#30.16.18.00.00
-unspsc7#30.16.19.00.00#Molding and millwork#30.16.00.00.00
-unspsc7#30.16.19.01.00#Louvers#30.16.19.00.00
-unspsc7#30.16.19.02.00#Columns#30.16.19.00.00
-unspsc7#30.16.19.03.00#Wainscoting#30.16.19.00.00
-unspsc7#30.16.19.04.00#Cornices#30.16.19.00.00
-unspsc7#30.16.19.05.00#Door surrounds#30.16.19.00.00
-unspsc7#30.16.19.06.00#Molding#30.16.19.00.00
-unspsc7#30.16.19.07.00#Stairs#30.16.19.00.00
-unspsc7#30.16.19.08.00#Stair parts#30.16.19.00.00
-unspsc7#30.17.00.00.00#Doors and windows and glass#30.00.00.00.00
-unspsc7#30.17.15.00.00#Doors#30.17.00.00.00
-unspsc7#30.17.15.01.00#Glass doors#30.17.15.00.00
-unspsc7#30.17.15.02.00#Screen doors#30.17.15.00.00
-unspsc7#30.17.15.03.00#Rolling doors#30.17.15.00.00
-unspsc7#30.17.15.04.00#Wooden doors#30.17.15.00.00
-unspsc7#30.17.15.05.00#Metal doors#30.17.15.00.00
-unspsc7#30.17.15.06.00#Storm doors#30.17.15.00.00
-unspsc7#30.17.15.07.00#Door frames#30.17.15.00.00
-unspsc7#30.17.15.08.00#Pocket doors#30.17.15.00.00
-unspsc7#30.17.15.09.00#Revolving doors#30.17.15.00.00
-unspsc7#30.17.15.10.00#Automatic doors#30.17.15.00.00
-unspsc7#30.17.15.11.00#Swing door#30.17.15.00.00
-unspsc7#30.17.15.12.00#Door openers#30.17.15.00.00
-unspsc7#30.17.16.00.00#Windows#30.17.00.00.00
-unspsc7#30.17.16.04.00#Double hung windows#30.17.16.00.00
-unspsc7#30.17.16.05.00#Single hung windows#30.17.16.00.00
-unspsc7#30.17.16.06.00#Casement windows#30.17.16.00.00
-unspsc7#30.17.16.07.00#Horizontal slider windows#30.17.16.00.00
-unspsc7#30.17.16.08.00#Tilt or transom windows#30.17.16.00.00
-unspsc7#30.17.16.09.00#Fixed windows#30.17.16.00.00
-unspsc7#30.17.16.10.00#Bay windows#30.17.16.00.00
-unspsc7#30.17.16.11.00#Bow windows#30.17.16.00.00
-unspsc7#30.17.16.12.00#Projected windows#30.17.16.00.00
-unspsc7#30.17.16.13.00#Window walls#30.17.16.00.00
-unspsc7#30.17.16.14.00#Window screens#30.17.16.00.00
-unspsc7#30.17.16.15.00#French windows#30.17.16.00.00
-unspsc7#30.17.17.00.00#Glass products#30.17.00.00.00
-unspsc7#30.17.17.01.00#Paving blocks#30.17.17.00.00
-unspsc7#30.17.17.03.00#Beveled glass#30.17.17.00.00
-unspsc7#30.17.17.04.00#Leaded glass#30.17.17.00.00
-unspsc7#30.17.17.05.00#Laminated glass#30.17.17.00.00
-unspsc7#30.17.17.06.00#Tempered glass#30.17.17.00.00
-unspsc7#30.17.17.07.00#Safety glass#30.17.17.00.00
-unspsc7#30.17.17.08.00#Float glass#30.17.17.00.00
-unspsc7#30.17.17.09.00#Wired glass#30.17.17.00.00
-unspsc7#30.17.18.00.00#Skylights#30.17.00.00.00
-unspsc7#30.17.18.01.00#Fixed skylights#30.17.18.00.00
-unspsc7#30.17.18.02.00#Vented skylights#30.17.18.00.00
-unspsc7#30.17.18.03.00#Tube skylights#30.17.18.00.00
-unspsc7#30.17.19.00.00#Window frames#30.17.00.00.00
-unspsc7#30.17.19.01.00#Double hung window frames#30.17.19.00.00
-unspsc7#30.17.19.02.00#Single hung window frames#30.17.19.00.00
-unspsc7#30.17.19.03.00#Casement window frames#30.17.19.00.00
-unspsc7#30.17.19.04.00#Horizontal slider window frames#30.17.19.00.00
-unspsc7#30.17.19.05.00#Tilt or transom window frames#30.17.19.00.00
-unspsc7#30.17.19.06.00#Fixed window frames#30.17.19.00.00
-unspsc7#30.17.20.00.00#Gates#30.17.00.00.00
-unspsc7#30.17.20.01.00#Single bar gate#30.17.20.00.00
-unspsc7#30.17.20.02.00#Double bar gate#30.17.20.00.00
-unspsc7#30.18.00.00.00#Plumbing fixtures#30.00.00.00.00
-unspsc7#30.18.15.00.00#Sanitary ware#30.18.00.00.00
-unspsc7#30.18.15.01.00#Bathtubs#30.18.15.00.00
-unspsc7#30.18.15.02.00#Bidets#30.18.15.00.00
-unspsc7#30.18.15.03.00#Showers#30.18.15.00.00
-unspsc7#30.18.15.04.00#Sinks#30.18.15.00.00
-unspsc7#30.18.15.05.00#Toilets#30.18.15.00.00
-unspsc7#30.18.15.06.00#Urinals#30.18.15.00.00
-unspsc7#30.18.15.07.00#Bathtub or shower enclosures#30.18.15.00.00
-unspsc7#30.18.15.08.00#Restroom partitions#30.18.15.00.00
-unspsc7#30.18.15.09.00#Soap dishes#30.18.15.00.00
-unspsc7#30.18.15.10.00#Napkin rings#30.18.15.00.00
-unspsc7#30.19.00.00.00#Construction and maintenance support equipment#30.00.00.00.00
-unspsc7#30.19.15.00.00#Ladders and scaffolding#30.19.00.00.00
-unspsc7#30.19.15.01.00#Ladders#30.19.15.00.00
-unspsc7#30.19.15.02.00#Scaffolding#30.19.15.00.00
-unspsc7#30.19.15.03.00#Step stool#30.19.15.00.00
-unspsc7#30.19.15.04.00#Step stool#30.19.15.00.00
-unspsc7#30.19.15.05.00#Step stool#30.19.15.00.00
-unspsc7#30.19.16.00.00#Ladders and scaffolding accessories#30.19.00.00.00
-unspsc7#30.19.16.01.00#Handrails#30.19.16.00.00
-unspsc7#30.19.16.02.00#Scaffolding stabilizers#30.19.16.00.00
-unspsc7#30.19.16.03.00#Scaffolding flooring#30.19.16.00.00
-unspsc7#30.20.00.00.00#Prefabricated structures#30.00.00.00.00
-unspsc7#30.20.15.00.00#Prefabricated farm structures#30.20.00.00.00
-unspsc7#30.20.15.01.00#Silos#30.20.15.00.00
-unspsc7#30.20.15.02.00#Greenhouses#30.20.15.00.00
-unspsc7#30.20.16.00.00#Prefabricated residential structures#30.20.00.00.00
-unspsc7#30.20.16.01.00#Houses#30.20.16.00.00
-unspsc7#30.20.16.02.00#Mobile homes#30.20.16.00.00
-unspsc7#30.20.16.03.00#Cabins#30.20.16.00.00
-unspsc7#30.20.16.04.00#Garages#30.20.16.00.00
-unspsc7#30.20.16.05.00#Gazebo#30.20.16.00.00
-unspsc7#30.20.17.00.00#Prefabricated commercial and industrial structures#30.20.00.00.00
-unspsc7#30.20.17.01.00#In plant offices#30.20.17.00.00
-unspsc7#30.20.17.02.00#Spray booths#30.20.17.00.00
-unspsc7#30.20.17.03.00#Storage sheds#30.20.17.00.00
-unspsc7#30.20.17.04.00#Clean rooms#30.20.17.00.00
-unspsc7#30.20.17.05.00#Guardhouses#30.20.17.00.00
-unspsc7#30.20.17.06.00#Portable toilettes#30.20.17.00.00
-unspsc7#30.20.17.07.00#Warehouses#30.20.17.00.00
-unspsc7#30.20.17.08.00#Auditorium#30.20.17.00.00
-unspsc7#30.20.17.09.00#Conservatory#30.20.17.00.00
-unspsc7#30.20.17.10.00#Office kitchens#30.20.17.00.00
-unspsc7#30.20.18.00.00#Prefabricated emergency relief structures#30.20.00.00.00
-unspsc7#30.20.18.01.00#Shelters#30.20.18.00.00
-unspsc7#30.20.18.02.00#Emergency tent halls#30.20.18.00.00
-unspsc7#30.20.18.03.00#Container units#30.20.18.00.00
-unspsc7#30.20.19.00.00#Prefabricated medical structures#30.20.00.00.00
-unspsc7#30.20.19.01.00#Medical units#30.20.19.00.00
-unspsc7#30.20.19.02.00#Laboratory units#30.20.19.00.00
-unspsc7#30.20.19.03.00#Dental units#30.20.19.00.00
-unspsc7#30.20.19.04.00#Surgical units#30.20.19.00.00
-unspsc7#30.21.00.00.00#Electrical equipment and components and supplies#30.00.00.00.00
-unspsc7#30.21.15.00.00#Power conversion#30.21.00.00.00
-unspsc7#30.21.15.01.00#Transformers#30.21.15.00.00
-unspsc7#30.21.15.02.00#Power supply units#30.21.15.00.00
-unspsc7#30.21.15.03.00#Power distribution units (PDUs)#30.21.15.00.00
-unspsc7#30.21.15.04.00#Power adapters or inverters#30.21.15.00.00
-unspsc7#30.21.15.05.00#Frequency converters#30.21.15.00.00
-unspsc7#30.21.15.06.00#Signal converters#30.21.15.00.00
-unspsc7#30.21.15.07.00#Transducers#30.21.15.00.00
-unspsc7#30.21.15.08.00#Regulators#30.21.15.00.00
-unspsc7#30.21.15.09.00#Magnetic coils#30.21.15.00.00
-unspsc7#30.21.15.10.00#Uninterruptible power supplies#30.21.15.00.00
-unspsc7#30.21.15.11.00#Solenoids#30.21.15.00.00
-unspsc7#30.21.15.12.00#Chokes#30.21.15.00.00
-unspsc7#30.21.15.13.00#Electric rotary converters#30.21.15.00.00
-unspsc7#30.21.15.14.00#Capacitor banks#30.21.15.00.00
-unspsc7#30.21.15.15.00#Reactors#30.21.15.00.00
-unspsc7#30.21.16.00.00#Conduits and raceways#30.21.00.00.00
-unspsc7#30.21.16.01.00#Cable trays#30.21.16.00.00
-unspsc7#30.21.16.02.00#Electrical conduit#30.21.16.00.00
-unspsc7#30.21.16.03.00#Electrical raceways#30.21.16.00.00
-unspsc7#30.21.16.04.00#Wiring ducts#30.21.16.00.00
-unspsc7#30.21.16.05.00#Wireways#30.21.16.00.00
-unspsc7#30.21.16.06.00#Wiring troughs#30.21.16.00.00
-unspsc7#30.21.17.00.00#Electrical boxes and enclosures and fittings#30.21.00.00.00
-unspsc7#30.21.17.01.00#Electrical boxes#30.21.17.00.00
-unspsc7#30.21.17.02.00#Electrical box covers#30.21.17.00.00
-unspsc7#30.21.17.03.00#Weatherproof boxes#30.21.17.00.00
-unspsc7#30.21.17.04.00#Switch boxes#30.21.17.00.00
-unspsc7#30.21.17.05.00#Floor boxes#30.21.17.00.00
-unspsc7#30.21.17.06.00#Outlet boxes#30.21.17.00.00
-unspsc7#30.21.17.07.00#Specialty electrical boxes#30.21.17.00.00
-unspsc7#30.21.17.08.00#Utility boxes#30.21.17.00.00
-unspsc7#30.21.17.09.00#Electrical fittings#30.21.17.00.00
-unspsc7#30.21.17.10.00#Electrical bushings#30.21.17.00.00
-unspsc7#30.21.17.11.00#Ceiling flanges#30.21.17.00.00
-unspsc7#30.21.18.00.00#Lugs connectors and terminals#30.21.00.00.00
-unspsc7#30.21.18.01.00#Electrical terminals#30.21.18.00.00
-unspsc7#30.21.18.02.00#Electrical plugs#30.21.18.00.00
-unspsc7#30.21.18.03.00#Twist lock plugs#30.21.18.00.00
-unspsc7#30.21.18.04.00#Electrical sleeves#30.21.18.00.00
-unspsc7#30.21.18.05.00#Cable or wire lugs#30.21.18.00.00
-unspsc7#30.21.18.06.00#Electrical receptacles#30.21.18.00.00
-unspsc7#30.21.18.07.00#Terminal strips#30.21.18.00.00
-unspsc7#30.21.18.08.00#Mechanical connectors#30.21.18.00.00
-unspsc7#30.21.18.09.00#Ring or flag terminals#30.21.18.00.00
-unspsc7#30.21.18.10.00#Wire connectors#30.21.18.00.00
-unspsc7#30.21.18.11.00#Terminal blocks#30.21.18.00.00
-unspsc7#30.21.18.12.00#Fuse blocks#30.21.18.00.00
-unspsc7#30.21.18.13.00#Backshell connectors#30.21.18.00.00
-unspsc7#30.21.18.14.00#Circular connectors#30.21.18.00.00
-unspsc7#30.21.18.15.00#Coaxial connectors#30.21.18.00.00
-unspsc7#30.21.18.16.00#Flat connectors#30.21.18.00.00
-unspsc7#30.21.18.17.00#Electronic connector caps#30.21.18.00.00
-unspsc7#30.21.18.18.00#Radio frequency (RF) connectors#30.21.18.00.00
-unspsc7#30.21.18.19.00#Electrical metallic tubing (EMT) connectors#30.21.18.00.00
-unspsc7#30.21.18.20.00#Compression connectors#30.21.18.00.00
-unspsc7#30.21.18.21.00#Set screw couplings#30.21.18.00.00
-unspsc7#30.21.18.22.00#Flex connectors#30.21.18.00.00
-unspsc7#30.21.18.23.00#Liquid tight connectors#30.21.18.00.00
-unspsc7#30.21.18.24.00#Connector assemblies#30.21.18.00.00
-unspsc7#30.21.18.25.00#Mechanical couplings#30.21.18.00.00
-unspsc7#30.21.18.26.00#Spring jaw connectors#30.21.18.00.00
-unspsc7#30.21.18.27.00#Terminal block covers#30.21.18.00.00
-unspsc7#30.21.18.28.00#Terminal block separator#30.21.18.00.00
-unspsc7#30.21.18.29.00#Jumper bar#30.21.18.00.00
-unspsc7#30.21.18.30.00#Wiring taps#30.21.18.00.00
-unspsc7#30.21.18.31.00#Electrical taps#30.21.18.00.00
-unspsc7#30.21.18.32.00#Fiber optic connector#30.21.18.00.00
-unspsc7#30.21.19.00.00#Switches and controls and relays#30.21.00.00.00
-unspsc7#30.21.19.01.00#Safety switches#30.21.19.00.00
-unspsc7#30.21.19.02.00#Dimmer switches#30.21.19.00.00
-unspsc7#30.21.19.03.00#Drum switches#30.21.19.00.00
-unspsc7#30.21.19.04.00#Time switches#30.21.19.00.00
-unspsc7#30.21.19.05.00#Snap switches#30.21.19.00.00
-unspsc7#30.21.19.06.00#Mechanical switches#30.21.19.00.00
-unspsc7#30.21.19.07.00#Pressure switches#30.21.19.00.00
-unspsc7#30.21.19.08.00#Toggle switches#30.21.19.00.00
-unspsc7#30.21.19.09.00#Slide switches#30.21.19.00.00
-unspsc7#30.21.19.10.00#Limit switches#30.21.19.00.00
-unspsc7#30.21.19.11.00#Controller switches#30.21.19.00.00
-unspsc7#30.21.19.12.00#Variable switches#30.21.19.00.00
-unspsc7#30.21.19.13.00#Push button switches#30.21.19.00.00
-unspsc7#30.21.19.14.00#Rotary switches#30.21.19.00.00
-unspsc7#30.21.19.15.00#Power relays#30.21.19.00.00
-unspsc7#30.21.19.16.00#General purpose relays#30.21.19.00.00
-unspsc7#30.21.19.17.00#Socket relays#30.21.19.00.00
-unspsc7#30.21.19.18.00#Alternating voltage relays#30.21.19.00.00
-unspsc7#30.21.19.19.00#Mercury relays#30.21.19.00.00
-unspsc7#30.21.19.20.00#Time relays#30.21.19.00.00
-unspsc7#30.21.19.21.00#Overload relays#30.21.19.00.00
-unspsc7#30.21.19.22.00#Motor starter controls#30.21.19.00.00
-unspsc7#30.21.19.23.00#Electrical contacts#30.21.19.00.00
-unspsc7#30.21.19.24.00#Timer controls#30.21.19.00.00
-unspsc7#30.21.19.25.00#Photocontrols#30.21.19.00.00
-unspsc7#30.21.19.26.00#Non fusible switches#30.21.19.00.00
-unspsc7#30.21.19.27.00#Radio frequency (RF) switches#30.21.19.00.00
-unspsc7#30.21.19.28.00#Proximity switches#30.21.19.00.00
-unspsc7#30.21.19.29.00#Encoders#30.21.19.00.00
-unspsc7#30.21.19.30.00#Photoelectric sensors#30.21.19.00.00
-unspsc7#30.21.19.31.00#Contactors#30.21.19.00.00
-unspsc7#30.21.20.00.00#Circuit protection devices and accessories#30.21.00.00.00
-unspsc7#30.21.20.01.00#Circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.02.00#Magnetic circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.03.00#Miniature circuit breakers#30.21.20.00.00
-unspsc7#30.21.20.04.00#Time delay fuses#30.21.20.00.00
-unspsc7#30.21.20.05.00#Plug fuses#30.21.20.00.00
-unspsc7#30.21.20.06.00#Cartridge fuses#30.21.20.00.00
-unspsc7#30.21.20.07.00#Glass body fuses#30.21.20.00.00
-unspsc7#30.21.20.08.00#Class type fuses#30.21.20.00.00
-unspsc7#30.21.20.09.00#Midget fuses#30.21.20.00.00
-unspsc7#30.21.20.10.00#Surge suppressers#30.21.20.00.00
-unspsc7#30.21.20.11.00#Ceramic fuses#30.21.20.00.00
-unspsc7#30.21.20.12.00#Blade fuses#30.21.20.00.00
-unspsc7#30.21.21.00.00#Electrical hardware and supplies#30.21.00.00.00
-unspsc7#30.21.21.01.00#Electrical hangers#30.21.21.00.00
-unspsc7#30.21.21.02.00#Cable clips#30.21.21.00.00
-unspsc7#30.21.21.03.00#Cable ties#30.21.21.00.00
-unspsc7#30.21.21.04.00#Wallplates#30.21.21.00.00
-unspsc7#30.21.21.05.00#Switchplates#30.21.21.00.00
-unspsc7#30.21.21.06.00#Cable clamps#30.21.21.00.00
-unspsc7#30.21.21.07.00#Transformer bushings#30.21.21.00.00
-unspsc7#30.21.21.08.00#Harness board nails#30.21.21.00.00
-unspsc7#30.21.21.09.00#Din Rail#30.21.21.00.00
-unspsc7#30.21.21.10.00#Handle tie#30.21.21.00.00
-unspsc7#30.21.21.11.00#Electrical receptacle multipliers#30.21.21.00.00
-unspsc7#30.21.21.12.00#Tubings#30.21.21.00.00
-unspsc7#30.21.21.13.00#End caps#30.21.21.00.00
-unspsc7#30.21.21.14.00#Spiral wrapping#30.21.21.00.00
-unspsc7#30.21.21.15.00#Grommet edging#30.21.21.00.00
-unspsc7#30.21.21.16.00#Corrugated loom tubes#30.21.21.00.00
-unspsc7#30.21.21.17.00#Expandable braided sleeve#30.21.21.00.00
-unspsc7#30.21.21.18.00#Cable tie mounts#30.21.21.00.00
-unspsc7#30.22.00.00.00#Permanent structures#30.00.00.00.00
-unspsc7#30.22.10.00.00#Commercial and entertainment structures#30.22.00.00.00
-unspsc7#30.22.10.01.00#Shopping malls#30.22.10.00.00
-unspsc7#30.22.10.02.00#Parking structures#30.22.10.00.00
-unspsc7#30.22.10.03.00#Cafeteria#30.22.10.00.00
-unspsc7#30.22.10.04.00#Shop buildings#30.22.10.00.00
-unspsc7#30.22.10.05.00#Shopping center#30.22.10.00.00
-unspsc7#30.22.10.06.00#Canteen#30.22.10.00.00
-unspsc7#30.22.10.07.00#Theater#30.22.10.00.00
-unspsc7#30.22.10.08.00#Auditorium#30.22.10.00.00
-unspsc7#30.22.10.09.00#Market#30.22.10.00.00
-unspsc7#30.22.10.10.00#Childrens play area#30.22.10.00.00
-unspsc7#30.22.10.11.00#Zoo#30.22.10.00.00
-unspsc7#30.22.10.12.00#Gardens#30.22.10.00.00
-unspsc7#30.22.10.13.00#Parks#30.22.10.00.00
-unspsc7#30.22.10.14.00#Waterside leisure facilities#30.22.10.00.00
-unspsc7#30.22.20.00.00#Transport structures#30.22.00.00.00
-unspsc7#30.22.20.01.00#Steel bridges#30.22.20.00.00
-unspsc7#30.22.20.02.00#Dry dock#30.22.20.00.00
-unspsc7#30.22.20.03.00#Bus station#30.22.20.00.00
-unspsc7#30.22.20.04.00#Bus garage#30.22.20.00.00
-unspsc7#30.22.20.05.00#Service area building#30.22.20.00.00
-unspsc7#30.22.20.06.00#Railway station#30.22.20.00.00
-unspsc7#30.22.20.07.00#Railway depot#30.22.20.00.00
-unspsc7#30.22.20.08.00#Underground railway station#30.22.20.00.00
-unspsc7#30.22.20.09.00#Rail terminal building#30.22.20.00.00
-unspsc7#30.22.20.10.00#Tramway depot#30.22.20.00.00
-unspsc7#30.22.20.11.00#Tramway platforms#30.22.20.00.00
-unspsc7#30.22.20.12.00#Airport buildings#30.22.20.00.00
-unspsc7#30.22.20.13.00#Airport control tower#30.22.20.00.00
-unspsc7#30.22.20.14.00#Airfield#30.22.20.00.00
-unspsc7#30.22.20.15.00#Runway#30.22.20.00.00
-unspsc7#30.22.20.16.00#Quay#30.22.20.00.00
-unspsc7#30.22.20.17.00#Pier#30.22.20.00.00
-unspsc7#30.22.20.18.00#Dock#30.22.20.00.00
-unspsc7#30.22.20.19.00#Wharf#30.22.20.00.00
-unspsc7#30.22.20.20.00#Marina#30.22.20.00.00
-unspsc7#30.22.20.21.00#Yacht harbor#30.22.20.00.00
-unspsc7#30.22.20.22.00#Breakwater#30.22.20.00.00
-unspsc7#30.22.20.23.00#Seawall#30.22.20.00.00
-unspsc7#30.22.20.24.00#Ferry terminal building#30.22.20.00.00
-unspsc7#30.22.20.25.00#Ro ro terminal#30.22.20.00.00
-unspsc7#30.22.20.26.00#Lighthouse#30.22.20.00.00
-unspsc7#30.22.20.27.00#Road bridge#30.22.20.00.00
-unspsc7#30.22.20.28.00#Railway bridge#30.22.20.00.00
-unspsc7#30.22.20.29.00#Footbridge#30.22.20.00.00
-unspsc7#30.22.20.30.00#Road viaduct#30.22.20.00.00
-unspsc7#30.22.20.31.00#Railway viaduct#30.22.20.00.00
-unspsc7#30.22.20.32.00#Underpass#30.22.20.00.00
-unspsc7#30.22.20.33.00#Overpass#30.22.20.00.00
-unspsc7#30.22.20.34.00#Subway#30.22.20.00.00
-unspsc7#30.22.20.35.00#Culverts#30.22.20.00.00
-unspsc7#30.22.20.36.00#Road tunnel#30.22.20.00.00
-unspsc7#30.22.20.37.00#Railway tunnel#30.22.20.00.00
-unspsc7#30.22.20.38.00#Pedestrian tunnel#30.22.20.00.00
-unspsc7#30.22.20.39.00#Canal tunnel#30.22.20.00.00
-unspsc7#30.22.20.40.00#Under river tunnel#30.22.20.00.00
-unspsc7#30.22.20.41.00#Undersea tunnel#30.22.20.00.00
-unspsc7#30.22.20.42.00#Highways#30.22.20.00.00
-unspsc7#30.22.20.43.00#Crossroad#30.22.20.00.00
-unspsc7#30.22.20.44.00#Ring road#30.22.20.00.00
-unspsc7#30.22.20.45.00#Trunk road#30.22.20.00.00
-unspsc7#30.22.20.46.00#Secondary road#30.22.20.00.00
-unspsc7#30.22.20.47.00#Access road#30.22.20.00.00
-unspsc7#30.22.20.48.00#Slip road#30.22.20.00.00
-unspsc7#30.22.20.49.00#Dual carriageway#30.22.20.00.00
-unspsc7#30.22.20.50.00#Single carriageway#30.22.20.00.00
-unspsc7#30.22.20.51.00#Road junction#30.22.20.00.00
-unspsc7#30.22.20.52.00#Pedestrian ways#30.22.20.00.00
-unspsc7#30.22.20.53.00#Pedestrian overpass#30.22.20.00.00
-unspsc7#30.22.20.54.00#Footpath#30.22.20.00.00
-unspsc7#30.22.20.55.00#Cycle path#30.22.20.00.00
-unspsc7#30.22.20.56.00#Pipeline carrying bridge#30.22.20.00.00
-unspsc7#30.22.20.57.00#Pipelines#30.22.20.00.00
-unspsc7#30.22.20.58.00#Pumping station#30.22.20.00.00
-unspsc7#30.22.20.59.00#Sewage pumping stations#30.22.20.00.00
-unspsc7#30.22.20.60.00#Sewage outfall#30.22.20.00.00
-unspsc7#30.22.20.61.00#Parking lot#30.22.20.00.00
-unspsc7#30.22.20.62.00#Parking structures#30.22.20.00.00
-unspsc7#30.22.20.63.00#Motorway service area#30.22.20.00.00
-unspsc7#30.22.21.00.00#Public structures#30.22.00.00.00
-unspsc7#30.22.21.01.00#Post office#30.22.21.00.00
-unspsc7#30.22.21.02.00#Bank#30.22.21.00.00
-unspsc7#30.22.21.03.00#Police station#30.22.21.00.00
-unspsc7#30.22.21.04.00#Court building#30.22.21.00.00
-unspsc7#30.22.21.05.00#Prison building#30.22.21.00.00
-unspsc7#30.22.21.06.00#Fire station#30.22.21.00.00
-unspsc7#30.22.21.07.00#Ambulance station#30.22.21.00.00
-unspsc7#30.22.21.08.00#Mountain rescue building#30.22.21.00.00
-unspsc7#30.22.21.09.00#Lifeboat station#30.22.21.00.00
-unspsc7#30.22.21.10.00#Coastguard building#30.22.21.00.00
-unspsc7#30.22.21.11.00#Rescue service station#30.22.21.00.00
-unspsc7#30.22.21.12.00#Civic center#30.22.21.00.00
-unspsc7#30.22.21.13.00#Crematorium#30.22.21.00.00
-unspsc7#30.22.21.14.00#Art gallery#30.22.21.00.00
-unspsc7#30.22.21.15.00#Prehistoric monument#30.22.21.00.00
-unspsc7#30.22.21.16.00#Ticket offices#30.22.21.00.00
-unspsc7#30.22.22.00.00#Utilities structures#30.22.00.00.00
-unspsc7#30.22.22.01.00#Radar station#30.22.22.00.00
-unspsc7#30.22.22.02.00#Substation#30.22.22.00.00
-unspsc7#30.22.22.03.00#Nuclear power station#30.22.22.00.00
-unspsc7#30.22.22.04.00#Water tower#30.22.22.00.00
-unspsc7#30.22.22.05.00#Wells#30.22.22.00.00
-unspsc7#30.22.22.06.00#Mobile telephone base stations#30.22.22.00.00
-unspsc7#30.22.22.07.00#Dam#30.22.22.00.00
-unspsc7#30.22.22.08.00#Oil or gas platforms#30.22.22.00.00
-unspsc7#30.22.23.00.00#Educational and research structures#30.22.00.00.00
-unspsc7#30.22.23.01.00#Schools#30.22.23.00.00
-unspsc7#30.22.23.02.00#Polytechnic#30.22.23.00.00
-unspsc7#30.22.23.03.00#Vocational college#30.22.23.00.00
-unspsc7#30.22.23.04.00#Lecture theater#30.22.23.00.00
-unspsc7#30.22.23.05.00#Library#30.22.23.00.00
-unspsc7#30.22.23.06.00#Language laboratory#30.22.23.00.00
-unspsc7#30.22.23.07.00#Laboratory building#30.22.23.00.00
-unspsc7#30.22.23.08.00#Meteorological stations#30.22.23.00.00
-unspsc7#30.22.23.09.00#Research or testing facilities#30.22.23.00.00
-unspsc7#30.22.24.00.00#Hospital structures#30.22.00.00.00
-unspsc7#30.22.24.01.00#Clinic#30.22.24.00.00
-unspsc7#30.22.24.02.00#Nursing home#30.22.24.00.00
-unspsc7#30.22.24.03.00#Operating theater#30.22.24.00.00
-unspsc7#30.22.24.04.00#Intensive care unit#30.22.24.00.00
-unspsc7#30.22.24.05.00#Diagnostic screening room#30.22.24.00.00
-unspsc7#30.22.24.06.00#Screening rooms#30.22.24.00.00
-unspsc7#30.22.24.07.00#Fluoroscopy room#30.22.24.00.00
-unspsc7#30.22.24.08.00#Pathology room#30.22.24.00.00
-unspsc7#30.22.24.09.00#Catheter room#30.22.24.00.00
-unspsc7#30.22.25.00.00#Accommodation structures#30.22.00.00.00
-unspsc7#30.22.25.01.00#Residential homes#30.22.25.00.00
-unspsc7#30.22.25.02.00#Flats#30.22.25.00.00
-unspsc7#30.22.25.03.00#Childrens home#30.22.25.00.00
-unspsc7#30.22.25.04.00#Daycare center#30.22.25.00.00
-unspsc7#30.22.25.05.00#Retirement home#30.22.25.00.00
-unspsc7#30.22.25.06.00#Old peoples home#30.22.25.00.00
-unspsc7#30.22.25.07.00#Hostel#30.22.25.00.00
-unspsc7#30.22.26.00.00#Sports and health structures#30.22.00.00.00
-unspsc7#30.22.26.01.00#Stadium#30.22.26.00.00
-unspsc7#30.22.26.02.00#Sports ground#30.22.26.00.00
-unspsc7#30.22.26.03.00#Running track#30.22.26.00.00
-unspsc7#30.22.26.04.00#Sports hall#30.22.26.00.00
-unspsc7#30.22.26.05.00#Spa#30.22.26.00.00
-unspsc7#30.22.26.06.00#Gymnasium#30.22.26.00.00
-unspsc7#30.22.26.07.00#Swimming pool#30.22.26.00.00
-unspsc7#30.22.26.08.00#Water sports facilities#30.22.26.00.00
-unspsc7#30.22.27.00.00#Industrial structures#30.22.00.00.00
-unspsc7#30.22.27.01.00#Workshops#30.22.27.00.00
-unspsc7#30.22.27.02.00#Cold storage installations#30.22.27.00.00
-unspsc7#30.22.27.03.00#Warehouse stores#30.22.27.00.00
-unspsc7#30.22.28.00.00#Agricultural and farming and fishing structures#30.22.00.00.00
-unspsc7#30.22.28.01.00#Barn#30.22.28.00.00
-unspsc7#30.22.28.02.00#Cowsheds#30.22.28.00.00
-unspsc7#30.22.28.03.00#Irrigation channel#30.22.28.00.00
-unspsc7#30.22.29.00.00#Defense structures#30.22.00.00.00
-unspsc7#30.22.29.01.00#Military bunker#30.22.29.00.00
-unspsc7#30.22.29.02.00#Military shelter#30.22.29.00.00
-unspsc7#30.22.29.03.00#Barracks#30.22.29.00.00
-unspsc7#30.22.29.04.00#Military mess#30.22.29.00.00
-unspsc7#30.22.30.00.00#Religious structures#30.22.00.00.00
-unspsc7#30.22.30.01.00#Churches#30.22.30.00.00
-unspsc7#30.22.30.02.00#Temples#30.22.30.00.00
-unspsc7#30.22.30.03.00#Mosques#30.22.30.00.00
-unspsc7#31.00.00.00.00#Manufacturing Components and Supplies#31.00.00.00.00
-unspsc7#31.10.00.00.00#Castings#31.00.00.00.00
-unspsc7#31.10.15.00.00#Die castings#31.10.00.00.00
-unspsc7#31.10.15.01.00#Aluminum die castings#31.10.15.00.00
-unspsc7#31.10.15.02.00#Ferrous alloy die castings#31.10.15.00.00
-unspsc7#31.10.15.03.00#Iron die castings#31.10.15.00.00
-unspsc7#31.10.15.04.00#Non ferrous alloy die castings#31.10.15.00.00
-unspsc7#31.10.15.05.00#Stainless steel die castings#31.10.15.00.00
-unspsc7#31.10.15.06.00#Steel die castings#31.10.15.00.00
-unspsc7#31.10.15.07.00#Magnesium die castings#31.10.15.00.00
-unspsc7#31.10.15.08.00#Zinc die castings#31.10.15.00.00
-unspsc7#31.10.15.09.00#Tin die castings#31.10.15.00.00
-unspsc7#31.10.15.10.00#Titanium die castings#31.10.15.00.00
-unspsc7#31.10.15.11.00#Beryllium die castings#31.10.15.00.00
-unspsc7#31.10.15.12.00#Precious metal die castings#31.10.15.00.00
-unspsc7#31.10.15.13.00#Copper die castings#31.10.15.00.00
-unspsc7#31.10.15.14.00#Lead die castings#31.10.15.00.00
-unspsc7#31.10.15.15.00#Brass die castings#31.10.15.00.00
-unspsc7#31.10.15.16.00#Bronze die castings#31.10.15.00.00
-unspsc7#31.10.16.00.00#Sand castings#31.10.00.00.00
-unspsc7#31.10.16.01.00#Non ferrous alloy sand castings#31.10.16.00.00
-unspsc7#31.10.16.02.00#Ferrous alloy sand castings#31.10.16.00.00
-unspsc7#31.10.16.03.00#Steel sand castings#31.10.16.00.00
-unspsc7#31.10.16.04.00#Stainless steel sand castings#31.10.16.00.00
-unspsc7#31.10.16.05.00#Iron sand castings#31.10.16.00.00
-unspsc7#31.10.16.06.00#Aluminum sand castings#31.10.16.00.00
-unspsc7#31.10.16.07.00#Magnesium sand castings#31.10.16.00.00
-unspsc7#31.10.16.08.00#Titanium sand castings#31.10.16.00.00
-unspsc7#31.10.16.09.00#Beryllium sand castings#31.10.16.00.00
-unspsc7#31.10.16.10.00#Copper sand castings#31.10.16.00.00
-unspsc7#31.10.16.11.00#Brass sand castings#31.10.16.00.00
-unspsc7#31.10.16.12.00#Bronze sand castings#31.10.16.00.00
-unspsc7#31.10.16.13.00#Zinc sand castings#31.10.16.00.00
-unspsc7#31.10.16.14.00#Tin sand castings#31.10.16.00.00
-unspsc7#31.10.16.15.00#Lead sand castings#31.10.16.00.00
-unspsc7#31.10.16.16.00#Precious metal sand castings#31.10.16.00.00
-unspsc7#31.10.17.00.00#Permanent mold castings#31.10.00.00.00
-unspsc7#31.10.17.01.00#Non ferrous alloy permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.02.00#Ferrous alloy permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.03.00#Steel permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.04.00#Stainless steel permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.05.00#Iron permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.06.00#Aluminum permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.07.00#Magnesium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.08.00#Titanium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.09.00#Beryllium permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.10.00#Copper permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.11.00#Brass permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.12.00#Bronze permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.13.00#Zinc permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.14.00#Tin permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.15.00#Lead permanent mold castings#31.10.17.00.00
-unspsc7#31.10.17.16.00#Precious metal permanent mold castings#31.10.17.00.00
-unspsc7#31.10.18.00.00#Shell mold castings#31.10.00.00.00
-unspsc7#31.10.18.01.00#Non ferrous alloy shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.02.00#Ferrous alloy shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.03.00#Steel shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.04.00#Stainless steel shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.05.00#Iron shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.06.00#Aluminum shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.07.00#Magnesium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.08.00#Titanium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.09.00#Beryllium shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.10.00#Copper shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.11.00#Brass shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.12.00#Bronze shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.13.00#Zinc shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.14.00#Tin shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.15.00#Lead shell mold castings#31.10.18.00.00
-unspsc7#31.10.18.16.00#Precious shell mold castings#31.10.18.00.00
-unspsc7#31.10.19.00.00#Investment castings#31.10.00.00.00
-unspsc7#31.10.19.01.00#Non ferrous alloy investment castings#31.10.19.00.00
-unspsc7#31.10.19.02.00#Ferrous alloy investment castings#31.10.19.00.00
-unspsc7#31.10.19.03.00#Steel investment castings#31.10.19.00.00
-unspsc7#31.10.19.04.00#Stainless steel investment castings#31.10.19.00.00
-unspsc7#31.10.19.05.00#Iron investment castings#31.10.19.00.00
-unspsc7#31.10.19.06.00#Aluminum investment castings#31.10.19.00.00
-unspsc7#31.10.19.07.00#Magnesium investment castings#31.10.19.00.00
-unspsc7#31.10.19.08.00#Zinc investment castings#31.10.19.00.00
-unspsc7#31.10.19.09.00#Tin investment castings#31.10.19.00.00
-unspsc7#31.10.19.10.00#Lead investment castings#31.10.19.00.00
-unspsc7#31.10.19.11.00#Precious metal investment castings#31.10.19.00.00
-unspsc7#31.10.19.12.00#Titanium investment castings#31.10.19.00.00
-unspsc7#31.10.20.00.00#Centrifugal castings#31.10.00.00.00
-unspsc7#31.10.20.01.00#Non ferrous alloy centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.02.00#Ferrous alloy centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.03.00#Steel centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.04.00#Stainless steel centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.05.00#Iron centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.06.00#Aluminum centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.07.00#Magnesium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.08.00#Titanium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.09.00#Beryllium centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.10.00#Copper centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.11.00#Brass centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.12.00#Bronze centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.13.00#Zinc centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.14.00#Tin centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.15.00#Lead centrifugal castings#31.10.20.00.00
-unspsc7#31.10.20.16.00#Precious metal centrifugal castings#31.10.20.00.00
-unspsc7#31.10.21.00.00#Ceramic mold castings#31.10.00.00.00
-unspsc7#31.10.21.01.00#Non ferrous alloy ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.02.00#Ferrous alloy ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.03.00#Steel ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.04.00#Stainless steel ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.05.00#Iron ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.06.00#Aluminum ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.07.00#Magnesium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.08.00#Titanium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.09.00#Beryllium ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.10.00#Copper ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.11.00#Brass ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.12.00#Bronze ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.13.00#Zinc ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.14.00#Tin ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.15.00#Lead ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.21.16.00#Precious metal ceramic mold castings#31.10.21.00.00
-unspsc7#31.10.22.00.00#Graphite mold castings#31.10.00.00.00
-unspsc7#31.10.22.01.00#Non ferrous alloy graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.02.00#Ferrrous alloy graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.03.00#Steel graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.04.00#Stainless steel graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.05.00#Iron graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.06.00#Aluminum graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.07.00#Magnesium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.08.00#Titanium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.09.00#Beryllium graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.10.00#Copper graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.11.00#Brass graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.12.00#Bronze graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.13.00#Zinc graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.14.00#Tin graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.15.00#Lead graphite mold castings#31.10.22.00.00
-unspsc7#31.10.22.16.00#Precious metal graphite mold castings#31.10.22.00.00
-unspsc7#31.10.23.00.00#Plaster mold castings#31.10.00.00.00
-unspsc7#31.10.23.01.00#Non ferrous alloy plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.02.00#Ferrous alloy plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.03.00#Steel plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.04.00#Stainless steel plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.05.00#Iron plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.06.00#Aluminum plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.07.00#Magnesium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.08.00#Titanium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.09.00#Beryllium plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.10.00#Copper plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.11.00#Brass plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.12.00#Bronze plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.13.00#Zinc plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.14.00#Tin plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.15.00#Lead plaster mold castings#31.10.23.00.00
-unspsc7#31.10.23.16.00#Precious metal plaster mold castings#31.10.23.00.00
-unspsc7#31.10.24.00.00#V process castings#31.10.00.00.00
-unspsc7#31.10.24.01.00#Non ferrous alloy v process castings#31.10.24.00.00
-unspsc7#31.10.24.02.00#Ferrous alloy v process castings#31.10.24.00.00
-unspsc7#31.10.24.03.00#Steel v process castings#31.10.24.00.00
-unspsc7#31.10.24.04.00#Stainless steel v process castings#31.10.24.00.00
-unspsc7#31.10.24.05.00#Iron v process castings#31.10.24.00.00
-unspsc7#31.10.24.06.00#Aluminum v process castings#31.10.24.00.00
-unspsc7#31.10.24.07.00#Magnesium v process castings#31.10.24.00.00
-unspsc7#31.10.24.08.00#Titanium v process castings#31.10.24.00.00
-unspsc7#31.10.24.09.00#Beryllium v process castings#31.10.24.00.00
-unspsc7#31.10.24.10.00#Copper v process castings#31.10.24.00.00
-unspsc7#31.10.24.11.00#Brass v process castings#31.10.24.00.00
-unspsc7#31.10.24.12.00#Bronze v process castings#31.10.24.00.00
-unspsc7#31.10.24.13.00#Zinc v process castings#31.10.24.00.00
-unspsc7#31.10.24.14.00#Tin v process castings#31.10.24.00.00
-unspsc7#31.10.24.15.00#Lead v process castings#31.10.24.00.00
-unspsc7#31.10.24.16.00#Precious metal v process castings#31.10.24.00.00
-unspsc7#31.11.00.00.00#Extrusions#31.00.00.00.00
-unspsc7#31.11.15.00.00#Profile extrusions#31.11.00.00.00
-unspsc7#31.11.15.01.00#Aluminum profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.02.00#Beryllium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.03.00#Brass profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.04.00#Bronze profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.05.00#Copper profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.06.00#Ferrous alloy profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.07.00#Lead profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.08.00#Magnesium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.09.00#Non ferrous alloy profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.10.00#Plastic profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.11.00#Precious metal profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.12.00#Rubber profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.13.00#Stainless steel profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.14.00#Steel profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.15.00#Tin profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.16.00#Titanium profile extrusions#31.11.15.00.00
-unspsc7#31.11.15.17.00#Zinc profile extrusions#31.11.15.00.00
-unspsc7#31.11.16.00.00#Impact extrusions#31.11.00.00.00
-unspsc7#31.11.16.01.00#Aluminum impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.02.00#Beryllium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.03.00#Brass impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.04.00#Bronze impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.05.00#Copper impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.06.00#Ferrous alloy impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.07.00#Lead impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.08.00#Magnesium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.09.00#Non ferrous alloy impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.10.00#Plastic impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.11.00#Precious metal impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.12.00#Rubber impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.13.00#Stainless steel impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.14.00#Steel impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.15.00#Tin impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.16.00#Titanium impact extrusions#31.11.16.00.00
-unspsc7#31.11.16.17.00#Zinc impact extrusions#31.11.16.00.00
-unspsc7#31.11.17.00.00#Cold extrusions#31.11.00.00.00
-unspsc7#31.11.17.01.00#Aluminum cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.02.00#Beryllium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.03.00#Brass cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.04.00#Bronze cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.05.00#Copper cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.06.00#Ferrous alloy cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.07.00#Lead cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.08.00#Magnesium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.09.00#Non ferrous alloy cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.10.00#Plastic cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.11.00#Precious metal cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.12.00#Rubber cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.13.00#Stainless steel cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.14.00#Steel cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.15.00#Tin cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.16.00#Titanium cold extrusions#31.11.17.00.00
-unspsc7#31.11.17.17.00#Zinc cold extrusions#31.11.17.00.00
-unspsc7#31.12.00.00.00#Machined castings#31.00.00.00.00
-unspsc7#31.12.10.00.00#Machined v process castings#31.12.00.00.00
-unspsc7#31.12.10.01.00#Non ferrous alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.02.00#Ferrous alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.03.00#Steel v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.04.00#Stainless steel v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.05.00#Iron v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.06.00#Aluminum v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.07.00#Magnesium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.08.00#Titanium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.09.00#Beryllium v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.10.00#Copper v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.11.00#Brass v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.12.00#Bronze v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.13.00#Zinc v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.14.00#Tin v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.15.00#Lead v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.16.00#Precious metal v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.17.00#Composite v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.18.00#Nickel alloy v process machined castings#31.12.10.00.00
-unspsc7#31.12.10.19.00#Non metallic v process machined castings#31.12.10.00.00
-unspsc7#31.12.11.00.00#Machined die castings#31.12.00.00.00
-unspsc7#31.12.11.01.00#Aluminum die machined castings#31.12.11.00.00
-unspsc7#31.12.11.02.00#Ferrous alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.03.00#Iron die machined castings#31.12.11.00.00
-unspsc7#31.12.11.04.00#Non ferrous alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.05.00#Stainless steel die machined castings#31.12.11.00.00
-unspsc7#31.12.11.06.00#Steel die machined castings#31.12.11.00.00
-unspsc7#31.12.11.07.00#Magnesium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.08.00#Zinc die machined castings#31.12.11.00.00
-unspsc7#31.12.11.09.00#Tin die machined castings#31.12.11.00.00
-unspsc7#31.12.11.10.00#Titanium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.11.00#Beryllium die machined castings#31.12.11.00.00
-unspsc7#31.12.11.12.00#Precious metal die machined castings#31.12.11.00.00
-unspsc7#31.12.11.13.00#Copper die machined castings#31.12.11.00.00
-unspsc7#31.12.11.14.00#Lead die machined castings#31.12.11.00.00
-unspsc7#31.12.11.15.00#Brass die machined castings#31.12.11.00.00
-unspsc7#31.12.11.16.00#Bronze die machined castings#31.12.11.00.00
-unspsc7#31.12.11.17.00#Composite die machined castings#31.12.11.00.00
-unspsc7#31.12.11.18.00#Nickel Alloy die machined castings#31.12.11.00.00
-unspsc7#31.12.11.19.00#Non metallic die machined castings#31.12.11.00.00
-unspsc7#31.12.12.00.00#Machined sand castings#31.12.00.00.00
-unspsc7#31.12.12.01.00#Non ferrous alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.02.00#Ferrous alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.03.00#Steel sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.04.00#Stainless steel sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.05.00#Iron sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.06.00#Aluminum sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.07.00#Magnesium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.08.00#Titanium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.09.00#Beryllium sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.10.00#Copper sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.11.00#Brass sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.12.00#Bronze sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.13.00#Zinc sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.14.00#Tin sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.15.00#Lead sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.16.00#Precious metal sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.17.00#Composite sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.18.00#Nickel Alloy sand machined castings#31.12.12.00.00
-unspsc7#31.12.12.19.00#Non metallic sand machined castings#31.12.12.00.00
-unspsc7#31.12.13.00.00#Machined permanent mold castings#31.12.00.00.00
-unspsc7#31.12.13.01.00#Non ferrous alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.02.00#Ferrous alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.03.00#Steel permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.04.00#Stainless steel permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.05.00#Iron permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.06.00#Aluminum permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.07.00#Magnesium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.08.00#Titanium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.09.00#Beryllium permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.10.00#Copper permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.11.00#Brass permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.12.00#Bronze permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.13.00#Zinc permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.14.00#Tin permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.15.00#Lead permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.16.00#Precious metal permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.17.00#Composite permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.18.00#Nickel alloy permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.13.19.00#Non metallic permanent mold machined castings#31.12.13.00.00
-unspsc7#31.12.14.00.00#Machined plaster mold castings#31.12.00.00.00
-unspsc7#31.12.14.01.00#Non ferrous alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.02.00#Ferrous alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.03.00#Steel plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.04.00#Stainless steel plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.05.00#Iron plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.06.00#Aluminum plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.07.00#Magnesium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.08.00#Titanium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.09.00#Beryllium plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.10.00#Copper plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.11.00#Brass plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.12.00#Bronze plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.13.00#Zinc plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.14.00#Tin plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.15.00#Lead plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.16.00#Precious metal plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.17.00#Composite plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.18.00#Nickel alloy plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.14.19.00#Non metallic plaster mold machined castings#31.12.14.00.00
-unspsc7#31.12.15.00.00#Machined shell mold castings#31.12.00.00.00
-unspsc7#31.12.15.01.00#Non ferrous alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.02.00#Ferrous alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.03.00#Steel shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.04.00#Stainless steel shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.05.00#Iron shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.06.00#Aluminum shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.07.00#Magnesium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.08.00#Titanium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.09.00#Beryllium shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.10.00#Copper shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.11.00#Brass shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.12.00#Bronze shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.13.00#Zinc shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.14.00#Tin shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.15.00#Lead shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.16.00#Precious shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.17.00#Composite shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.18.00#Nickel alloy shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.15.19.00#Non metallic shell mold machined castings#31.12.15.00.00
-unspsc7#31.12.16.00.00#Machined investment castings#31.12.00.00.00
-unspsc7#31.12.16.01.00#Non ferrous alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.02.00#Ferrous alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.03.00#Steel investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.04.00#Stainless steel investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.05.00#Iron investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.06.00#Aluminum investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.07.00#Magnesium investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.08.00#Zinc investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.09.00#Tin investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.10.00#Lead investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.11.00#Precious metal investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.12.00#Titanium investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.13.00#Composite investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.14.00#Nickel alloy investment machined castings#31.12.16.00.00
-unspsc7#31.12.16.15.00#Non metallic investment machined castings#31.12.16.00.00
-unspsc7#31.12.17.00.00#Machined centrifugal castings#31.12.00.00.00
-unspsc7#31.12.17.01.00#Non ferrous alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.02.00#Ferrous alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.03.00#Steel centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.04.00#Stainless steel centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.05.00#Iron centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.06.00#Aluminum centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.07.00#Magnesium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.08.00#Titanium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.09.00#Beryllium centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.10.00#Copper centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.11.00#Brass centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.12.00#Bronze centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.13.00#Zinc centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.14.00#Tin centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.15.00#Lead centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.16.00#Precious metal centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.17.00#Composite centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.18.00#Nickel alloy centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.17.19.00#Non metallic centrifugal machined castings#31.12.17.00.00
-unspsc7#31.12.18.00.00#Machined ceramic mold castings#31.12.00.00.00
-unspsc7#31.12.18.01.00#Non ferrous alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.02.00#Ferrous alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.03.00#Steel ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.04.00#Stainless steel ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.05.00#Iron ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.06.00#Aluminum ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.07.00#Magnesium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.08.00#Titanium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.09.00#Beryllium ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.10.00#Copper ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.11.00#Brass ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.12.00#Bronze ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.13.00#Zinc ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.14.00#Tin ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.15.00#Lead ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.16.00#Precious metal ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.17.00#Composite ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.18.00#Nickel alloy ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.18.19.00#Non metallic ceramic mold machined castings#31.12.18.00.00
-unspsc7#31.12.19.00.00#Machined graphite mold castings#31.12.00.00.00
-unspsc7#31.12.19.01.00#Non ferrous alloy graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.02.00#Ferrrous alloy graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.03.00#Steel graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.04.00#Stainless steel graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.05.00#Iron graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.06.00#Aluminum graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.07.00#Magnesium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.08.00#Titanium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.09.00#Beryllium graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.10.00#Copper graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.11.00#Brass graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.12.00#Bronze graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.13.00#Zinc graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.14.00#Tin graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.15.00#Lead graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.16.00#Precious metal graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.17.00#Composite graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.18.00#Nickel alloy metal graphite mold machined castings#31.12.19.00.00
-unspsc7#31.12.19.19.00#Non metallic graphite mold machined castings#31.12.19.00.00
-unspsc7#31.13.00.00.00#Forgings#31.00.00.00.00
-unspsc7#31.13.15.00.00#Open die forgings#31.13.00.00.00
-unspsc7#31.13.15.01.00#Non ferrous alloy open die forgings#31.13.15.00.00
-unspsc7#31.13.15.02.00#Ferrous alloy open die forgings#31.13.15.00.00
-unspsc7#31.13.15.03.00#Steel open die forgings#31.13.15.00.00
-unspsc7#31.13.15.04.00#Stainless steel open die forgings#31.13.15.00.00
-unspsc7#31.13.15.05.00#Iron open die forgings#31.13.15.00.00
-unspsc7#31.13.15.06.00#Aluminum open die forgings#31.13.15.00.00
-unspsc7#31.13.15.07.00#Magnesium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.08.00#Titanium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.09.00#Beryllium open die forgings#31.13.15.00.00
-unspsc7#31.13.15.10.00#Copper open die forgings#31.13.15.00.00
-unspsc7#31.13.15.11.00#Brass open die forgings#31.13.15.00.00
-unspsc7#31.13.15.12.00#Bronze open die forgings#31.13.15.00.00
-unspsc7#31.13.15.13.00#Zinc open die forgings#31.13.15.00.00
-unspsc7#31.13.15.14.00#Tin open die forgings#31.13.15.00.00
-unspsc7#31.13.15.15.00#Lead open die forgings#31.13.15.00.00
-unspsc7#31.13.15.16.00#Precious metal open die forgings#31.13.15.00.00
-unspsc7#31.13.16.00.00#Closed die forgings#31.13.00.00.00
-unspsc7#31.13.16.01.00#Non ferrous alloy closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.02.00#Ferrous alloy closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.03.00#Steel closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.04.00#Stainless steel closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.05.00#Iron closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.06.00#Aluminum closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.07.00#Magnesium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.08.00#Titanium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.09.00#Beryllium closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.10.00#Copper closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.11.00#Brass closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.12.00#Bronze closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.13.00#Zinc closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.14.00#Tin closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.15.00#Lead closed die forgings#31.13.16.00.00
-unspsc7#31.13.16.16.00#Precious metal closed die forgings#31.13.16.00.00
-unspsc7#31.13.17.00.00#Impression die forgings#31.13.00.00.00
-unspsc7#31.13.17.01.00#Non ferrous alloy impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.02.00#Ferrous alloy impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.03.00#Steel impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.04.00#Stainless steel impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.05.00#Iron impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.06.00#Aluminum impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.07.00#Magnesium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.08.00#Titanium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.09.00#Beryllium impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.10.00#Copper impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.11.00#Brass impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.12.00#Bronze impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.13.00#Zinc impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.14.00#Tin impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.15.00#Lead impression die forgings#31.13.17.00.00
-unspsc7#31.13.17.16.00#Precious metal impression die forgings#31.13.17.00.00
-unspsc7#31.13.18.00.00#Drop forgings#31.13.00.00.00
-unspsc7#31.13.18.01.00#Non ferrous alloy drop forgings#31.13.18.00.00
-unspsc7#31.13.18.02.00#Zinc drop forgings#31.13.18.00.00
-unspsc7#31.13.18.03.00#Ferrous alloy drop forgings#31.13.18.00.00
-unspsc7#31.13.18.04.00#Tin drop forgings#31.13.18.00.00
-unspsc7#31.13.18.05.00#Lead drop forgings#31.13.18.00.00
-unspsc7#31.13.18.06.00#Steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.07.00#Precious metal drop forgings#31.13.18.00.00
-unspsc7#31.13.18.08.00#Stainless steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.09.00#Iron drop forgings#31.13.18.00.00
-unspsc7#31.13.18.10.00#Aluminum drop forgings#31.13.18.00.00
-unspsc7#31.13.18.11.00#Magnesium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.12.00#Titanium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.13.00#Beryllium drop forgings#31.13.18.00.00
-unspsc7#31.13.18.14.00#Copper drop forgings#31.13.18.00.00
-unspsc7#31.13.18.15.00#Brass drop forgings#31.13.18.00.00
-unspsc7#31.13.18.16.00#Bronze drop forgings#31.13.18.00.00
-unspsc7#31.13.18.17.00#Cold steel drop forgings#31.13.18.00.00
-unspsc7#31.13.18.18.00#Semi finished drop forgings#31.13.18.00.00
-unspsc7#31.13.19.00.00#Rolled ring forgings#31.13.00.00.00
-unspsc7#31.13.19.01.00#Aluminum rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.02.00#Beryllium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.03.00#Brass rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.04.00#Bronze rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.05.00#Copper rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.06.00#Iron rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.07.00#Lead rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.08.00#Magnesium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.09.00#Precious metal rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.10.00#Stainless steel rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.11.00#Tin rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.12.00#Titanium rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.13.00#Zinc rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.14.00#Non ferrous alloy rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.15.00#Ferrous alloy rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.19.16.00#Steel rolled ring forgings#31.13.19.00.00
-unspsc7#31.13.20.00.00#Powdered metal components#31.13.00.00.00
-unspsc7#31.13.20.01.00#Ferrous powdered metal components#31.13.20.00.00
-unspsc7#31.13.20.02.00#Non ferrous powdered metal parts#31.13.20.00.00
-unspsc7#31.14.00.00.00#Moldings#31.00.00.00.00
-unspsc7#31.14.15.00.00#Injection moldings#31.14.00.00.00
-unspsc7#31.14.15.01.00#Plastic injection moldings#31.14.15.00.00
-unspsc7#31.14.15.02.00#Rubber injection moldings#31.14.15.00.00
-unspsc7#31.14.15.03.00#Glass injection moldings#31.14.15.00.00
-unspsc7#31.14.16.00.00#Vacuum moldings#31.14.00.00.00
-unspsc7#31.14.16.01.00#Plastic vacuum moldings#31.14.16.00.00
-unspsc7#31.14.16.02.00#Rubber vacuum moldings#31.14.16.00.00
-unspsc7#31.14.16.03.00#Glass vacuum moldings#31.14.16.00.00
-unspsc7#31.14.17.00.00#Blow moldings#31.14.00.00.00
-unspsc7#31.14.17.01.00#Plastic blow moldings#31.14.17.00.00
-unspsc7#31.14.17.02.00#Rubber blow moldings#31.14.17.00.00
-unspsc7#31.14.18.00.00#Reaction injection moldings (RIM)#31.14.00.00.00
-unspsc7#31.14.18.01.00#Plastic reaction injection moldings#31.14.18.00.00
-unspsc7#31.14.18.02.00#Rubber reaction injection moldings#31.14.18.00.00
-unspsc7#31.15.00.00.00#Rope and chain and cable and wire and strap#31.00.00.00.00
-unspsc7#31.15.15.00.00#Ropes#31.15.00.00.00
-unspsc7#31.15.15.01.00#Cotton rope#31.15.15.00.00
-unspsc7#31.15.15.02.00#Polyester rope#31.15.15.00.00
-unspsc7#31.15.15.03.00#Polypropylene rope#31.15.15.00.00
-unspsc7#31.15.15.04.00#Nylon rope#31.15.15.00.00
-unspsc7#31.15.15.05.00#Wire rope#31.15.15.00.00
-unspsc7#31.15.15.06.00#Hemp rope#31.15.15.00.00
-unspsc7#31.15.15.07.00#String or twine#31.15.15.00.00
-unspsc7#31.15.15.08.00#Sisal rope#31.15.15.00.00
-unspsc7#31.15.16.00.00#Chains#31.15.00.00.00
-unspsc7#31.15.16.01.00#Safety chains#31.15.16.00.00
-unspsc7#31.15.16.02.00#Skid chains#31.15.16.00.00
-unspsc7#31.15.16.03.00#Roller chains#31.15.16.00.00
-unspsc7#31.15.16.04.00#Proof coil chains#31.15.16.00.00
-unspsc7#31.15.16.05.00#Sash chain#31.15.16.00.00
-unspsc7#31.15.16.06.00#Jack chains#31.15.16.00.00
-unspsc7#31.15.16.07.00#Coil chains#31.15.16.00.00
-unspsc7#31.15.16.08.00#Ball chains#31.15.16.00.00
-unspsc7#31.15.16.09.00#Chain links#31.15.16.00.00
-unspsc7#31.15.17.00.00#Mechanical cable#31.15.00.00.00
-unspsc7#31.15.17.01.00#Mechanical cables#31.15.17.00.00
-unspsc7#31.15.17.02.00#Non electric control cables#31.15.17.00.00
-unspsc7#31.15.17.03.00#Lifting cables#31.15.17.00.00
-unspsc7#31.15.17.04.00#Track cables#31.15.17.00.00
-unspsc7#31.15.17.05.00#Non electrical steel cables#31.15.17.00.00
-unspsc7#31.15.17.06.00#Non electrical copper cables#31.15.17.00.00
-unspsc7#31.15.17.07.00#Non electrical aluminum cables#31.15.17.00.00
-unspsc7#31.15.18.00.00#Mechanical wire#31.15.00.00.00
-unspsc7#31.15.18.01.00#Mechanical wire#31.15.18.00.00
-unspsc7#31.15.18.02.00#Barbed wire#31.15.18.00.00
-unspsc7#31.15.18.03.00#Piano steel wire#31.15.18.00.00
-unspsc7#31.15.19.00.00#Straps#31.15.00.00.00
-unspsc7#31.15.19.01.00#Metal straps#31.15.19.00.00
-unspsc7#31.15.19.02.00#Leather straps#31.15.19.00.00
-unspsc7#31.15.19.03.00#Fiber straps#31.15.19.00.00
-unspsc7#31.15.19.04.00#Plastic straps#31.15.19.00.00
-unspsc7#31.15.20.00.00#Security wire#31.15.00.00.00
-unspsc7#31.15.20.01.00#Razor wire#31.15.20.00.00
-unspsc7#31.15.20.02.00#Barbed wire#31.15.20.00.00
-unspsc7#31.15.21.00.00#Electrical wire#31.15.00.00.00
-unspsc7#31.15.21.01.00#Wire assembly#31.15.21.00.00
-unspsc7#31.16.00.00.00#Hardware#31.00.00.00.00
-unspsc7#31.16.15.00.00#Screws#31.16.00.00.00
-unspsc7#31.16.15.01.00#Cap screws#31.16.15.00.00
-unspsc7#31.16.15.02.00#Anchor screws#31.16.15.00.00
-unspsc7#31.16.15.03.00#Drive screws#31.16.15.00.00
-unspsc7#31.16.15.04.00#Machine screws#31.16.15.00.00
-unspsc7#31.16.15.05.00#Set screws#31.16.15.00.00
-unspsc7#31.16.15.06.00#Sheet metal screws#31.16.15.00.00
-unspsc7#31.16.15.07.00#Tapping screws#31.16.15.00.00
-unspsc7#31.16.15.08.00#Wood screws#31.16.15.00.00
-unspsc7#31.16.15.09.00#Drywall screws#31.16.15.00.00
-unspsc7#31.16.15.10.00#Captive screw#31.16.15.00.00
-unspsc7#31.16.15.11.00#Locking screws#31.16.15.00.00
-unspsc7#31.16.15.12.00#Thread rolling screws#31.16.15.00.00
-unspsc7#31.16.15.13.00#Flathead screws#31.16.15.00.00
-unspsc7#31.16.15.14.00#Weld screws#31.16.15.00.00
-unspsc7#31.16.15.15.00#Flat head screws#31.16.15.00.00
-unspsc7#31.16.15.16.00#Thumb screws#31.16.15.00.00
-unspsc7#31.16.15.17.00#Shoulder screws#31.16.15.00.00
-unspsc7#31.16.16.00.00#Bolts#31.16.00.00.00
-unspsc7#31.16.16.01.00#Anchor bolts#31.16.16.00.00
-unspsc7#31.16.16.02.00#Blind bolts#31.16.16.00.00
-unspsc7#31.16.16.03.00#Carriage bolts#31.16.16.00.00
-unspsc7#31.16.16.04.00#Clevis bolts#31.16.16.00.00
-unspsc7#31.16.16.05.00#Cylinder bolts#31.16.16.00.00
-unspsc7#31.16.16.06.00#Door bolts#31.16.16.00.00
-unspsc7#31.16.16.07.00#Expansion bolts#31.16.16.00.00
-unspsc7#31.16.16.08.00#Lag bolts#31.16.16.00.00
-unspsc7#31.16.16.09.00#Toggle bolts#31.16.16.00.00
-unspsc7#31.16.16.10.00#Eye bolts#31.16.16.00.00
-unspsc7#31.16.16.11.00#Locking bolts#31.16.16.00.00
-unspsc7#31.16.16.12.00#Pin or collar bolts#31.16.16.00.00
-unspsc7#31.16.16.13.00#Tension bolts#31.16.16.00.00
-unspsc7#31.16.16.14.00#Structural bolts#31.16.16.00.00
-unspsc7#31.16.16.15.00#Torque bolts#31.16.16.00.00
-unspsc7#31.16.16.16.00#U bolts#31.16.16.00.00
-unspsc7#31.16.16.17.00#Wing bolts#31.16.16.00.00
-unspsc7#31.16.16.18.00#Threaded rod#31.16.16.00.00
-unspsc7#31.16.16.19.00#Stud bolts#31.16.16.00.00
-unspsc7#31.16.16.20.00#Hexagonal bolts#31.16.16.00.00
-unspsc7#31.16.17.00.00#Nuts#31.16.00.00.00
-unspsc7#31.16.17.01.00#Anchor nuts#31.16.17.00.00
-unspsc7#31.16.17.02.00#Bearing nuts#31.16.17.00.00
-unspsc7#31.16.17.03.00#Blind nuts#31.16.17.00.00
-unspsc7#31.16.17.04.00#Barrel nuts#31.16.17.00.00
-unspsc7#31.16.17.05.00#Cap nuts#31.16.17.00.00
-unspsc7#31.16.17.06.00#Captive nuts#31.16.17.00.00
-unspsc7#31.16.17.07.00#Castle nuts#31.16.17.00.00
-unspsc7#31.16.17.08.00#Channel nuts#31.16.17.00.00
-unspsc7#31.16.17.09.00#Clamping nuts#31.16.17.00.00
-unspsc7#31.16.17.10.00#Expansion nuts#31.16.17.00.00
-unspsc7#31.16.17.11.00#Eye nuts#31.16.17.00.00
-unspsc7#31.16.17.12.00#Flange nuts#31.16.17.00.00
-unspsc7#31.16.17.13.00#Hose nuts#31.16.17.00.00
-unspsc7#31.16.17.14.00#Insert nuts#31.16.17.00.00
-unspsc7#31.16.17.15.00#Self locking nuts#31.16.17.00.00
-unspsc7#31.16.17.16.00#Locknuts#31.16.17.00.00
-unspsc7#31.16.17.17.00#Wing nuts#31.16.17.00.00
-unspsc7#31.16.17.18.00#Toggle nuts#31.16.17.00.00
-unspsc7#31.16.17.19.00#Swivel nuts#31.16.17.00.00
-unspsc7#31.16.17.20.00#Stop nuts#31.16.17.00.00
-unspsc7#31.16.17.21.00#Spring nuts#31.16.17.00.00
-unspsc7#31.16.17.22.00#Union nuts#31.16.17.00.00
-unspsc7#31.16.17.23.00#Nutplate nuts#31.16.17.00.00
-unspsc7#31.16.17.24.00#Press nuts#31.16.17.00.00
-unspsc7#31.16.17.25.00#Clip nuts#31.16.17.00.00
-unspsc7#31.16.17.26.00#Dome nuts#31.16.17.00.00
-unspsc7#31.16.17.27.00#Hexagonal nuts#31.16.17.00.00
-unspsc7#31.16.17.28.00#Coupling nuts#31.16.17.00.00
-unspsc7#31.16.17.29.00#Knurled nuts#31.16.17.00.00
-unspsc7#31.16.18.00.00#Washers#31.16.00.00.00
-unspsc7#31.16.18.01.00#Locking washers#31.16.18.00.00
-unspsc7#31.16.18.02.00#Bevel washers#31.16.18.00.00
-unspsc7#31.16.18.03.00#Binding washers#31.16.18.00.00
-unspsc7#31.16.18.04.00#Curved washers#31.16.18.00.00
-unspsc7#31.16.18.05.00#Electrical insulating washers#31.16.18.00.00
-unspsc7#31.16.18.06.00#Finishing washers#31.16.18.00.00
-unspsc7#31.16.18.07.00#Flat washers#31.16.18.00.00
-unspsc7#31.16.18.08.00#Open washers#31.16.18.00.00
-unspsc7#31.16.18.09.00#Reducing washers#31.16.18.00.00
-unspsc7#31.16.18.10.00#Shim washers#31.16.18.00.00
-unspsc7#31.16.18.11.00#Spring washers#31.16.18.00.00
-unspsc7#31.16.18.12.00#Square washers#31.16.18.00.00
-unspsc7#31.16.18.13.00#Swivel washers#31.16.18.00.00
-unspsc7#31.16.18.14.00#Thrust washers#31.16.18.00.00
-unspsc7#31.16.18.15.00#Shoulder washers#31.16.18.00.00
-unspsc7#31.16.18.16.00#Spacers or standoffs#31.16.18.00.00
-unspsc7#31.16.18.17.00#Conical washers#31.16.18.00.00
-unspsc7#31.16.19.00.00#Springs#31.16.00.00.00
-unspsc7#31.16.19.01.00#Helical springs#31.16.19.00.00
-unspsc7#31.16.19.02.00#Leaf springs#31.16.19.00.00
-unspsc7#31.16.19.03.00#Spiral springs#31.16.19.00.00
-unspsc7#31.16.19.04.00#Compression springs#31.16.19.00.00
-unspsc7#31.16.19.05.00#Die springs#31.16.19.00.00
-unspsc7#31.16.19.06.00#Disk springs#31.16.19.00.00
-unspsc7#31.16.19.07.00#Extension springs#31.16.19.00.00
-unspsc7#31.16.19.08.00#Torsion springs#31.16.19.00.00
-unspsc7#31.16.20.00.00#Nails#31.16.00.00.00
-unspsc7#31.16.20.01.00#Brads#31.16.20.00.00
-unspsc7#31.16.20.02.00#Cap nails#31.16.20.00.00
-unspsc7#31.16.20.03.00#Finishing nails#31.16.20.00.00
-unspsc7#31.16.20.04.00#Masonry nails#31.16.20.00.00
-unspsc7#31.16.20.05.00#Roofing nails#31.16.20.00.00
-unspsc7#31.16.20.06.00#Wire nails#31.16.20.00.00
-unspsc7#31.16.20.07.00#Upholstery nails#31.16.20.00.00
-unspsc7#31.16.20.08.00#Drive pins#31.16.20.00.00
-unspsc7#31.16.21.00.00#Anchors#31.16.00.00.00
-unspsc7#31.16.21.01.00#Concrete anchors#31.16.21.00.00
-unspsc7#31.16.21.02.00#Wedge anchors#31.16.21.00.00
-unspsc7#31.16.21.03.00#Wall anchors#31.16.21.00.00
-unspsc7#31.16.21.04.00#Screw anchors#31.16.21.00.00
-unspsc7#31.16.21.05.00#Resin anchors#31.16.21.00.00
-unspsc7#31.16.21.06.00#Pipe anchors#31.16.21.00.00
-unspsc7#31.16.21.07.00#Nail expansion anchors#31.16.21.00.00
-unspsc7#31.16.21.08.00#Tie down anchors#31.16.21.00.00
-unspsc7#31.16.22.00.00#Rivets#31.16.00.00.00
-unspsc7#31.16.22.01.00#Blind rivets#31.16.22.00.00
-unspsc7#31.16.22.02.00#Crownhead rivets#31.16.22.00.00
-unspsc7#31.16.22.03.00#Flat head rivets#31.16.22.00.00
-unspsc7#31.16.22.04.00#Full rivets#31.16.22.00.00
-unspsc7#31.16.22.05.00#Ratchet rivets#31.16.22.00.00
-unspsc7#31.16.22.06.00#Tinners rivets#31.16.22.00.00
-unspsc7#31.16.22.07.00#Compression rivets#31.16.22.00.00
-unspsc7#31.16.22.08.00#Coopers rivets#31.16.22.00.00
-unspsc7#31.16.22.09.00#Button head rivets#31.16.22.00.00
-unspsc7#31.16.23.00.00#Mounting hardware#31.16.00.00.00
-unspsc7#31.16.23.01.00#Mounting profiles#31.16.23.00.00
-unspsc7#31.16.23.03.00#Mounting bars#31.16.23.00.00
-unspsc7#31.16.23.04.00#Mounting strips#31.16.23.00.00
-unspsc7#31.16.23.05.00#Mounting clips#31.16.23.00.00
-unspsc7#31.16.23.06.00#Mounting hangers#31.16.23.00.00
-unspsc7#31.16.23.07.00#Mounting plates#31.16.23.00.00
-unspsc7#31.16.23.08.00#Mounting panels#31.16.23.00.00
-unspsc7#31.16.23.09.00#Mounting racks#31.16.23.00.00
-unspsc7#31.16.23.10.00#Mounting straps#31.16.23.00.00
-unspsc7#31.16.23.11.00#Wall bushings#31.16.23.00.00
-unspsc7#31.16.24.00.00#Miscellaneous fasteners#31.16.00.00.00
-unspsc7#31.16.24.01.00#Grommets#31.16.24.00.00
-unspsc7#31.16.24.02.00#Hasps#31.16.24.00.00
-unspsc7#31.16.24.03.00#Hinges#31.16.24.00.00
-unspsc7#31.16.24.04.00#Hardware staples#31.16.24.00.00
-unspsc7#31.16.24.05.00#Turnbuckles#31.16.24.00.00
-unspsc7#31.16.24.06.00#Strapping or banding buckles#31.16.24.00.00
-unspsc7#31.16.24.07.00#Latch#31.16.24.00.00
-unspsc7#31.16.24.08.00#Cotter pins#31.16.24.00.00
-unspsc7#31.16.25.00.00#Brackets and braces#31.16.00.00.00
-unspsc7#31.16.25.01.00#Shelf brackets#31.16.25.00.00
-unspsc7#31.16.25.02.00#Angle brackets#31.16.25.00.00
-unspsc7#31.16.25.03.00#Braces#31.16.25.00.00
-unspsc7#31.16.25.04.00#Electrical fixture brackets#31.16.25.00.00
-unspsc7#31.16.25.05.00#Magnetic mounting brackets#31.16.25.00.00
-unspsc7#31.16.26.00.00#Hooks#31.16.00.00.00
-unspsc7#31.16.26.01.00#Swivel hooks#31.16.26.00.00
-unspsc7#31.16.26.02.00#Spring hooks#31.16.26.00.00
-unspsc7#31.16.26.03.00#S hooks#31.16.26.00.00
-unspsc7#31.16.26.04.00#Safety hooks#31.16.26.00.00
-unspsc7#31.16.26.05.00#Lifting hooks#31.16.26.00.00
-unspsc7#31.16.26.06.00#J hooks#31.16.26.00.00
-unspsc7#31.16.26.07.00#Guy wire hooks#31.16.26.00.00
-unspsc7#31.16.26.08.00#Grab hooks#31.16.26.00.00
-unspsc7#31.16.26.09.00#Screw hooks#31.16.26.00.00
-unspsc7#31.16.26.10.00#Peg board hooks#31.16.26.00.00
-unspsc7#31.16.26.11.00#Slip hooks#31.16.26.00.00
-unspsc7#31.16.27.00.00#Rolling hardware#31.16.00.00.00
-unspsc7#31.16.27.01.00#Casters#31.16.27.00.00
-unspsc7#31.16.27.02.00#Wheels#31.16.27.00.00
-unspsc7#31.16.27.03.00#Sliders#31.16.27.00.00
-unspsc7#31.16.28.00.00#Miscellaneous hardware#31.16.00.00.00
-unspsc7#31.16.28.01.00#Handles or knobs#31.16.28.00.00
-unspsc7#31.16.28.02.00#Inserts#31.16.28.00.00
-unspsc7#31.16.28.03.00#Shackles#31.16.28.00.00
-unspsc7#31.16.28.04.00#Door stops#31.16.28.00.00
-unspsc7#31.16.28.05.00#Cable thimble#31.16.28.00.00
-unspsc7#31.16.28.06.00#Screw covers#31.16.28.00.00
-unspsc7#31.16.28.07.00#Levers#31.16.28.00.00
-unspsc7#31.16.28.08.00#Panic bars#31.16.28.00.00
-unspsc7#31.16.29.00.00#Clamps#31.16.00.00.00
-unspsc7#31.16.29.01.00#Ear clamps#31.16.29.00.00
-unspsc7#31.16.29.02.00#Spring clamps#31.16.29.00.00
-unspsc7#31.16.29.03.00#Screw clamps#31.16.29.00.00
-unspsc7#31.16.29.04.00#Wire rope clamps#31.16.29.00.00
-unspsc7#31.16.29.05.00#Beam clamps#31.16.29.00.00
-unspsc7#31.16.30.00.00#Couplings#31.16.00.00.00
-unspsc7#31.16.30.01.00#Elastomeric couplings#31.16.30.00.00
-unspsc7#31.16.30.02.00#Gear couplings#31.16.30.00.00
-unspsc7#31.16.30.03.00#Metallic couplings#31.16.30.00.00
-unspsc7#31.16.30.04.00#Miniature couplings#31.16.30.00.00
-unspsc7#31.16.31.00.00#Connectors#31.16.00.00.00
-unspsc7#31.16.31.01.00#Quick disconnects#31.16.31.00.00
-unspsc7#31.16.31.02.00#Ferrule#31.16.31.00.00
-unspsc7#31.16.31.03.00#Trailer Connector#31.16.31.00.00
-unspsc7#31.16.32.00.00#Retaining hardware#31.16.00.00.00
-unspsc7#31.16.32.01.00#Spring pins#31.16.32.00.00
-unspsc7#31.16.32.02.00#Retaining rings#31.16.32.00.00
-unspsc7#31.16.32.03.00#Dowel pin#31.16.32.00.00
-unspsc7#31.16.32.04.00#Cotter pin#31.16.32.00.00
-unspsc7#31.16.32.05.00#Taper pins#31.16.32.00.00
-unspsc7#31.16.32.06.00#Grooved pins#31.16.32.00.00
-unspsc7#31.16.32.07.00#Shaft or woodruff keys#31.16.32.00.00
-unspsc7#31.16.32.08.00#Keystock#31.16.32.00.00
-unspsc7#31.16.32.09.00#Bearing holders or retainers#31.16.32.00.00
-unspsc7#31.16.32.10.00#Retaining collars#31.16.32.00.00
-unspsc7#31.16.33.00.00#Spacer#31.16.00.00.00
-unspsc7#31.16.33.01.00#Shim#31.16.33.00.00
-unspsc7#31.17.00.00.00#Bearings and bushings and wheels and gears#31.00.00.00.00
-unspsc7#31.17.15.00.00#Bearings#31.17.00.00.00
-unspsc7#31.17.15.01.00#Flanged bearings#31.17.15.00.00
-unspsc7#31.17.15.02.00#Radial bearings#31.17.15.00.00
-unspsc7#31.17.15.03.00#Wheel bearings#31.17.15.00.00
-unspsc7#31.17.15.04.00#Ball bearings#31.17.15.00.00
-unspsc7#31.17.15.05.00#Roller bearings#31.17.15.00.00
-unspsc7#31.17.15.06.00#Linear bearings#31.17.15.00.00
-unspsc7#31.17.15.07.00#Thrust bearings#31.17.15.00.00
-unspsc7#31.17.15.08.00#Rod end bearings#31.17.15.00.00
-unspsc7#31.17.15.09.00#Sleeve bearings#31.17.15.00.00
-unspsc7#31.17.15.10.00#Spherical bearings#31.17.15.00.00
-unspsc7#31.17.15.11.00#Pillow block bearings#31.17.15.00.00
-unspsc7#31.17.15.12.00#Needle bearings#31.17.15.00.00
-unspsc7#31.17.15.13.00#Hanger bearings#31.17.15.00.00
-unspsc7#31.17.15.14.00#Door closers#31.17.15.00.00
-unspsc7#31.17.15.15.00#Plain bearings#31.17.15.00.00
-unspsc7#31.17.15.16.00#Tapered bearings#31.17.15.00.00
-unspsc7#31.17.15.17.00#Needle bearings#31.17.15.00.00
-unspsc7#31.17.15.18.00#Bearing Cage#31.17.15.00.00
-unspsc7#31.17.15.19.00#Bearing blocks or housings#31.17.15.00.00
-unspsc7#31.17.15.20.00#Bearing journals#31.17.15.00.00
-unspsc7#31.17.15.21.00#Bearing rollers or balls#31.17.15.00.00
-unspsc7#31.17.16.00.00#Bushings#31.17.00.00.00
-unspsc7#31.17.16.01.00#Transformer bushings#31.17.16.00.00
-unspsc7#31.17.16.02.00#Wall bushings#31.17.16.00.00
-unspsc7#31.17.16.03.00#Drill bushings#31.17.16.00.00
-unspsc7#31.17.16.04.00#Pilot bushings#31.17.16.00.00
-unspsc7#31.17.16.05.00#Shaft bushings#31.17.16.00.00
-unspsc7#31.17.17.00.00#Gears#31.17.00.00.00
-unspsc7#31.17.17.01.00#Gear boxes#31.17.17.00.00
-unspsc7#31.17.17.02.00#Rack or pinion gears#31.17.17.00.00
-unspsc7#31.17.17.03.00#Differential gears#31.17.17.00.00
-unspsc7#31.17.17.04.00#Friction gears#31.17.17.00.00
-unspsc7#31.17.17.05.00#Helical gears#31.17.17.00.00
-unspsc7#31.17.17.06.00#Conical gears#31.17.17.00.00
-unspsc7#31.17.17.07.00#Spur gears#31.17.17.00.00
-unspsc7#31.17.17.08.00#Bevel gears#31.17.17.00.00
-unspsc7#31.17.17.09.00#Rack gears#31.17.17.00.00
-unspsc7#31.17.17.10.00#Pinion gears#31.17.17.00.00
-unspsc7#31.17.17.11.00#Ring gears#31.17.17.00.00
-unspsc7#31.17.17.12.00#Worm gears#31.17.17.00.00
-unspsc7#31.17.17.13.00#Side Gears#31.17.17.00.00
-unspsc7#31.17.17.14.00#Helical gears#31.17.17.00.00
-unspsc7#31.17.18.00.00#Industrial wheels#31.17.00.00.00
-unspsc7#31.17.18.01.00#Cog wheels#31.17.18.00.00
-unspsc7#31.17.18.02.00#Impeller wheels#31.17.18.00.00
-unspsc7#31.17.18.03.00#Flywheels#31.17.18.00.00
-unspsc7#31.17.18.04.00#Sheaves#31.17.18.00.00
-unspsc7#31.17.18.05.00#Wheel brushes#31.17.18.00.00
-unspsc7#31.17.19.00.00#Sprockets#31.17.00.00.00
-unspsc7#31.17.19.01.00#Roller chain sprockets#31.17.19.00.00
-unspsc7#31.17.19.02.00#Split sprockets#31.17.19.00.00
-unspsc7#31.18.00.00.00#Gaskets and seals#31.00.00.00.00
-unspsc7#31.18.15.00.00#Gaskets#31.18.00.00.00
-unspsc7#31.18.15.01.00#Plastic gaskets#31.18.15.00.00
-unspsc7#31.18.15.02.00#Rubber gaskets#31.18.15.00.00
-unspsc7#31.18.15.03.00#Metal gaskets#31.18.15.00.00
-unspsc7#31.18.15.04.00#Textile gaskets#31.18.15.00.00
-unspsc7#31.18.15.05.00#Cork gaskets#31.18.15.00.00
-unspsc7#31.18.15.06.00#O ring gaskets#31.18.15.00.00
-unspsc7#31.18.15.07.00#Electromagnetic interference (EMI) gaskets#31.18.15.00.00
-unspsc7#31.18.15.08.00#Bolted gaskets#31.18.15.00.00
-unspsc7#31.18.15.09.00#Gasket kits#31.18.15.00.00
-unspsc7#31.18.15.10.00#Silicone gaskets#31.18.15.00.00
-unspsc7#31.18.15.11.00#Liquid gaskets#31.18.15.00.00
-unspsc7#31.18.16.00.00#Seals#31.18.00.00.00
-unspsc7#31.18.16.01.00#Plastic seals#31.18.16.00.00
-unspsc7#31.18.16.02.00#Rubber seals#31.18.16.00.00
-unspsc7#31.18.16.03.00#Metallic seals#31.18.16.00.00
-unspsc7#31.18.16.04.00#Seal mechanical#31.18.16.00.00
-unspsc7#31.18.17.00.00#Packings and glands#31.18.00.00.00
-unspsc7#31.18.17.01.00#Packings#31.18.17.00.00
-unspsc7#31.18.17.02.00#Glands#31.18.17.00.00
-unspsc7#31.19.00.00.00#Grinding and polishing and smoothing materials#31.00.00.00.00
-unspsc7#31.19.15.00.00#Abrasives and abrasive media#31.19.00.00.00
-unspsc7#31.19.15.01.00#Abrasive papers#31.19.15.00.00
-unspsc7#31.19.15.02.00#Buffs#31.19.15.00.00
-unspsc7#31.19.15.03.00#Abrasive wheels#31.19.15.00.00
-unspsc7#31.19.15.04.00#Abrasive cloth#31.19.15.00.00
-unspsc7#31.19.15.05.00#Abrasive pads#31.19.15.00.00
-unspsc7#31.19.15.06.00#Abrasive discs#31.19.15.00.00
-unspsc7#31.19.15.07.00#Abrasive belts#31.19.15.00.00
-unspsc7#31.19.15.08.00#Bort#31.19.15.00.00
-unspsc7#31.19.15.09.00#Abrasive polishers#31.19.15.00.00
-unspsc7#31.19.15.10.00#Abrasive stones#31.19.15.00.00
-unspsc7#31.19.15.11.00#Steel wool#31.19.15.00.00
-unspsc7#31.19.15.12.00#Shot blast#31.19.15.00.00
-unspsc7#31.19.15.13.00#Glass bead#31.19.15.00.00
-unspsc7#31.19.15.14.00#Tumble media#31.19.15.00.00
-unspsc7#31.19.15.15.00#Abrasive mesh#31.19.15.00.00
-unspsc7#31.19.15.16.00#Abrasive cartridge rolls#31.19.15.00.00
-unspsc7#31.19.15.17.00#Emery boards#31.19.15.00.00
-unspsc7#31.19.16.00.00#Abrasive wheels#31.19.00.00.00
-unspsc7#31.19.16.01.00#Abrasive cubic borozon nitrate wheels#31.19.16.00.00
-unspsc7#31.19.16.02.00#Abrasive diamond wheels#31.19.16.00.00
-unspsc7#31.19.16.03.00#Tungsten carbide abrasive wheels#31.19.16.00.00
-unspsc7#31.20.00.00.00#Adhesives and sealants#31.00.00.00.00
-unspsc7#31.20.15.00.00#Tape#31.20.00.00.00
-unspsc7#31.20.15.01.00#Duct tape#31.20.15.00.00
-unspsc7#31.20.15.02.00#Electrical insulating tape#31.20.15.00.00
-unspsc7#31.20.15.03.00#Masking tape#31.20.15.00.00
-unspsc7#31.20.15.04.00#Carpet tape#31.20.15.00.00
-unspsc7#31.20.15.05.00#Double sided tape#31.20.15.00.00
-unspsc7#31.20.15.06.00#Bismalemide tape#31.20.15.00.00
-unspsc7#31.20.15.07.00#Fiberglass tape#31.20.15.00.00
-unspsc7#31.20.15.08.00#Graphite tape#31.20.15.00.00
-unspsc7#31.20.15.09.00#Nylon tape#31.20.15.00.00
-unspsc7#31.20.15.10.00#Resin impregnated tape#31.20.15.00.00
-unspsc7#31.20.15.11.00#Wire mesh tape#31.20.15.00.00
-unspsc7#31.20.15.12.00#Transparent tape#31.20.15.00.00
-unspsc7#31.20.15.13.00#Non skid safety tapes#31.20.15.00.00
-unspsc7#31.20.15.14.00#Polytetrafluoroethylene (PTFE) thread sealing tape#31.20.15.00.00
-unspsc7#31.20.15.15.00#Paper tapes#31.20.15.00.00
-unspsc7#31.20.15.16.00#Reflective tape#31.20.15.00.00
-unspsc7#31.20.15.17.00#Packaging tape#31.20.15.00.00
-unspsc7#31.20.15.18.00#Electrically conductive tape#31.20.15.00.00
-unspsc7#31.20.15.19.00#Pipe or hose repair tape#31.20.15.00.00
-unspsc7#31.20.15.20.00#Aisle marking tape#31.20.15.00.00
-unspsc7#31.20.15.21.00#Foil tape#31.20.15.00.00
-unspsc7#31.20.15.22.00#Adhesive transfer tape#31.20.15.00.00
-unspsc7#31.20.15.23.00#Cloth tape#31.20.15.00.00
-unspsc7#31.20.15.24.00#Color coding tape#31.20.15.00.00
-unspsc7#31.20.15.25.00#Vinyl tape#31.20.15.00.00
-unspsc7#31.20.15.26.00#Magnetic tape#31.20.15.00.00
-unspsc7#31.20.16.00.00#Other adhesives and sealants#31.20.00.00.00
-unspsc7#31.20.16.01.00#Chemical adhesives#31.20.16.00.00
-unspsc7#31.20.16.02.00#Pastes#31.20.16.00.00
-unspsc7#31.20.16.03.00#Gums#31.20.16.00.00
-unspsc7#31.20.16.04.00#Rubber cements#31.20.16.00.00
-unspsc7#31.20.16.05.00#Putties#31.20.16.00.00
-unspsc7#31.20.16.06.00#Caulks#31.20.16.00.00
-unspsc7#31.20.16.07.00#Epoxy bond#31.20.16.00.00
-unspsc7#31.20.16.08.00#Foam adhesives#31.20.16.00.00
-unspsc7#31.20.16.09.00#Hot melt adhesives#31.20.16.00.00
-unspsc7#31.20.16.10.00#Glues#31.20.16.00.00
-unspsc7#31.20.16.11.00#Film adhesives#31.20.16.00.00
-unspsc7#31.20.16.12.00#Thread sealants#31.20.16.00.00
-unspsc7#31.20.16.13.00#Re usable adhesive#31.20.16.00.00
-unspsc7#31.20.16.14.00#Sealing waxes#31.20.16.00.00
-unspsc7#31.21.00.00.00#Paints and primers and finishes#31.00.00.00.00
-unspsc7#31.21.15.00.00#Paints and primers#31.21.00.00.00
-unspsc7#31.21.15.01.00#Enamel paints#31.21.15.00.00
-unspsc7#31.21.15.02.00#Water based paints#31.21.15.00.00
-unspsc7#31.21.15.03.00#Pigment paints#31.21.15.00.00
-unspsc7#31.21.15.04.00#Coating paints#31.21.15.00.00
-unspsc7#31.21.15.05.00#Oil based paints#31.21.15.00.00
-unspsc7#31.21.15.06.00#Latex paints#31.21.15.00.00
-unspsc7#31.21.15.07.00#Spray paints#31.21.15.00.00
-unspsc7#31.21.15.08.00#Acrylic paints#31.21.15.00.00
-unspsc7#31.21.15.09.00#Enamel primers#31.21.15.00.00
-unspsc7#31.21.15.10.00#Polyurethane primers#31.21.15.00.00
-unspsc7#31.21.15.11.00#Urethane primers#31.21.15.00.00
-unspsc7#31.21.15.12.00#Latex primers#31.21.15.00.00
-unspsc7#31.21.16.00.00#Paint additives#31.21.00.00.00
-unspsc7#31.21.16.01.00#Calcimines#31.21.16.00.00
-unspsc7#31.21.16.02.00#Texturing materials#31.21.16.00.00
-unspsc7#31.21.16.03.00#Paint driers#31.21.16.00.00
-unspsc7#31.21.16.04.00#Paint extenders#31.21.16.00.00
-unspsc7#31.21.16.05.00#Anti slip agents#31.21.16.00.00
-unspsc7#31.21.16.06.00#Leveling agents#31.21.16.00.00
-unspsc7#31.21.16.07.00#Anti foaming agents#31.21.16.00.00
-unspsc7#31.21.17.00.00#Miscellaneous finishes#31.21.00.00.00
-unspsc7#31.21.17.01.00#Glazes#31.21.17.00.00
-unspsc7#31.21.17.02.00#Lusters#31.21.17.00.00
-unspsc7#31.21.17.03.00#Lacquers#31.21.17.00.00
-unspsc7#31.21.17.04.00#Sealers#31.21.17.00.00
-unspsc7#31.21.17.05.00#Shellacs#31.21.17.00.00
-unspsc7#31.21.17.06.00#Stains#31.21.17.00.00
-unspsc7#31.21.17.07.00#Varnishes#31.21.17.00.00
-unspsc7#31.21.17.08.00#Powder coat#31.21.17.00.00
-unspsc7#31.21.18.00.00#Paint solvents and thinners#31.21.00.00.00
-unspsc7#31.21.18.01.00#Paint or varnish removers#31.21.18.00.00
-unspsc7#31.21.18.02.00#Paint or varnish strippers#31.21.18.00.00
-unspsc7#31.21.18.03.00#Paint or varnish thinners#31.21.18.00.00
-unspsc7#31.21.19.00.00#Paint applicators and painting accessories#31.21.00.00.00
-unspsc7#31.21.19.01.00#Drop cloths#31.21.19.00.00
-unspsc7#31.21.19.02.00#Edging tools#31.21.19.00.00
-unspsc7#31.21.19.03.00#Masking equipment#31.21.19.00.00
-unspsc7#31.21.19.04.00#Paint brushes#31.21.19.00.00
-unspsc7#31.21.19.05.00#Paint mixers#31.21.19.00.00
-unspsc7#31.21.19.06.00#Paint rollers#31.21.19.00.00
-unspsc7#31.21.19.08.00#Paint sprayers#31.21.19.00.00
-unspsc7#31.21.19.09.00#Paint trays#31.21.19.00.00
-unspsc7#31.21.19.10.00#Paint mitts#31.21.19.00.00
-unspsc7#31.21.19.12.00#Telescoping poles#31.21.19.00.00
-unspsc7#31.21.19.13.00#Paint nozzles#31.21.19.00.00
-unspsc7#31.21.19.14.00#Air brushes#31.21.19.00.00
-unspsc7#31.21.19.15.00#Paint strainers#31.21.19.00.00
-unspsc7#31.22.00.00.00#Dyeing and tanning extracts#31.00.00.00.00
-unspsc7#31.22.15.00.00#Dyeing products#31.22.00.00.00
-unspsc7#31.22.15.01.00#Inorganic dyes#31.22.15.00.00
-unspsc7#31.22.15.02.00#Organic dyes of animal origin#31.22.15.00.00
-unspsc7#31.22.15.03.00#Organic dyes of vegetable origin#31.22.15.00.00
-unspsc7#31.22.16.00.00#Tanning products#31.22.00.00.00
-unspsc7#31.22.16.01.00#Inorganic tanning extracts#31.22.16.00.00
-unspsc7#31.22.16.02.00#Organic tanning extracts of animal origin#31.22.16.00.00
-unspsc7#31.22.16.03.00#Organic tanning extracts of vegetable origin#31.22.16.00.00
-unspsc7#31.23.00.00.00#Machined raw stock#31.00.00.00.00
-unspsc7#31.23.11.00.00#Machined bar stock#31.23.00.00.00
-unspsc7#31.23.11.01.00#Aluminum machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.02.00#Beryllium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.03.00#Brass machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.04.00#Bronze machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.05.00#Copper machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.06.00#Iron machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.07.00#Lead machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.08.00#Magnesium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.09.00#Precious metal machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.10.00#Stainless steel machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.11.00#Tin machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.12.00#Titanium machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.13.00#Zinc machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.14.00#Non ferrous alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.15.00#Ferrous alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.16.00#Steel machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.17.00#Composite machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.18.00#Nickel alloy machined bar stock#31.23.11.00.00
-unspsc7#31.23.11.19.00#Non metallic machined bar stock#31.23.11.00.00
-unspsc7#31.23.12.00.00#Machined plate stock#31.23.00.00.00
-unspsc7#31.23.12.01.00#Aluminum machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.02.00#Beryllium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.03.00#Brass machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.04.00#Bronze machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.05.00#Copper machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.06.00#Iron machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.07.00#Lead machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.08.00#Magnesium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.09.00#Precious metal machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.10.00#Stainless steel machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.11.00#Tin machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.12.00#Titanium machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.13.00#Zinc machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.14.00#Non ferrous alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.15.00#Ferrous alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.16.00#Steel machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.17.00#Composite machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.18.00#Nickel alloy machined plate stock#31.23.12.00.00
-unspsc7#31.23.12.19.00#Non metallic machined plate stock#31.23.12.00.00
-unspsc7#31.23.13.00.00#Shim stock#31.23.00.00.00
-unspsc7#31.23.13.01.00#Brass shim stock#31.23.13.00.00
-unspsc7#31.23.13.02.00#Steel shim stock#31.23.13.00.00
-unspsc7#31.23.13.03.00#Stainless steel shim stock#31.23.13.00.00
-unspsc7#31.23.13.04.00#Aluminum shim stock#31.23.13.00.00
-unspsc7#31.23.13.05.00#Copper shim stock#31.23.13.00.00
-unspsc7#31.24.00.00.00#Industrial optics#31.00.00.00.00
-unspsc7#31.24.15.00.00#Lenses and prisms#31.24.00.00.00
-unspsc7#31.24.15.01.00#Lenses#31.24.15.00.00
-unspsc7#31.24.15.02.00#Prisms#31.24.15.00.00
-unspsc7#31.24.16.00.00#Optical blanks#31.24.00.00.00
-unspsc7#31.24.16.01.00#Filter blanks#31.24.16.00.00
-unspsc7#31.24.16.02.00#Glass disks#31.24.16.00.00
-unspsc7#31.24.16.03.00#Molded glass#31.24.16.00.00
-unspsc7#31.24.16.04.00#Prism blanks#31.24.16.00.00
-unspsc7#31.24.16.05.00#Silicon blanks#31.24.16.00.00
-unspsc7#31.24.16.06.00#Germanium blanks#31.24.16.00.00
-unspsc7#31.24.16.07.00#Round bar stock#31.24.16.00.00
-unspsc7#31.24.16.08.00#Square bar stock#31.24.16.00.00
-unspsc7#31.24.16.09.00#Witness sample blanks#31.24.16.00.00
-unspsc7#31.24.16.10.00#Infrared optical material blanks#31.24.16.00.00
-unspsc7#31.24.17.00.00#Mirrors#31.24.00.00.00
-unspsc7#31.24.17.01.00#Diamond turned mirrors#31.24.17.00.00
-unspsc7#31.24.17.02.00#Metallic mirrors#31.24.17.00.00
-unspsc7#31.24.17.03.00#Parabolic mirrors#31.24.17.00.00
-unspsc7#31.24.17.04.00#Uncoated mirrors#31.24.17.00.00
-unspsc7#31.24.18.00.00#Optical filters#31.24.00.00.00
-unspsc7#31.24.18.01.00#Broad band filters#31.24.18.00.00
-unspsc7#31.24.18.02.00#Gradient filters#31.24.18.00.00
-unspsc7#31.24.18.03.00#Infrared filters#31.24.18.00.00
-unspsc7#31.24.18.04.00#Laser filters#31.24.18.00.00
-unspsc7#31.24.18.05.00#Narrow band filters#31.24.18.00.00
-unspsc7#31.24.18.06.00#Pelicle filters#31.24.18.00.00
-unspsc7#31.24.18.07.00#Visual filters#31.24.18.00.00
-unspsc7#31.24.19.00.00#Optical domes#31.24.00.00.00
-unspsc7#31.24.19.01.00#Specialty domes#31.24.19.00.00
-unspsc7#31.24.19.02.00#Diamond turned domes#31.24.19.00.00
-unspsc7#31.24.19.03.00#Metallic domes#31.24.19.00.00
-unspsc7#31.24.19.04.00#Molded glass domes#31.24.19.00.00
-unspsc7#31.24.19.05.00#Molded polycarbonate domes#31.24.19.00.00
-unspsc7#31.24.19.06.00#Replicated domes#31.24.19.00.00
-unspsc7#31.24.19.07.00#Shaped domes#31.24.19.00.00
-unspsc7#31.24.19.08.00#Frangible domes#31.24.19.00.00
-unspsc7#31.24.20.00.00#Lens and laser windows#31.24.00.00.00
-unspsc7#31.24.20.01.00#External lens or laser windows#31.24.20.00.00
-unspsc7#31.24.20.02.00#Infrared lens or laser windows#31.24.20.00.00
-unspsc7#31.24.20.03.00#Visual lens or laser windows#31.24.20.00.00
-unspsc7#31.24.21.00.00#Optical device accessories#31.24.00.00.00
-unspsc7#31.24.21.01.00#Prism holders#31.24.21.00.00
-unspsc7#31.24.21.02.00#Lens holders#31.24.21.00.00
-unspsc7#31.24.21.03.00#Optical slits#31.24.21.00.00
-unspsc7#31.25.00.00.00#Pneumatic and hydraulic and electric control systems#31.00.00.00.00
-unspsc7#31.25.15.00.00#Actuators#31.25.00.00.00
-unspsc7#31.25.15.01.00#Electric actuators#31.25.15.00.00
-unspsc7#31.25.15.02.00#Electronic actuators#31.25.15.00.00
-unspsc7#31.25.15.03.00#Hydraulic actuators#31.25.15.00.00
-unspsc7#31.25.15.04.00#Pneumatic actuators#31.25.15.00.00
-unspsc7#31.25.15.05.00#Valve actuators#31.25.15.00.00
-unspsc7#31.25.15.06.00#Gear actuators#31.25.15.00.00
-unspsc7#31.25.15.07.00#Rotary actuators#31.25.15.00.00
-unspsc7#31.25.15.08.00#Photoelectric actuators#31.25.15.00.00
-unspsc7#31.25.15.09.00#Electromagnetic actuators#31.25.15.00.00
-unspsc7#31.25.15.10.00#Solenoids#31.25.15.00.00
-unspsc7#31.25.15.11.00#Linear actuators#31.25.15.00.00
-unspsc7#31.26.00.00.00#Housings and cabinets and casings#31.00.00.00.00
-unspsc7#31.26.15.00.00#Housings and cabinets#31.26.00.00.00
-unspsc7#31.26.15.01.00#Plastic housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.02.00#Metal housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.03.00#Steel housings or cabinets#31.26.15.00.00
-unspsc7#31.26.15.04.00#Gear boxes or housings#31.26.15.00.00
-unspsc7#31.26.16.00.00#Shells and casings#31.26.00.00.00
-unspsc7#31.26.16.01.00#Plastic shells or casings#31.26.16.00.00
-unspsc7#31.26.16.02.00#Metal shells or casings#31.26.16.00.00
-unspsc7#31.26.16.03.00#Steel shells or casings#31.26.16.00.00
-unspsc7#31.27.00.00.00#Machine made parts#31.00.00.00.00
-unspsc7#31.27.15.00.00#General machine made parts#31.27.00.00.00
-unspsc7#31.27.15.01.00#Metal general machine made parts#31.27.15.00.00
-unspsc7#31.27.15.02.00#Non metal general machine made parts#31.27.15.00.00
-unspsc7#31.27.16.00.00#Screw machine made parts#31.27.00.00.00
-unspsc7#31.27.16.01.00#Metal screw machine made parts#31.27.16.00.00
-unspsc7#31.27.16.02.00#Non metal screw machine made parts#31.27.16.00.00
-unspsc7#31.28.00.00.00#Stampings and sheet components#31.00.00.00.00
-unspsc7#31.28.15.00.00#Stamped components#31.28.00.00.00
-unspsc7#31.28.15.01.00#Stamped metal components#31.28.15.00.00
-unspsc7#31.28.15.02.00#Aluminum stamped components#31.28.15.00.00
-unspsc7#31.28.15.03.00#Ferrous alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.04.00#Iron stamped components#31.28.15.00.00
-unspsc7#31.28.15.05.00#Non ferrous alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.06.00#Stainless steel stamped components#31.28.15.00.00
-unspsc7#31.28.15.07.00#Carbon Steel stamped components#31.28.15.00.00
-unspsc7#31.28.15.08.00#Magnesium stamped components#31.28.15.00.00
-unspsc7#31.28.15.09.00#Zinc stamped components#31.28.15.00.00
-unspsc7#31.28.15.10.00#Tin stamped components#31.28.15.00.00
-unspsc7#31.28.15.11.00#Titanium stamped components#31.28.15.00.00
-unspsc7#31.28.15.12.00#Beryllium stamped components#31.28.15.00.00
-unspsc7#31.28.15.13.00#Precious metal stamped components#31.28.15.00.00
-unspsc7#31.28.15.14.00#Copper stamped components#31.28.15.00.00
-unspsc7#31.28.15.15.00#Lead stamped components#31.28.15.00.00
-unspsc7#31.28.15.16.00#Brass stamped components#31.28.15.00.00
-unspsc7#31.28.15.17.00#Bronze stamped components#31.28.15.00.00
-unspsc7#31.28.15.18.00#Composite stamped components#31.28.15.00.00
-unspsc7#31.28.15.19.00#Nickel alloy stamped components#31.28.15.00.00
-unspsc7#31.28.15.20.00#Non metallic stamped components#31.28.15.00.00
-unspsc7#31.28.15.21.00#Coated Stampings#31.28.15.00.00
-unspsc7#31.28.16.00.00#Formed components#31.28.00.00.00
-unspsc7#31.28.16.01.00#Formed metal components#31.28.16.00.00
-unspsc7#31.28.17.00.00#Welded components#31.28.00.00.00
-unspsc7#31.28.17.01.00#Welded metal components#31.28.17.00.00
-unspsc7#31.28.18.00.00#Punched components#31.28.00.00.00
-unspsc7#31.28.18.01.00#Aluminum punched components#31.28.18.00.00
-unspsc7#31.28.18.02.00#Ferrous alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.03.00#Iron punched components#31.28.18.00.00
-unspsc7#31.28.18.04.00#Non ferrous alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.05.00#Stainless steel punched components#31.28.18.00.00
-unspsc7#31.28.18.06.00#Carbon Steel punched components#31.28.18.00.00
-unspsc7#31.28.18.07.00#Composite punched components#31.28.18.00.00
-unspsc7#31.28.18.08.00#Nickel alloy punched components#31.28.18.00.00
-unspsc7#31.28.18.09.00#Non metallic punched components#31.28.18.00.00
-unspsc7#31.28.18.10.00#Titanium punched components#31.28.18.00.00
-unspsc7#31.28.18.11.00#Beryllium punched components#31.28.18.00.00
-unspsc7#31.28.18.12.00#Precious metal punched components#31.28.18.00.00
-unspsc7#31.28.18.13.00#Copper punched components#31.28.18.00.00
-unspsc7#31.28.18.14.00#Lead punched components#31.28.18.00.00
-unspsc7#31.28.18.15.00#Brass punched components#31.28.18.00.00
-unspsc7#31.28.18.16.00#Bronze punched components#31.28.18.00.00
-unspsc7#31.28.18.17.00#Magnesium punched components#31.28.18.00.00
-unspsc7#31.28.18.18.00#Zinc punched components#31.28.18.00.00
-unspsc7#31.28.18.19.00#Tin punched components#31.28.18.00.00
-unspsc7#31.28.19.00.00#Draw formed components#31.28.00.00.00
-unspsc7#31.28.19.01.00#Aluminum draw formed components#31.28.19.00.00
-unspsc7#31.28.19.02.00#Beryllium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.03.00#Brass draw formed components#31.28.19.00.00
-unspsc7#31.28.19.04.00#Bronze draw formed components#31.28.19.00.00
-unspsc7#31.28.19.05.00#Composite draw formed components#31.28.19.00.00
-unspsc7#31.28.19.06.00#Copper draw formed components#31.28.19.00.00
-unspsc7#31.28.19.07.00#Ferrous alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.08.00#Iron draw formed components#31.28.19.00.00
-unspsc7#31.28.19.09.00#Lead draw formed components#31.28.19.00.00
-unspsc7#31.28.19.10.00#Magnesium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.11.00#Nickel alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.12.00#Non ferrous alloy draw formed components#31.28.19.00.00
-unspsc7#31.28.19.13.00#Non metallic draw formed components#31.28.19.00.00
-unspsc7#31.28.19.14.00#Precious metal draw formed components#31.28.19.00.00
-unspsc7#31.28.19.15.00#Stainless steel draw formed components#31.28.19.00.00
-unspsc7#31.28.19.16.00#Steel draw formed components#31.28.19.00.00
-unspsc7#31.28.19.17.00#Tin draw formed components#31.28.19.00.00
-unspsc7#31.28.19.18.00#Titanium draw formed components#31.28.19.00.00
-unspsc7#31.28.19.19.00#Zinc draw formed components#31.28.19.00.00
-unspsc7#31.28.20.00.00#Hydro formed components#31.28.00.00.00
-unspsc7#31.28.20.01.00#Aluminum hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.02.00#Beryllium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.03.00#Brass hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.04.00#Bronze hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.05.00#Composite hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.06.00#Copper hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.07.00#Ferrous alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.08.00#Iron hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.09.00#Lead hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.10.00#Magnesium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.11.00#Nickel alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.12.00#Non ferrous alloy hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.13.00#Non metallic hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.14.00#Precious metal hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.15.00#Stainless steel hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.16.00#Steel hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.17.00#Tin hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.18.00#Titanium hydro formed components#31.28.20.00.00
-unspsc7#31.28.20.19.00#Zinc hydro formed components#31.28.20.00.00
-unspsc7#31.28.21.00.00#Spin formed components#31.28.00.00.00
-unspsc7#31.28.21.01.00#Aluminum spin formed components#31.28.21.00.00
-unspsc7#31.28.21.02.00#Beryllium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.03.00#Brass spin formed components#31.28.21.00.00
-unspsc7#31.28.21.04.00#Bronze spin formed components#31.28.21.00.00
-unspsc7#31.28.21.05.00#Composite spin formed components#31.28.21.00.00
-unspsc7#31.28.21.06.00#Copper spin formed components#31.28.21.00.00
-unspsc7#31.28.21.07.00#Ferrous alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.08.00#Iron spin formed components#31.28.21.00.00
-unspsc7#31.28.21.09.00#Lead spin formed components#31.28.21.00.00
-unspsc7#31.28.21.10.00#Magnesium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.11.00#Nickel alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.12.00#Non ferrous alloy spin formed components#31.28.21.00.00
-unspsc7#31.28.21.13.00#Non metallic spin formed components#31.28.21.00.00
-unspsc7#31.28.21.14.00#Precious metal spin formed components#31.28.21.00.00
-unspsc7#31.28.21.15.00#Stainless steel spin formed components#31.28.21.00.00
-unspsc7#31.28.21.16.00#Steel spin formed components#31.28.21.00.00
-unspsc7#31.28.21.17.00#Tin spin formed components#31.28.21.00.00
-unspsc7#31.28.21.18.00#Titanium spin formed components#31.28.21.00.00
-unspsc7#31.28.21.19.00#Zinc spin formed components#31.28.21.00.00
-unspsc7#31.28.22.00.00#Roll formed components#31.28.00.00.00
-unspsc7#31.28.22.01.00#Aluminum roll formed components#31.28.22.00.00
-unspsc7#31.28.22.02.00#Beryllium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.03.00#Brass roll formed components#31.28.22.00.00
-unspsc7#31.28.22.04.00#Bronze roll formed components#31.28.22.00.00
-unspsc7#31.28.22.05.00#Composite roll formed components#31.28.22.00.00
-unspsc7#31.28.22.06.00#Copper roll formed components#31.28.22.00.00
-unspsc7#31.28.22.07.00#Ferrous alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.08.00#Iron roll formed components#31.28.22.00.00
-unspsc7#31.28.22.09.00#Lead roll formed components#31.28.22.00.00
-unspsc7#31.28.22.10.00#Magnesium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.11.00#Nickel alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.12.00#Non ferrous alloy roll formed components#31.28.22.00.00
-unspsc7#31.28.22.13.00#Non metallic roll formed components#31.28.22.00.00
-unspsc7#31.28.22.14.00#Precious metal roll formed components#31.28.22.00.00
-unspsc7#31.28.22.15.00#Stainless steel roll formed components#31.28.22.00.00
-unspsc7#31.28.22.16.00#Steel roll formed components#31.28.22.00.00
-unspsc7#31.28.22.17.00#Tin roll formed components#31.28.22.00.00
-unspsc7#31.28.22.18.00#Titanium roll formed components#31.28.22.00.00
-unspsc7#31.28.22.19.00#Zinc roll formed components#31.28.22.00.00
-unspsc7#31.28.23.00.00#Stretch formed components#31.28.00.00.00
-unspsc7#31.28.23.01.00#Aluminum stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.02.00#Beryllium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.03.00#Brass stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.04.00#Bronze stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.05.00#Composite stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.06.00#Copper stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.07.00#Ferrous alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.08.00#Iron stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.09.00#Lead stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.10.00#Magnesium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.11.00#Nickel alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.12.00#Non ferrous alloy stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.13.00#Non metallic stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.14.00#Precious metal stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.15.00#Stainless steel stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.16.00#Steel stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.17.00#Tin stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.18.00#Titanium stretch formed components#31.28.23.00.00
-unspsc7#31.28.23.19.00#Zinc stretch formed components#31.28.23.00.00
-unspsc7#31.28.24.00.00#Explosive formed components#31.28.00.00.00
-unspsc7#31.28.24.01.00#Aluminum explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.02.00#Beryllium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.03.00#Brass explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.04.00#Bronze explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.05.00#Composite explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.06.00#Copper explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.07.00#Ferrous alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.08.00#Iron explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.09.00#Lead explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.10.00#Magnesium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.11.00#Nickel alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.12.00#Non ferrous alloy explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.13.00#Non metallic explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.14.00#Precious metal explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.15.00#Stainless steel explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.16.00#Steel explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.17.00#Tin explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.18.00#Titanium explosive formed components#31.28.24.00.00
-unspsc7#31.28.24.19.00#Zinc explosive formed components#31.28.24.00.00
-unspsc7#31.29.00.00.00#Machined extrusions#31.00.00.00.00
-unspsc7#31.29.11.00.00#Machined hydro static extrusions#31.29.00.00.00
-unspsc7#31.29.11.01.00#Aluminum machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.02.00#Beryllium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.03.00#Brass machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.04.00#Bronze machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.05.00#Copper machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.06.00#Ferrous alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.07.00#Lead machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.08.00#Magnesium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.09.00#Non ferrous alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.10.00#Plastic machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.11.00#Precious metal machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.12.00#Rubber machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.13.00#Stainless steel machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.14.00#Steel machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.15.00#Tin machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.16.00#Titanium machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.17.00#Zinc machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.18.00#Composite machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.19.00#Nickel alloy machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.11.20.00#Non metallic machined hydro static extrusions#31.29.11.00.00
-unspsc7#31.29.12.00.00#Machined impact extrusions#31.29.00.00.00
-unspsc7#31.29.12.01.00#Aluminum machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.02.00#Beryllium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.03.00#Brass machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.04.00#Bronze machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.05.00#Copper machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.06.00#Ferrous alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.07.00#Lead machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.08.00#Magnesium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.09.00#Non ferrous alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.10.00#Plastic machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.11.00#Precious metal machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.12.00#Rubber machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.13.00#Stainless steel machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.14.00#Steel machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.15.00#Tin machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.16.00#Titanium machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.17.00#Zinc machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.18.00#Composite machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.19.00#Nickel alloy machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.12.20.00#Non metallic machined impact extrusions#31.29.12.00.00
-unspsc7#31.29.13.00.00#Machined cold extrusions#31.29.00.00.00
-unspsc7#31.29.13.01.00#Aluminum machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.02.00#Beryllium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.03.00#Brass machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.04.00#Bronze machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.05.00#Copper machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.06.00#Ferrous alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.07.00#Lead machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.08.00#Magnesium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.09.00#Non ferrous alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.10.00#Plastic machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.11.00#Precious metal machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.12.00#Rubber machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.13.00#Stainless steel machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.14.00#Steel machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.15.00#Tin machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.16.00#Titanium machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.17.00#Zinc machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.18.00#Composite machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.19.00#Nickel alloy machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.13.20.00#Non metallic machined cold extrusions#31.29.13.00.00
-unspsc7#31.29.14.00.00#Machined hot extrusions#31.29.00.00.00
-unspsc7#31.29.14.01.00#Aluminum machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.02.00#Beryllium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.03.00#Brass machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.04.00#Bronze machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.05.00#Copper machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.06.00#Ferrous alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.07.00#Lead machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.08.00#Magnesium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.09.00#Non ferrous alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.10.00#Plastic machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.11.00#Precious metal machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.12.00#Rubber machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.13.00#Stainless steel machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.14.00#Steel machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.15.00#Tin machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.16.00#Titanium machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.17.00#Zinc machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.18.00#Composite machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.19.00#Nickel alloy machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.14.20.00#Non metallic machined hot extrusions#31.29.14.00.00
-unspsc7#31.29.15.00.00#Machined impact extrusions#31.29.00.00.00
-unspsc7#31.29.16.00.00#Machined cold extrusions#31.29.00.00.00
-unspsc7#31.29.17.00.00#Machined hot extrusions#31.29.00.00.00
-unspsc7#31.29.18.00.00#Machined hydro static extrusions#31.29.00.00.00
-unspsc7#31.30.00.00.00#Machined forgings#31.00.00.00.00
-unspsc7#31.30.10.00.00#Machined rolled ring forgings#31.30.00.00.00
-unspsc7#31.30.11.00.00#Machined open die forgings#31.30.00.00.00
-unspsc7#31.30.11.01.00#Non ferrous alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.02.00#Ferrous alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.03.00#Steel open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.04.00#Stainless steel open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.05.00#Iron open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.06.00#Aluminum open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.07.00#Magnesium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.08.00#Titanium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.09.00#Beryllium open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.10.00#Copper open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.11.00#Brass open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.12.00#Bronze open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.13.00#Zinc open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.14.00#Tin open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.15.00#Lead open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.16.00#Precious metal open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.17.00#Composite open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.18.00#Nickel alloy open die machined forgings#31.30.11.00.00
-unspsc7#31.30.11.19.00#Non metallic open die machined forgings#31.30.11.00.00
-unspsc7#31.30.12.00.00#Machined closed die forgings#31.30.00.00.00
-unspsc7#31.30.12.01.00#Non ferrous alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.02.00#Ferrous alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.03.00#Steel closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.04.00#Stainless steel closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.05.00#Iron closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.06.00#Aluminum closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.07.00#Magnesium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.08.00#Titanium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.09.00#Beryllium closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.10.00#Copper closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.11.00#Brass closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.12.00#Bronze closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.13.00#Zinc closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.14.00#Tin closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.15.00#Lead closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.16.00#Precious metal closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.17.00#Composite closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.18.00#Nickel alloy closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.12.19.00#Non metallic closed die machined forgings#31.30.12.00.00
-unspsc7#31.30.13.00.00#Machined impression die forgings#31.30.00.00.00
-unspsc7#31.30.13.01.00#Non ferrous alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.02.00#Ferrous alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.03.00#Steel impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.04.00#Stainless steel impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.05.00#Iron impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.06.00#Aluminum impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.07.00#Magnesium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.08.00#Titanium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.09.00#Beryllium impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.10.00#Copper impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.11.00#Brass impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.12.00#Bronze impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.13.00#Zinc impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.14.00#Tin impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.15.00#Lead impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.16.00#Precious metal impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.17.00#Composite impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.18.00#Nickel alloy impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.13.19.00#Non metallic impression die machined forgings#31.30.13.00.00
-unspsc7#31.30.14.00.00#Machined drop forgings#31.30.00.00.00
-unspsc7#31.30.14.01.00#Non ferrous alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.02.00#Zinc drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.03.00#Ferrous alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.04.00#Tin drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.05.00#Lead drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.06.00#Steel drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.07.00#Precious metal drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.08.00#Stainless steel drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.09.00#Iron drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.10.00#Aluminum drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.11.00#Magnesium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.12.00#Titanium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.13.00#Beryllium drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.14.00#Copper drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.15.00#Brass drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.16.00#Bronze drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.17.00#Composite drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.18.00#Nickel alloy drop machined forgings#31.30.14.00.00
-unspsc7#31.30.14.19.00#Non metallic drop machined forgings#31.30.14.00.00
-unspsc7#31.30.15.00.00#Machined rolled ring forgings#31.30.00.00.00
-unspsc7#31.30.15.01.00#Aluminum rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.02.00#Beryllium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.03.00#Brass rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.04.00#Bronze rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.05.00#Copper rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.06.00#Iron rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.07.00#Lead rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.08.00#Magnesium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.09.00#Precious metal rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.10.00#Stainless steel rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.11.00#Tin rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.12.00#Titanium rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.13.00#Zinc rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.14.00#Non ferrous alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.15.00#Ferrous alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.16.00#Steel rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.17.00#Composite rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.18.00#Nickel alloy rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.15.19.00#Non metallic rolled ring machined forgings#31.30.15.00.00
-unspsc7#31.30.16.00.00#Machined open die forgings#31.30.00.00.00
-unspsc7#31.30.17.00.00#Machined closed die forgings#31.30.00.00.00
-unspsc7#31.30.18.00.00#Machined impression die forgings#31.30.00.00.00
-unspsc7#31.30.19.00.00#Machined drop forgings#31.30.00.00.00
-unspsc7#31.31.00.00.00#Fabricated pipe assemblies#31.00.00.00.00
-unspsc7#31.31.11.00.00#Solvent welded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.11.01.00#Aluminum solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.02.00#Carbon steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.03.00#Hastalloy X solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.04.00#Inconel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.05.00#Low alloy steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.06.00#Non metallic solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.07.00#Other ferrous solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.08.00#Other non ferrous solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.09.00#Stainless steel solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.10.00#Titanium solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.11.00#Waspalloy solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.12.00#Copper solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.11.13.00#Brass solvent welded pipe assemblies#31.31.11.00.00
-unspsc7#31.31.12.00.00#Riveted pipe assemblies#31.31.00.00.00
-unspsc7#31.31.12.01.00#Aluminum riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.02.00#Carbon steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.03.00#Hastalloy X riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.04.00#Inconel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.05.00#Low alloy steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.06.00#Non metallic riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.07.00#Other ferrous riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.08.00#Other non ferrous riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.09.00#Stainless steel riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.10.00#Titanium riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.11.00#Waspalloy riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.12.00#Copper riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.12.13.00#Brass riveted pipe assemblies#31.31.12.00.00
-unspsc7#31.31.13.00.00#Bolted pipe assemblies#31.31.00.00.00
-unspsc7#31.31.13.01.00#Aluminum bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.02.00#Carbon steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.03.00#Hastalloy X bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.04.00#Inconel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.05.00#Low alloy steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.06.00#Non metallic bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.07.00#Other ferrous bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.08.00#Other non ferrous bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.09.00#Stainless steel bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.10.00#Titanium bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.11.00#Waspalloy bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.12.00#Copper bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.13.13.00#Brass bolted pipe assemblies#31.31.13.00.00
-unspsc7#31.31.14.00.00#Ultra violet welded (UV) pipe assemblies#31.31.00.00.00
-unspsc7#31.31.14.01.00#Aluminum ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.02.00#Carbon steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.03.00#Hastalloy X ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.04.00#Inconel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.05.00#Low alloy steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.06.00#Non metallic ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.07.00#Other ferrous ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.08.00#Other non ferrous ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.09.00#Stainless steel ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.10.00#Titanium ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.11.00#Waspalloy ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.12.00#Copper ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.14.13.00#Brass ultra violet welded pipe assemblies#31.31.14.00.00
-unspsc7#31.31.15.00.00#Welded or brazed pipe assemblies#31.31.00.00.00
-unspsc7#31.31.15.01.00#Aluminum welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.02.00#Carbon steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.03.00#Hastalloy X welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.04.00#Inconel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.05.00#Low alloy steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.06.00#Non metallic welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.07.00#Other ferrous welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.08.00#Other non ferrous welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.09.00#Stainless steel welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.10.00#Titanium welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.11.00#Waspalloy welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.12.00#Copper welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.15.13.00#Brass welded or brazed pipe assemblies#31.31.15.00.00
-unspsc7#31.31.16.00.00#Sonic welded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.16.01.00#Aluminum sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.02.00#Carbon steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.03.00#Hastalloy X sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.04.00#Inconel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.05.00#Low alloy steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.06.00#Non metallic sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.07.00#Other ferrous sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.08.00#Other non ferrous sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.09.00#Stainless steel sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.10.00#Titanium sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.11.00#Waspalloy sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.12.00#Copper sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.16.13.00#Brass sonic welded pipe assemblies#31.31.16.00.00
-unspsc7#31.31.17.00.00#Bonded pipe assemblies#31.31.00.00.00
-unspsc7#31.31.17.01.00#Aluminum bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.02.00#Carbon steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.03.00#Hastalloy X bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.04.00#Inconel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.05.00#Low alloy steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.06.00#Non metallic bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.07.00#Other ferrous bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.08.00#Other non ferrous bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.09.00#Stainless steel bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.10.00#Titanium bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.11.00#Waspalloy bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.12.00#Copper bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.31.17.13.00#Brass bonded pipe assemblies#31.31.17.00.00
-unspsc7#31.32.00.00.00#Fabricated bar stock assemblies#31.00.00.00.00
-unspsc7#31.32.11.00.00#Bonded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.11.01.00#Aluminum bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.02.00#Carbon steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.03.00#Hastalloy X bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.04.00#Inconel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.05.00#Low alloy steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.06.00#Non metallic bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.07.00#Other ferrous bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.08.00#Other non ferrous bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.09.00#Stainless steel bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.10.00#Titanium bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.11.00#Waspalloy bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.12.00#Copper bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.11.13.00#Brass bonded bar stock assemblies#31.32.11.00.00
-unspsc7#31.32.12.00.00#Solvent welded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.12.01.00#Aluminum solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.02.00#Carbon steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.03.00#Hastalloy X solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.04.00#Inconel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.05.00#Low alloy steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.06.00#Non metallic solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.07.00#Other ferrous solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.08.00#Other non ferrous solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.09.00#Stainless steel solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.10.00#Titanium solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.11.00#Waspalloy solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.12.00#Copper solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.12.13.00#Brass solvent welded bar stock assemblies#31.32.12.00.00
-unspsc7#31.32.13.00.00#Riveted bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.13.01.00#Aluminum riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.02.00#Carbon steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.03.00#Hastalloy X riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.04.00#Inconel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.05.00#Low alloy steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.06.00#Non metallic riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.07.00#Other ferrous riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.08.00#Other non ferrous riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.09.00#Stainless steel riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.10.00#Titanium riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.11.00#Waspalloy riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.12.00#Copper riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.13.13.00#Brass riveted bar stock assemblies#31.32.13.00.00
-unspsc7#31.32.14.00.00#Welded or brazed bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.14.01.00#Aluminum welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.02.00#Carbon steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.03.00#Hastalloy X welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.04.00#Inconel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.05.00#Low alloy steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.06.00#Non metallic welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.07.00#Other ferrous welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.08.00#Other non ferrous welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.09.00#Stainless steel welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.10.00#Titanium welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.11.00#Waspalloy welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.12.00#Copper welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.14.13.00#Brass welded or brazed bar stock assemblies#31.32.14.00.00
-unspsc7#31.32.15.00.00#Ultra violet welded (UV) bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.15.01.00#Aluminum ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.02.00#Carbon steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.03.00#Hastalloy X ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.04.00#Inconel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.05.00#Low alloy steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.06.00#Non metallic ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.07.00#Other ferrous ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.08.00#Other non ferrous ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.09.00#Stainless steel ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.10.00#Titanium ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.11.00#Waspalloy ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.12.00#Copper ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.15.13.00#Brass ultra violet welded bar stock assemblies#31.32.15.00.00
-unspsc7#31.32.16.00.00#Sonic welded bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.16.01.00#Aluminum sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.02.00#Carbon steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.03.00#Hastalloy X sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.04.00#Inconel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.05.00#Low alloy steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.06.00#Non metallic sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.07.00#Other ferrous sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.08.00#Other non ferrous sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.09.00#Stainless steel sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.10.00#Titanium sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.11.00#Waspalloy sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.12.00#Copper sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.16.13.00#Brass sonic welded bar stock assemblies#31.32.16.00.00
-unspsc7#31.32.17.00.00#Bolted bar stock assemblies#31.32.00.00.00
-unspsc7#31.32.17.01.00#Aluminum bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.02.00#Carbon steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.03.00#Hastalloy X bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.04.00#Inconel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.05.00#Low alloy steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.06.00#Non metallic bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.07.00#Other ferrous bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.08.00#Other non ferrous bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.09.00#Stainless steel bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.10.00#Titanium bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.11.00#Waspalloy bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.12.00#Copper bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.32.17.13.00#Brass bolted bar stock assemblies#31.32.17.00.00
-unspsc7#31.33.00.00.00#Fabricated structural assemblies#31.00.00.00.00
-unspsc7#31.33.11.00.00#Bonded structural assemblies#31.33.00.00.00
-unspsc7#31.33.11.01.00#Aluminum bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.02.00#Carbon steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.03.00#Hastalloy X bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.04.00#Inconel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.05.00#Low alloy steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.06.00#Non metallic bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.07.00#Other ferrous bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.08.00#Other non ferrous bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.09.00#Stainless steel bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.10.00#Titanium bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.11.00#Waspalloy bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.12.00#Copper bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.11.13.00#Brass bonded structural assemblies#31.33.11.00.00
-unspsc7#31.33.12.00.00#Bolted structural assemblies#31.33.00.00.00
-unspsc7#31.33.12.01.00#Aluminum bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.02.00#Carbon steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.03.00#Hastalloy X bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.04.00#Inconel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.05.00#Low alloy steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.06.00#Non metallic bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.07.00#Other ferrous bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.08.00#Other non ferrous bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.09.00#Stainless steel bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.10.00#Titanium bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.11.00#Waspalloy bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.12.00#Copper bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.12.13.00#Brass bolted structural assemblies#31.33.12.00.00
-unspsc7#31.33.13.00.00#Sonic welded structural assemblies#31.33.00.00.00
-unspsc7#31.33.13.01.00#Aluminum sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.02.00#Carbon steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.03.00#Hastalloy X sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.04.00#Inconel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.05.00#Low alloy steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.06.00#Non metallic sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.07.00#Other ferrous sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.08.00#Other non ferrous sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.09.00#Stainless steel sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.10.00#Titanium sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.11.00#Waspalloy sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.12.00#Copper sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.13.13.00#Brass sonic welded structural assemblies#31.33.13.00.00
-unspsc7#31.33.14.00.00#Ultra violet welded (UV) structural assemblies#31.33.00.00.00
-unspsc7#31.33.14.01.00#Aluminum ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.02.00#Carbon steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.03.00#Hastalloy X ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.04.00#Inconel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.05.00#Low alloy steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.06.00#Non metallic ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.07.00#Other ferrous ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.08.00#Other non ferrous ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.09.00#Stainless steel ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.10.00#Titanium ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.11.00#Waspalloy ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.12.00#Copper ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.14.13.00#Brass ultra violet welded structural assemblies#31.33.14.00.00
-unspsc7#31.33.15.00.00#Solvent welded structural assemblies#31.33.00.00.00
-unspsc7#31.33.15.01.00#Aluminum solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.02.00#Carbon steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.03.00#Hastalloy X solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.04.00#Inconel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.05.00#Low alloy steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.06.00#Non metallic solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.07.00#Other ferrous solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.08.00#Other non ferrous solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.09.00#Stainless steel solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.10.00#Titanium solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.11.00#Waspalloy solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.12.00#Copper solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.15.13.00#Brass solvent welded structural assemblies#31.33.15.00.00
-unspsc7#31.33.16.00.00#Welded or brazed structural assemblies#31.33.00.00.00
-unspsc7#31.33.16.01.00#Aluminum welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.02.00#Carbon steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.03.00#Hastalloy X welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.04.00#Inconel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.05.00#Low alloy steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.06.00#Non metallic welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.07.00#Other ferrous welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.08.00#Other non ferrous welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.09.00#Stainless steel welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.10.00#Titanium welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.11.00#Waspalloy welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.12.00#Copper welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.16.13.00#Brass welded or brazed structural assemblies#31.33.16.00.00
-unspsc7#31.33.17.00.00#Riveted structural assemblies#31.33.00.00.00
-unspsc7#31.33.17.01.00#Aluminum riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.02.00#Carbon steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.03.00#Hastalloy X riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.04.00#Inconel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.05.00#Low alloy steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.06.00#Non metallic riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.07.00#Other ferrous riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.08.00#Other non ferrous riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.09.00#Stainless steel riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.10.00#Titanium riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.11.00#Waspalloy riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.12.00#Copper riveted structural assemblies#31.33.17.00.00
-unspsc7#31.33.17.13.00#Brass riveted structural assemblies#31.33.17.00.00
-unspsc7#31.34.00.00.00#Fabricated sheet assemblies#31.00.00.00.00
-unspsc7#31.34.11.00.00#Welded or brazed sheet assemblies#31.34.00.00.00
-unspsc7#31.34.11.01.00#Aluminum welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.02.00#Carbon steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.03.00#Hastalloy X welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.04.00#Inconel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.05.00#Low alloy steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.06.00#Non metallic welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.07.00#Other ferrous welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.08.00#Other non ferrous welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.09.00#Stainless steel welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.10.00#Titanium welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.11.00#Waspalloy welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.12.00#Copper welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.11.13.00#Brass welded or brazed sheet assemblies#31.34.11.00.00
-unspsc7#31.34.12.00.00#Riveted sheet assemblies#31.34.00.00.00
-unspsc7#31.34.12.01.00#Aluminum riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.02.00#Carbon steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.03.00#Hastalloy X riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.04.00#Inconel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.05.00#Low alloy steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.06.00#Non metallic riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.07.00#Other ferrous riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.08.00#Other non ferrous riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.09.00#Stainless steel riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.10.00#Titanium riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.11.00#Waspalloy riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.12.00#Copper riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.12.13.00#Brass riveted sheet assemblies#31.34.12.00.00
-unspsc7#31.34.13.00.00#Ultra violet welded (UV) sheet assemblies#31.34.00.00.00
-unspsc7#31.34.13.01.00#Aluminum ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.02.00#Carbon steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.03.00#Hastalloy X ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.04.00#Inconel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.05.00#Low alloy steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.06.00#Non metallic ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.07.00#Other ferrous ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.08.00#Other non ferrous ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.09.00#Stainless steel ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.10.00#Titanium ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.11.00#Waspalloy ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.12.00#Copper ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.13.13.00#Brass ultra violet welded sheet assemblies#31.34.13.00.00
-unspsc7#31.34.14.00.00#Sonic welded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.14.01.00#Aluminum sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.02.00#Carbon steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.03.00#Hastalloy X sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.04.00#Inconel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.05.00#Low alloy steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.06.00#Non metallic sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.07.00#Other ferrous sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.08.00#Other non ferrous sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.09.00#Stainless steel sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.10.00#Titanium sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.11.00#Waspalloy sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.12.00#Copper sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.14.13.00#Brass sonic welded sheet assemblies#31.34.14.00.00
-unspsc7#31.34.15.00.00#Solvent welded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.15.01.00#Aluminum solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.02.00#Carbon steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.03.00#Hastalloy X solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.04.00#Inconel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.05.00#Low alloy steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.06.00#Non metallic solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.07.00#Other ferrous solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.08.00#Other non ferrous solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.09.00#Stainless steel solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.10.00#Titanium solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.11.00#Waspalloy solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.12.00#Copper solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.15.13.00#Brass solvent welded sheet assemblies#31.34.15.00.00
-unspsc7#31.34.16.00.00#Bonded sheet assemblies#31.34.00.00.00
-unspsc7#31.34.16.01.00#Aluminum bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.02.00#Carbon steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.03.00#Hastalloy X bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.04.00#Inconel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.05.00#Low alloy steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.06.00#Non metallic bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.07.00#Other ferrous bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.08.00#Other non ferrous bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.09.00#Stainless steel bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.10.00#Titanium bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.11.00#Waspalloy bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.12.00#Copper bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.16.13.00#Brass bonded sheet assemblies#31.34.16.00.00
-unspsc7#31.34.17.00.00#Bolted sheet assemblies#31.34.00.00.00
-unspsc7#31.34.17.01.00#Aluminum bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.02.00#Carbon steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.03.00#Hastalloy X bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.04.00#Inconel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.05.00#Low alloy steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.06.00#Non metallic bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.07.00#Other ferrous bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.08.00#Other non ferrous bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.09.00#Stainless steel bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.10.00#Titanium bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.11.00#Waspalloy bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.12.00#Copper bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.34.17.13.00#Brass bolted sheet assemblies#31.34.17.00.00
-unspsc7#31.35.00.00.00#Fabricated tube assemblies#31.00.00.00.00
-unspsc7#31.35.11.00.00#Ultra violet welded (UV) tube assemblies#31.35.00.00.00
-unspsc7#31.35.11.01.00#Aluminum ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.02.00#Carbon steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.03.00#Hastalloy X ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.04.00#Inconel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.05.00#Low alloy steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.06.00#Non metallic ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.07.00#Other ferrous ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.08.00#Other non ferrous ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.09.00#Stainless steel ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.10.00#Titanium ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.11.00#Waspalloy ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.12.00#Copper ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.11.13.00#Brass ultra violet welded tube assemblies#31.35.11.00.00
-unspsc7#31.35.12.00.00#Welded or brazed tube assemblies#31.35.00.00.00
-unspsc7#31.35.12.01.00#Aluminum welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.02.00#Carbon steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.03.00#Hastalloy X welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.04.00#Inconel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.05.00#Low alloy steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.06.00#Non metallic welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.07.00#Other ferrous welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.08.00#Other non ferrous welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.09.00#Stainless steel welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.10.00#Titanium welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.11.00#Waspalloy welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.12.00#Copper welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.12.13.00#Brass welded or brazed tube assemblies#31.35.12.00.00
-unspsc7#31.35.13.00.00#Riveted tube assemblies#31.35.00.00.00
-unspsc7#31.35.13.01.00#Aluminum riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.02.00#Carbon steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.03.00#Hastalloy X riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.04.00#Inconel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.05.00#Low alloy steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.06.00#Non metallic riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.07.00#Other ferrous riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.08.00#Other non ferrous riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.09.00#Stainless steel riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.10.00#Titanium riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.11.00#Waspalloy riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.12.00#Copper riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.13.13.00#Brass riveted tube assemblies#31.35.13.00.00
-unspsc7#31.35.14.00.00#Bonded tube assemblies#31.35.00.00.00
-unspsc7#31.35.14.01.00#Aluminum bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.02.00#Carbon steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.03.00#Hastalloy X bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.04.00#Inconel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.05.00#Low alloy steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.06.00#Non metallic bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.07.00#Other ferrous bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.08.00#Other non ferrous bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.09.00#Stainless steel bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.10.00#Titanium bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.11.00#Waspalloy bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.12.00#Copper bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.14.13.00#Brass bonded tube assemblies#31.35.14.00.00
-unspsc7#31.35.15.00.00#Bolted tube assemblies#31.35.00.00.00
-unspsc7#31.35.15.01.00#Aluminum bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.02.00#Carbon steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.03.00#Hastalloy X bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.04.00#Inconel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.05.00#Low alloy steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.06.00#Non metallic bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.07.00#Other ferrous bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.08.00#Other non ferrous bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.09.00#Stainless steel bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.10.00#Titanium bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.11.00#Waspalloy bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.12.00#Copper bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.15.13.00#Brass bolted tube assemblies#31.35.15.00.00
-unspsc7#31.35.16.00.00#Solvent welded tube assemblies#31.35.00.00.00
-unspsc7#31.35.16.01.00#Aluminum solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.02.00#Carbon steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.03.00#Hastalloy X solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.04.00#Inconel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.05.00#Low alloy steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.06.00#Non metallic solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.07.00#Other ferrous solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.08.00#Other non ferrous solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.09.00#Stainless steel solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.10.00#Titanium solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.11.00#Waspalloy solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.12.00#Copper solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.16.13.00#Brass solvent welded tube assemblies#31.35.16.00.00
-unspsc7#31.35.17.00.00#Sonic welded tube assemblies#31.35.00.00.00
-unspsc7#31.35.17.01.00#Aluminum sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.02.00#Carbon steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.03.00#Hastalloy X sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.04.00#Inconel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.05.00#Low alloy steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.06.00#Non metallic sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.07.00#Other ferrous sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.08.00#Other non ferrous sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.09.00#Stainless steel sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.10.00#Titanium sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.11.00#Waspalloy sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.12.00#Copper sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.35.17.13.00#Brass sonic welded tube assemblies#31.35.17.00.00
-unspsc7#31.36.00.00.00#Fabricated plate assemblies#31.00.00.00.00
-unspsc7#31.36.11.00.00#Bonded plate assemblies#31.36.00.00.00
-unspsc7#31.36.11.01.00#Aluminum bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.02.00#Carbon steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.03.00#Hastalloy X bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.04.00#Inconel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.05.00#Low alloy steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.06.00#Non metallic bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.07.00#Other ferrous bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.08.00#Other non ferrous bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.09.00#Stainless steel bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.10.00#Titanium bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.11.00#Waspalloy bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.12.00#Copper bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.11.13.00#Brass bonded plate assemblies#31.36.11.00.00
-unspsc7#31.36.12.00.00#Bolted plate assemblies#31.36.00.00.00
-unspsc7#31.36.12.01.00#Aluminum bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.02.00#Carbon steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.03.00#Hastalloy X bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.04.00#Inconel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.05.00#Low alloy steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.06.00#Non metallic bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.07.00#Other ferrous bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.08.00#Other non ferrous bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.09.00#Stainless steel bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.10.00#Titanium bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.11.00#Waspalloy bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.12.00#Copper bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.12.13.00#Brass bolted plate assemblies#31.36.12.00.00
-unspsc7#31.36.13.00.00#Solvent welded plate assemblies#31.36.00.00.00
-unspsc7#31.36.13.01.00#Aluminum solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.02.00#Carbon steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.03.00#Hastalloy X solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.04.00#Inconel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.05.00#Low alloy steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.06.00#Non metallic solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.07.00#Other ferrous solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.08.00#Other non ferrous solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.09.00#Stainless steel solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.10.00#Titanium solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.11.00#Waspalloy solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.12.00#Copper solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.13.13.00#Brass solvent welded plate assemblies#31.36.13.00.00
-unspsc7#31.36.14.00.00#Welded or brazed plate assemblies#31.36.00.00.00
-unspsc7#31.36.14.01.00#Aluminum welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.02.00#Carbon steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.03.00#Hastalloy X welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.04.00#Inconel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.05.00#Low alloy steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.06.00#Non metallic welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.07.00#Other ferrous welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.08.00#Other non ferrous welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.09.00#Stainless steel welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.10.00#Titanium welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.11.00#Waspalloy welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.12.00#Copper welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.14.13.00#Brass welded or brazed plate assemblies#31.36.14.00.00
-unspsc7#31.36.15.00.00#Ultra violet welded (UV) plate assemblies#31.36.00.00.00
-unspsc7#31.36.15.01.00#Aluminum ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.02.00#Carbon steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.03.00#Hastalloy X ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.04.00#Inconel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.05.00#Low alloy steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.06.00#Non metallic ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.07.00#Other ferrous ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.08.00#Other non ferrous ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.09.00#Stainless steel ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.10.00#Titanium ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.11.00#Waspalloy ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.12.00#Copper ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.15.13.00#Brass ultra violet welded plate assemblies#31.36.15.00.00
-unspsc7#31.36.16.00.00#Sonic welded plate assemblies#31.36.00.00.00
-unspsc7#31.36.16.01.00#Aluminum sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.02.00#Carbon steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.03.00#Hastalloy X sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.04.00#Inconel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.05.00#Low alloy steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.06.00#Non metallic sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.07.00#Other ferrous sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.08.00#Other non ferrous sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.09.00#Stainless steel sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.10.00#Titanium sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.11.00#Waspalloy sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.12.00#Copper sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.16.13.00#Brass sonic welded plate assemblies#31.36.16.00.00
-unspsc7#31.36.17.00.00#Riveted plate assemblies#31.36.00.00.00
-unspsc7#31.36.17.01.00#Aluminum riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.02.00#Carbon steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.03.00#Hastalloy X riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.04.00#Inconel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.05.00#Low alloy steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.06.00#Non metallic riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.07.00#Other ferrous riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.08.00#Other non ferrous riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.09.00#Stainless steel riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.10.00#Titanium riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.11.00#Waspalloy riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.12.00#Copper riveted plate assemblies#31.36.17.00.00
-unspsc7#31.36.17.13.00#Brass riveted plate assemblies#31.36.17.00.00
-unspsc7#31.37.00.00.00#Refractories#31.00.00.00.00
-unspsc7#31.37.10.00.00#Ceramic fibre products#31.37.00.00.00
-unspsc7#31.37.10.01.00#Insulation boards#31.37.10.00.00
-unspsc7#31.37.10.02.00#Insulating wool#31.37.10.00.00
-unspsc7#31.37.11.00.00#Refractory bricks#31.37.00.00.00
-unspsc7#31.37.11.01.00#Mullite bricks#31.37.11.00.00
-unspsc7#31.37.11.02.00#Sillimanite bricks#31.37.11.00.00
-unspsc7#31.37.11.03.00#Acid resistant bricks#31.37.11.00.00
-unspsc7#31.37.11.04.00#Silica bricks#31.37.11.00.00
-unspsc7#31.37.11.05.00#High alumina bricks#31.37.11.00.00
-unspsc7#31.37.11.06.00#Calcium silicate blocks#31.37.11.00.00
-unspsc7#31.37.11.07.00#Shaped bricks#31.37.11.00.00
-unspsc7#31.37.12.00.00#Castables#31.37.00.00.00
-unspsc7#31.37.12.01.00#Dense castables#31.37.12.00.00
-unspsc7#31.37.12.02.00#Insulating castables#31.37.12.00.00
-unspsc7#31.37.12.03.00#Low cement castables#31.37.12.00.00
-unspsc7#31.37.12.04.00#Acid or alkali resistant castable#31.37.12.00.00
-unspsc7#31.37.12.05.00#Abrasion resistant castable#31.37.12.00.00
-unspsc7#31.37.12.06.00#Sic castable#31.37.12.00.00
-unspsc7#31.37.12.07.00#Self flow castable#31.37.12.00.00
-unspsc7#31.37.12.08.00#Tabular alumina castable#31.37.12.00.00
-unspsc7#31.37.12.09.00#Erosion resistant castable#31.37.12.00.00
-unspsc7#31.37.13.00.00#Shaped refractories#31.37.00.00.00
-unspsc7#31.37.13.01.00#Porous blocks#31.37.13.00.00
-unspsc7#31.37.13.02.00#Zircon nozzles#31.37.13.00.00
-unspsc7#31.38.00.00.00#Magnets and magnetic materials#31.00.00.00.00
-unspsc7#31.38.10.00.00#Permanent magnets#31.38.00.00.00
-unspsc7#31.38.10.01.00#Lode stone#31.38.10.00.00
-unspsc7#31.38.10.02.00#Alnico magnets#31.38.10.00.00
-unspsc7#32.00.00.00.00#Electronic Components and Supplies#32.00.00.00.00
-unspsc7#32.10.00.00.00#Printed circuits and integrated circuits and microassemblies#32.00.00.00.00
-unspsc7#32.10.15.00.00#Printed circuits and circuit card assemblies#32.10.00.00.00
-unspsc7#32.10.15.01.00#Bare printed circuit boards#32.10.15.00.00
-unspsc7#32.10.15.02.00#Printed circuit assemblies (PCAs)#32.10.15.00.00
-unspsc7#32.10.15.03.00#Mixed circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.04.00#Surface mount circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.05.00#Plated through circuit assemblies#32.10.15.00.00
-unspsc7#32.10.15.06.00#Double sided circuit cards#32.10.15.00.00
-unspsc7#32.10.15.07.00#Backplane circuit cards#32.10.15.00.00
-unspsc7#32.10.15.08.00#Multilayer circuit cards#32.10.15.00.00
-unspsc7#32.10.15.09.00#Single sided circuit cards#32.10.15.00.00
-unspsc7#32.10.15.10.00#Printed wire boards#32.10.15.00.00
-unspsc7#32.10.16.00.00#Electronic components for memory or smart cards#32.10.00.00.00
-unspsc7#32.10.16.01.00#Random access memory (RAM)#32.10.16.00.00
-unspsc7#32.10.16.02.00#Dynamic random access memory (DRAM)#32.10.16.00.00
-unspsc7#32.10.16.03.00#Static random access memory (SRAM)#32.10.16.00.00
-unspsc7#32.10.16.04.00#Programmable read only memory (PROM)#32.10.16.00.00
-unspsc7#32.10.16.05.00#Eraseable programmable read only memory (EPROM)#32.10.16.00.00
-unspsc7#32.10.16.06.00#Electronically eraseable programmable read only memory (EEPROM)#32.10.16.00.00
-unspsc7#32.10.16.07.00#Monolitihc memory integrated circuits (MMIC)#32.10.16.00.00
-unspsc7#32.10.16.08.00#Read only memory (ROM)#32.10.16.00.00
-unspsc7#32.10.16.09.00#Application specific integrated circuits (ASIC)#32.10.16.00.00
-unspsc7#32.10.16.10.00#Thin quad flat pack (TQFP)#32.10.16.00.00
-unspsc7#32.10.16.11.00#Programmable array logic (PAL)#32.10.16.00.00
-unspsc7#32.10.16.12.00#Gate array logic (GAL)#32.10.16.00.00
-unspsc7#32.10.16.13.00#Transistor transistor logic (TTL)#32.10.16.00.00
-unspsc7#32.10.16.14.00#Emitter coupled logic (ECL)#32.10.16.00.00
-unspsc7#32.10.16.15.00#Bipolar or metal oxide semiconductor technology (BIMOS)#32.10.16.00.00
-unspsc7#32.10.16.16.00#Bipolar complementary metal oxide semiconductor technology (BICMOS)#32.10.16.00.00
-unspsc7#32.10.16.17.00#Smart cards#32.10.16.00.00
-unspsc7#32.10.16.18.00#Upscreened integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.19.00#Linear integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.20.00#Digital integrated circuits#32.10.16.00.00
-unspsc7#32.10.16.21.00#Synchronous dynamic random access memory (SDRAM)#32.10.16.00.00
-unspsc7#32.10.16.22.00#Flash memory#32.10.16.00.00
-unspsc7#32.10.16.23.00#Rambus dynamic random access memoryRDRAM#32.10.16.00.00
-unspsc7#32.10.16.24.00#Synchronous graphic random access memory SGRAM#32.10.16.00.00
-unspsc7#32.10.17.00.00#Hybrid integrated circuits#32.10.00.00.00
-unspsc7#32.10.17.01.00#Microprocessors#32.10.17.00.00
-unspsc7#32.10.17.02.00#Clock oscillators#32.10.17.00.00
-unspsc7#32.10.17.03.00#Microcontrollers#32.10.17.00.00
-unspsc7#32.10.18.00.00#Unmounted integrated circuits#32.10.00.00.00
-unspsc7#32.10.18.01.00#Unmounted dies#32.10.18.00.00
-unspsc7#32.10.18.02.00#Unmounted wafers#32.10.18.00.00
-unspsc7#32.10.18.03.00#Unmounted chips#32.10.18.00.00
-unspsc7#32.11.00.00.00#Diodes and transistors and semiconductor devices#32.00.00.00.00
-unspsc7#32.11.15.00.00#Diodes#32.11.00.00.00
-unspsc7#32.11.15.01.00#Microwave diodes#32.11.15.00.00
-unspsc7#32.11.15.02.00#Zener diodes#32.11.15.00.00
-unspsc7#32.11.15.03.00#Light emitting diodes (LEDs)#32.11.15.00.00
-unspsc7#32.11.15.04.00#Schottky diodes#32.11.15.00.00
-unspsc7#32.11.15.05.00#Tunnel diodes#32.11.15.00.00
-unspsc7#32.11.15.06.00#Photosensitive diodes#32.11.15.00.00
-unspsc7#32.11.15.07.00#Variable capacitance diodes#32.11.15.00.00
-unspsc7#32.11.15.08.00#Solar diodes#32.11.15.00.00
-unspsc7#32.11.15.09.00#Power diodes#32.11.15.00.00
-unspsc7#32.11.15.10.00#Radio frequency (RF) diodes#32.11.15.00.00
-unspsc7#32.11.15.11.00#Small signal diodes#32.11.15.00.00
-unspsc7#32.11.16.00.00#Transistors#32.11.00.00.00
-unspsc7#32.11.16.01.00#Photo sensitive transistors#32.11.16.00.00
-unspsc7#32.11.16.02.00#Field effect transistors (FET)#32.11.16.00.00
-unspsc7#32.11.16.03.00#Metal oxide silicone field effect transistors (MOSFET)#32.11.16.00.00
-unspsc7#32.11.16.04.00#Transistor chips#32.11.16.00.00
-unspsc7#32.11.16.05.00#Transistor dies#32.11.16.00.00
-unspsc7#32.11.16.06.00#Transistor wafers#32.11.16.00.00
-unspsc7#32.11.16.07.00#Bipolar darlington or radio frequency (RF) transistors#32.11.16.00.00
-unspsc7#32.11.16.08.00#Unijunction transistors#32.11.16.00.00
-unspsc7#32.11.16.09.00#Insulated gate bipolar transistors (IGBT)#32.11.16.00.00
-unspsc7#32.11.16.10.00#Junction field effect transistors (JFET)#32.11.16.00.00
-unspsc7#32.11.17.00.00#Semiconductor devices#32.11.00.00.00
-unspsc7#32.11.17.01.00#Photovoltaic cells#32.11.17.00.00
-unspsc7#32.11.17.02.00#Thyristors#32.11.17.00.00
-unspsc7#32.11.17.03.00#Diacs#32.11.17.00.00
-unspsc7#32.11.17.04.00#Triacs#32.11.17.00.00
-unspsc7#32.11.17.05.00#Optical coupled isolators#32.11.17.00.00
-unspsc7#32.11.17.06.00#Crystal oscillators#32.11.17.00.00
-unspsc7#32.11.18.00.00#Integrated circuit components#32.11.00.00.00
-unspsc7#32.11.18.01.00#Intergrated circuit lids#32.11.18.00.00
-unspsc7#32.11.18.02.00#Integrated circuit packages#32.11.18.00.00
-unspsc7#32.11.18.03.00#Substrates#32.11.18.00.00
-unspsc7#32.11.19.00.00#Radio frequency (RF) components#32.11.00.00.00
-unspsc7#32.11.19.01.00#Amplifiers#32.11.19.00.00
-unspsc7#32.11.19.02.00#Attenuators#32.11.19.00.00
-unspsc7#32.11.19.03.00#Circulators#32.11.19.00.00
-unspsc7#32.11.19.04.00#Couplers#32.11.19.00.00
-unspsc7#32.11.19.05.00#Delay lines#32.11.19.00.00
-unspsc7#32.11.19.06.00#Detectors#32.11.19.00.00
-unspsc7#32.11.19.07.00#Dummy loads#32.11.19.00.00
-unspsc7#32.11.19.08.00#Radio frequency (RF) filters#32.11.19.00.00
-unspsc7#32.11.19.09.00#Isolators#32.11.19.00.00
-unspsc7#32.11.19.10.00#Mixers#32.11.19.00.00
-unspsc7#32.11.19.11.00#Phase shifters#32.11.19.00.00
-unspsc7#32.11.19.12.00#Power dividers#32.11.19.00.00
-unspsc7#32.11.19.13.00#Wave tube amplifiers#32.11.19.00.00
-unspsc7#32.11.19.14.00#Terminations#32.11.19.00.00
-unspsc7#32.11.19.15.00#Modulators#32.11.19.00.00
-unspsc7#32.12.00.00.00#Printed components#32.00.00.00.00
-unspsc7#32.12.15.00.00#Capacitors#32.12.00.00.00
-unspsc7#32.12.15.01.00#Fixed capacitors#32.12.15.00.00
-unspsc7#32.12.15.02.00#Variable capacitors or varactors#32.12.15.00.00
-unspsc7#32.12.15.03.00#Adjustable pre set capacitors#32.12.15.00.00
-unspsc7#32.12.15.04.00#Capacitor networks#32.12.15.00.00
-unspsc7#32.12.16.00.00#Resistors#32.12.00.00.00
-unspsc7#32.12.16.01.00#Thermistors#32.12.16.00.00
-unspsc7#32.12.16.02.00#Fusistors#32.12.16.00.00
-unspsc7#32.12.16.03.00#Variable resistors or varistors#32.12.16.00.00
-unspsc7#32.12.16.04.00#Fixed carbon resistors#32.12.16.00.00
-unspsc7#32.12.16.05.00#Fixed thick film resistors#32.12.16.00.00
-unspsc7#32.12.16.06.00#Fixed thin film resistors#32.12.16.00.00
-unspsc7#32.12.16.07.00#Resistor networks#32.12.16.00.00
-unspsc7#32.12.16.08.00#Wire wound resistors#32.12.16.00.00
-unspsc7#32.12.17.00.00#Discrete components#32.12.00.00.00
-unspsc7#32.12.17.01.00#Rectifiers#32.12.17.00.00
-unspsc7#32.12.17.02.00#Inductors#32.12.17.00.00
-unspsc7#32.12.17.03.00#Ferrites#32.12.17.00.00
-unspsc7#32.12.17.04.00#Static converters#32.12.17.00.00
-unspsc7#32.12.17.05.00#Inverters#32.12.17.00.00
-unspsc7#32.12.17.06.00#Resistor or capacitor (R/C) networks#32.12.17.00.00
-unspsc7#32.13.00.00.00#Passive components#32.00.00.00.00
-unspsc7#32.13.10.00.00#Temperature controls#32.13.00.00.00
-unspsc7#32.13.10.01.00#Heat sinks#32.13.10.00.00
-unspsc7#39.00.00.00.00#Lighting and Electrical Accessories and Supplies#39.00.00.00.00
-unspsc7#39.10.00.00.00#Lamps and lightbulbs and lamp components#39.00.00.00.00
-unspsc7#39.10.16.00.00#Lamps#39.10.00.00.00
-unspsc7#39.10.16.01.00#Halogen lamps#39.10.16.00.00
-unspsc7#39.10.16.02.00#Medical lamps#39.10.16.00.00
-unspsc7#39.10.16.03.00#Solar lamps#39.10.16.00.00
-unspsc7#39.10.16.04.00#Alcohol lamps#39.10.16.00.00
-unspsc7#39.10.16.05.00#Fluorescent lamps#39.10.16.00.00
-unspsc7#39.10.16.06.00#Arc lamps#39.10.16.00.00
-unspsc7#39.10.16.08.00#Shadowless or scialytic operation light#39.10.16.00.00
-unspsc7#39.10.16.09.00#Stage or studio lamps#39.10.16.00.00
-unspsc7#39.10.16.10.00#Filament lamps#39.10.16.00.00
-unspsc7#39.10.16.11.00#High intensity discharge (HID) lamps#39.10.16.00.00
-unspsc7#39.10.16.12.00#Incandescent lamps#39.10.16.00.00
-unspsc7#39.10.16.13.00#Infrared lamps#39.10.16.00.00
-unspsc7#39.10.16.14.00#Metal halide lamps#39.10.16.00.00
-unspsc7#39.10.16.15.00#Vapor lamps#39.10.16.00.00
-unspsc7#39.10.16.16.00#Ultraviolet (UV) lamps#39.10.16.00.00
-unspsc7#39.10.16.17.00#High pressure sodium lamps#39.10.16.00.00
-unspsc7#39.10.17.00.00#Bulb glass#39.10.00.00.00
-unspsc7#39.10.17.01.00#Fluorescent tubes#39.10.17.00.00
-unspsc7#39.10.18.00.00#Lamp components#39.10.00.00.00
-unspsc7#39.10.18.01.00#Lamp filament#39.10.18.00.00
-unspsc7#39.10.19.00.00#Mobile and fixed floodlighting#39.10.00.00.00
-unspsc7#39.10.19.01.00#Light tower#39.10.19.00.00
-unspsc7#39.10.19.02.00#Light cart#39.10.19.00.00
-unspsc7#39.10.19.03.00#Light stand#39.10.19.00.00
-unspsc7#39.11.00.00.00#Lighting and fixtures and accessories#39.00.00.00.00
-unspsc7#39.11.15.00.00#Interior lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.15.01.00#Fluorescent fixtures#39.11.15.00.00
-unspsc7#39.11.15.02.00#Vanity lighting#39.11.15.00.00
-unspsc7#39.11.15.03.00#Wall fixtures#39.11.15.00.00
-unspsc7#39.11.15.04.00#Stage or studio lighting systems#39.11.15.00.00
-unspsc7#39.11.15.05.00#Recessed lighting#39.11.15.00.00
-unspsc7#39.11.15.06.00#Chandeliers#39.11.15.00.00
-unspsc7#39.11.15.07.00#Desk fixtures#39.11.15.00.00
-unspsc7#39.11.15.08.00#Track lighting#39.11.15.00.00
-unspsc7#39.11.15.09.00#Floor torchiere#39.11.15.00.00
-unspsc7#39.11.15.10.00#Table lamps#39.11.15.00.00
-unspsc7#39.11.15.11.00#Decorative lighting#39.11.15.00.00
-unspsc7#39.11.15.12.00#Laboratory bench lights#39.11.15.00.00
-unspsc7#39.11.15.13.00#Interior solar lighting#39.11.15.00.00
-unspsc7#39.11.15.14.00#Tree lights#39.11.15.00.00
-unspsc7#39.11.15.15.00#Downlighting fixtures#39.11.15.00.00
-unspsc7#39.11.15.16.00#Task lighting fixtures#39.11.15.00.00
-unspsc7#39.11.15.17.00#Wax candles#39.11.15.00.00
-unspsc7#39.11.15.18.00#Hand or extension light#39.11.15.00.00
-unspsc7#39.11.15.19.00#Candle holders#39.11.15.00.00
-unspsc7#39.11.15.20.00#Halogen lighting fixtures#39.11.15.00.00
-unspsc7#39.11.16.00.00#Exterior lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.16.03.00#Roadway or highway lighting#39.11.16.00.00
-unspsc7#39.11.16.05.00#Landscape or area lighting#39.11.16.00.00
-unspsc7#39.11.16.06.00#Underwater lighting#39.11.16.00.00
-unspsc7#39.11.16.08.00#Residential street lights#39.11.16.00.00
-unspsc7#39.11.16.09.00#Kerosene or propane or butane lanterns#39.11.16.00.00
-unspsc7#39.11.17.00.00#Emergency lighting#39.11.00.00.00
-unspsc7#39.11.17.02.00#Flashlights#39.11.17.00.00
-unspsc7#39.11.17.03.00#Storm lights#39.11.17.00.00
-unspsc7#39.11.17.04.00#Flood lights#39.11.17.00.00
-unspsc7#39.11.17.05.00#Light sticks#39.11.17.00.00
-unspsc7#39.11.18.00.00#Lighting accessories#39.11.00.00.00
-unspsc7#39.11.18.01.00#Lamp ballasts#39.11.18.00.00
-unspsc7#39.11.18.02.00#Lamp housings#39.11.18.00.00
-unspsc7#39.11.18.03.00#Lamp sockets#39.11.18.00.00
-unspsc7#39.11.18.04.00#Lamp bases#39.11.18.00.00
-unspsc7#39.11.18.05.00#Lamp brackets#39.11.18.00.00
-unspsc7#39.11.18.06.00#Light boxes#39.11.18.00.00
-unspsc7#39.11.18.08.00#Grilles#39.11.18.00.00
-unspsc7#39.11.18.09.00#Light conditioner filters#39.11.18.00.00
-unspsc7#39.11.18.10.00#Lamp starter#39.11.18.00.00
-unspsc7#39.11.18.11.00#Electrified tracks#39.11.18.00.00
-unspsc7#39.11.18.12.00#Lamp covers#39.11.18.00.00
-unspsc7#39.11.19.00.00#Hazardous location lighting and fixtures#39.11.00.00.00
-unspsc7#39.11.19.01.00#Hazardous location flourescent fixtures#39.11.19.00.00
-unspsc7#39.11.19.02.00#Hazardous location incandescent fixtures#39.11.19.00.00
-unspsc7#40.00.00.00.00#Distribution and Conditioning Systems and Equipment and Components#40.00.00.00.00
-unspsc7#40.10.00.00.00#Heating and ventilation and air circulation#40.00.00.00.00
-unspsc7#40.10.15.00.00#Ventilation#40.10.00.00.00
-unspsc7#40.10.15.01.00#Air collectors#40.10.15.00.00
-unspsc7#40.10.15.02.00#Air exhausters#40.10.15.00.00
-unspsc7#40.10.15.03.00#Vents#40.10.15.00.00
-unspsc7#40.10.15.04.00#Ventilation dampers#40.10.15.00.00
-unspsc7#40.10.15.05.00#Air diffusers#40.10.15.00.00
-unspsc7#40.10.15.06.00#Ventilation pipes#40.10.15.00.00
-unspsc7#40.10.16.00.00#Air circulation#40.10.00.00.00
-unspsc7#40.10.16.01.00#Blowers#40.10.16.00.00
-unspsc7#40.10.16.02.00#Air circulators#40.10.16.00.00
-unspsc7#40.10.16.03.00#Impellers#40.10.16.00.00
-unspsc7#40.10.16.04.00#Fans#40.10.16.00.00
-unspsc7#40.10.17.00.00#Cooling#40.10.00.00.00
-unspsc7#40.10.17.01.00#Air conditioners#40.10.17.00.00
-unspsc7#40.10.17.02.00#Cooling exchangers#40.10.17.00.00
-unspsc7#40.10.17.03.00#Evaporative coolers#40.10.17.00.00
-unspsc7#40.10.17.04.00#Condensing units#40.10.17.00.00
-unspsc7#40.10.18.00.00#Heating equipment#40.10.00.00.00
-unspsc7#40.10.18.01.00#Radiators#40.10.18.00.00
-unspsc7#40.10.18.02.00#Heat exchangers#40.10.18.00.00
-unspsc7#40.10.18.03.00#Fireplaces#40.10.18.00.00
-unspsc7#40.10.18.04.00#Heaters#40.10.18.00.00
-unspsc7#40.10.18.05.00#Furnaces#40.10.18.00.00
-unspsc7#40.10.18.06.00#Heat pumps#40.10.18.00.00
-unspsc7#40.10.18.07.00#Solar heating units#40.10.18.00.00
-unspsc7#40.10.18.08.00#Heating stoves#40.10.18.00.00
-unspsc7#40.10.18.09.00#Circulation heaters#40.10.18.00.00
-unspsc7#40.10.18.10.00#Coil duct heaters#40.10.18.00.00
-unspsc7#40.10.18.11.00#Convection heaters#40.10.18.00.00
-unspsc7#40.10.18.12.00#Divided exchangers#40.10.18.00.00
-unspsc7#40.10.18.13.00#Double split exchangers#40.10.18.00.00
-unspsc7#40.10.18.14.00#Finned tubular heaters#40.10.18.00.00
-unspsc7#40.10.18.15.00#Immersion heaters#40.10.18.00.00
-unspsc7#40.10.18.16.00#Kettle exchangers#40.10.18.00.00
-unspsc7#40.10.18.17.00#One pass exchangers#40.10.18.00.00
-unspsc7#40.10.18.18.00#Process air heaters#40.10.18.00.00
-unspsc7#40.10.18.19.00#Space heaters#40.10.18.00.00
-unspsc7#40.10.18.20.00#Split exchangers#40.10.18.00.00
-unspsc7#40.10.18.21.00#Strip heaters#40.10.18.00.00
-unspsc7#40.10.18.22.00#Tubular heaters#40.10.18.00.00
-unspsc7#40.10.18.23.00#Two pass exchangers#40.10.18.00.00
-unspsc7#40.10.18.24.00#Quartz heater#40.10.18.00.00
-unspsc7#40.10.18.25.00#Domestic water heaters#40.10.18.00.00
-unspsc7#40.10.18.26.00#Commercial water heaters#40.10.18.00.00
-unspsc7#40.10.19.00.00#Humidity control#40.10.00.00.00
-unspsc7#40.10.19.01.00#Vaporizers#40.10.19.00.00
-unspsc7#40.10.19.02.00#Dehumidifiers#40.10.19.00.00
-unspsc7#40.10.19.03.00#Humidifiers#40.10.19.00.00
-unspsc7#40.10.20.00.00#Boilers#40.10.00.00.00
-unspsc7#40.10.20.01.00#Fire tube boilers#40.10.20.00.00
-unspsc7#40.10.20.02.00#Water tube boiler#40.10.20.00.00
-unspsc7#40.10.20.03.00#Electric boilers#40.10.20.00.00
-unspsc7#40.14.00.00.00#Fluid and gas distribution#40.00.00.00.00
-unspsc7#40.14.15.00.00#Fluid and gas conduits#40.14.00.00.00
-unspsc7#40.14.15.02.00#Ducts#40.14.15.00.00
-unspsc7#40.14.15.04.00#Hoses#40.14.15.00.00
-unspsc7#40.14.16.00.00#Valves#40.14.00.00.00
-unspsc7#40.14.16.01.00#Check valves#40.14.16.00.00
-unspsc7#40.14.16.02.00#Needle valves#40.14.16.00.00
-unspsc7#40.14.16.03.00#Pneumatic valves#40.14.16.00.00
-unspsc7#40.14.16.04.00#Safety valves#40.14.16.00.00
-unspsc7#40.14.16.05.00#Solenoid valves#40.14.16.00.00
-unspsc7#40.14.16.06.00#Relief valves#40.14.16.00.00
-unspsc7#40.14.16.07.00#Ball valves#40.14.16.00.00
-unspsc7#40.14.16.08.00#Hydraulic valves#40.14.16.00.00
-unspsc7#40.14.16.09.00#Control valves#40.14.16.00.00
-unspsc7#40.14.16.10.00#Float valves#40.14.16.00.00
-unspsc7#40.14.16.11.00#Globe valves#40.14.16.00.00
-unspsc7#40.14.16.12.00#Expansion valves#40.14.16.00.00
-unspsc7#40.14.16.13.00#Gate valves#40.14.16.00.00
-unspsc7#40.14.16.14.00#Butterfly valves#40.14.16.00.00
-unspsc7#40.14.16.15.00#Flap valves#40.14.16.00.00
-unspsc7#40.14.16.16.00#Valve parts and accessories#40.14.16.00.00
-unspsc7#40.14.16.17.00#Angle globe valves#40.14.16.00.00
-unspsc7#40.14.16.18.00#Ball check valves#40.14.16.00.00
-unspsc7#40.14.16.19.00#Butterfly lug pattern valves#40.14.16.00.00
-unspsc7#40.14.16.20.00#Butterfly wafer pattern valves#40.14.16.00.00
-unspsc7#40.14.16.21.00#Diaphragm valves#40.14.16.00.00
-unspsc7#40.14.16.22.00#Inline check valves#40.14.16.00.00
-unspsc7#40.14.16.23.00#Knife gate valves#40.14.16.00.00
-unspsc7#40.14.16.24.00#Lubricated plug valves#40.14.16.00.00
-unspsc7#40.14.16.25.00#Mud or slush valves#40.14.16.00.00
-unspsc7#40.14.16.26.00#Nonlubricated plug valves#40.14.16.00.00
-unspsc7#40.14.16.27.00#Orifice valves#40.14.16.00.00
-unspsc7#40.14.16.28.00#Pilot valves#40.14.16.00.00
-unspsc7#40.14.16.29.00#Pinch valves#40.14.16.00.00
-unspsc7#40.14.16.30.00#Piston check valves#40.14.16.00.00
-unspsc7#40.14.16.31.00#Pump valves#40.14.16.00.00
-unspsc7#40.14.16.32.00#Sentinel valves#40.14.16.00.00
-unspsc7#40.14.16.33.00#Slider valves#40.14.16.00.00
-unspsc7#40.14.16.34.00#Swing check valves#40.14.16.00.00
-unspsc7#40.14.16.35.00#Turbine valves#40.14.16.00.00
-unspsc7#40.14.16.36.00#Valve kits#40.14.16.00.00
-unspsc7#40.14.16.37.00#Wafer check valves#40.14.16.00.00
-unspsc7#40.14.17.00.00#Hardware and fittings#40.14.00.00.00
-unspsc7#40.14.17.01.00#Drains#40.14.17.00.00
-unspsc7#40.14.17.02.00#Faucets#40.14.17.00.00
-unspsc7#40.14.17.03.00#Shower heads#40.14.17.00.00
-unspsc7#40.14.17.04.00#Spigots#40.14.17.00.00
-unspsc7#40.14.17.05.00#Spouts#40.14.17.00.00
-unspsc7#40.14.17.06.00#Pipe plugs#40.14.17.00.00
-unspsc7#40.14.17.07.00#Pipe clamps#40.14.17.00.00
-unspsc7#40.14.17.08.00#Liquid traps#40.14.17.00.00
-unspsc7#40.14.17.09.00#Steam traps#40.14.17.00.00
-unspsc7#40.14.17.10.00#Plumbing flanges#40.14.17.00.00
-unspsc7#40.14.17.11.00#Metal or rubber expansion joints#40.14.17.00.00
-unspsc7#40.14.17.12.00#Pipe caps#40.14.17.00.00
-unspsc7#40.14.17.13.00#Plumbing unions#40.14.17.00.00
-unspsc7#40.14.17.14.00#Plumbing crosses#40.14.17.00.00
-unspsc7#40.14.17.15.00#Plumbing nipples#40.14.17.00.00
-unspsc7#40.14.17.16.00#P traps#40.14.17.00.00
-unspsc7#40.14.17.17.00#Pipe bends#40.14.17.00.00
-unspsc7#40.14.17.18.00#Plumbing elbows#40.14.17.00.00
-unspsc7#40.14.17.19.00#Plumbing adapters#40.14.17.00.00
-unspsc7#40.14.17.20.00#Plumbing connectors#40.14.17.00.00
-unspsc7#40.14.17.21.00#Plumbing couplings#40.14.17.00.00
-unspsc7#40.14.17.22.00#Half couplings#40.14.17.00.00
-unspsc7#40.14.17.23.00#Reducing couplings#40.14.17.00.00
-unspsc7#40.14.17.24.00#Plumbing bushings#40.14.17.00.00
-unspsc7#40.14.17.25.00#Plumbing hangers#40.14.17.00.00
-unspsc7#40.14.17.26.00#Hydrants#40.14.17.00.00
-unspsc7#40.14.17.27.00#Plumbing vents#40.14.17.00.00
-unspsc7#40.14.17.28.00#Fluid regulators#40.14.17.00.00
-unspsc7#40.14.17.29.00#Plumbing tees#40.14.17.00.00
-unspsc7#40.14.17.30.00#Strainers#40.14.17.00.00
-unspsc7#40.14.17.31.00#Nozzles#40.14.17.00.00
-unspsc7#40.14.17.32.00#Plumbing spiders#40.14.17.00.00
-unspsc7#40.14.17.33.00#Pipe fitting#40.14.17.00.00
-unspsc7#40.14.17.34.00#Hose fitting#40.14.17.00.00
-unspsc7#40.14.17.35.00#Funnels#40.14.17.00.00
-unspsc7#40.14.17.36.00#Grease fitting#40.14.17.00.00
-unspsc7#40.14.17.37.00#Diaphragms#40.14.17.00.00
-unspsc7#40.14.18.00.00#Tube and tubing#40.14.00.00.00
-unspsc7#40.14.18.01.00#Ferrous alloy tubing#40.14.18.00.00
-unspsc7#40.14.18.02.00#Copper tubing#40.14.18.00.00
-unspsc7#40.14.18.03.00#Titanium tubing#40.14.18.00.00
-unspsc7#40.14.18.04.00#Magnesium tubing#40.14.18.00.00
-unspsc7#40.14.18.05.00#Tin tubing#40.14.18.00.00
-unspsc7#40.14.18.06.00#Brass tubing#40.14.18.00.00
-unspsc7#40.14.18.07.00#Lead tubing#40.14.18.00.00
-unspsc7#40.14.18.08.00#Bronze tubing#40.14.18.00.00
-unspsc7#40.14.18.09.00#Zinc tubing#40.14.18.00.00
-unspsc7#40.14.18.10.00#Steel tubing#40.14.18.00.00
-unspsc7#40.14.18.11.00#Iron tubing#40.14.18.00.00
-unspsc7#40.14.18.12.00#Cement tubing#40.14.18.00.00
-unspsc7#40.14.18.13.00#Plastic tubing#40.14.18.00.00
-unspsc7#40.14.18.14.00#Rubber tubing#40.14.18.00.00
-unspsc7#40.14.18.15.00#Glass tubing#40.14.18.00.00
-unspsc7#40.14.18.16.00#Stone tubing#40.14.18.00.00
-unspsc7#40.14.18.17.00#Non ferrous alloy tubing#40.14.18.00.00
-unspsc7#40.14.18.18.00#Aluminum tubing#40.14.18.00.00
-unspsc7#40.14.18.19.00#Stainless steel tubing#40.14.18.00.00
-unspsc7#40.14.18.20.00#Precious metal tubing#40.14.18.00.00
-unspsc7#40.14.18.21.00#Nylon tubing#40.14.18.00.00
-unspsc7#40.14.19.00.00#Ducts#40.14.00.00.00
-unspsc7#40.14.19.01.00#Flexible ducts#40.14.19.00.00
-unspsc7#40.14.19.02.00#Rigid ducts#40.14.19.00.00
-unspsc7#40.14.20.00.00#Hoses#40.14.00.00.00
-unspsc7#40.14.20.01.00#Acid hoses#40.14.20.00.00
-unspsc7#40.14.20.02.00#Air hoses#40.14.20.00.00
-unspsc7#40.14.20.03.00#Drill hoses#40.14.20.00.00
-unspsc7#40.14.20.04.00#Marine hoses#40.14.20.00.00
-unspsc7#40.14.20.05.00#Material handling hoses#40.14.20.00.00
-unspsc7#40.14.20.06.00#Oil hoses#40.14.20.00.00
-unspsc7#40.14.20.07.00#Special hoses#40.14.20.00.00
-unspsc7#40.14.20.08.00#Water hoses#40.14.20.00.00
-unspsc7#40.14.20.09.00#Air water gas multipurpose hoses#40.14.20.00.00
-unspsc7#40.14.20.10.00#Teflon lined hoses#40.14.20.00.00
-unspsc7#40.14.21.00.00#Pipe#40.14.00.00.00
-unspsc7#40.14.21.01.00#Carbon steel pipe#40.14.21.00.00
-unspsc7#40.14.21.02.00#Ductile iron pipe#40.14.21.00.00
-unspsc7#40.14.21.03.00#High nickel alloy pipe#40.14.21.00.00
-unspsc7#40.14.21.04.00#High yield steel pipe#40.14.21.00.00
-unspsc7#40.14.21.05.00#Ferritic alloy pipe#40.14.21.00.00
-unspsc7#40.14.21.06.00#Aluminum pipe#40.14.21.00.00
-unspsc7#40.14.21.07.00#Brass pipe#40.14.21.00.00
-unspsc7#40.14.21.08.00#Bronze pipe#40.14.21.00.00
-unspsc7#40.14.21.09.00#Concrete pipe#40.14.21.00.00
-unspsc7#40.14.21.10.00#Copper pipe#40.14.21.00.00
-unspsc7#40.14.21.11.00#Cast iron pipe#40.14.21.00.00
-unspsc7#40.14.21.12.00#Lead pipe#40.14.21.00.00
-unspsc7#40.14.21.13.00#Magnesium pipe#40.14.21.00.00
-unspsc7#40.14.21.14.00#Non ferrous pipe#40.14.21.00.00
-unspsc7#40.14.21.15.00#Plastic pipe#40.14.21.00.00
-unspsc7#40.14.21.16.00#Rubber pipe#40.14.21.00.00
-unspsc7#40.14.21.17.00#Stainless steel pipe#40.14.21.00.00
-unspsc7#40.14.21.18.00#Tin pipe#40.14.21.00.00
-unspsc7#40.14.21.19.00#Titanium pipe#40.14.21.00.00
-unspsc7#40.14.21.20.00#Zinc pipe#40.14.21.00.00
-unspsc7#40.14.21.21.00#Hose reels#40.14.21.00.00
-unspsc7#40.14.22.00.00#Fluid and gas regulators#40.14.00.00.00
-unspsc7#40.14.22.01.00#Gas regulators#40.14.22.00.00
-unspsc7#40.14.22.02.00#Fluid regulators#40.14.22.00.00
-unspsc7#40.14.23.00.00#Pipe fittings#40.14.00.00.00
-unspsc7#40.14.23.01.00#Pipe angle face rings#40.14.23.00.00
-unspsc7#40.14.23.02.00#Pipe branch outlets#40.14.23.00.00
-unspsc7#40.14.23.03.00#Pipe laterals#40.14.23.00.00
-unspsc7#40.14.23.04.00#Pipe inserts#40.14.23.00.00
-unspsc7#40.14.23.05.00#Pipe reducers#40.14.23.00.00
-unspsc7#40.14.23.06.00#Pipe saddles#40.14.23.00.00
-unspsc7#40.14.23.07.00#Pipe stubends#40.14.23.00.00
-unspsc7#40.14.23.08.00#Pipe wyes#40.14.23.00.00
-unspsc7#40.14.23.09.00#Pipe bends#40.14.23.00.00
-unspsc7#40.14.23.10.00#Pipe caps#40.14.23.00.00
-unspsc7#40.14.23.11.00#Pipe half couplings#40.14.23.00.00
-unspsc7#40.14.23.12.00#Pipe expansion joints#40.14.23.00.00
-unspsc7#40.14.23.13.00#Pipe plugs#40.14.23.00.00
-unspsc7#40.14.23.14.00#Pipe bushings#40.14.23.00.00
-unspsc7#40.14.23.15.00#Pipe couplings#40.14.23.00.00
-unspsc7#40.14.23.16.00#Pipe crosses#40.14.23.00.00
-unspsc7#40.14.23.17.00#Pipe elbows#40.14.23.00.00
-unspsc7#40.14.23.18.00#Pipe nipples#40.14.23.00.00
-unspsc7#40.14.23.19.00#Pipe tees#40.14.23.00.00
-unspsc7#40.14.23.20.00#Pipe unions#40.14.23.00.00
-unspsc7#40.14.23.21.00#Pipe reducing couplings#40.14.23.00.00
-unspsc7#40.14.23.22.00#Pipe repair clamps#40.14.23.00.00
-unspsc7#40.14.23.23.00#Rupture disk#40.14.23.00.00
-unspsc7#40.14.24.00.00#Pipe flanges#40.14.00.00.00
-unspsc7#40.14.24.01.00#Ammonia flanges#40.14.24.00.00
-unspsc7#40.14.24.02.00#Backup flanges#40.14.24.00.00
-unspsc7#40.14.24.03.00#Blind flanges#40.14.24.00.00
-unspsc7#40.14.24.04.00#Lapjoint flanges#40.14.24.00.00
-unspsc7#40.14.24.05.00#Long weldneck flanges#40.14.24.00.00
-unspsc7#40.14.24.06.00#Orifice flanges#40.14.24.00.00
-unspsc7#40.14.24.07.00#Plate flanges#40.14.24.00.00
-unspsc7#40.14.24.08.00#Slipon flanges#40.14.24.00.00
-unspsc7#40.14.24.09.00#Socketweld flanges#40.14.24.00.00
-unspsc7#40.14.24.10.00#Spectacle blind flanges#40.14.24.00.00
-unspsc7#40.14.24.11.00#Threaded flanges#40.14.24.00.00
-unspsc7#40.14.24.12.00#Weldneck flanges#40.14.24.00.00
-unspsc7#40.14.25.00.00#Traps and strainers#40.14.00.00.00
-unspsc7#40.14.25.01.00#Liquid strainers#40.14.25.00.00
-unspsc7#40.14.25.02.00#Liquid traps#40.14.25.00.00
-unspsc7#40.14.25.03.00#Steam traps#40.14.25.00.00
-unspsc7#40.14.25.04.00#Steam strainers#40.14.25.00.00
-unspsc7#40.14.26.00.00#Tube fittings#40.14.00.00.00
-unspsc7#40.14.26.01.00#Brass tube fittings#40.14.26.00.00
-unspsc7#40.14.26.02.00#Carbon steel tube fittings#40.14.26.00.00
-unspsc7#40.14.26.03.00#Stainless steel tube fittings#40.14.26.00.00
-unspsc7#40.15.00.00.00#Industrial pumps and compressors#40.00.00.00.00
-unspsc7#40.15.15.00.00#Pumps#40.15.00.00.00
-unspsc7#40.15.15.01.00#Air pumps#40.15.15.00.00
-unspsc7#40.15.15.02.00#Vacuum pumps#40.15.15.00.00
-unspsc7#40.15.15.03.00#Centrifugal pumps#40.15.15.00.00
-unspsc7#40.15.15.04.00#Circulating pumps#40.15.15.00.00
-unspsc7#40.15.15.05.00#Dosing pumps#40.15.15.00.00
-unspsc7#40.15.15.06.00#Hand pumps#40.15.15.00.00
-unspsc7#40.15.15.07.00#Irrigation pumps#40.15.15.00.00
-unspsc7#40.15.15.08.00#Mud pumps#40.15.15.00.00
-unspsc7#40.15.15.09.00#Reciprocating pumps#40.15.15.00.00
-unspsc7#40.15.15.10.00#Water pumps#40.15.15.00.00
-unspsc7#40.15.15.11.00#Well pumps#40.15.15.00.00
-unspsc7#40.15.15.12.00#Sump pumps#40.15.15.00.00
-unspsc7#40.15.15.13.00#Submersible pumps#40.15.15.00.00
-unspsc7#40.15.15.14.00#Steam pumps#40.15.15.00.00
-unspsc7#40.15.15.15.00#Solenoid pumps#40.15.15.00.00
-unspsc7#40.15.15.16.00#Shear pumps#40.15.15.00.00
-unspsc7#40.15.15.17.00#Sewage pumps#40.15.15.00.00
-unspsc7#40.15.15.18.00#Sealless pumps#40.15.15.00.00
-unspsc7#40.15.15.19.00#Sanitary pumps#40.15.15.00.00
-unspsc7#40.15.15.20.00#Sampling pumps#40.15.15.00.00
-unspsc7#40.15.15.21.00#Rotary pumps#40.15.15.00.00
-unspsc7#40.15.15.22.00#Reverse osmosis pumps#40.15.15.00.00
-unspsc7#40.15.15.23.00#Positive displacement pumps#40.15.15.00.00
-unspsc7#40.15.15.24.00#Oil pumps#40.15.15.00.00
-unspsc7#40.15.15.25.00#Sludge pumps#40.15.15.00.00
-unspsc7#40.15.15.26.00#Turbine pumps#40.15.15.00.00
-unspsc7#40.15.15.27.00#Plunger pumps#40.15.15.00.00
-unspsc7#40.15.15.28.00#Oscillating pumps#40.15.15.00.00
-unspsc7#40.15.15.29.00#Drum pumps#40.15.15.00.00
-unspsc7#40.15.15.30.00#Dredge pumps#40.15.15.00.00
-unspsc7#40.15.15.31.00#Dewatering pumps#40.15.15.00.00
-unspsc7#40.15.15.32.00#Fuel pumps#40.15.15.00.00
-unspsc7#40.15.15.33.00#Hydraulic pumps#40.15.15.00.00
-unspsc7#40.15.15.34.00#Cryogenic pumps#40.15.15.00.00
-unspsc7#40.15.15.35.00#Sludge pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.36.00#Sewage pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.37.00#Submersible pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.38.00#Water pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.39.00#Well pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.40.00#Sump pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.41.00#Dosing pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.42.00#Centrifugal pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.43.00#Circulation pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.44.00#Rotary pump spare parts#40.15.15.00.00
-unspsc7#40.15.15.45.00#Pump parts and accessories#40.15.15.00.00
-unspsc7#40.15.15.46.00#Axial split pumps#40.15.15.00.00
-unspsc7#40.15.15.47.00#Deepwell pumps#40.15.15.00.00
-unspsc7#40.15.15.48.00#Diaphragm pumps#40.15.15.00.00
-unspsc7#40.15.15.49.00#Double diaphragm pumps#40.15.15.00.00
-unspsc7#40.15.15.50.00#Duplex pumps#40.15.15.00.00
-unspsc7#40.15.15.51.00#Gear pumps#40.15.15.00.00
-unspsc7#40.15.15.52.00#Metering or injection or proportioning pumps#40.15.15.00.00
-unspsc7#40.15.15.53.00#Progressive cavity pumps#40.15.15.00.00
-unspsc7#40.15.15.54.00#Ram pumps#40.15.15.00.00
-unspsc7#40.15.15.55.00#Rotary cam pumps#40.15.15.00.00
-unspsc7#40.15.15.56.00#Rotary lobe pumps#40.15.15.00.00
-unspsc7#40.15.15.57.00#Rotating piston pumps#40.15.15.00.00
-unspsc7#40.15.15.58.00#Screw Pumps#40.15.15.00.00
-unspsc7#40.15.15.59.00#Simplex pumps#40.15.15.00.00
-unspsc7#40.15.15.60.00#Sliding vane pumps#40.15.15.00.00
-unspsc7#40.15.15.61.00#Triplex pumps#40.15.15.00.00
-unspsc7#40.15.15.62.00#Worm pumps#40.15.15.00.00
-unspsc7#40.15.16.00.00#Compressors#40.15.00.00.00
-unspsc7#40.15.16.01.00#Air compressors#40.15.16.00.00
-unspsc7#40.15.16.02.00#Axial flow compressors#40.15.16.00.00
-unspsc7#40.15.16.03.00#Diaphragm compressors#40.15.16.00.00
-unspsc7#40.15.16.04.00#Gas compressors#40.15.16.00.00
-unspsc7#40.15.16.05.00#Motor compressors#40.15.16.00.00
-unspsc7#40.15.16.06.00#Reciprocating compressors#40.15.16.00.00
-unspsc7#40.15.16.07.00#Refrigerant compressors#40.15.16.00.00
-unspsc7#40.15.16.08.00#Rotary compressors#40.15.16.00.00
-unspsc7#40.15.16.09.00#Screw compressors#40.15.16.00.00
-unspsc7#40.15.16.10.00#Compressor parts and accessories#40.15.16.00.00
-unspsc7#40.15.16.11.00#Barrel compressors#40.15.16.00.00
-unspsc7#40.15.16.12.00#Centrifugal compressors#40.15.16.00.00
-unspsc7#40.15.16.13.00#Combination compressors#40.15.16.00.00
-unspsc7#40.15.16.14.00#Semi radial compressors#40.15.16.00.00
-unspsc7#40.15.16.15.00#Turbo compressors#40.15.16.00.00
-unspsc7#40.15.16.16.00#Compressor kits#40.15.16.00.00
-unspsc7#40.15.17.00.00#Pump parts and accessories#40.15.00.00.00
-unspsc7#40.15.17.01.00#Pump casings#40.15.17.00.00
-unspsc7#40.15.17.02.00#Pump packings#40.15.17.00.00
-unspsc7#40.16.00.00.00#Industrial filtering and purification#40.00.00.00.00
-unspsc7#40.16.15.00.00#Filters#40.16.00.00.00
-unspsc7#40.16.15.01.00#Vacuum filters#40.16.15.00.00
-unspsc7#40.16.15.02.00#Water filters#40.16.15.00.00
-unspsc7#40.16.15.03.00#Dust collectors#40.16.15.00.00
-unspsc7#40.16.15.04.00#Oil filters#40.16.15.00.00
-unspsc7#40.16.15.05.00#Air filters#40.16.15.00.00
-unspsc7#40.16.15.06.00#Filtering machinery#40.16.15.00.00
-unspsc7#40.16.15.07.00#Filter membranes#40.16.15.00.00
-unspsc7#40.16.15.08.00#Bag filters#40.16.15.00.00
-unspsc7#40.16.15.09.00#Absorption filters#40.16.15.00.00
-unspsc7#40.16.15.10.00#Bag filters#40.16.15.00.00
-unspsc7#40.16.15.11.00#Coalescing filters#40.16.15.00.00
-unspsc7#40.16.15.12.00#Electronic filters#40.16.15.00.00
-unspsc7#40.16.15.13.00#Fuel filters#40.16.15.00.00
-unspsc7#40.16.15.14.00#Gas pipeline filters#40.16.15.00.00
-unspsc7#40.16.15.15.00#Hydraulic filters#40.16.15.00.00
-unspsc7#40.16.15.16.00#In line filters#40.16.15.00.00
-unspsc7#40.16.15.17.00#Light filters#40.16.15.00.00
-unspsc7#40.16.15.18.00#Microfiber filters#40.16.15.00.00
-unspsc7#40.16.15.19.00#Panel filters#40.16.15.00.00
-unspsc7#40.16.15.20.00#Radial fin filters#40.16.15.00.00
-unspsc7#40.16.15.21.00#Filter Base#40.16.15.00.00
-unspsc7#40.16.15.22.00#Filter Fins#40.16.15.00.00
-unspsc7#40.16.15.23.00#Fuel#40.16.15.00.00
-unspsc7#40.16.15.24.00#Paint#40.16.15.00.00
-unspsc7#40.16.16.00.00#Purification#40.16.00.00.00
-unspsc7#40.16.16.01.00#Air scrubbers#40.16.16.00.00
-unspsc7#40.16.16.02.00#Air cleaners#40.16.16.00.00
-unspsc7#40.16.17.00.00#Separators#40.16.00.00.00
-unspsc7#40.16.17.01.00#Centrifuges#40.16.17.00.00
-unspsc7#40.16.17.02.00#Wet scrubbers#40.16.17.00.00
-unspsc7#40.16.17.03.00#Mist eliminators#40.16.17.00.00
-unspsc7#40.16.18.00.00#Filter media#40.16.00.00.00
-unspsc7#40.16.18.01.00#Metal fabric media#40.16.18.00.00
-unspsc7#40.16.18.02.00#Pressed felts#40.16.18.00.00
-unspsc7#40.16.18.03.00#Filter papers#40.16.18.00.00
-unspsc7#40.16.18.05.00#Filter cloth#40.16.18.00.00
-unspsc7#41.00.00.00.00#Laboratory and Measuring and Observing and Testing Equipment#41.00.00.00.00
-unspsc7#41.10.00.00.00#Laboratory and scientific equipment#41.00.00.00.00
-unspsc7#41.10.15.00.00#Laboratory blending and dispersing and homogenizing and mixing and stirring equipment#41.10.00.00.00
-unspsc7#41.10.15.01.00#Mixers or blenders or emulsifiers#41.10.15.00.00
-unspsc7#41.10.15.02.00#Stomachers#41.10.15.00.00
-unspsc7#41.10.15.03.00#Laboratory sprayers#41.10.15.00.00
-unspsc7#41.10.15.04.00#Homogenisers#41.10.15.00.00
-unspsc7#41.10.15.05.00#French pressure cells#41.10.15.00.00
-unspsc7#41.10.15.06.00#Roller mixers#41.10.15.00.00
-unspsc7#41.10.15.07.00#Rotators#41.10.15.00.00
-unspsc7#41.10.15.08.00#Vibrators#41.10.15.00.00
-unspsc7#41.10.15.10.00#Magnetic spin bars or retrievers#41.10.15.00.00
-unspsc7#41.10.15.11.00#Stirring tables#41.10.15.00.00
-unspsc7#41.10.15.12.00#Multi bank or flocculation equipment#41.10.15.00.00
-unspsc7#41.10.15.13.00#Shakers#41.10.15.00.00
-unspsc7#41.10.15.14.00#Laboratory centrifuges#41.10.15.00.00
-unspsc7#41.10.15.15.00#Liquid measuring cans#41.10.15.00.00
-unspsc7#41.10.15.16.00#Liquid dispensers#41.10.15.00.00
-unspsc7#41.10.16.00.00#Laboratory fixtures and accessories#41.10.00.00.00
-unspsc7#41.10.16.03.00#Laboratory stands or clamps or tongs#41.10.16.00.00
-unspsc7#41.10.16.04.00#Slide containers#41.10.16.00.00
-unspsc7#41.10.16.05.00#Slide drying plates#41.10.16.00.00
-unspsc7#41.10.16.07.00#Microslide making equipment#41.10.16.00.00
-unspsc7#41.10.16.08.00#Microslide storage equipment#41.10.16.00.00
-unspsc7#41.10.16.09.00#Static eliminators#41.10.16.00.00
-unspsc7#41.10.16.11.00#Slide warmers#41.10.16.00.00
-unspsc7#41.10.17.00.00#Laboratory boring and grinding and cutting and crushing and pressing equipment#41.10.00.00.00
-unspsc7#41.10.17.01.00#Mills#41.10.17.00.00
-unspsc7#41.10.17.02.00#Pestle or mortars#41.10.17.00.00
-unspsc7#41.10.17.03.00#Tissue grinders#41.10.17.00.00
-unspsc7#41.10.17.04.00#Microtomes#41.10.17.00.00
-unspsc7#41.10.17.05.00#Crushers or pulverisers#41.10.17.00.00
-unspsc7#41.10.17.06.00#Disintegrators#41.10.17.00.00
-unspsc7#41.10.17.07.00#Laboratory presses#41.10.17.00.00
-unspsc7#41.10.18.00.00#Laboratory electron and solid state physics equipment#41.10.00.00.00
-unspsc7#41.10.18.01.00#Electron guns#41.10.18.00.00
-unspsc7#41.10.18.02.00#X ray generators#41.10.18.00.00
-unspsc7#41.10.18.03.00#Coulometers#41.10.18.00.00
-unspsc7#41.10.18.04.00#Electroscopes#41.10.18.00.00
-unspsc7#41.10.18.05.00#Fluxmeters#41.10.18.00.00
-unspsc7#41.10.18.06.00#Magnetometers#41.10.18.00.00
-unspsc7#41.10.18.07.00#Electron diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.08.00#Neutron diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.09.00#Optical diffraction apparatus#41.10.18.00.00
-unspsc7#41.10.18.10.00#Diffractometers#41.10.18.00.00
-unspsc7#41.10.19.00.00#Laboratory ionic equipment#41.10.00.00.00
-unspsc7#41.10.19.01.00#Ion sources#41.10.19.00.00
-unspsc7#41.10.19.02.00#Ion exchange apparatus#41.10.19.00.00
-unspsc7#41.10.19.03.00#Ion implantation equipment#41.10.19.00.00
-unspsc7#41.10.20.00.00#Sampling and purification equipment#41.10.00.00.00
-unspsc7#41.10.20.01.00#Sample changers#41.10.20.00.00
-unspsc7#41.10.20.02.00#Sample oxidiser#41.10.20.00.00
-unspsc7#41.10.20.03.00#Sample preparation line#41.10.20.00.00
-unspsc7#41.10.20.04.00#Sample preparation bombs#41.10.20.00.00
-unspsc7#41.10.20.05.00#Water samplers#41.10.20.00.00
-unspsc7#41.10.20.06.00#Air samplers or collectors#41.10.20.00.00
-unspsc7#41.10.20.07.00#Reagent kits for use with air samplers#41.10.20.00.00
-unspsc7#41.10.20.08.00#Filters or other spare parts for samplers#41.10.20.00.00
-unspsc7#41.10.20.09.00#Dust fall holders or jars#41.10.20.00.00
-unspsc7#41.10.20.11.00#Sulphur dioxide or smoke samplers#41.10.20.00.00
-unspsc7#41.10.20.12.00#Sample applicators#41.10.20.00.00
-unspsc7#41.10.20.13.00#Plant samples analysis equipment#41.10.20.00.00
-unspsc7#41.10.20.14.00#Air pollutant samplers#41.10.20.00.00
-unspsc7#41.10.20.15.00#Water purification reagents#41.10.20.00.00
-unspsc7#41.10.20.16.00#Deionisation or demineralisation equipment#41.10.20.00.00
-unspsc7#41.10.20.17.00#Base exchange equipment#41.10.20.00.00
-unspsc7#41.10.20.18.00#Reverse osmosis equipment#41.10.20.00.00
-unspsc7#41.10.20.19.00#Ultra violet water purification units#41.10.20.00.00
-unspsc7#41.10.20.20.00#Ultra pure water systems#41.10.20.00.00
-unspsc7#41.10.20.21.00#Water analysis systems#41.10.20.00.00
-unspsc7#41.10.20.22.00#Dehydrators#41.10.20.00.00
-unspsc7#41.10.20.23.00#Deoxiders#41.10.20.00.00
-unspsc7#41.10.20.24.00#Dissolvers#41.10.20.00.00
-unspsc7#41.10.20.25.00#Specimen holders#41.10.20.00.00
-unspsc7#41.10.20.26.00#Specimen collectors#41.10.20.00.00
-unspsc7#41.10.20.27.00#Sample holders#41.10.20.00.00
-unspsc7#41.10.20.28.00#Lubricant samplers#41.10.20.00.00
-unspsc7#41.10.23.00.00#Laboratory fermentation and incubating equipment#41.10.00.00.00
-unspsc7#41.10.23.01.00#Standard fermentation units#41.10.23.00.00
-unspsc7#41.10.23.02.00#Continuous culture apparatus#41.10.23.00.00
-unspsc7#41.10.23.03.00#Anaerobic jars#41.10.23.00.00
-unspsc7#41.10.23.04.00#Digestion systems#41.10.23.00.00
-unspsc7#41.10.23.05.00#Water jacketed incubators#41.10.23.00.00
-unspsc7#41.10.23.06.00#CO2 incubators#41.10.23.00.00
-unspsc7#41.10.23.07.00#Tissue culture incubators#41.10.23.00.00
-unspsc7#41.10.23.08.00#Incubator ovens#41.10.23.00.00
-unspsc7#41.10.23.09.00#Cooled incubators (BOD)#41.10.23.00.00
-unspsc7#41.10.23.10.00#Shaking incubators#41.10.23.00.00
-unspsc7#41.10.23.11.00#Inspissators#41.10.23.00.00
-unspsc7#41.10.23.12.00#Plate incubators#41.10.23.00.00
-unspsc7#41.10.23.13.00#In vitro culture equipment#41.10.23.00.00
-unspsc7#41.10.23.14.00#Bacteria equipment#41.10.23.00.00
-unspsc7#41.10.24.00.00#Laboratory heating and drying equipment#41.10.00.00.00
-unspsc7#41.10.24.01.00#Gas burners#41.10.24.00.00
-unspsc7#41.10.24.02.00#Spirit burners#41.10.24.00.00
-unspsc7#41.10.24.03.00#Laboratory incinerators#41.10.24.00.00
-unspsc7#41.10.24.04.00#Laboratory heaters#41.10.24.00.00
-unspsc7#41.10.24.05.00#Mantles or tapes#41.10.24.00.00
-unspsc7#41.10.24.06.00#Hot plates#41.10.24.00.00
-unspsc7#41.10.24.07.00#Warming cabinets#41.10.24.00.00
-unspsc7#41.10.24.08.00#Drying ovens#41.10.24.00.00
-unspsc7#41.10.24.09.00#Induction dryers#41.10.24.00.00
-unspsc7#41.10.24.10.00#Infrared dryers#41.10.24.00.00
-unspsc7#41.10.24.11.00#Spray dryers#41.10.24.00.00
-unspsc7#41.10.24.12.00#Hot air blowers#41.10.24.00.00
-unspsc7#41.10.24.13.00#Drying cabinets#41.10.24.00.00
-unspsc7#41.10.24.14.00#Freeze dryers#41.10.24.00.00
-unspsc7#41.10.24.15.00#Laboratory furnaces#41.10.24.00.00
-unspsc7#41.10.24.16.00#Ageing ovens#41.10.24.00.00
-unspsc7#41.10.24.18.00#Quartz oven pots#41.10.24.00.00
-unspsc7#41.10.24.19.00#Microwave or radiant heat ovens#41.10.24.00.00
-unspsc7#41.10.24.20.00#Desiccators#41.10.24.00.00
-unspsc7#41.10.24.21.00#Temperature cycling chambers#41.10.24.00.00
-unspsc7#41.10.25.00.00#Laboratory entomological equipment and accessories#41.10.00.00.00
-unspsc7#41.10.25.01.00#Insect containers#41.10.25.00.00
-unspsc7#41.10.25.02.00#Rearing facilities for entomology#41.10.25.00.00
-unspsc7#41.10.25.03.00#Fabric or netting for entomology#41.10.25.00.00
-unspsc7#41.10.25.04.00#Entomological pinning equipment#41.10.25.00.00
-unspsc7#41.10.25.05.00#Entomological mounting materials#41.10.25.00.00
-unspsc7#41.10.25.06.00#Entomological trays#41.10.25.00.00
-unspsc7#41.10.25.07.00#Entomological catching equipment#41.10.25.00.00
-unspsc7#41.10.25.08.00#Entomological aspirators#41.10.25.00.00
-unspsc7#41.10.25.09.00#Entomological dippers#41.10.25.00.00
-unspsc7#41.10.25.10.00#Entomological monocups#41.10.25.00.00
-unspsc7#41.10.25.11.00#Entomological sticky traps#41.10.25.00.00
-unspsc7#41.10.25.12.00#Insect test kits#41.10.25.00.00
-unspsc7#41.10.25.13.00#Entomological display units#41.10.25.00.00
-unspsc7#41.10.26.00.00#Animal laboratory equipment and accessories#41.10.00.00.00
-unspsc7#41.10.26.01.00#Cages for small animals#41.10.26.00.00
-unspsc7#41.10.26.02.00#Aquaria equipment#41.10.26.00.00
-unspsc7#41.10.26.03.00#Animal identification supplies#41.10.26.00.00
-unspsc7#41.10.26.04.00#Animal catching devices#41.10.26.00.00
-unspsc7#41.10.26.05.00#Fish aeration systems#41.10.26.00.00
-unspsc7#41.10.26.06.00#Animal feeding needles#41.10.26.00.00
-unspsc7#41.10.27.00.00#Crystallography equipment#41.10.00.00.00
-unspsc7#41.10.27.01.00#Crystal lattice models#41.10.27.00.00
-unspsc7#41.10.27.02.00#Scintillation crystal assemblies#41.10.27.00.00
-unspsc7#41.10.27.03.00#Light scattering equipment#41.10.27.00.00
-unspsc7#41.10.27.04.00#X ray diffraction equipment#41.10.27.00.00
-unspsc7#41.10.27.05.00#Crystallisers#41.10.27.00.00
-unspsc7#41.10.27.06.00#Crystal growing equipment#41.10.27.00.00
-unspsc7#41.10.29.00.00#Histology equipment#41.10.00.00.00
-unspsc7#41.10.29.01.00#Tissue embedding stations#41.10.29.00.00
-unspsc7#41.10.29.02.00#Embedding molds#41.10.29.00.00
-unspsc7#41.10.29.03.00#Embedding capsules#41.10.29.00.00
-unspsc7#41.10.29.04.00#Embedding compounds#41.10.29.00.00
-unspsc7#41.10.29.05.00#Histological staining apparatus#41.10.29.00.00
-unspsc7#41.10.29.09.00#Tissue processors#41.10.29.00.00
-unspsc7#41.10.29.10.00#Tissue culture apparatus#41.10.29.00.00
-unspsc7#41.10.29.11.00#Histological knives or knife holders#41.10.29.00.00
-unspsc7#41.10.29.12.00#Histological glass knife makers#41.10.29.00.00
-unspsc7#41.10.29.13.00#Histological hones or straps or compounds#41.10.29.00.00
-unspsc7#41.10.29.14.00#Ultrasonic disintegrators#41.10.29.00.00
-unspsc7#41.10.30.00.00#Laboratory cooling equipment#41.10.00.00.00
-unspsc7#41.10.30.01.00#Refrigerated cooling plate probes#41.10.30.00.00
-unspsc7#41.10.30.02.00#Freezing spray aerosols#41.10.30.00.00
-unspsc7#41.10.30.03.00#Cryostats#41.10.30.00.00
-unspsc7#41.10.30.04.00#Fan circulated ovens#41.10.30.00.00
-unspsc7#41.10.30.05.00#Ultra cold cabinets#41.10.30.00.00
-unspsc7#41.10.30.06.00#Cryogenic freezers#41.10.30.00.00
-unspsc7#41.10.30.07.00#Chilling units or cold water circulation#41.10.30.00.00
-unspsc7#41.10.30.08.00#Refrigerated cooling modules#41.10.30.00.00
-unspsc7#41.10.30.09.00#Cadaver storage refrigerators#41.10.30.00.00
-unspsc7#41.10.31.00.00#Laboratory supplies#41.10.00.00.00
-unspsc7#41.10.31.01.00#Test tubes#41.10.31.00.00
-unspsc7#41.10.31.03.00#Pipettes or accessories#41.10.31.00.00
-unspsc7#41.10.31.04.00#Flasks#41.10.31.00.00
-unspsc7#41.10.31.05.00#Beakers#41.10.31.00.00
-unspsc7#41.10.31.06.00#Stirring rods#41.10.31.00.00
-unspsc7#41.10.31.07.00#Laboratory or sampling syringes#41.10.31.00.00
-unspsc7#41.10.31.08.00#Desiccants#41.10.31.00.00
-unspsc7#41.10.31.09.00#Watch glasses#41.10.31.00.00
-unspsc7#41.10.31.10.00#Burets#41.10.31.00.00
-unspsc7#41.10.31.11.00#Measuring cylinder#41.10.31.00.00
-unspsc7#41.10.31.12.00#Laboratory dishes#41.10.31.00.00
-unspsc7#41.10.31.13.00#Slides#41.10.31.00.00
-unspsc7#41.10.31.14.00#Stoppers#41.10.31.00.00
-unspsc7#41.10.31.15.00#Tubing connectors#41.10.31.00.00
-unspsc7#41.10.31.16.00#Laboratory cases#41.10.31.00.00
-unspsc7#41.10.31.17.00#Laboratory scoops or spatulas#41.10.31.00.00
-unspsc7#41.10.32.00.00#Laboratory cleaning equipment#41.10.00.00.00
-unspsc7#41.10.32.01.00#Chemical engineering washers#41.10.32.00.00
-unspsc7#41.10.32.02.00#Laboratory washing machines#41.10.32.00.00
-unspsc7#41.10.32.03.00#Pipette washers#41.10.32.00.00
-unspsc7#41.10.32.04.00#Ultrasonic cleaners#41.10.32.00.00
-unspsc7#41.10.33.00.00#Fluid mechanics equipment#41.10.00.00.00
-unspsc7#41.10.33.01.00#Liquid scintillation counters#41.10.33.00.00
-unspsc7#41.10.33.02.00#Battery acid hydrometers#41.10.33.00.00
-unspsc7#41.10.33.03.00#Densitometers#41.10.33.00.00
-unspsc7#41.10.33.04.00#Vacuum ovens#41.10.33.00.00
-unspsc7#41.10.33.05.00#High vacuum equipment#41.10.33.00.00
-unspsc7#41.10.33.06.00#Pneumatic vacuum equipment#41.10.33.00.00
-unspsc7#41.10.33.07.00#Vacuum or mercury vapour equipment#41.10.33.00.00
-unspsc7#41.10.33.08.00#High vacuum combustion apparatus#41.10.33.00.00
-unspsc7#41.10.33.09.00#Flow injection analysis equipment#41.10.33.00.00
-unspsc7#41.10.33.10.00#Gas or vapour concentration measuring instruments#41.10.33.00.00
-unspsc7#41.10.33.11.00#Manometers#41.10.33.00.00
-unspsc7#41.10.33.12.00#Viscosimeters#41.10.33.00.00
-unspsc7#41.10.33.13.00#Depth indicators#41.10.33.00.00
-unspsc7#41.10.33.14.00#Microscopic structure estimation apparatus#41.10.33.00.00
-unspsc7#41.10.33.15.00#Solution strength estimation apparatus#41.10.33.00.00
-unspsc7#41.10.34.00.00#Laboratory environmental conditioning equipment#41.10.00.00.00
-unspsc7#41.10.34.01.00#Contamination control screens#41.10.34.00.00
-unspsc7#41.10.34.02.00#Environmental chambers#41.10.34.00.00
-unspsc7#41.10.34.03.00#Microbiological aircontrol#41.10.34.00.00
-unspsc7#41.10.34.04.00#Growth chambers#41.10.34.00.00
-unspsc7#41.10.34.05.00#Walk in chambers#41.10.34.00.00
-unspsc7#41.10.34.06.00#Glove boxes#41.10.34.00.00
-unspsc7#41.10.35.00.00#Laboratory ventilating equipment#41.10.00.00.00
-unspsc7#41.10.35.01.00#Ebuliometer#41.10.35.00.00
-unspsc7#41.10.35.02.00#Fume hoods#41.10.35.00.00
-unspsc7#41.10.35.03.00#Fume cupboards#41.10.35.00.00
-unspsc7#41.10.35.04.00#Laminar flow cabinets or stations#41.10.35.00.00
-unspsc7#41.10.36.00.00#Laboratory decanting and distilling and evaporating and filtering equipment and supplies#41.10.00.00.00
-unspsc7#41.10.36.01.00#Flask or retort units#41.10.36.00.00
-unspsc7#41.10.36.02.00#Bi distillation units#41.10.36.00.00
-unspsc7#41.10.36.03.00#Evaporators#41.10.36.00.00
-unspsc7#41.10.36.04.00#Vacuum evaporators#41.10.36.00.00
-unspsc7#41.10.36.05.00#Extracting equipment#41.10.36.00.00
-unspsc7#41.10.36.06.00#Line filters#41.10.36.00.00
-unspsc7#41.10.36.07.00#Gel filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.08.00#Ultra filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.09.00#Sintered cell filters#41.10.36.00.00
-unspsc7#41.10.36.10.00#Thin channel filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.11.00#Reverse osmosis filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.12.00#Molecular filtration equipment#41.10.36.00.00
-unspsc7#41.10.36.13.00#Cartridge element filters#41.10.36.00.00
-unspsc7#41.10.36.14.00#Filter holders or cyclones#41.10.36.00.00
-unspsc7#41.10.36.15.00#Multi sheet or press or filter#41.10.36.00.00
-unspsc7#41.10.36.16.00#Air filtration systems#41.10.36.00.00
-unspsc7#41.10.36.17.00#Hepa filters#41.10.36.00.00
-unspsc7#41.10.36.18.00#Fluid presses filter#41.10.36.00.00
-unspsc7#41.10.36.19.00#Sedimentological analyzing unit#41.10.36.00.00
-unspsc7#41.10.36.20.00#Laboratory separators#41.10.36.00.00
-unspsc7#41.10.36.21.00#Laboratory sifting equipment#41.10.36.00.00
-unspsc7#41.10.36.22.00#Test sieves#41.10.36.00.00
-unspsc7#41.10.36.23.00#Laboratory scrubbers#41.10.36.00.00
-unspsc7#41.10.36.24.00#Titration equipment#41.10.36.00.00
-unspsc7#41.10.36.25.00#Laboratory diluters#41.10.36.00.00
-unspsc7#41.10.36.26.00#Fractionation apparatus#41.10.36.00.00
-unspsc7#41.10.36.27.00#Distillation pipings or columns or fittings#41.10.36.00.00
-unspsc7#41.10.36.28.00#Reflux components#41.10.36.00.00
-unspsc7#41.10.36.29.00#Heat exchange condensers#41.10.36.00.00
-unspsc7#41.10.37.00.00#Laboratory baths#41.10.00.00.00
-unspsc7#41.10.37.01.00#Circulating baths#41.10.37.00.00
-unspsc7#41.10.37.02.00#Thermostatic baths#41.10.37.00.00
-unspsc7#41.10.37.03.00#Multiple baths#41.10.37.00.00
-unspsc7#41.10.37.04.00#Biological baths#41.10.37.00.00
-unspsc7#41.10.37.05.00#Organ baths#41.10.37.00.00
-unspsc7#41.10.37.06.00#Water baths#41.10.37.00.00
-unspsc7#41.10.37.07.00#Oil baths#41.10.37.00.00
-unspsc7#41.10.37.08.00#Sand baths#41.10.37.00.00
-unspsc7#41.10.37.09.00#Refrigerated baths#41.10.37.00.00
-unspsc7#41.11.00.00.00#Measuring and observing and testing instruments#41.00.00.00.00
-unspsc7#41.11.15.00.00#Weight measuring instruments#41.11.00.00.00
-unspsc7#41.11.15.01.00#Electronic toploading balances#41.11.15.00.00
-unspsc7#41.11.15.02.00#Laboratory balances#41.11.15.00.00
-unspsc7#41.11.15.03.00#Mechanical balances#41.11.15.00.00
-unspsc7#41.11.15.04.00#Pull spring balances#41.11.15.00.00
-unspsc7#41.11.15.05.00#Calibration weights or weight sets#41.11.15.00.00
-unspsc7#41.11.15.06.00#Animal weighing scales#41.11.15.00.00
-unspsc7#41.11.15.07.00#Bench scales#41.11.15.00.00
-unspsc7#41.11.15.08.00#Bodyweight measuring scales#41.11.15.00.00
-unspsc7#41.11.15.09.00#Floor or platform scales#41.11.15.00.00
-unspsc7#41.11.15.10.00#Postal scales#41.11.15.00.00
-unspsc7#41.11.15.11.00#Truck or rail scales#41.11.15.00.00
-unspsc7#41.11.16.00.00#Length and thickness and distance measuring instruments#41.11.00.00.00
-unspsc7#41.11.16.01.00#Micrometers#41.11.16.00.00
-unspsc7#41.11.16.02.00#Pedometers#41.11.16.00.00
-unspsc7#41.11.16.03.00#Rangefinders#41.11.16.00.00
-unspsc7#41.11.16.04.00#Rulers#41.11.16.00.00
-unspsc7#41.11.16.05.00#Strain gauges#41.11.16.00.00
-unspsc7#41.11.16.06.00#Tellurometers#41.11.16.00.00
-unspsc7#41.11.16.07.00#Thread counters or gauges#41.11.16.00.00
-unspsc7#41.11.16.08.00#Calipers#41.11.16.00.00
-unspsc7#41.11.16.13.00#Distance meters#41.11.16.00.00
-unspsc7#41.11.16.14.00#Height gauges#41.11.16.00.00
-unspsc7#41.11.16.15.00#Laser measuring systems#41.11.16.00.00
-unspsc7#41.11.16.16.00#Measuring wheels for distance#41.11.16.00.00
-unspsc7#41.11.16.17.00#Feeler gauges#41.11.16.00.00
-unspsc7#41.11.16.18.00#Gage block set#41.11.16.00.00
-unspsc7#41.11.16.19.00#Go or no go gauge#41.11.16.00.00
-unspsc7#41.11.16.20.00#Etalon wedge#41.11.16.00.00
-unspsc7#41.11.17.00.00#Viewing and observing instruments and accessories#41.11.00.00.00
-unspsc7#41.11.17.01.00#Ion microscopes#41.11.17.00.00
-unspsc7#41.11.17.02.00#Monocular microscopes#41.11.17.00.00
-unspsc7#41.11.17.03.00#Stereo microscopes#41.11.17.00.00
-unspsc7#41.11.17.04.00#Illuminators for microscopes#41.11.17.00.00
-unspsc7#41.11.17.05.00#Objectives for microscopes#41.11.17.00.00
-unspsc7#41.11.17.06.00#Photo attachments for microscopes#41.11.17.00.00
-unspsc7#41.11.17.07.00#Profile projectors#41.11.17.00.00
-unspsc7#41.11.17.08.00#Video attachments for microscopes#41.11.17.00.00
-unspsc7#41.11.17.09.00#Binocular microscope#41.11.17.00.00
-unspsc7#41.11.17.10.00#Combination electron and light microscopes#41.11.17.00.00
-unspsc7#41.11.17.11.00#Electron microscopes#41.11.17.00.00
-unspsc7#41.11.17.12.00#Inverted microscopes#41.11.17.00.00
-unspsc7#41.11.17.13.00#Magnifiers#41.11.17.00.00
-unspsc7#41.11.17.14.00#Loupes#41.11.17.00.00
-unspsc7#41.11.17.15.00#Telescopes#41.11.17.00.00
-unspsc7#41.11.17.16.00#Borescope inspection equipment#41.11.17.00.00
-unspsc7#41.11.17.17.00#Binoculars#41.11.17.00.00
-unspsc7#41.11.18.00.00#Non destructive examination equipment#41.11.00.00.00
-unspsc7#41.11.18.01.00#Eddy current examination equipment#41.11.18.00.00
-unspsc7#41.11.18.02.00#Liquid penetrant examination equipment#41.11.18.00.00
-unspsc7#41.11.18.03.00#Magnetic particle examination equipment#41.11.18.00.00
-unspsc7#41.11.18.04.00#Ultrasonic examination equipment#41.11.18.00.00
-unspsc7#41.11.18.05.00#CO 60 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.06.00#CS 137 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.07.00#IR 192 radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.18.08.00#X ray radiography examination equipment#41.11.18.00.00
-unspsc7#41.11.19.00.00#Indicating and recording instruments#41.11.00.00.00
-unspsc7#41.11.19.01.00#Counters#41.11.19.00.00
-unspsc7#41.11.19.02.00#Electronic counters#41.11.19.00.00
-unspsc7#41.11.19.03.00#Metal detectors#41.11.19.00.00
-unspsc7#41.11.19.04.00#Electronic columns#41.11.19.00.00
-unspsc7#41.11.19.05.00#Electronic measuring probes#41.11.19.00.00
-unspsc7#41.11.19.06.00#Chart recorders#41.11.19.00.00
-unspsc7#41.11.19.07.00#Digital readout recorders#41.11.19.00.00
-unspsc7#41.11.19.08.00#Graphic recorders#41.11.19.00.00
-unspsc7#41.11.19.09.00#Magnetic tape recorders#41.11.19.00.00
-unspsc7#41.11.19.10.00#Multipen recorders#41.11.19.00.00
-unspsc7#41.11.19.11.00#Oscillographic recorders#41.11.19.00.00
-unspsc7#41.11.19.12.00#Physiological recorders#41.11.19.00.00
-unspsc7#41.11.19.13.00#Point plotting recorders#41.11.19.00.00
-unspsc7#41.11.19.14.00#Servo recorders#41.11.19.00.00
-unspsc7#41.11.19.15.00#Bi metallic sensors#41.11.19.00.00
-unspsc7#41.11.19.16.00#Non contact sensors#41.11.19.00.00
-unspsc7#41.11.19.17.00#Digital testers#41.11.19.00.00
-unspsc7#41.11.19.18.00#Gyroscopic instruments#41.11.19.00.00
-unspsc7#41.11.19.19.00#Detection apparatus for non metalic objects#41.11.19.00.00
-unspsc7#41.11.19.20.00#Coordinate measuring machines (CMM)#41.11.19.00.00
-unspsc7#41.11.19.21.00#Speed sensors#41.11.19.00.00
-unspsc7#41.11.19.22.00#Lamp failure sensor#41.11.19.00.00
-unspsc7#41.11.19.23.00#Pre ignition knock sensor#41.11.19.00.00
-unspsc7#41.11.19.24.00#Oxygen sensors#41.11.19.00.00
-unspsc7#41.11.19.25.00#Speed sensors#41.11.19.00.00
-unspsc7#41.11.19.26.00#Proximity sensors#41.11.19.00.00
-unspsc7#41.11.19.27.00#Pressure sensors#41.11.19.00.00
-unspsc7#41.11.19.28.00#Current sensors#41.11.19.00.00
-unspsc7#41.11.20.00.00#Light and wave and sound generating and measuring equipment#41.11.00.00.00
-unspsc7#41.11.20.01.00#Light absorptionmeters#41.11.20.00.00
-unspsc7#41.11.20.02.00#Acoustic testing rooms#41.11.20.00.00
-unspsc7#41.11.20.03.00#Anechoic chambers#41.11.20.00.00
-unspsc7#41.11.20.04.00#Frequency analyzers#41.11.20.00.00
-unspsc7#41.11.20.05.00#Frequency counters or timer or dividers#41.11.20.00.00
-unspsc7#41.11.20.06.00#Electrical frequency meters#41.11.20.00.00
-unspsc7#41.11.20.07.00#Interferometers#41.11.20.00.00
-unspsc7#41.11.20.08.00#Lasers#41.11.20.00.00
-unspsc7#41.11.20.09.00#Lightmeters#41.11.20.00.00
-unspsc7#41.11.20.10.00#Luxmeters#41.11.20.00.00
-unspsc7#41.11.20.11.00#Optical callibration sets#41.11.20.00.00
-unspsc7#41.11.20.12.00#Photometers#41.11.20.00.00
-unspsc7#41.11.20.13.00#Polarimeters#41.11.20.00.00
-unspsc7#41.11.20.14.00#Polariscopes#41.11.20.00.00
-unspsc7#41.11.20.15.00#Reflectometers#41.11.20.00.00
-unspsc7#41.11.20.16.00#Sonars#41.11.20.00.00
-unspsc7#41.11.20.17.00#Sonometers#41.11.20.00.00
-unspsc7#41.11.20.18.00#Sound measuring apparatus or decibel meter#41.11.20.00.00
-unspsc7#41.11.20.19.00#Spectrofluorimeters#41.11.20.00.00
-unspsc7#41.11.20.20.00#Spectrographs#41.11.20.00.00
-unspsc7#41.11.20.21.00#Spectrometers#41.11.20.00.00
-unspsc7#41.11.20.22.00#Mass spectrometers#41.11.20.00.00
-unspsc7#41.11.20.23.00#Proton spectrometers#41.11.20.00.00
-unspsc7#41.11.20.24.00#Spectrophotometers#41.11.20.00.00
-unspsc7#41.11.20.25.00#Stroboscopes#41.11.20.00.00
-unspsc7#41.11.20.26.00#Sound velocity analyzers#41.11.20.00.00
-unspsc7#41.11.20.27.00#Thickness measuring devices#41.11.20.00.00
-unspsc7#41.11.21.00.00#Transducers#41.11.00.00.00
-unspsc7#41.11.21.01.00#Piezo electric crystals#41.11.21.00.00
-unspsc7#41.11.21.02.00#Strain gauges#41.11.21.00.00
-unspsc7#41.11.21.03.00#Fiber sensors#41.11.21.00.00
-unspsc7#41.11.22.00.00#Temperature and heat measuring instruments#41.11.00.00.00
-unspsc7#41.11.22.01.00#Calorimeters#41.11.22.00.00
-unspsc7#41.11.22.02.00#Heat tracing equipment#41.11.22.00.00
-unspsc7#41.11.22.03.00#Melting point recorders#41.11.22.00.00
-unspsc7#41.11.22.04.00#Pyrometers#41.11.22.00.00
-unspsc7#41.11.22.05.00#Temperature regulators#41.11.22.00.00
-unspsc7#41.11.22.06.00#Thermocouples#41.11.22.00.00
-unspsc7#41.11.22.07.00#Thermographs#41.11.22.00.00
-unspsc7#41.11.22.09.00#Thermostats#41.11.22.00.00
-unspsc7#41.11.22.10.00#Remote reading thermometers#41.11.22.00.00
-unspsc7#41.11.22.11.00#Resistance thermometers#41.11.22.00.00
-unspsc7#41.11.22.12.00#Surface thermometers#41.11.22.00.00
-unspsc7#41.11.22.13.00#Handheld thermometer#41.11.22.00.00
-unspsc7#41.11.23.00.00#Humidity measuring instruments#41.11.00.00.00
-unspsc7#41.11.23.01.00#Hygrometers#41.11.23.00.00
-unspsc7#41.11.23.02.00#Psychrometers#41.11.23.00.00
-unspsc7#41.11.23.03.00#Temperature humidity testers#41.11.23.00.00
-unspsc7#41.11.24.00.00#Pressure measuring and control instruments#41.11.00.00.00
-unspsc7#41.11.24.01.00#Depth gauges#41.11.24.00.00
-unspsc7#41.11.24.02.00#Manostats#41.11.24.00.00
-unspsc7#41.11.24.03.00#Pressure reading indicators#41.11.24.00.00
-unspsc7#41.11.24.04.00#Pressure regulator#41.11.24.00.00
-unspsc7#41.11.24.05.00#Pressure or vacuum recorders#41.11.24.00.00
-unspsc7#41.11.24.06.00#Vacuum gauges#41.11.24.00.00
-unspsc7#41.11.24.07.00#Liquid level controls or instruments#41.11.24.00.00
-unspsc7#41.11.25.00.00#Flow measuring instruments#41.11.00.00.00
-unspsc7#41.11.25.01.00#Flowmeters#41.11.25.00.00
-unspsc7#41.11.25.02.00#Rheometers#41.11.25.00.00
-unspsc7#41.11.25.03.00#Rotameters#41.11.25.00.00
-unspsc7#41.11.25.04.00#Water meters#41.11.25.00.00
-unspsc7#41.11.25.05.00#Water meter spares#41.11.25.00.00
-unspsc7#41.11.25.06.00#Venturis#41.11.25.00.00
-unspsc7#41.11.27.00.00#Seed and feed equipment#41.11.00.00.00
-unspsc7#41.11.27.01.00#Grain analyzers#41.11.27.00.00
-unspsc7#41.11.27.02.00#Seed counters#41.11.27.00.00
-unspsc7#41.11.27.03.00#Fiber apparatus for feed sample analysis#41.11.27.00.00
-unspsc7#41.11.28.00.00#Transportation related equipment and instruments#41.11.00.00.00
-unspsc7#41.11.28.01.00#Speedometers#41.11.28.00.00
-unspsc7#41.11.28.02.00#Tachometers#41.11.28.00.00
-unspsc7#41.11.29.00.00#Navigational equipment and instruments#41.11.00.00.00
-unspsc7#41.11.29.01.00#Direction finding compasses#41.11.29.00.00
-unspsc7#41.11.29.02.00#Radio navigation instruments#41.11.29.00.00
-unspsc7#41.11.29.03.00#Sextants#41.11.29.00.00
-unspsc7#41.11.29.04.00#Complex controlling devices#41.11.29.00.00
-unspsc7#41.11.30.00.00#Chemical evaluation instruments and supplies#41.11.00.00.00
-unspsc7#41.11.30.01.00#Digital analyzer controllers#41.11.30.00.00
-unspsc7#41.11.30.02.00#Chemiluminescence or bioluminescence analyzers#41.11.30.00.00
-unspsc7#41.11.30.03.00#Electrogravimetry analyzers#41.11.30.00.00
-unspsc7#41.11.30.04.00#Flame ionization analyzers#41.11.30.00.00
-unspsc7#41.11.30.05.00#Ion analyzers#41.11.30.00.00
-unspsc7#41.11.30.06.00#Radiometry analyzers#41.11.30.00.00
-unspsc7#41.11.30.07.00#Random access analyzers#41.11.30.00.00
-unspsc7#41.11.30.08.00#Cintigraphic analyzers#41.11.30.00.00
-unspsc7#41.11.30.09.00#Thermal differential analyzers#41.11.30.00.00
-unspsc7#41.11.30.10.00#Thermo gravimetry analyzers#41.11.30.00.00
-unspsc7#41.11.30.11.00#Chromatographic detectors#41.11.30.00.00
-unspsc7#41.11.30.12.00#Chromatographic scanners#41.11.30.00.00
-unspsc7#41.11.30.13.00#Gas chromatographs#41.11.30.00.00
-unspsc7#41.11.30.14.00#Ion chromatographs#41.11.30.00.00
-unspsc7#41.11.30.15.00#Liquid chromatographs#41.11.30.00.00
-unspsc7#41.11.30.16.00#Thinlayer chromatographs#41.11.30.00.00
-unspsc7#41.11.30.18.00#High pressure liquid chromatograph chromatography#41.11.30.00.00
-unspsc7#41.11.30.19.00#High pressure thin layer chromatograph (TLC)#41.11.30.00.00
-unspsc7#41.11.30.20.00#Colorimeters#41.11.30.00.00
-unspsc7#41.11.30.21.00#Conductimetric instruments#41.11.30.00.00
-unspsc7#41.11.30.22.00#Fluorimeters#41.11.30.00.00
-unspsc7#41.11.30.23.00#Gel partition equipment#41.11.30.00.00
-unspsc7#41.11.30.24.00#Hydrometers#41.11.30.00.00
-unspsc7#41.11.30.25.00#Monochromators#41.11.30.00.00
-unspsc7#41.11.30.26.00#Nephelometers#41.11.30.00.00
-unspsc7#41.11.30.27.00#Osmometers#41.11.30.00.00
-unspsc7#41.11.30.28.00#pH meters#41.11.30.00.00
-unspsc7#41.11.30.29.00#Polarographs#41.11.30.00.00
-unspsc7#41.11.30.30.00#Radiochromatographic scanner#41.11.30.00.00
-unspsc7#41.11.30.31.00#Saccharometers#41.11.30.00.00
-unspsc7#41.11.30.32.00#Salinity meter#41.11.30.00.00
-unspsc7#41.11.30.33.00#Volumeters#41.11.30.00.00
-unspsc7#41.11.31.00.00#Gas analyzers#41.11.00.00.00
-unspsc7#41.11.31.01.00#Automotive exhaust emission analyzers#41.11.31.00.00
-unspsc7#41.11.31.02.00#Catalytic combustion analyzers#41.11.31.00.00
-unspsc7#41.11.31.03.00#Chemical absorption gas analyzers#41.11.31.00.00
-unspsc7#41.11.31.04.00#Explosimeters#41.11.31.00.00
-unspsc7#41.11.31.05.00#Hydrocarbons analyzers or detectors#41.11.31.00.00
-unspsc7#41.11.31.06.00#Infra red or ultra violet absorption analyzers#41.11.31.00.00
-unspsc7#41.11.31.07.00#Nitrogen analyzers#41.11.31.00.00
-unspsc7#41.11.31.08.00#Nitrogen oxide analyzers#41.11.31.00.00
-unspsc7#41.11.31.09.00#ORSAT equipment#41.11.31.00.00
-unspsc7#41.11.31.10.00#Oxygen gas analyzers#41.11.31.00.00
-unspsc7#41.11.31.11.00#Ozone analyzers#41.11.31.00.00
-unspsc7#41.11.31.12.00#Paramagnetic susceptibility analyzers#41.11.31.00.00
-unspsc7#41.11.31.13.00#Sulfur dioxide analyzers or detectors#41.11.31.00.00
-unspsc7#41.11.31.14.00#Thermal conductivity analyzers#41.11.31.00.00
-unspsc7#41.11.31.15.00#Radon detectors#41.11.31.00.00
-unspsc7#41.11.31.16.00#Gas detector tubes#41.11.31.00.00
-unspsc7#41.11.33.00.00#Liquid and solid analyzers#41.11.00.00.00
-unspsc7#41.11.33.01.00#Acid or base analyzers#41.11.33.00.00
-unspsc7#41.11.33.02.00#Albuminometers#41.11.33.00.00
-unspsc7#41.11.33.03.00#Amino acid analyzers#41.11.33.00.00
-unspsc7#41.11.33.04.00#Bauxite analyzers#41.11.33.00.00
-unspsc7#41.11.33.05.00#Calcium analyzers#41.11.33.00.00
-unspsc7#41.11.33.06.00#Chloride analyzers#41.11.33.00.00
-unspsc7#41.11.33.07.00#Dissolved oxygen measurement meter#41.11.33.00.00
-unspsc7#41.11.33.08.00#Electrolyte analyzers#41.11.33.00.00
-unspsc7#41.11.33.09.00#Enzyme analyzers#41.11.33.00.00
-unspsc7#41.11.33.10.00#Fatty acid analyzers#41.11.33.00.00
-unspsc7#41.11.33.11.00#Halide detector lamp#41.11.33.00.00
-unspsc7#41.11.33.12.00#Lactate analyzers#41.11.33.00.00
-unspsc7#41.11.33.13.00#Mineral oil testing instruments#41.11.33.00.00
-unspsc7#41.11.33.14.00#Oil content monitors analyzers#41.11.33.00.00
-unspsc7#41.11.33.15.00#Organic carbon analyzers#41.11.33.00.00
-unspsc7#41.11.33.16.00#Petroleum testing equipment#41.11.33.00.00
-unspsc7#41.11.33.17.00#Protein analyzers#41.11.33.00.00
-unspsc7#41.11.33.18.00#Uranium analyzers#41.11.33.00.00
-unspsc7#41.11.33.19.00#Water analyzers#41.11.33.00.00
-unspsc7#41.11.33.20.00#Lubricating oil testing kit#41.11.33.00.00
-unspsc7#41.11.33.21.00#Paint tester#41.11.33.00.00
-unspsc7#41.11.34.00.00#Nuclear evaluation instruments#41.11.00.00.00
-unspsc7#41.11.34.01.00#Alpha counters#41.11.34.00.00
-unspsc7#41.11.34.02.00#Alpha beta counters#41.11.34.00.00
-unspsc7#41.11.34.03.00#Beta counters#41.11.34.00.00
-unspsc7#41.11.34.04.00#Beta gamma counters#41.11.34.00.00
-unspsc7#41.11.34.05.00#Gamma counters#41.11.34.00.00
-unspsc7#41.11.34.06.00#KVP meters#41.11.34.00.00
-unspsc7#41.11.34.07.00#X ray microanalysers#41.11.34.00.00
-unspsc7#41.11.36.00.00#Electrical measuring and testing equipment#41.11.00.00.00
-unspsc7#41.11.36.01.00#Ammeters#41.11.36.00.00
-unspsc7#41.11.36.02.00#Phasemeters#41.11.36.00.00
-unspsc7#41.11.36.03.00#Bridges#41.11.36.00.00
-unspsc7#41.11.36.04.00#Capacitance meters#41.11.36.00.00
-unspsc7#41.11.36.05.00#Thermoanalysis derivatographs#41.11.36.00.00
-unspsc7#41.11.36.06.00#Freeze watch indicators#41.11.36.00.00
-unspsc7#41.11.36.07.00#Heat stress monitors#41.11.36.00.00
-unspsc7#41.11.36.08.00#Coincidence or anticoincidence counters#41.11.36.00.00
-unspsc7#41.11.36.09.00#Conductivity cells#41.11.36.00.00
-unspsc7#41.11.36.10.00#Conductivity meters#41.11.36.00.00
-unspsc7#41.11.36.11.00#Cross talk meters#41.11.36.00.00
-unspsc7#41.11.36.12.00#Earth resistance testers#41.11.36.00.00
-unspsc7#41.11.36.13.00#Electrical value recorders#41.11.36.00.00
-unspsc7#41.11.36.14.00#Electromagnetic field meters#41.11.36.00.00
-unspsc7#41.11.36.15.00#Electrometers#41.11.36.00.00
-unspsc7#41.11.36.16.00#Electronic loads#41.11.36.00.00
-unspsc7#41.11.36.17.00#Field strength measuring equipment#41.11.36.00.00
-unspsc7#41.11.36.18.00#Gain measuring instruments#41.11.36.00.00
-unspsc7#41.11.36.19.00#Galvanometers#41.11.36.00.00
-unspsc7#41.11.36.20.00#High voltage cable detection#41.11.36.00.00
-unspsc7#41.11.36.21.00#Impedance meters#41.11.36.00.00
-unspsc7#41.11.36.22.00#Calibrated inductance coils or boxes#41.11.36.00.00
-unspsc7#41.11.36.23.00#Insulation resistance meters#41.11.36.00.00
-unspsc7#41.11.36.24.00#Insulation testers#41.11.36.00.00
-unspsc7#41.11.36.25.00#Ionization chambers#41.11.36.00.00
-unspsc7#41.11.36.26.00#Ionmeters#41.11.36.00.00
-unspsc7#41.11.36.27.00#Line earth loop testers#41.11.36.00.00
-unspsc7#41.11.36.28.00#Megohmmeters#41.11.36.00.00
-unspsc7#41.11.36.29.00#Microwave leakage meters#41.11.36.00.00
-unspsc7#41.11.36.30.00#Multimeters#41.11.36.00.00
-unspsc7#41.11.36.31.00#Ohmmeters#41.11.36.00.00
-unspsc7#41.11.36.32.00#Oscillographs#41.11.36.00.00
-unspsc7#41.11.36.33.00#Potentiometers#41.11.36.00.00
-unspsc7#41.11.36.34.00#Q meters#41.11.36.00.00
-unspsc7#41.11.36.35.00#Calibrated resistance measuring equipment#41.11.36.00.00
-unspsc7#41.11.36.36.00#Level generators#41.11.36.00.00
-unspsc7#41.11.36.37.00#Voltage or current meters#41.11.36.00.00
-unspsc7#41.11.36.38.00#Oscilloscopes#41.11.36.00.00
-unspsc7#41.11.36.39.00#Accelerometers#41.11.36.00.00
-unspsc7#41.11.36.40.00#Wattmeters#41.11.36.00.00
-unspsc7#41.11.36.41.00#GFI circuit testors#41.11.36.00.00
-unspsc7#41.11.36.42.00#Circuit tester#41.11.36.00.00
-unspsc7#41.11.36.43.00#Demand meters or registers#41.11.36.00.00
-unspsc7#41.11.36.44.00#Circuit tracers#41.11.36.00.00
-unspsc7#41.11.37.00.00#Electronic and communication measuring and testing instruments#41.11.00.00.00
-unspsc7#41.11.37.01.00#Cathode ray tube tester#41.11.37.00.00
-unspsc7#41.11.37.02.00#Comparators#41.11.37.00.00
-unspsc7#41.11.37.03.00#Directional coupler#41.11.37.00.00
-unspsc7#41.11.37.04.00#Integrated circuit testers#41.11.37.00.00
-unspsc7#41.11.37.05.00#Logic state testers#41.11.37.00.00
-unspsc7#41.11.37.06.00#Semiconductor testers#41.11.37.00.00
-unspsc7#41.11.37.07.00#Transistor circuit testers#41.11.37.00.00
-unspsc7#41.11.37.08.00#Power meters#41.11.37.00.00
-unspsc7#41.11.37.09.00#Modulation meters#41.11.37.00.00
-unspsc7#41.11.37.10.00#Level meter#41.11.37.00.00
-unspsc7#41.11.37.11.00#Network analyzers#41.11.37.00.00
-unspsc7#41.11.37.12.00#Tape testers#41.11.37.00.00
-unspsc7#41.11.37.13.00#Tapespeed testers#41.11.37.00.00
-unspsc7#41.11.37.14.00#Differentiator#41.11.37.00.00
-unspsc7#41.11.38.00.00#Geophysical and geotechnical instruments#41.11.00.00.00
-unspsc7#41.11.38.01.00#Geological compasses#41.11.38.00.00
-unspsc7#41.11.38.02.00#Geological prospecting apparatus#41.11.38.00.00
-unspsc7#41.11.38.03.00#Electromagnetic geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.04.00#Gravity geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.05.00#Induced polarization (IP) geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.06.00#Magnetometer geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.07.00#Resistivity geophysical instruments#41.11.38.00.00
-unspsc7#41.11.38.08.00#Gravimeters#41.11.38.00.00
-unspsc7#41.11.39.00.00#Soil measuring equipment#41.11.00.00.00
-unspsc7#41.11.39.01.00#Bore measuring instruments#41.11.39.00.00
-unspsc7#41.11.39.02.00#Dissolution or disintegration testers#41.11.39.00.00
-unspsc7#41.11.39.03.00#Particle size measuring apparatus#41.11.39.00.00
-unspsc7#41.11.39.04.00#Penetrometers#41.11.39.00.00
-unspsc7#41.11.39.05.00#Permeability testing apparatus#41.11.39.00.00
-unspsc7#41.11.39.06.00#Permeability or porosity estimation apparatus#41.11.39.00.00
-unspsc7#41.11.39.07.00#Porosimeters#41.11.39.00.00
-unspsc7#41.11.39.08.00#Sand testing apparatus#41.11.39.00.00
-unspsc7#41.11.39.09.00#Soil core sampling apparatus#41.11.39.00.00
-unspsc7#41.11.39.10.00#Soil testing kits#41.11.39.00.00
-unspsc7#41.11.40.00.00#Rock and strata measuring equipment#41.11.00.00.00
-unspsc7#41.11.40.01.00#Clinometers#41.11.40.00.00
-unspsc7#41.11.41.00.00#Seismological instruments#41.11.00.00.00
-unspsc7#41.11.41.02.00#Earthquake simulators#41.11.41.00.00
-unspsc7#41.11.41.03.00#Seismic alarm modules#41.11.41.00.00
-unspsc7#41.11.41.04.00#Seismic amplifiers#41.11.41.00.00
-unspsc7#41.11.41.05.00#Portable seismic apparatus#41.11.41.00.00
-unspsc7#41.11.41.06.00#Seismic recorders or seismographs#41.11.41.00.00
-unspsc7#41.11.41.07.00#Seismometers#41.11.41.00.00
-unspsc7#41.11.41.08.00#Vibrometers#41.11.41.00.00
-unspsc7#41.11.42.00.00#Land surveying instruments#41.11.00.00.00
-unspsc7#41.11.42.01.00#Measuring tapes#41.11.42.00.00
-unspsc7#41.11.42.02.00#Measuring rods#41.11.42.00.00
-unspsc7#41.11.42.03.00#Measuring tables#41.11.42.00.00
-unspsc7#41.11.42.04.00#Theodolites#41.11.42.00.00
-unspsc7#41.11.42.05.00#Location stake#41.11.42.00.00
-unspsc7#41.11.42.06.00#Location hub#41.11.42.00.00
-unspsc7#41.11.43.00.00#Hydrological instruments#41.11.00.00.00
-unspsc7#41.11.43.01.00#Open stream current meters#41.11.43.00.00
-unspsc7#41.11.43.02.00#Logging instruments for water wells#41.11.43.00.00
-unspsc7#41.11.43.03.00#Open stream water level recorders#41.11.43.00.00
-unspsc7#41.11.44.00.00#Meteorological instruments#41.11.00.00.00
-unspsc7#41.11.44.01.00#Anemometers#41.11.44.00.00
-unspsc7#41.11.44.02.00#Barometers#41.11.44.00.00
-unspsc7#41.11.44.03.00#Precipitation or evaporation recorders#41.11.44.00.00
-unspsc7#41.11.44.04.00#Radiosonde apparatus#41.11.44.00.00
-unspsc7#41.11.44.05.00#Rainfall recorders#41.11.44.00.00
-unspsc7#41.11.44.06.00#Precipitation or evaporation surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.07.00#Solar radiation surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.08.00#Temperature or humidity surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.09.00#Wind surface observing apparatus#41.11.44.00.00
-unspsc7#41.11.44.10.00#Weather stations#41.11.44.00.00
-unspsc7#41.11.44.11.00#Meteorology instrument accessories#41.11.44.00.00
-unspsc7#41.11.45.00.00#Mechanical instruments#41.11.00.00.00
-unspsc7#41.11.45.01.00#Dynamometers#41.11.45.00.00
-unspsc7#41.11.45.02.00#Elastometers#41.11.45.00.00
-unspsc7#41.11.45.03.00#Extensometers#41.11.45.00.00
-unspsc7#41.11.45.04.00#Pitch measuring instruments#41.11.45.00.00
-unspsc7#41.11.45.05.00#Roundness testing instruments#41.11.45.00.00
-unspsc7#41.11.45.06.00#Spherometers#41.11.45.00.00
-unspsc7#41.11.45.07.00#Spring testing machines#41.11.45.00.00
-unspsc7#41.11.45.08.00#Surface testers#41.11.45.00.00
-unspsc7#41.11.45.09.00#Tensiometers#41.11.45.00.00
-unspsc7#41.11.45.10.00#Torque limiter#41.11.45.00.00
-unspsc7#41.11.46.00.00#Metals and metallurgy and structural materials testing instruments#41.11.00.00.00
-unspsc7#41.11.46.01.00#Abrasion testers#41.11.46.00.00
-unspsc7#41.11.46.02.00#Compression testers#41.11.46.00.00
-unspsc7#41.11.46.03.00#Concrete or cement testing instruments#41.11.46.00.00
-unspsc7#41.11.46.04.00#Corrosion testers#41.11.46.00.00
-unspsc7#41.11.46.05.00#Crack or corrosion detectors#41.11.46.00.00
-unspsc7#41.11.46.06.00#Creep testers#41.11.46.00.00
-unspsc7#41.11.46.07.00#Ductility testing machines#41.11.46.00.00
-unspsc7#41.11.46.08.00#Fatigue testers#41.11.46.00.00
-unspsc7#41.11.46.09.00#Forging testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.10.00#Foundry testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.11.00#Hardness testers#41.11.46.00.00
-unspsc7#41.11.46.12.00#Impact testers#41.11.46.00.00
-unspsc7#41.11.46.13.00#Load frame#41.11.46.00.00
-unspsc7#41.11.46.14.00#Metal testing instruments#41.11.46.00.00
-unspsc7#41.11.46.15.00#Photoelastic testing instruments#41.11.46.00.00
-unspsc7#41.11.46.16.00#Proofstress indicators#41.11.46.00.00
-unspsc7#41.11.46.17.00#Relaxation testers#41.11.46.00.00
-unspsc7#41.11.46.18.00#Roughness measuring instruments#41.11.46.00.00
-unspsc7#41.11.46.19.00#Shear strength testers#41.11.46.00.00
-unspsc7#41.11.46.20.00#Shock testing apparatus#41.11.46.00.00
-unspsc7#41.11.46.21.00#Tension testers#41.11.46.00.00
-unspsc7#41.11.46.22.00#Torsion testers#41.11.46.00.00
-unspsc7#41.11.46.23.00#Flexure or transverse testing machines#41.11.46.00.00
-unspsc7#41.11.46.24.00#Vibration testers#41.11.46.00.00
-unspsc7#41.11.46.25.00#Wear testers#41.11.46.00.00
-unspsc7#41.11.46.26.00#Welding testing apparatus#41.11.46.00.00
-unspsc7#41.11.47.00.00#Paper and wood and textile testing instruments#41.11.00.00.00
-unspsc7#41.11.47.01.00#Cardboard testing instruments#41.11.47.00.00
-unspsc7#41.11.47.02.00#Textiles fastness testers#41.11.47.00.00
-unspsc7#41.11.47.03.00#Leather testing instruments#41.11.47.00.00
-unspsc7#41.11.47.04.00#Paper testing instruments#41.11.47.00.00
-unspsc7#41.11.47.05.00#Textile testing instruments#41.11.47.00.00
-unspsc7#41.11.47.06.00#Wood testing instruments#41.11.47.00.00
-unspsc7#41.11.48.00.00#Ceramics and glass testing instruments#41.11.00.00.00
-unspsc7#41.11.48.01.00#Ceramics testing instruments#41.11.48.00.00
-unspsc7#41.11.48.02.00#Glass testing instruments#41.11.48.00.00
-unspsc7#41.11.48.03.00#Pottery testing instruments#41.11.48.00.00
-unspsc7#41.11.51.00.00#Coal and ore testing instruments#41.11.00.00.00
-unspsc7#41.11.51.01.00#Coal testing instruments#41.11.51.00.00
-unspsc7#41.11.52.00.00#Radar and sonar systems and components#41.11.00.00.00
-unspsc7#41.11.52.01.00#Radarbased surveillance systems#41.11.52.00.00
-unspsc7#41.11.52.02.00#Feed horns#41.11.52.00.00
-unspsc7#42.00.00.00.00#Medical Equipment and Accessories and Supplies#42.00.00.00.00
-unspsc7#42.10.00.00.00#Hospital and medical and dental equipment#42.00.00.00.00
-unspsc7#42.10.15.00.00#Anesthesia equipment and instruments and accessories#42.10.00.00.00
-unspsc7#42.10.15.02.00#Healthcare gas machines#42.10.15.00.00
-unspsc7#42.10.15.03.00#Anesthesia machines#42.10.15.00.00
-unspsc7#42.10.15.04.00#Regional anaesthesia kits or needles#42.10.15.00.00
-unspsc7#42.10.16.00.00#Medical equipment and instruments#42.10.00.00.00
-unspsc7#42.10.16.01.00#Medical thermometers#42.10.16.00.00
-unspsc7#42.10.16.02.00#Speculums#42.10.16.00.00
-unspsc7#42.10.16.03.00#Otoscopes#42.10.16.00.00
-unspsc7#42.10.16.04.00#Audiometers or tympanometers#42.10.16.00.00
-unspsc7#42.10.16.05.00#Stethoscopes#42.10.16.00.00
-unspsc7#42.10.16.06.00#Ergonometers#42.10.16.00.00
-unspsc7#42.10.16.07.00#Electro therapy apparatus#42.10.16.00.00
-unspsc7#42.10.16.08.00#Photo therapy apparatus#42.10.16.00.00
-unspsc7#42.10.16.09.00#Hydrotherapy supplies or accessories#42.10.16.00.00
-unspsc7#42.10.16.10.00#Acupuncture units#42.10.16.00.00
-unspsc7#42.10.16.11.00#Stethographs#42.10.16.00.00
-unspsc7#42.10.16.12.00#Medical pumps#42.10.16.00.00
-unspsc7#42.10.16.13.00#Medical valves#42.10.16.00.00
-unspsc7#42.10.16.14.00#Endoscopes#42.10.16.00.00
-unspsc7#42.10.17.00.00#Medical testing and analyzing and diagnostic equipment#42.10.00.00.00
-unspsc7#42.10.17.01.00#Skin test strips#42.10.17.00.00
-unspsc7#42.10.17.02.00#Blood analyzers#42.10.17.00.00
-unspsc7#42.10.17.03.00#Blood cell counters#42.10.17.00.00
-unspsc7#42.10.17.04.00#Haemoglobinometers#42.10.17.00.00
-unspsc7#42.10.17.05.00#Bilirubin meters#42.10.17.00.00
-unspsc7#42.10.17.06.00#Haemacytometers#42.10.17.00.00
-unspsc7#42.10.17.07.00#Colony counters#42.10.17.00.00
-unspsc7#42.10.17.08.00#Ferritin test kits#42.10.17.00.00
-unspsc7#42.10.17.09.00#Enzyme linked immunosorbent assay (ELISA) test kit#42.10.17.00.00
-unspsc7#42.10.17.10.00#Human immune deficiency (HIV) test kits#42.10.17.00.00
-unspsc7#42.10.17.11.00#Syfacard syphilis tests#42.10.17.00.00
-unspsc7#42.10.17.12.00#Pregnancy test kits#42.10.17.00.00
-unspsc7#42.10.17.13.00#Radio immunoassay (RIA) test kits#42.10.17.00.00
-unspsc7#42.10.17.14.00#Polio case investigation kit#42.10.17.00.00
-unspsc7#42.10.17.15.00#Urine blood test strips#42.10.17.00.00
-unspsc7#42.10.17.16.00#Cell size analyzers#42.10.17.00.00
-unspsc7#42.10.17.17.00#Whole body counters#42.10.17.00.00
-unspsc7#42.10.17.18.00#Biomedical counters#42.10.17.00.00
-unspsc7#42.10.17.19.00#Medical multiprobe system counters#42.10.17.00.00
-unspsc7#42.10.17.20.00#Allergy or diagnostic kits#42.10.17.00.00
-unspsc7#42.10.17.21.00#Urinary test set#42.10.17.00.00
-unspsc7#42.10.17.22.00#Differential cell counters#42.10.17.00.00
-unspsc7#42.10.17.23.00#Plasma viscosity measurement#42.10.17.00.00
-unspsc7#42.10.17.24.00#Platelet analysis#42.10.17.00.00
-unspsc7#42.10.17.25.00#Blood glucose meters#42.10.17.00.00
-unspsc7#42.10.17.26.00#Hemoculture tests#42.10.17.00.00
-unspsc7#42.10.17.27.00#Bodyfat analysers#42.10.17.00.00
-unspsc7#42.10.17.28.00#Sample collection systems#42.10.17.00.00
-unspsc7#42.10.18.00.00#X ray and alpha and beta and gamma radiation apparatus#42.10.00.00.00
-unspsc7#42.10.18.01.00#Diagnostic x ray equipment#42.10.18.00.00
-unspsc7#42.10.18.02.00#Radiotherapy simulator#42.10.18.00.00
-unspsc7#42.10.18.03.00#Calibration equipment#42.10.18.00.00
-unspsc7#42.10.18.04.00#Biomedical research support units#42.10.18.00.00
-unspsc7#42.10.18.05.00#Computed tomography (CT) scanners#42.10.18.00.00
-unspsc7#42.10.18.06.00#Water phantoms#42.10.18.00.00
-unspsc7#42.10.18.07.00#Radiobiological instruments#42.10.18.00.00
-unspsc7#42.10.18.08.00#Gamma scintillators#42.10.18.00.00
-unspsc7#42.10.18.09.00#Gamma cameras#42.10.18.00.00
-unspsc7#42.10.18.10.00#Linear accelerators#42.10.18.00.00
-unspsc7#42.10.18.11.00#Radiotherapy brachytherapy equipment#42.10.18.00.00
-unspsc7#42.10.18.12.00#Radiotherapy teletherapy cobalt 60 machine#42.10.18.00.00
-unspsc7#42.10.18.13.00#Radiotherapy teletherapy superficial x ray machine#42.10.18.00.00
-unspsc7#42.10.18.14.00#Radiotherapy teletherapy orthovoltage x ray machine#42.10.18.00.00
-unspsc7#42.10.18.15.00#Radiotherapy teletherapy linear accelerators#42.10.18.00.00
-unspsc7#42.10.18.16.00#Radioisotope scanners for medical purposes#42.10.18.00.00
-unspsc7#42.10.18.17.00#Dental x ray units#42.10.18.00.00
-unspsc7#42.10.18.18.00#Angiography supplies#42.10.18.00.00
-unspsc7#42.10.18.19.00#Angiography devices#42.10.18.00.00
-unspsc7#42.10.18.20.00#Angioplasty supplies#42.10.18.00.00
-unspsc7#42.10.18.21.00#Angioplasty devices#42.10.18.00.00
-unspsc7#42.10.19.00.00#Oxygen therapy equipment#42.10.00.00.00
-unspsc7#42.10.19.01.00#Inhalation equipment#42.10.19.00.00
-unspsc7#42.10.19.02.00#Medical humidifiers#42.10.19.00.00
-unspsc7#42.10.19.03.00#Resuscitators or respirators#42.10.19.00.00
-unspsc7#42.10.19.04.00#Aspirators#42.10.19.00.00
-unspsc7#42.10.19.05.00#Insufflators#42.10.19.00.00
-unspsc7#42.10.19.06.00#Resuscitation emergency outfits#42.10.19.00.00
-unspsc7#42.10.19.07.00#Nebulizers#42.10.19.00.00
-unspsc7#42.10.19.08.00#Aerosol therapy apparatus#42.10.19.00.00
-unspsc7#42.10.19.09.00#Medical ventilation systems#42.10.19.00.00
-unspsc7#42.10.19.10.00#Masks or breathing bags#42.10.19.00.00
-unspsc7#42.10.19.11.00#Heart lung apparatus#42.10.19.00.00
-unspsc7#42.10.19.12.00#Breathing device with hygienic barrier#42.10.19.00.00
-unspsc7#42.10.19.13.00#Oxygen masks#42.10.19.00.00
-unspsc7#42.10.19.14.00#Mobile suction unit#42.10.19.00.00
-unspsc7#42.10.19.15.00#Hyperbaric treatment chamber#42.10.19.00.00
-unspsc7#42.10.19.16.00#Oxygenators#42.10.19.00.00
-unspsc7#42.10.19.17.00#Air oxygen units#42.10.19.00.00
-unspsc7#42.10.20.00.00#Medical and surgical and laboratory sterilizers#42.10.00.00.00
-unspsc7#42.10.20.01.00#Autoclaves#42.10.20.00.00
-unspsc7#42.10.20.02.00#Steam sterilizers#42.10.20.00.00
-unspsc7#42.10.20.03.00#Boiling disinfectors#42.10.20.00.00
-unspsc7#42.10.20.04.00#Hot air sterilizers#42.10.20.00.00
-unspsc7#42.10.20.05.00#Chemical sterilizers#42.10.20.00.00
-unspsc7#42.10.20.06.00#Laboratory sterilizers#42.10.20.00.00
-unspsc7#42.10.20.07.00#Sterilization ovens#42.10.20.00.00
-unspsc7#42.10.20.08.00#Germicidal lamps#42.10.20.00.00
-unspsc7#42.10.20.09.00#Sterilizing lamps#42.10.20.00.00
-unspsc7#42.10.20.10.00#Decontamination washing equipment#42.10.20.00.00
-unspsc7#42.10.21.00.00#Surgical sets and instruments#42.10.00.00.00
-unspsc7#42.10.21.01.00#Cryo surgery equipment#42.10.21.00.00
-unspsc7#42.10.21.02.00#Autopsy instruments#42.10.21.00.00
-unspsc7#42.10.21.03.00#Suction units or parts#42.10.21.00.00
-unspsc7#42.10.21.04.00#Surgical lasers#42.10.21.00.00
-unspsc7#42.10.21.05.00#Electro cautery surgical equipment#42.10.21.00.00
-unspsc7#42.10.21.06.00#Ear or nose or throat (ENT) surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.07.00#Gynecological surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.08.00#Cardiology surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.09.00#Micro surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.10.00#Orthopedic surgery instruments#42.10.21.00.00
-unspsc7#42.10.21.11.00#Suture clips#42.10.21.00.00
-unspsc7#42.10.21.12.00#Dissecting instruments#42.10.21.00.00
-unspsc7#42.10.21.13.00#Dissecting pins#42.10.21.00.00
-unspsc7#42.10.21.14.00#Implant systems#42.10.21.00.00
-unspsc7#42.10.21.15.00#Blood lancets#42.10.21.00.00
-unspsc7#42.10.21.16.00#Scalpels#42.10.21.00.00
-unspsc7#42.10.21.17.00#Surgical blades#42.10.21.00.00
-unspsc7#42.10.21.18.00#Cranioclasts#42.10.21.00.00
-unspsc7#42.10.21.19.00#Surgical scissors#42.10.21.00.00
-unspsc7#42.10.21.20.00#Surgical shears#42.10.21.00.00
-unspsc7#42.10.21.21.00#Surgical drills#42.10.21.00.00
-unspsc7#42.10.21.22.00#Surgical wire saws#42.10.21.00.00
-unspsc7#42.10.21.23.00#Surgical perforators#42.10.21.00.00
-unspsc7#42.10.21.24.00#Curettes#42.10.21.00.00
-unspsc7#42.10.21.25.00#Surgical clamps#42.10.21.00.00
-unspsc7#42.10.21.26.00#Surgical instrument holders#42.10.21.00.00
-unspsc7#42.10.21.27.00#Surgical elevators#42.10.21.00.00
-unspsc7#42.10.21.28.00#Raspatory instruments#42.10.21.00.00
-unspsc7#42.10.21.29.00#Forceps#42.10.21.00.00
-unspsc7#42.10.21.30.00#Surgical retractors#42.10.21.00.00
-unspsc7#42.10.21.31.00#Surgical spreaders#42.10.21.00.00
-unspsc7#42.10.21.32.00#Uterine sound instruments#42.10.21.00.00
-unspsc7#42.10.21.33.00#Dilators#42.10.21.00.00
-unspsc7#42.10.21.34.00#Surgical dishes or pots#42.10.21.00.00
-unspsc7#42.10.21.35.00#Surgical probes#42.10.21.00.00
-unspsc7#42.10.21.36.00#Surgical mallets#42.10.21.00.00
-unspsc7#42.10.21.37.00#Decapitation hooks#42.10.21.00.00
-unspsc7#42.10.21.38.00#Sutures#42.10.21.00.00
-unspsc7#42.10.21.39.00#Catgut chromic sutures#42.10.21.00.00
-unspsc7#42.10.21.40.00#Laryngoscopes#42.10.21.00.00
-unspsc7#42.10.21.41.00#Surgical shaving kits#42.10.21.00.00
-unspsc7#42.10.22.00.00#Rehabilitation equipment and accessories#42.10.00.00.00
-unspsc7#42.10.22.01.00#Splints#42.10.22.00.00
-unspsc7#42.10.22.02.00#Psychological aptitude testing apparatus#42.10.22.00.00
-unspsc7#42.10.22.03.00#Massage apparatus#42.10.22.00.00
-unspsc7#42.10.22.04.00#Traction pulleys or belts or weights#42.10.22.00.00
-unspsc7#42.10.22.05.00#Physical therapy rehabilitation equipment or accessories#42.10.22.00.00
-unspsc7#42.10.22.06.00#Overbed frames#42.10.22.00.00
-unspsc7#42.10.22.07.00#Rehabilitation stimulators#42.10.22.00.00
-unspsc7#42.10.22.08.00#Patient lifters#42.10.22.00.00
-unspsc7#42.10.22.09.00#Short wave diathermy equipment#42.10.22.00.00
-unspsc7#42.10.22.10.00#Moist heat therapy equipment#42.10.22.00.00
-unspsc7#42.10.22.11.00#Heat or cold packs#42.10.22.00.00
-unspsc7#42.10.22.12.00#Physiological equipment#42.10.22.00.00
-unspsc7#42.10.22.13.00#Stimulators#42.10.22.00.00
-unspsc7#42.10.22.14.00#Rehabilitation supplies for the blind#42.10.22.00.00
-unspsc7#42.10.22.15.00#Electromyograph#42.10.22.00.00
-unspsc7#42.10.22.16.00#Rehabilitation supplies for speech handicapped#42.10.22.00.00
-unspsc7#42.10.22.17.00#Electro sleep apparatus#42.10.22.00.00
-unspsc7#42.10.22.18.00#Visual exercise training aids#42.10.22.00.00
-unspsc7#42.10.22.19.00#Orthopedic cushions#42.10.22.00.00
-unspsc7#42.10.23.00.00#Ophthalmology instruments and appliances#42.10.00.00.00
-unspsc7#42.10.23.01.00#Opthalmological punches#42.10.23.00.00
-unspsc7#42.10.23.02.00#Photocoagulators#42.10.23.00.00
-unspsc7#42.10.23.03.00#Slit lamps#42.10.23.00.00
-unspsc7#42.10.23.04.00#Perimeters#42.10.23.00.00
-unspsc7#42.10.23.05.00#Tonometers#42.10.23.00.00
-unspsc7#42.10.23.06.00#Retinometers#42.10.23.00.00
-unspsc7#42.10.23.07.00#Eyewashers#42.10.23.00.00
-unspsc7#42.10.23.08.00#Ophthalmometers#42.10.23.00.00
-unspsc7#42.10.23.09.00#Ophthalmoscopes#42.10.23.00.00
-unspsc7#42.10.23.10.00#Emergency eye care equipment#42.10.23.00.00
-unspsc7#42.10.23.11.00#Keratometers#42.10.23.00.00
-unspsc7#42.10.23.12.00#Vision testers#42.10.23.00.00
-unspsc7#42.10.23.13.00#Synotoscopes#42.10.23.00.00
-unspsc7#42.10.23.14.00#Ophthalmic operation instruments#42.10.23.00.00
-unspsc7#42.10.24.00.00#Gynecological and obstetrical instruments#42.10.00.00.00
-unspsc7#42.10.24.01.00#Intra uterine device (IUD) insertion kits#42.10.24.00.00
-unspsc7#42.10.24.02.00#Tubal ligation kits#42.10.24.00.00
-unspsc7#42.10.24.03.00#Vasectomy kits#42.10.24.00.00
-unspsc7#42.10.24.04.00#Laparoscopic equipment#42.10.24.00.00
-unspsc7#42.10.24.05.00#Silastic bands#42.10.24.00.00
-unspsc7#42.10.24.06.00#Menstruation regulation kits#42.10.24.00.00
-unspsc7#42.10.24.07.00#Spermokinesemeter#42.10.24.00.00
-unspsc7#42.10.24.08.00#Uterine or gynecological tests#42.10.24.00.00
-unspsc7#42.10.24.09.00#Obstetrical retractors#42.10.24.00.00
-unspsc7#42.10.24.10.00#Umbilical tapes#42.10.24.00.00
-unspsc7#42.10.24.11.00#Breast pumps or accessories#42.10.24.00.00
-unspsc7#42.10.24.12.00#Midwife equipment or kits#42.10.24.00.00
-unspsc7#42.10.24.13.00#Hysteroscopic equipment#42.10.24.00.00
-unspsc7#42.10.24.14.00#Vaginoscope#42.10.24.00.00
-unspsc7#42.10.24.15.00#Urethroscope cysterscope#42.10.24.00.00
-unspsc7#42.10.24.16.00#Umbilical cord clamps#42.10.24.00.00
-unspsc7#42.10.24.17.00#Vacuum extractors#42.10.24.00.00
-unspsc7#42.10.24.18.00#In vitro fertilization equipment or supplies#42.10.24.00.00
-unspsc7#42.10.24.19.00#Endometrial biopsy equipment#42.10.24.00.00
-unspsc7#42.10.24.20.00#Intrauterine insemination catheters#42.10.24.00.00
-unspsc7#42.10.24.21.00#Pelvimeters#42.10.24.00.00
-unspsc7#42.10.25.00.00#Fiber optic examination instruments#42.10.00.00.00
-unspsc7#42.10.25.01.00#Light sources#42.10.25.00.00
-unspsc7#42.10.25.02.00#Endoscopy equipment#42.10.25.00.00
-unspsc7#42.10.25.03.00#Protoscopes#42.10.25.00.00
-unspsc7#42.10.25.04.00#Culdoscopes#42.10.25.00.00
-unspsc7#42.10.25.05.00#Gastroscopes#42.10.25.00.00
-unspsc7#42.10.25.06.00#Esophagoscope#42.10.25.00.00
-unspsc7#42.10.25.07.00#Sigmoidoscope#42.10.25.00.00
-unspsc7#42.10.25.08.00#Bronchoscope#42.10.25.00.00
-unspsc7#42.10.25.09.00#Colonoscope#42.10.25.00.00
-unspsc7#42.10.25.10.00#Arthroscope#42.10.25.00.00
-unspsc7#42.10.26.00.00#Electro diagnostic apparatus#42.10.00.00.00
-unspsc7#42.10.26.01.00#Electrocardiographs (ECGs)#42.10.26.00.00
-unspsc7#42.10.26.02.00#Cardioscopes#42.10.26.00.00
-unspsc7#42.10.26.03.00#Stereotactic systems#42.10.26.00.00
-unspsc7#42.10.26.04.00#Achillean reflexometer#42.10.26.00.00
-unspsc7#42.10.26.05.00#Thesiometer#42.10.26.00.00
-unspsc7#42.10.26.06.00#Pneumotachographs#42.10.26.00.00
-unspsc7#42.10.26.07.00#Biovideographs#42.10.26.00.00
-unspsc7#42.10.26.08.00#Physiological levers#42.10.26.00.00
-unspsc7#42.10.26.09.00#Nerve chamber equipment#42.10.26.00.00
-unspsc7#42.10.26.10.00#Ultrasonic diagnostic equipment#42.10.26.00.00
-unspsc7#42.10.26.11.00#Ultrasound scanners#42.10.26.00.00
-unspsc7#42.10.26.12.00#Doppler ultrasound equipment#42.10.26.00.00
-unspsc7#42.10.26.13.00#Ultrasonic surgery equipment or ultrasonic aspiration#42.10.26.00.00
-unspsc7#42.10.26.14.00#Ultrasound physiotherapy equipment#42.10.26.00.00
-unspsc7#42.10.26.15.00#Cardio sonars#42.10.26.00.00
-unspsc7#42.10.26.16.00#Short wave medical apparatus#42.10.26.00.00
-unspsc7#42.10.26.17.00#Blood pressure measuring equipment#42.10.26.00.00
-unspsc7#42.10.26.18.00#Electroencephalographs (EEGs)#42.10.26.00.00
-unspsc7#42.10.26.19.00#Spirometers#42.10.26.00.00
-unspsc7#42.10.26.20.00#Gynecological diagnostic equipment#42.10.26.00.00
-unspsc7#42.10.26.21.00#Colposcopes#42.10.26.00.00
-unspsc7#42.10.26.22.00#Amnioscopes#42.10.26.00.00
-unspsc7#42.10.26.23.00#Fetal monitors#42.10.26.00.00
-unspsc7#42.10.26.24.00#Delivery monitors#42.10.26.00.00
-unspsc7#42.10.26.25.00#Neonatal monitors#42.10.26.00.00
-unspsc7#42.10.26.26.00#Heart monitor systems#42.10.26.00.00
-unspsc7#42.10.26.27.00#Intensive care monitors#42.10.26.00.00
-unspsc7#42.10.26.28.00#Electromedical testing equipment#42.10.26.00.00
-unspsc7#42.10.26.29.00#Defibrillator tester#42.10.26.00.00
-unspsc7#42.10.26.30.00#Audiometer calibration tester#42.10.26.00.00
-unspsc7#42.10.26.31.00#Electrode or electromedical tester#42.10.26.00.00
-unspsc7#42.10.26.32.00#Ventilator test meters#42.10.26.00.00
-unspsc7#42.10.26.33.00#ECG patient simulators#42.10.26.00.00
-unspsc7#42.10.26.34.00#Electrosurgical analyzers#42.10.26.00.00
-unspsc7#42.10.26.35.00#Electromedical safety analyzers#42.10.26.00.00
-unspsc7#42.10.26.36.00#Electromedical test systems#42.10.26.00.00
-unspsc7#42.10.26.37.00#Electronic pulse monitors#42.10.26.00.00
-unspsc7#42.10.26.38.00#Vaginal ultrasound probe#42.10.26.00.00
-unspsc7#42.10.26.39.00#Medical conductive gels#42.10.26.00.00
-unspsc7#42.10.27.00.00#Dialysis equipment and instruments#42.10.00.00.00
-unspsc7#42.10.27.01.00#Blood bag sampler#42.10.27.00.00
-unspsc7#42.10.27.02.00#Blood warmer#42.10.27.00.00
-unspsc7#42.10.27.03.00#Dialysis instrument sets#42.10.27.00.00
-unspsc7#42.10.27.04.00#Peritoneal dialysis units#42.10.27.00.00
-unspsc7#42.10.27.05.00#Haemodialysis units#42.10.27.00.00
-unspsc7#42.10.27.06.00#Blood filters#42.10.27.00.00
-unspsc7#42.10.27.07.00#Blood separator stand#42.10.27.00.00
-unspsc7#42.10.27.08.00#Plasmaphoresis equipment#42.10.27.00.00
-unspsc7#42.10.27.09.00#Angiographic injectors#42.10.27.00.00
-unspsc7#42.10.27.10.00#Hemafilters#42.10.27.00.00
-unspsc7#42.10.27.11.00#Dialysis tubing or membranes#42.10.27.00.00
-unspsc7#42.10.27.12.00#Blood oxygen demand apparatus#42.10.27.00.00
-unspsc7#42.10.27.13.00#Clot coagulation detection systems#42.10.27.00.00
-unspsc7#42.10.27.14.00#Medical drains or drainage kits#42.10.27.00.00
-unspsc7#42.10.27.15.00#Kymographs#42.10.27.00.00
-unspsc7#42.10.27.16.00#Blood sampling equipment#42.10.27.00.00
-unspsc7#42.10.28.00.00#Dental instruments and appliances#42.10.00.00.00
-unspsc7#42.10.28.01.00#Dental mixing slabs#42.10.28.00.00
-unspsc7#42.10.28.02.00#Bands for dental matrix#42.10.28.00.00
-unspsc7#42.10.28.03.00#Dental retainers#42.10.28.00.00
-unspsc7#42.10.28.04.00#Dental handpieces#42.10.28.00.00
-unspsc7#42.10.28.05.00#Dental cryosurgical instrumentation#42.10.28.00.00
-unspsc7#42.10.28.06.00#Dental formers#42.10.28.00.00
-unspsc7#42.10.28.07.00#Periodontium control instruments or periotest#42.10.28.00.00
-unspsc7#42.10.28.08.00#Dental trays#42.10.28.00.00
-unspsc7#42.10.28.09.00#Dental probes#42.10.28.00.00
-unspsc7#42.10.28.10.00#Dental scales#42.10.28.00.00
-unspsc7#42.10.28.11.00#Dental spatulas#42.10.28.00.00
-unspsc7#42.10.28.12.00#Dental elevators#42.10.28.00.00
-unspsc7#42.10.28.13.00#Dental excavators#42.10.28.00.00
-unspsc7#42.10.28.14.00#Dental finger protectors#42.10.28.00.00
-unspsc7#42.10.28.15.00#Dental tweezers#42.10.28.00.00
-unspsc7#42.10.28.16.00#Dental scissors#42.10.28.00.00
-unspsc7#42.10.28.17.00#Dental forceps#42.10.28.00.00
-unspsc7#42.10.28.18.00#Dental mirrors#42.10.28.00.00
-unspsc7#42.10.28.19.00#Orthodontic appliances#42.10.28.00.00
-unspsc7#42.10.28.20.00#Dental impression trays#42.10.28.00.00
-unspsc7#42.10.28.21.00#Dental syringes or needles#42.10.28.00.00
-unspsc7#42.10.28.22.00#Dental drills#42.10.28.00.00
-unspsc7#42.10.28.23.00#Endodontics accessories#42.10.28.00.00
-unspsc7#42.10.29.00.00#Cardiology equipment and supplies#42.10.00.00.00
-unspsc7#42.10.29.01.00#Heart valves#42.10.29.00.00
-unspsc7#42.10.29.02.00#Heart catheters#42.10.29.00.00
-unspsc7#42.10.29.03.00#Defribilators#42.10.29.00.00
-unspsc7#42.10.29.04.00#Aortic balloon equipment#42.10.29.00.00
-unspsc7#42.10.29.05.00#Pacemakers#42.10.29.00.00
-unspsc7#42.10.30.00.00#Medical consumables#42.10.00.00.00
-unspsc7#42.10.30.01.00#Blood or intravenous (IV) bottles or bags#42.10.30.00.00
-unspsc7#42.10.30.02.00#Tongue depressors#42.10.30.00.00
-unspsc7#42.10.30.03.00#Suture needles#42.10.30.00.00
-unspsc7#42.10.30.04.00#Biopsy needles#42.10.30.00.00
-unspsc7#42.10.30.05.00#Biopsy capsules or punches#42.10.30.00.00
-unspsc7#42.10.30.06.00#Dissecting needles#42.10.30.00.00
-unspsc7#42.10.30.07.00#Acupuncture needles#42.10.30.00.00
-unspsc7#42.10.30.08.00#Medical disposal containers#42.10.30.00.00
-unspsc7#42.10.30.09.00#Haematocrit tubes#42.10.30.00.00
-unspsc7#42.10.30.10.00#Swabs#42.10.30.00.00
-unspsc7#42.10.30.11.00#Blood transfusion needles or cannulae#42.10.30.00.00
-unspsc7#42.10.30.12.00#Transfer swabs or applicators#42.10.30.00.00
-unspsc7#42.10.30.13.00#Urine bags#42.10.30.00.00
-unspsc7#42.10.30.14.00#Specimen containers#42.10.30.00.00
-unspsc7#42.10.30.15.00#Plaster of paris#42.10.30.00.00
-unspsc7#42.10.30.16.00#Sterile strips#42.10.30.00.00
-unspsc7#42.10.30.17.00#Gauze cloth#42.10.30.00.00
-unspsc7#42.10.30.18.00#Cotton wool#42.10.30.00.00
-unspsc7#42.10.30.19.00#Sterile surgical compresses#42.10.30.00.00
-unspsc7#42.10.30.20.00#Bandages#42.10.30.00.00
-unspsc7#42.10.30.21.00#First aid kits or kit refills#42.10.30.00.00
-unspsc7#42.10.30.22.00#Hypodermic syringes#42.10.30.00.00
-unspsc7#42.10.30.23.00#Cotton swabs on sticks#42.10.30.00.00
-unspsc7#42.10.30.24.00#Infusion sets#42.10.30.00.00
-unspsc7#42.10.30.25.00#Nasogastric tubes#42.10.30.00.00
-unspsc7#42.10.30.26.00#Destruction clips#42.10.30.00.00
-unspsc7#42.10.30.27.00#Dressings#42.10.30.00.00
-unspsc7#42.10.30.28.00#Implantable drug delivery systems#42.10.30.00.00
-unspsc7#42.10.30.29.00#Automatic mass vaccinators#42.10.30.00.00
-unspsc7#42.10.30.30.00#Pipetting syringes#42.10.30.00.00
-unspsc7#42.10.30.31.00#Scalp vein needles or stopcocks#42.10.30.00.00
-unspsc7#42.10.30.32.00#Hypodermic needles#42.10.30.00.00
-unspsc7#42.10.30.33.00#Medical jet injectors#42.10.30.00.00
-unspsc7#42.10.30.34.00#Lancets#42.10.30.00.00
-unspsc7#42.10.30.35.00#Catheter for infusion#42.10.30.00.00
-unspsc7#42.10.30.36.00#Intavenous (IV) equipment tubes#42.10.30.00.00
-unspsc7#42.10.30.37.00#Eyewash solutions#42.10.30.00.00
-unspsc7#42.10.30.38.00#Examination gloves#42.10.30.00.00
-unspsc7#42.10.30.39.00#Pathogen cleanup kits#42.10.30.00.00
-unspsc7#42.10.30.40.00#Diabetic syringes#42.10.30.00.00
-unspsc7#42.10.30.41.00#Diabetic pen needles#42.10.30.00.00
-unspsc7#42.10.30.42.00#Lancet device#42.10.30.00.00
-unspsc7#42.11.00.00.00#Assistive and corrective devices for people with disabilities#42.00.00.00.00
-unspsc7#42.11.15.00.00#Prostheses and parts thereof#42.11.00.00.00
-unspsc7#42.11.15.01.00#Ankle or foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.02.00#Cervical orthoses#42.11.15.00.00
-unspsc7#42.11.15.03.00#Cervico thoratic orthoses#42.11.15.00.00
-unspsc7#42.11.15.04.00#Cervico thoratic lumbo sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.05.00#Elbow orthoses#42.11.15.00.00
-unspsc7#42.11.15.06.00#Elbow wrist orthoses#42.11.15.00.00
-unspsc7#42.11.15.07.00#Finger orthoses#42.11.15.00.00
-unspsc7#42.11.15.08.00#Foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.09.00#Hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.10.00#Hip orthoses#42.11.15.00.00
-unspsc7#42.11.15.11.00#Hip knee ankle foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.12.00#Hip or knee or ankle orthoses joints#42.11.15.00.00
-unspsc7#42.11.15.13.00#Shoulder or elbow or wrist orthoses joints#42.11.15.00.00
-unspsc7#42.11.15.14.00#Knee orthoses#42.11.15.00.00
-unspsc7#42.11.15.15.00#Knee ankle foot orthoses#42.11.15.00.00
-unspsc7#42.11.15.16.00#Lumbo or sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.17.00#Sacro iliac orthoses#42.11.15.00.00
-unspsc7#42.11.15.18.00#Shoulder or elbow or wrist or hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.19.00#Thoraco or lumbo or sacral orthoses#42.11.15.00.00
-unspsc7#42.11.15.20.00#Wrist orthoses#42.11.15.00.00
-unspsc7#42.11.15.21.00#Wrist or hand orthoses#42.11.15.00.00
-unspsc7#42.11.15.22.00#Wrist or hand or finger orthoses#42.11.15.00.00
-unspsc7#42.11.15.23.00#Ankle disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.24.00#Aural prostheses#42.11.15.00.00
-unspsc7#42.11.15.25.00#Cosmetic or skin covering prostheses#42.11.15.00.00
-unspsc7#42.11.15.26.00#Elbow disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.27.00#Hip disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.28.00#Hook or functional tool prostheses#42.11.15.00.00
-unspsc7#42.11.15.29.00#Knee or hip joint prostheses or torque reducers#42.11.15.00.00
-unspsc7#42.11.15.30.00#Wrist or elbow joint prostheses#42.11.15.00.00
-unspsc7#42.11.15.31.00#Knee disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.32.00#Mammary prostheses#42.11.15.00.00
-unspsc7#42.11.15.33.00#Nasal prostheses#42.11.15.00.00
-unspsc7#42.11.15.34.00#Ocular prostheses#42.11.15.00.00
-unspsc7#42.11.15.35.00#Back filler prostheses#42.11.15.00.00
-unspsc7#42.11.15.36.00#Palate prostheses#42.11.15.00.00
-unspsc7#42.11.15.37.00#Partial foot including toe prostheses#42.11.15.00.00
-unspsc7#42.11.15.38.00#Partial hand including finger prostheses#42.11.15.00.00
-unspsc7#42.11.15.39.00#Shoulder disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.40.00#Socket or alignment unit prostheses#42.11.15.00.00
-unspsc7#42.11.15.41.00#Temporary prostheses for early mobilization of lower limb amputees#42.11.15.00.00
-unspsc7#42.11.15.42.00#Transfemoral prostheses#42.11.15.00.00
-unspsc7#42.11.15.43.00#Transhumeral prostheses#42.11.15.00.00
-unspsc7#42.11.15.44.00#Transradial prostheses#42.11.15.00.00
-unspsc7#42.11.15.45.00#Transtibial including ankle or foot device prostheses#42.11.15.00.00
-unspsc7#42.11.15.46.00#Wrist disarticulation prostheses#42.11.15.00.00
-unspsc7#42.11.15.47.00#Prosthetic hands#42.11.15.00.00
-unspsc7#42.11.15.48.00#Vascular prostheses#42.11.15.00.00
-unspsc7#42.11.16.00.00#Communication and educational material for people with disabilities#42.11.00.00.00
-unspsc7#42.11.16.01.00#Braille writing paper or plastic#42.11.16.00.00
-unspsc7#42.11.16.02.00#Switchboards for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.03.00#Character reading machines for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.04.00#Synthetic speech devices for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.05.00#Tactile displays for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.06.00#Letter or symbol boards for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.07.00#Dialogue units for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.08.00#Voice generators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.09.00#Voice amplifiers for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.10.00#Hearing aids#42.11.16.00.00
-unspsc7#42.11.16.11.00#Writing frames for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.12.00#Rain indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.13.00#Light indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.14.00#Sound indicators for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.15.00#Speech training aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.16.00#Language training aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.17.00#Braille equipment#42.11.16.00.00
-unspsc7#42.11.16.18.00#Book or manuscript holders for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.19.00#Page turners for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.20.00#Signature guides or stamps for people with disabilities#42.11.16.00.00
-unspsc7#42.11.16.21.00#Ergonomically designed stationery aids for people with disabilities#42.11.16.00.00
-unspsc7#42.11.17.00.00#Furniture and accessories for people with disabilities#42.11.00.00.00
-unspsc7#42.11.17.01.00#Pressure sore prevention furniture#42.11.17.00.00
-unspsc7#42.11.17.02.00#Pressure sore prevention mattresses or coverings#42.11.17.00.00
-unspsc7#42.11.17.03.00#Backpads or backrests or similar adaptations for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.04.00#Arm rests for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.05.00#Bed extensions for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.06.00#Bed lifts for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.07.00#Bed shortening aids for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.08.00#Ergonomicall designed beds for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.09.00#Blanket supports for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.10.00#Mechanized chairs to assist with sitting or standing for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.11.00#Coxit or arthrodesis chairs for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.12.00#Leg extenders for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.13.00#Leg supports for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.14.00#Modular or special sitting furniture systems for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.15.00#Height adjustable plinths or brackets for people with disabilities#42.11.17.00.00
-unspsc7#42.11.17.16.00#Ergonomically designed tables for people with disabilities#42.11.17.00.00
-unspsc7#42.11.18.00.00#Personal care devices for people with disabilities#42.11.00.00.00
-unspsc7#42.11.18.01.00#Aids to assist in dressing ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.02.00#Aids for washing ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.03.00#Aids for drying ones self for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.04.00#Bathing stretchers or shower tables for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.05.00#Diaper changing tables for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.06.00#Bedpans or commode chairs for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.07.00#Buttoning or fastening devices for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.08.00#Extended handle combs or brushes for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.09.00#Toilet attached douches or air dryers for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.10.00#Toilet seats for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.11.00#Hand grip toothbrushes for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.12.00#Body worn urine absorbing aids for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.13.00#Urine collection systems for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.14.00#Incontinence alarms for people with disabilities#42.11.18.00.00
-unspsc7#42.11.18.15.00#Ostomy bags or accessories for people with disabilities#42.11.18.00.00
-unspsc7#42.11.19.00.00#Protection and mobility devices for people with disabilities#42.11.00.00.00
-unspsc7#42.11.19.01.00#Crutches#42.11.19.00.00
-unspsc7#42.11.19.02.00#Tripods or quadropods#42.11.19.00.00
-unspsc7#42.11.19.03.00#Walking sticks accessories or parts thereof#42.11.19.00.00
-unspsc7#42.11.19.04.00#Rollators#42.11.19.00.00
-unspsc7#42.11.19.05.00#Walkers#42.11.19.00.00
-unspsc7#42.11.19.06.00#Wheelchairs#42.11.19.00.00
-unspsc7#42.11.19.07.00#Wheelchair accessories#42.11.19.00.00
-unspsc7#42.11.19.08.00#Support rails for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.09.00#Rope ladders or lifting belts or harnesses for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.10.00#Lifting or turning cushions carpets or sheets for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.11.00#Hoists or trolleys for people with disabities#42.11.19.00.00
-unspsc7#42.11.19.12.00#Wheelchair ramps#42.11.19.00.00
-unspsc7#42.11.19.13.00#Wheelchair lifting platforms#42.11.19.00.00
-unspsc7#42.11.19.14.00#Navigation or orientation aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.15.00#Chair lifts or chair transporters for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.16.00#Warning or alarm devices for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.17.00#Airway protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.18.00#Ear or hearing protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.19.00#Face or eye protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.20.00#Hand or arm or elbow protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.21.00#Head protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.22.00#Lower extremity protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.23.00#Bathtub length or width reduction aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.24.00#Trunk or whole body protection aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.25.00#Body support units for hoists for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.26.00#Door warners for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.27.00#Floatation or swmming aids for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.28.00#Relief maps for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.29.00#Non cosmetic skin cleaning or protective products for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.30.00#Stationary hoists for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.31.00#Stoma shields or protectors#42.11.19.00.00
-unspsc7#42.11.19.32.00#Tactile sticks for people with disabilities#42.11.19.00.00
-unspsc7#42.11.19.33.00#Toilet arm or backrests for people with disabilities#42.11.19.00.00
-unspsc7#42.11.20.00.00#Recreational and training aids for people with disabilities#42.11.00.00.00
-unspsc7#42.11.20.01.00#Camping equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.02.00#Tilting tables for balance training for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.03.00#Biofeedback devices for movement strength or balance for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.04.00#Sports exercise aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.05.00#Fishing or hunting aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.06.00#Playing or training balls for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.07.00#Chess for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.08.00#Playing cards or holders for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.09.00#Gardening tools or aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.10.00#Handicraft tools materials or equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.11.00#Photographic equipment or aids for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.12.00#Caravanning equipment for people with disabilities#42.11.20.00.00
-unspsc7#42.11.20.13.00#Vibrating chairs for training deaf people#42.11.20.00.00
-unspsc7#42.11.21.00.00#Specialized aids for housekeeping and handling goods and measuring for people with disabilities#42.11.00.00.00
-unspsc7#42.11.21.01.00#Weighing or measuring aids or people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.02.00#Cutting or chopping or dividing aids or people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.03.00#Cleaning or peeling aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.04.00#Baking or cooking or frying aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.05.00#Food or drink service aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.06.00#Food stoppers or funnels for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.07.00#Tableware for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.08.00#Pusher edges or plate buffers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.09.00#Feeding apparatus for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.10.00#Feeding probes for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.11.00#Shoe cleaning apparatus for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.12.00#Sewing or knitting or crocheting or darning aids for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.13.00#Bottle or can or container openers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.14.00#Tube squeezing keys for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.15.00#Grasping aids to assist or replace hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.16.00#Grip adapters or attachments for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.17.00#Body worn holders to assist hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.18.00#Stands to assist hand or finger function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.19.00#Operating sticks such as head or chin or mouth sticks for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.20.00#Extenders without grip function for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.21.00#Fixed positioning systems for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.22.00#Balances or equipment for hoisting or balancing objects for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.23.00#Manipulators for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.24.00#Robots to assist people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.25.00#Indicators such as signal lights or buzzers for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.26.00#Pointing lamps for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.27.00#Measuring aids or tools for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.28.00#Object positioning lifting or tilting systems for people with disabilities#42.11.21.00.00
-unspsc7#42.11.21.29.00#Manual extended reach gripping tongs for people with disabilities#42.11.21.00.00
-unspsc7#42.12.00.00.00#Veterinary equipment and supplies#42.00.00.00.00
-unspsc7#42.12.15.00.00#Veterinary equipment#42.12.00.00.00
-unspsc7#42.12.15.01.00#Veterinary blood pressure testers#42.12.15.00.00
-unspsc7#42.12.15.02.00#Veterinary kymograph tester#42.12.15.00.00
-unspsc7#42.12.15.03.00#Veterinary pyrogenic tester#42.12.15.00.00
-unspsc7#42.12.15.04.00#Veterinary stereotoxic equipment#42.12.15.00.00
-unspsc7#42.12.15.05.00#Veterinary electrocardiograph (ECG)#42.12.15.00.00
-unspsc7#42.12.16.00.00#Veterinary products#42.12.00.00.00
-unspsc7#42.12.16.01.00#Gastrointestinal veterinary products#42.12.16.00.00
-unspsc7#42.12.16.02.00#Blood or blood forming veterinary products#42.12.16.00.00
-unspsc7#42.12.16.03.00#Respiratory system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.04.00#Musculo skeletal or nervous system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.05.00#Cardiovascular system veterinary products#42.12.16.00.00
-unspsc7#42.12.16.06.00#Dermatologicals or antiprotozoa veterinary products#42.12.16.00.00
-unspsc7#42.12.16.07.00#Genito urinary system sex or hormone veterinary products#42.12.16.00.00
-unspsc7#43.00.00.00.00#Communications and Computer Equipment and Peripherals and Components and Supplies#43.00.00.00.00
-unspsc7#43.16.00.00.00#Software#43.00.00.00.00
-unspsc7#43.16.15.00.00#Database systems#43.16.00.00.00
-unspsc7#43.16.15.01.00#Database software#43.16.15.00.00
-unspsc7#43.16.16.00.00#Operating systems#43.16.00.00.00
-unspsc7#43.16.16.01.00#Mainframe operating system software#43.16.16.00.00
-unspsc7#43.16.16.02.00#Personal computer (PC) operating system software#43.16.16.00.00
-unspsc7#43.16.16.03.00#Open systems operating systems#43.16.16.00.00
-unspsc7#43.16.16.04.00#Clustering software#43.16.16.00.00
-unspsc7#43.16.17.00.00#Business transaction and personal business software#43.16.00.00.00
-unspsc7#43.16.17.01.00#Investment management software#43.16.17.00.00
-unspsc7#43.16.17.02.00#Tax preparation software#43.16.17.00.00
-unspsc7#43.16.17.03.00#Facilities management software#43.16.17.00.00
-unspsc7#43.16.17.04.00#Software suites#43.16.17.00.00
-unspsc7#43.16.17.05.00#Inventory management software#43.16.17.00.00
-unspsc7#43.16.17.06.00#Financial analysis software#43.16.17.00.00
-unspsc7#43.16.17.07.00#Accounting software#43.16.17.00.00
-unspsc7#43.16.17.08.00#Time accounting or human resources software#43.16.17.00.00
-unspsc7#43.16.17.09.00#Analytical or scientific software#43.16.17.00.00
-unspsc7#43.16.17.10.00#Mathematical or forecasting software#43.16.17.00.00
-unspsc7#43.16.17.11.00#Auction software#43.16.17.00.00
-unspsc7#43.16.17.12.00#Sales or marketing software#43.16.17.00.00
-unspsc7#43.16.18.00.00#Document creation software#43.16.00.00.00
-unspsc7#43.16.18.01.00#Document management software#43.16.18.00.00
-unspsc7#43.16.18.02.00#Electronic publishing software#43.16.18.00.00
-unspsc7#43.16.18.03.00#Optical character reader (OCR) software#43.16.18.00.00
-unspsc7#43.16.18.04.00#Voice recognition software#43.16.18.00.00
-unspsc7#43.16.18.05.00#Desktop publishing software#43.16.18.00.00
-unspsc7#43.16.18.06.00#Presentation software#43.16.18.00.00
-unspsc7#43.16.18.07.00#Word processing software#43.16.18.00.00
-unspsc7#43.16.18.08.00#Scanner software#43.16.18.00.00
-unspsc7#43.16.18.09.00#Spell checkers#43.16.18.00.00
-unspsc7#43.16.19.00.00#Drawing and imaging software#43.16.00.00.00
-unspsc7#43.16.19.01.00#Computer aided design (CAD) software#43.16.19.00.00
-unspsc7#43.16.19.02.00#Graphics software#43.16.19.00.00
-unspsc7#43.16.19.03.00#Educational software#43.16.19.00.00
-unspsc7#43.16.19.04.00#Computer aided manufacturing (CAM) software#43.16.19.00.00
-unspsc7#43.16.19.05.00#Charting software#43.16.19.00.00
-unspsc7#43.16.19.06.00#Form making software#43.16.19.00.00
-unspsc7#43.16.19.07.00#Mapping software#43.16.19.00.00
-unspsc7#43.16.20.00.00#Scheduling and productivity software#43.16.00.00.00
-unspsc7#43.16.20.01.00#Project management software#43.16.20.00.00
-unspsc7#43.16.20.02.00#Scheduling software#43.16.20.00.00
-unspsc7#43.16.20.03.00#Contact management software#43.16.20.00.00
-unspsc7#43.16.21.00.00#Spreadsheets and enhancement software#43.16.00.00.00
-unspsc7#43.16.21.01.00#Spreadsheet software#43.16.21.00.00
-unspsc7#43.16.22.00.00#Multimedia software#43.16.00.00.00
-unspsc7#43.16.22.01.00#Music or sound editing software#43.16.22.00.00
-unspsc7#43.16.23.00.00#Print shop software#43.16.00.00.00
-unspsc7#43.16.23.01.00#Address book making software#43.16.23.00.00
-unspsc7#43.16.23.02.00#Label making software#43.16.23.00.00
-unspsc7#43.16.24.00.00#Programming languages and tools#43.16.00.00.00
-unspsc7#43.16.24.01.00#Compiling softwares#43.16.24.00.00
-unspsc7#43.16.24.02.00#Configuration management software#43.16.24.00.00
-unspsc7#43.16.24.03.00#Development software#43.16.24.00.00
-unspsc7#43.16.24.04.00#Graphical user interface (GUI) tools#43.16.24.00.00
-unspsc7#43.16.24.05.00#Programming languages#43.16.24.00.00
-unspsc7#43.16.24.06.00#Program testing software#43.16.24.00.00
-unspsc7#43.16.25.00.00#Software utilities#43.16.00.00.00
-unspsc7#43.16.25.01.00#Backup or recovery software#43.16.25.00.00
-unspsc7#43.16.25.02.00#Bar coding software#43.16.25.00.00
-unspsc7#43.16.25.03.00#File security or data security software#43.16.25.00.00
-unspsc7#43.16.25.04.00#Foreign language translation software#43.16.25.00.00
-unspsc7#43.16.25.05.00#Print utility software#43.16.25.00.00
-unspsc7#43.16.25.06.00#Storage media loading software#43.16.25.00.00
-unspsc7#43.16.25.07.00#Virus protection software#43.16.25.00.00
-unspsc7#43.16.25.08.00#General utility software#43.16.25.00.00
-unspsc7#43.16.25.09.00#Compression utilities#43.16.25.00.00
-unspsc7#43.16.25.10.00#System management software#43.16.25.00.00
-unspsc7#43.16.25.11.00#Storage management software#43.16.25.00.00
-unspsc7#43.16.25.12.00#Version checker software#43.16.25.00.00
-unspsc7#43.16.26.00.00#Networking software#43.16.00.00.00
-unspsc7#43.16.26.01.00#Platform interconnectivity software#43.16.26.00.00
-unspsc7#43.16.26.02.00#Optical jukebox server software#43.16.26.00.00
-unspsc7#43.16.26.03.00#Operating system enhancement software#43.16.26.00.00
-unspsc7#43.16.26.04.00#Network operating system software#43.16.26.00.00
-unspsc7#43.16.26.05.00#Networking developers software#43.16.26.00.00
-unspsc7#43.16.26.06.00#Network connectivity terminal emulation software#43.16.26.00.00
-unspsc7#43.16.26.07.00#Mainframe transaction processing software#43.16.26.00.00
-unspsc7#43.16.26.08.00#License management software#43.16.26.00.00
-unspsc7#43.16.26.09.00#Gateway software#43.16.26.00.00
-unspsc7#43.16.26.10.00#Compact disc (CD) server software#43.16.26.00.00
-unspsc7#43.16.26.11.00#Administration software#43.16.26.00.00
-unspsc7#43.16.26.12.00#Transaction server software#43.16.26.00.00
-unspsc7#43.16.26.13.00#Switch or router software#43.16.26.00.00
-unspsc7#43.16.26.14.00#Multiplexer software#43.16.26.00.00
-unspsc7#43.16.26.15.00#Communications server software#43.16.26.00.00
-unspsc7#43.16.26.16.00#Bridge software#43.16.26.00.00
-unspsc7#43.16.27.00.00#Communication Software#43.16.00.00.00
-unspsc7#43.16.27.01.00#Desktop communications software#43.16.27.00.00
-unspsc7#43.16.27.02.00#Server communications software#43.16.27.00.00
-unspsc7#43.16.27.03.00#Interactive voice response software#43.16.27.00.00
-unspsc7#43.16.27.04.00#Modem software#43.16.27.00.00
-unspsc7#43.16.27.05.00#Remote access software#43.16.27.00.00
-unspsc7#43.16.27.06.00#Video conferencing software#43.16.27.00.00
-unspsc7#43.16.27.07.00#Exchange software#43.16.27.00.00
-unspsc7#43.16.28.00.00#Internet and intranet software#43.16.00.00.00
-unspsc7#43.16.28.01.00#Internet browsing software#43.16.28.00.00
-unspsc7#43.16.28.02.00#Web server software#43.16.28.00.00
-unspsc7#43.16.29.00.00#Miscellaneous software#43.16.00.00.00
-unspsc7#43.16.29.01.00#Computer game software#43.16.29.00.00
-unspsc7#43.16.29.02.00#Screen savers#43.16.29.00.00
-unspsc7#43.16.29.03.00#Training software#43.16.29.00.00
-unspsc7#43.16.29.04.00#Entertainment software#43.16.29.00.00
-unspsc7#43.16.29.05.00#Family titles#43.16.29.00.00
-unspsc7#43.16.29.06.00#Educational software#43.16.29.00.00
-unspsc7#43.16.30.00.00#Industry specific software#43.16.00.00.00
-unspsc7#43.16.30.01.00#Point of sale (POS) software#43.16.30.00.00
-unspsc7#43.16.30.02.00#Flight control software#43.16.30.00.00
-unspsc7#43.16.30.03.00#Aviation ground support software#43.16.30.00.00
-unspsc7#43.16.30.04.00#Aviation test software#43.16.30.00.00
-unspsc7#43.16.30.05.00#Industrial control software#43.16.30.00.00
-unspsc7#43.16.30.06.00#Library software#43.16.30.00.00
-unspsc7#43.16.30.07.00#Compliance software#43.16.30.00.00
-unspsc7#43.16.31.00.00#Drivers and system software#43.16.00.00.00
-unspsc7#43.16.31.01.00#Ethernet drivers#43.16.31.00.00
-unspsc7#43.16.31.02.00#Graphics card drivers#43.16.31.00.00
-unspsc7#43.17.00.00.00#Hardware and accessories#43.00.00.00.00
-unspsc7#43.17.15.00.00#Telephony equipment#43.17.00.00.00
-unspsc7#43.17.15.01.00#Exchange components (CODEC)#43.17.15.00.00
-unspsc7#43.17.15.02.00#Exchange data interface cards#43.17.15.00.00
-unspsc7#43.17.15.03.00#Exchange datacom modules#43.17.15.00.00
-unspsc7#43.17.15.04.00#Phone exchange interfaces or components#43.17.15.00.00
-unspsc7#43.17.15.05.00#Exchange trunk interface or card components#43.17.15.00.00
-unspsc7#43.17.15.06.00#Premise branch exchange (PBX) systems#43.17.15.00.00
-unspsc7#43.17.15.07.00#Telephone switching equipment#43.17.15.00.00
-unspsc7#43.17.15.08.00#Switchboard equipment#43.17.15.00.00
-unspsc7#43.17.15.09.00#Punch down blocks#43.17.15.00.00
-unspsc7#43.17.15.10.00#Analog or digital telephones#43.17.15.00.00
-unspsc7#43.17.15.11.00#Analog or digital cellular telephones#43.17.15.00.00
-unspsc7#43.17.15.12.00#Mobile telephones#43.17.15.00.00
-unspsc7#43.17.15.13.00#Cordless telephones#43.17.15.00.00
-unspsc7#43.17.15.14.00#Pay telephones#43.17.15.00.00
-unspsc7#43.17.15.15.00#Answering machines#43.17.15.00.00
-unspsc7#43.17.15.16.00#Telephone headsets#43.17.15.00.00
-unspsc7#43.17.15.17.00#Voice mail systems#43.17.15.00.00
-unspsc7#43.17.15.18.00#Call management system#43.17.15.00.00
-unspsc7#43.17.15.19.00#Cellular telephone accessories#43.17.15.00.00
-unspsc7#43.17.15.20.00#Telephone rests#43.17.15.00.00
-unspsc7#43.17.15.21.00#Telephone adapters#43.17.15.00.00
-unspsc7#43.17.15.22.00#Telephone line multipliers#43.17.15.00.00
-unspsc7#43.17.15.23.00#Telephone line modular couplers#43.17.15.00.00
-unspsc7#43.17.15.24.00#Videophones#43.17.15.00.00
-unspsc7#43.17.15.25.00#Dialers#43.17.15.00.00
-unspsc7#43.17.15.26.00#Telephone amplifiers#43.17.15.00.00
-unspsc7#43.17.15.27.00#Telephone stands or holders#43.17.15.00.00
-unspsc7#43.17.15.28.00#Integrated services digital network exchanges ISDN#43.17.15.00.00
-unspsc7#43.17.15.29.00#Telephone jacks#43.17.15.00.00
-unspsc7#43.17.16.00.00#Antennas#43.17.00.00.00
-unspsc7#43.17.16.01.00#Transmitters#43.17.16.00.00
-unspsc7#43.17.16.02.00#Receivers#43.17.16.00.00
-unspsc7#43.17.16.03.00#Tuners#43.17.16.00.00
-unspsc7#43.17.16.04.00#Short wave equipment#43.17.16.00.00
-unspsc7#43.17.16.05.00#Aircraft antennas#43.17.16.00.00
-unspsc7#43.17.16.06.00#Automotive antennas#43.17.16.00.00
-unspsc7#43.17.16.07.00#Broadcast antennas#43.17.16.00.00
-unspsc7#43.17.16.08.00#Microwave antennas#43.17.16.00.00
-unspsc7#43.17.16.09.00#Television antennas#43.17.16.00.00
-unspsc7#43.17.16.10.00#Satellite antennas#43.17.16.00.00
-unspsc7#43.17.16.11.00#Radio antennas#43.17.16.00.00
-unspsc7#43.17.16.12.00#Radar antennas#43.17.16.00.00
-unspsc7#43.17.16.13.00#Communications antennas#43.17.16.00.00
-unspsc7#43.17.16.14.00#Communication towers or support#43.17.16.00.00
-unspsc7#43.17.17.00.00#Telecommunications equipment#43.17.00.00.00
-unspsc7#43.17.17.01.00#Wireless base stations#43.17.17.00.00
-unspsc7#43.17.17.02.00#Telegraph equipment#43.17.17.00.00
-unspsc7#43.17.17.03.00#Teletype equipment#43.17.17.00.00
-unspsc7#43.17.17.04.00#Teleconferencing equipment#43.17.17.00.00
-unspsc7#43.17.17.05.00#Satellite communication equipment#43.17.17.00.00
-unspsc7#43.17.17.06.00#Pagers or beepers#43.17.17.00.00
-unspsc7#43.17.17.07.00#Intercommunications or paging systems#43.17.17.00.00
-unspsc7#43.17.17.08.00#Public address equipment#43.17.17.00.00
-unspsc7#43.17.17.09.00#Electronic sound equipment#43.17.17.00.00
-unspsc7#43.17.17.10.00#Dictating machines#43.17.17.00.00
-unspsc7#43.17.17.11.00#Line conditioners#43.17.17.00.00
-unspsc7#43.17.17.12.00#Channel service unit or data service unit (CSU or DSU)#43.17.17.00.00
-unspsc7#43.17.18.00.00#Computers#43.17.00.00.00
-unspsc7#43.17.18.01.00#Notebook computers#43.17.18.00.00
-unspsc7#43.17.18.02.00#Docking stations#43.17.18.00.00
-unspsc7#43.17.18.03.00#Workstations or desktop computers#43.17.18.00.00
-unspsc7#43.17.18.04.00#Personal digital assistants (PDAs) or pen based computers#43.17.18.00.00
-unspsc7#43.17.18.05.00#Mainframe computers#43.17.18.00.00
-unspsc7#43.17.18.06.00#Servers#43.17.18.00.00
-unspsc7#43.17.18.07.00#Port replicators#43.17.18.00.00
-unspsc7#43.17.18.08.00#Minicomputers#43.17.18.00.00
-unspsc7#43.17.18.09.00#Point of sale (POS) terminals#43.17.18.00.00
-unspsc7#43.17.18.10.00#Programmable logic controller (PLC)#43.17.18.00.00
-unspsc7#43.17.18.11.00#Console mainframe#43.17.18.00.00
-unspsc7#43.17.18.12.00#Console controller mainframe#43.17.18.00.00
-unspsc7#43.17.18.13.00#Channel converter#43.17.18.00.00
-unspsc7#43.17.18.14.00#Channel to channel interface mainframe#43.17.18.00.00
-unspsc7#43.17.18.15.00#Control unit#43.17.18.00.00
-unspsc7#43.17.18.16.00#Coupler facility mainframe#43.17.18.00.00
-unspsc7#43.17.18.17.00#Power cooler unit mainframe#43.17.18.00.00
-unspsc7#43.17.18.18.00#Thin client or diskless workstations#43.17.18.00.00
-unspsc7#43.17.18.19.00#Console extenders#43.17.18.00.00
-unspsc7#43.17.19.00.00#Memory and central processing units CPUs and accessories#43.17.00.00.00
-unspsc7#43.17.19.01.00#Cache memory modules#43.17.19.00.00
-unspsc7#43.17.19.02.00#Central processing unit (CPU) processors#43.17.19.00.00
-unspsc7#43.17.19.03.00#Cental processing unit (CPU) motherboards or daughterboards#43.17.19.00.00
-unspsc7#43.17.19.04.00#Memory modules#43.17.19.00.00
-unspsc7#43.17.19.05.00#Central processing unit coolers#43.17.19.00.00
-unspsc7#43.17.20.00.00#Computer control and interface boards and cards and cables#43.17.00.00.00
-unspsc7#43.17.20.01.00#Parallel to small computer system interface converters#43.17.20.00.00
-unspsc7#43.17.20.02.00#Parallel to serial converters#43.17.20.00.00
-unspsc7#43.17.20.03.00#Serial infrared ports#43.17.20.00.00
-unspsc7#43.17.20.04.00#Video accelerator cards#43.17.20.00.00
-unspsc7#43.17.20.05.00#Graphic accelerator cards#43.17.20.00.00
-unspsc7#43.17.20.06.00#Network interface cards#43.17.20.00.00
-unspsc7#43.17.20.07.00#Audio cards#43.17.20.00.00
-unspsc7#43.17.20.08.00#Emulation adapters#43.17.20.00.00
-unspsc7#43.17.20.09.00#Serial port cards#43.17.20.00.00
-unspsc7#43.17.20.10.00#Parallel port cards#43.17.20.00.00
-unspsc7#43.17.20.11.00#Small computer system interface (SCSI) controller cards#43.17.20.00.00
-unspsc7#43.17.20.12.00#Decoder#43.17.20.00.00
-unspsc7#43.17.20.13.00#Programmable logic controller input module#43.17.20.00.00
-unspsc7#43.17.20.14.00#Programmable logic controller counter module#43.17.20.00.00
-unspsc7#43.17.20.15.00#Programmable logic controller communication module#43.17.20.00.00
-unspsc7#43.17.20.16.00#Wireless network interface cards#43.17.20.00.00
-unspsc7#43.17.20.17.00#Timekeeping card machine and computer interface device#43.17.20.00.00
-unspsc7#43.17.20.18.00#Processor cards#43.17.20.00.00
-unspsc7#43.17.21.00.00#Audio and visual accessories#43.17.00.00.00
-unspsc7#43.17.21.01.00#Musical instrument digital interface (MIDI) interfaces or adapters#43.17.21.00.00
-unspsc7#43.17.21.02.00#Signal processor upgrades#43.17.21.00.00
-unspsc7#43.17.21.03.00#Video capture boards#43.17.21.00.00
-unspsc7#43.17.21.04.00#Television cards#43.17.21.00.00
-unspsc7#43.17.21.05.00#Radio cards#43.17.21.00.00
-unspsc7#43.17.21.06.00#Multimedia kits#43.17.21.00.00
-unspsc7#43.17.21.07.00#Computer speakers#43.17.21.00.00
-unspsc7#43.17.21.08.00#Computer headset#43.17.21.00.00
-unspsc7#43.17.21.09.00#Set top boxes#43.17.21.00.00
-unspsc7#43.17.21.10.00#Video cassette containers#43.17.21.00.00
-unspsc7#43.17.22.00.00#Input devices#43.17.00.00.00
-unspsc7#43.17.22.01.00#Bar code readers#43.17.22.00.00
-unspsc7#43.17.22.02.00#Graphics tablets or digitizers#43.17.22.00.00
-unspsc7#43.17.22.03.00#Joysticks or game pads#43.17.22.00.00
-unspsc7#43.17.22.04.00#Keyboards or keypads#43.17.22.00.00
-unspsc7#43.17.22.05.00#Computer mouse#43.17.22.00.00
-unspsc7#43.17.22.06.00#Remote user interfaces#43.17.22.00.00
-unspsc7#43.17.22.07.00#Scanners#43.17.22.00.00
-unspsc7#43.17.22.08.00#Touch pads#43.17.22.00.00
-unspsc7#43.17.22.09.00#Touch screens#43.17.22.00.00
-unspsc7#43.17.22.10.00#Trackballs#43.17.22.00.00
-unspsc7#43.17.22.11.00#Voice microphones for computers#43.17.22.00.00
-unspsc7#43.17.22.12.00#Punch card readers#43.17.22.00.00
-unspsc7#43.17.22.13.00#Light pen#43.17.22.00.00
-unspsc7#43.17.22.14.00#Stylus pen for mobile computers#43.17.22.00.00
-unspsc7#43.17.22.15.00#Mouse pad#43.17.22.00.00
-unspsc7#43.17.22.16.00#Programmable logic controller handheld programmer#43.17.22.00.00
-unspsc7#43.17.22.17.00#EGR Electronic gate reader#43.17.22.00.00
-unspsc7#43.17.22.18.00#Dumb terminal#43.17.22.00.00
-unspsc7#43.17.22.19.00#Punched cards#43.17.22.00.00
-unspsc7#43.17.23.00.00#Electronic data storage equipment#43.17.00.00.00
-unspsc7#43.17.23.01.00#Read only compact disc (CD) drives#43.17.23.00.00
-unspsc7#43.17.23.02.00#Compact disc (CD) jukeboxes or changers#43.17.23.00.00
-unspsc7#43.17.23.03.00#Combination floppy drives#43.17.23.00.00
-unspsc7#43.17.23.04.00#Disk arrays#43.17.23.00.00
-unspsc7#43.17.23.05.00#Floppy drives#43.17.23.00.00
-unspsc7#43.17.23.06.00#High capacity removable media drives#43.17.23.00.00
-unspsc7#43.17.23.07.00#Multi drive hard drive towers#43.17.23.00.00
-unspsc7#43.17.23.08.00#Recordable compact disc (CD) drives#43.17.23.00.00
-unspsc7#43.17.23.09.00#Reel to reel tape drives#43.17.23.00.00
-unspsc7#43.17.23.10.00#Single optical drives#43.17.23.00.00
-unspsc7#43.17.23.11.00#Tape arrays#43.17.23.00.00
-unspsc7#43.17.23.12.00#Tape drive auto loaders or libraries#43.17.23.00.00
-unspsc7#43.17.23.13.00#Hard drives#43.17.23.00.00
-unspsc7#43.17.23.14.00#Computer DVD drives#43.17.23.00.00
-unspsc7#43.17.23.15.00#Array controller#43.17.23.00.00
-unspsc7#43.17.23.16.00#MP3 player#43.17.23.00.00
-unspsc7#43.17.23.17.00#Memory card readers#43.17.23.00.00
-unspsc7#43.17.23.18.00#Peripheral component microchannel interconnect architecture reader and writer drives#43.17.23.00.00
-unspsc7#43.17.24.00.00#Monitors and displays#43.17.00.00.00
-unspsc7#43.17.24.01.00#Monitors#43.17.24.00.00
-unspsc7#43.17.24.02.00#Flat panel displays#43.17.24.00.00
-unspsc7#43.17.24.03.00#Touch screen monitors#43.17.24.00.00
-unspsc7#43.17.24.04.00#Monitor accessories#43.17.24.00.00
-unspsc7#43.17.25.00.00#Printers#43.17.00.00.00
-unspsc7#43.17.25.01.00#Plotters#43.17.25.00.00
-unspsc7#43.17.25.02.00#Band printers#43.17.25.00.00
-unspsc7#43.17.25.03.00#Dot matrix printers#43.17.25.00.00
-unspsc7#43.17.25.04.00#Label printers#43.17.25.00.00
-unspsc7#43.17.25.05.00#Large format printers#43.17.25.00.00
-unspsc7#43.17.25.06.00#Line matrix printers#43.17.25.00.00
-unspsc7#43.17.25.07.00#Page printers#43.17.25.00.00
-unspsc7#43.17.25.08.00#Thermal tape printers#43.17.25.00.00
-unspsc7#43.17.25.09.00#Inkjet printers#43.17.25.00.00
-unspsc7#43.17.25.10.00#Laser printers#43.17.25.00.00
-unspsc7#43.17.25.11.00#Bubble jet printers#43.17.25.00.00
-unspsc7#43.17.25.12.00#Bag tag printer#43.17.25.00.00
-unspsc7#43.17.25.13.00#Printer seperator#43.17.25.00.00
-unspsc7#43.17.25.14.00#Multi function printers#43.17.25.00.00
-unspsc7#43.17.25.15.00#ATB airline ticket or boarding pass printer#43.17.25.00.00
-unspsc7#43.17.26.00.00#Enclosures and frames and backplanes#43.17.00.00.00
-unspsc7#43.17.26.01.00#Chassis#43.17.26.00.00
-unspsc7#43.17.26.02.00#Network chassis#43.17.26.00.00
-unspsc7#43.17.26.03.00#Drive cabinets#43.17.26.00.00
-unspsc7#43.17.26.04.00#Expansion slot expander#43.17.26.00.00
-unspsc7#43.17.26.05.00#Racks#43.17.26.00.00
-unspsc7#43.17.26.06.00#Programmable logic controller rack or base#43.17.26.00.00
-unspsc7#43.17.26.07.00#Removable drive frames#43.17.26.00.00
-unspsc7#43.17.27.00.00#Network hardware and components and accessories#43.17.00.00.00
-unspsc7#43.17.27.01.00#Hubs or concentrators#43.17.27.00.00
-unspsc7#43.17.27.02.00#Routers#43.17.27.00.00
-unspsc7#43.17.27.03.00#Repeaters#43.17.27.00.00
-unspsc7#43.17.27.04.00#Network bridges#43.17.27.00.00
-unspsc7#43.17.27.05.00#Switches#43.17.27.00.00
-unspsc7#43.17.27.06.00#Media filters#43.17.27.00.00
-unspsc7#43.17.27.07.00#Wide area network (WAN) cards#43.17.27.00.00
-unspsc7#43.17.27.08.00#Multistation access units (MAUs)#43.17.27.00.00
-unspsc7#43.17.27.09.00#Data service units (DSUs)#43.17.27.00.00
-unspsc7#43.17.27.10.00#Network adapters#43.17.27.00.00
-unspsc7#43.17.27.11.00#Load balancer#43.17.27.00.00
-unspsc7#43.17.27.12.00#Printer accumulator#43.17.27.00.00
-unspsc7#43.17.27.13.00#Enterprise System Connectivity ESCON Director#43.17.27.00.00
-unspsc7#43.17.27.14.00#Network management system#43.17.27.00.00
-unspsc7#43.17.27.15.00#Firewall firewall appliance#43.17.27.00.00
-unspsc7#43.17.27.16.00#Cable network testers#43.17.27.00.00
-unspsc7#43.17.27.17.00#Data synchronization device#43.17.27.00.00
-unspsc7#43.17.27.18.00#Digital cross connects equipment#43.17.27.00.00
-unspsc7#43.17.27.19.00#Optical cross connects equipment#43.17.27.00.00
-unspsc7#43.17.27.20.00#Screen amplifier#43.17.27.00.00
-unspsc7#43.17.27.21.00#Time divisional multiplex#43.17.27.00.00
-unspsc7#43.17.27.22.00#Connection panels#43.17.27.00.00
-unspsc7#43.17.27.23.00#Voice echo cancellers#43.17.27.00.00
-unspsc7#43.17.27.24.00#Patch panel#43.17.27.00.00
-unspsc7#43.17.28.00.00#Modems and related hardware#43.17.00.00.00
-unspsc7#43.17.28.01.00#Modems or network combo cards#43.17.28.00.00
-unspsc7#43.17.28.02.00#Modems#43.17.28.00.00
-unspsc7#43.17.28.03.00#Integrated services digital network (ISDN) adapters#43.17.28.00.00
-unspsc7#43.17.28.04.00#Modem banks#43.17.28.00.00
-unspsc7#43.17.28.05.00#Modem teleadaptors#43.17.28.00.00
-unspsc7#43.17.28.06.00#Multiplexor MUXs#43.17.28.00.00
-unspsc7#43.17.28.07.00#Add drop multiplexer#43.17.28.00.00
-unspsc7#43.17.29.00.00#Network switches#43.17.00.00.00
-unspsc7#43.17.29.01.00#Local area network (LAN) switches#43.17.29.00.00
-unspsc7#43.17.29.02.00#Asynchronous transfer mode (ATM) switches#43.17.29.00.00
-unspsc7#43.17.29.03.00#Fiber distributed data interface (FDDI) switches#43.17.29.00.00
-unspsc7#43.17.29.04.00#Wide area network (WAN) switches#43.17.29.00.00
-unspsc7#43.17.29.05.00#Intelligent network switching system#43.17.29.00.00
-unspsc7#43.17.30.00.00#Network repeaters#43.17.00.00.00
-unspsc7#43.17.30.01.00#Attached resource computer network (ARCnet) repeaters#43.17.30.00.00
-unspsc7#43.17.30.02.00#Ethernet repeaters#43.17.30.00.00
-unspsc7#43.17.30.03.00#Fiber distributed data interface (FDDI) repeaters#43.17.30.00.00
-unspsc7#43.17.30.04.00#Token ring repeaters#43.17.30.00.00
-unspsc7#43.17.31.00.00#Radio systems#43.17.00.00.00
-unspsc7#43.17.31.01.00#Transmitters#43.17.31.00.00
-unspsc7#43.17.31.02.00#Receivers#43.17.31.00.00
-unspsc7#43.17.31.03.00#Transceivers#43.17.31.00.00
-unspsc7#43.17.31.04.00#Tuners#43.17.31.00.00
-unspsc7#43.17.31.05.00#Short wave equipment#43.17.31.00.00
-unspsc7#43.17.32.00.00#Automated data collection equipment#43.17.00.00.00
-unspsc7#43.17.32.01.00#Bar code equipment#43.17.32.00.00
-unspsc7#43.17.32.02.00#Radio frequency identification (ID) equipment#43.17.32.00.00
-unspsc7#43.17.32.03.00#Radio frequency data communication equipment#43.17.32.00.00
-unspsc7#43.17.32.04.00#Camera based vision systems for automated data collection#43.17.32.00.00
-unspsc7#43.17.32.05.00#Currency recognition equipment#43.17.32.00.00
-unspsc7#43.17.32.06.00#Magnetic card readers#43.17.32.00.00
-unspsc7#43.17.33.00.00#Computer data switches#43.17.00.00.00
-unspsc7#43.17.33.01.00#Serial data switches#43.17.33.00.00
-unspsc7#43.17.33.02.00#Keyboard video mouse (KVM) switch boxes#43.17.33.00.00
-unspsc7#43.17.33.03.00#Manual printer switches#43.17.33.00.00
-unspsc7#43.17.33.04.00#Automatic printer switches#43.17.33.00.00
-unspsc7#43.17.33.05.00#Console switch#43.17.33.00.00
-unspsc7#43.17.33.06.00#Parallel data switches#43.17.33.00.00
-unspsc7#43.17.34.00.00#Computer accessory covers#43.17.00.00.00
-unspsc7#43.17.34.01.00#Key board skins#43.17.34.00.00
-unspsc7#43.17.34.02.00#Notebook or palmtop skins#43.17.34.00.00
-unspsc7#43.17.35.00.00#Key board skins#43.17.00.00.00
-unspsc7#43.17.36.00.00#Computer cables and accessories#43.17.00.00.00
-unspsc7#43.17.36.01.00#Mouse adapter#43.17.36.00.00
-unspsc7#43.17.36.02.00#Keyboard extension cables#43.17.36.00.00
-unspsc7#43.17.36.03.00#Modem cables#43.17.36.00.00
-unspsc7#43.17.36.04.00#Cord covers#43.17.36.00.00
-unspsc7#43.17.36.05.00#Parallel cables#43.17.36.00.00
-unspsc7#43.17.36.06.00#Serial cables#43.17.36.00.00
-unspsc7#43.17.36.07.00#Universal serial bus USB cables#43.17.36.00.00
-unspsc7#43.17.36.08.00#Network patch cables#43.17.36.00.00
-unspsc7#43.17.36.09.00#Computer audio cables#43.17.36.00.00
-unspsc7#43.17.36.10.00#Computer video cables#43.17.36.00.00
-unspsc7#43.17.36.11.00#Inter device link cables#43.17.36.00.00
-unspsc7#43.17.36.12.00#Computer cable kits#43.17.36.00.00
-unspsc7#43.17.36.13.00#Cable jacks or connectors#43.17.36.00.00
-unspsc7#43.17.37.00.00#Storage drive components#43.17.00.00.00
-unspsc7#43.17.37.01.00#Head assemblies or parts#43.17.37.00.00
-unspsc7#43.17.37.02.00#Lead assemblies#43.17.37.00.00
-unspsc7#43.17.37.03.00#Head stack assemblies#43.17.37.00.00
-unspsc7#43.17.37.04.00#Comb assemblies#43.17.37.00.00
-unspsc7#43.17.37.05.00#Crash stops#43.17.37.00.00
-unspsc7#43.17.37.06.00#Platters or disks#43.17.37.00.00
-unspsc7#43.17.37.07.00#Head mounting arms#43.17.37.00.00
-unspsc7#43.17.37.08.00#Read write heads#43.17.37.00.00
-unspsc7#43.17.37.09.00#Motor drives#43.17.37.00.00
-unspsc7#43.18.00.00.00#Communications and computer supplies#43.00.00.00.00
-unspsc7#43.18.15.00.00#Audio recording media#43.18.00.00.00
-unspsc7#43.18.15.01.00#Blank audio tapes#43.18.15.00.00
-unspsc7#43.18.16.00.00#Data storage media#43.18.00.00.00
-unspsc7#43.18.16.01.00#Floppy diskettes#43.18.16.00.00
-unspsc7#43.18.16.02.00#Recordable compact discs (CDs)#43.18.16.00.00
-unspsc7#43.18.16.03.00#Blank data tapes#43.18.16.00.00
-unspsc7#43.18.16.04.00#High density removable media blank disks#43.18.16.00.00
-unspsc7#43.18.16.05.00#Blank digital video discs DVD#43.18.16.00.00
-unspsc7#43.18.16.06.00#Data storage cards#43.18.16.00.00
-unspsc7#43.18.16.07.00#Magneto optical disks#43.18.16.00.00
-unspsc7#43.18.17.00.00#Multimedia storage#43.18.00.00.00
-unspsc7#43.18.17.01.00#Multimedia towers#43.18.17.00.00
-unspsc7#43.18.17.02.00#Multimedia drawers#43.18.17.00.00
-unspsc7#43.18.17.03.00#Compact disc (CD) cases#43.18.17.00.00
-unspsc7#43.18.17.04.00#Diskette holders#43.18.17.00.00
-unspsc7#43.18.17.05.00#Diskette storage#43.18.17.00.00
-unspsc7#43.18.17.06.00#Multimedia trays or organizers#43.18.17.00.00
-unspsc7#43.18.17.07.00#Zip mailers#43.18.17.00.00
-unspsc7#43.18.18.00.00#Monitor stands or risers#43.18.00.00.00
-unspsc7#43.18.19.00.00#Monitor arms#43.18.00.00.00
-unspsc7#44.00.00.00.00#Office Equipment and Accessories and Supplies#44.00.00.00.00
-unspsc7#44.10.00.00.00#Office machines and their supplies and accessories#44.00.00.00.00
-unspsc7#44.10.15.00.00#Duplicating machines#44.10.00.00.00
-unspsc7#44.10.15.01.00#Photocopiers#44.10.15.00.00
-unspsc7#44.10.15.02.00#Facsimile machines#44.10.15.00.00
-unspsc7#44.10.15.03.00#Multifunction machines#44.10.15.00.00
-unspsc7#44.10.16.00.00#Paper processing machines#44.10.00.00.00
-unspsc7#44.10.16.01.00#Paper cutting machines#44.10.16.00.00
-unspsc7#44.10.16.02.00#Paper punching or binding machines#44.10.16.00.00
-unspsc7#44.10.16.03.00#Paper shredding machines or accessories#44.10.16.00.00
-unspsc7#44.10.17.00.00#Printer and photocopier and facsimile accessories#44.10.00.00.00
-unspsc7#44.10.17.01.00#Color options or upgrades#44.10.17.00.00
-unspsc7#44.10.17.02.00#Duplexer trays#44.10.17.00.00
-unspsc7#44.10.17.03.00#Duplexer units#44.10.17.00.00
-unspsc7#44.10.17.04.00#Facsimile handsets#44.10.17.00.00
-unspsc7#44.10.17.05.00#Printer trays or feeders#44.10.17.00.00
-unspsc7#44.10.17.06.00#Photoconductor or imaging units#44.10.17.00.00
-unspsc7#44.10.17.07.00#Stapler units#44.10.17.00.00
-unspsc7#44.10.18.00.00#Calculating machines#44.10.00.00.00
-unspsc7#44.10.18.01.00#Calculators#44.10.18.00.00
-unspsc7#44.10.18.02.00#Adding machines#44.10.18.00.00
-unspsc7#44.10.18.03.00#Accounting machines#44.10.18.00.00
-unspsc7#44.10.18.04.00#Cash registers#44.10.18.00.00
-unspsc7#44.10.19.00.00#Check endorsing and writing machines#44.10.00.00.00
-unspsc7#44.10.19.01.00#Check endorsing machines#44.10.19.00.00
-unspsc7#44.10.19.02.00#Check writing machines#44.10.19.00.00
-unspsc7#44.10.20.00.00#Laminating supplies#44.10.00.00.00
-unspsc7#44.10.20.01.00#Lamination film#44.10.20.00.00
-unspsc7#44.10.20.02.00#Laminator pouches#44.10.20.00.00
-unspsc7#44.10.21.00.00#Mail machines#44.10.00.00.00
-unspsc7#44.10.21.01.00#Franking or postage machines#44.10.21.00.00
-unspsc7#44.10.21.02.00#Mail opening machines#44.10.21.00.00
-unspsc7#44.10.21.03.00#Mail sealing machines#44.10.21.00.00
-unspsc7#44.10.21.04.00#Stamp canceling machines#44.10.21.00.00
-unspsc7#44.10.21.05.00#Addressing machines#44.10.21.00.00
-unspsc7#44.10.21.06.00#Letter folders#44.10.21.00.00
-unspsc7#44.10.22.00.00#Scanner accessories#44.10.00.00.00
-unspsc7#44.10.22.01.00#Endorsers#44.10.22.00.00
-unspsc7#44.10.23.00.00#Packing machines#44.10.00.00.00
-unspsc7#44.10.23.01.00#Bundling machines#44.10.23.00.00
-unspsc7#44.10.23.02.00#Parcel wrapping machines#44.10.23.00.00
-unspsc7#44.10.23.03.00#Seal presses#44.10.23.00.00
-unspsc7#44.10.23.04.00#Sealing machines#44.10.23.00.00
-unspsc7#44.10.23.05.00#Strapping tensioners or sealers#44.10.23.00.00
-unspsc7#44.10.23.06.00#Tying machines#44.10.23.00.00
-unspsc7#44.10.24.00.00#Labeling machines#44.10.00.00.00
-unspsc7#44.10.24.01.00#Tape label makers#44.10.24.00.00
-unspsc7#44.10.24.02.00#Dating or numbering machines#44.10.24.00.00
-unspsc7#44.10.24.03.00#Identification (ID) press machines#44.10.24.00.00
-unspsc7#44.10.24.04.00#Label applying machines#44.10.24.00.00
-unspsc7#44.10.24.05.00#Label making machines#44.10.24.00.00
-unspsc7#44.10.24.06.00#Lettering equipment#44.10.24.00.00
-unspsc7#44.10.24.07.00#Tape embosser#44.10.24.00.00
-unspsc7#44.10.24.08.00#Automatic labeling systems#44.10.24.00.00
-unspsc7#44.10.24.09.00#Semi automatic labeling systems#44.10.24.00.00
-unspsc7#44.10.24.11.00#Label dispensers#44.10.24.00.00
-unspsc7#44.10.25.00.00#Sorting machines#44.10.00.00.00
-unspsc7#44.10.25.01.00#Money counting machines#44.10.25.00.00
-unspsc7#44.10.25.02.00#Sorters#44.10.25.00.00
-unspsc7#44.10.26.00.00#Typing machines and accessories#44.10.00.00.00
-unspsc7#44.10.26.02.00#Typewriters#44.10.26.00.00
-unspsc7#44.10.26.03.00#Printwheels#44.10.26.00.00
-unspsc7#44.10.26.04.00#Stenotype machines#44.10.26.00.00
-unspsc7#44.10.26.05.00#Dictation machines#44.10.26.00.00
-unspsc7#44.10.26.06.00#Typerwriter ribbons#44.10.26.00.00
-unspsc7#44.10.26.07.00#Word processors#44.10.26.00.00
-unspsc7#44.10.26.08.00#Typewriter printing elements#44.10.26.00.00
-unspsc7#44.10.28.00.00#Binding and lamination machines#44.10.00.00.00
-unspsc7#44.10.28.01.00#Laminators#44.10.28.00.00
-unspsc7#44.10.29.00.00#Office machine accessories#44.10.00.00.00
-unspsc7#44.10.29.01.00#Travel kits for office machines#44.10.29.00.00
-unspsc7#44.10.29.02.00#Storage accessories for office machines#44.10.29.00.00
-unspsc7#44.10.29.03.00#Tape cleaners#44.10.29.00.00
-unspsc7#44.10.29.04.00#Air compressed spray#44.10.29.00.00
-unspsc7#44.10.29.05.00#Small paper bags of wet absorbing salts#44.10.29.00.00
-unspsc7#44.10.29.06.00#Computer or office equipment cleaning kit#44.10.29.00.00
-unspsc7#44.10.29.07.00#Equipment dust covers#44.10.29.00.00
-unspsc7#44.10.29.08.00#Compact disc cleaners or scratch removers#44.10.29.00.00
-unspsc7#44.10.29.09.00#Compact disc drive cleaner#44.10.29.00.00
-unspsc7#44.10.29.10.00#Laminator trays#44.10.29.00.00
-unspsc7#44.10.29.11.00#Cleaning wipes for office machines#44.10.29.00.00
-unspsc7#44.10.29.12.00#Cleaning solutions for office equipment#44.10.29.00.00
-unspsc7#44.10.29.13.00#Compact disc destroyer#44.10.29.00.00
-unspsc7#44.10.30.00.00#Fusers and accessories#44.10.00.00.00
-unspsc7#44.10.30.01.00#Fuser cleaning pads#44.10.30.00.00
-unspsc7#44.10.30.02.00#Fuser oil#44.10.30.00.00
-unspsc7#44.10.30.03.00#Fuser wiper#44.10.30.00.00
-unspsc7#44.10.30.04.00#Fusers#44.10.30.00.00
-unspsc7#44.10.31.00.00#Printer and facsimile and photocopier supplies#44.10.00.00.00
-unspsc7#44.10.31.01.00#Printer or facsimile or photocopier belts#44.10.31.00.00
-unspsc7#44.10.31.02.00#Printer or facsimile or photocopier ribbons#44.10.31.00.00
-unspsc7#44.10.31.03.00#Toner#44.10.31.00.00
-unspsc7#44.10.31.04.00#Transfer rolls#44.10.31.00.00
-unspsc7#44.10.31.05.00#Ink cartridges#44.10.31.00.00
-unspsc7#44.10.31.06.00#Ink sticks#44.10.31.00.00
-unspsc7#44.10.31.07.00#Printer or facsimile or photocopier cleaning supplies#44.10.31.00.00
-unspsc7#44.10.31.08.00#Developer for printers or photocopiers#44.10.31.00.00
-unspsc7#44.10.31.09.00#Printer or facsimile or photocopier drums#44.10.31.00.00
-unspsc7#44.10.31.10.00#Print heads#44.10.31.00.00
-unspsc7#44.10.31.11.00#Ink rolls#44.10.31.00.00
-unspsc7#44.10.31.12.00#Printer ribbon#44.10.31.00.00
-unspsc7#44.10.31.13.00#Phasers or inkjet kits#44.10.31.00.00
-unspsc7#44.10.31.14.00#Laserjet coating kits#44.10.31.00.00
-unspsc7#44.10.31.15.00#Imaging films#44.10.31.00.00
-unspsc7#44.10.31.16.00#Kit for printer#44.10.31.00.00
-unspsc7#44.10.31.17.00#Facsimile ribbons#44.10.31.00.00
-unspsc7#44.10.32.00.00#Office time recording machines and accessories#44.10.00.00.00
-unspsc7#44.10.32.01.00#Time card machines#44.10.32.00.00
-unspsc7#44.10.32.02.00#Time stamping machines#44.10.32.00.00
-unspsc7#44.10.32.03.00#Time card machine replacement ribbon#44.10.32.00.00
-unspsc7#44.10.32.04.00#Time card racks#44.10.32.00.00
-unspsc7#44.10.32.05.00#Time cards or sheets#44.10.32.00.00
-unspsc7#44.10.33.00.00#Time card machines#44.10.00.00.00
-unspsc7#44.10.34.00.00#Time stamping machines#44.10.00.00.00
-unspsc7#44.10.35.00.00#Binding machine suplies#44.10.00.00.00
-unspsc7#44.10.35.01.00#Wire binding elements or combs#44.10.35.00.00
-unspsc7#44.10.35.02.00#Binding covers#44.10.35.00.00
-unspsc7#44.11.00.00.00#Office and desk accessories#44.00.00.00.00
-unspsc7#44.11.15.00.00#Organizers and accessories#44.11.00.00.00
-unspsc7#44.11.15.01.00#Message holders or dispensers#44.11.15.00.00
-unspsc7#44.11.15.02.00#Desk drawer organizers#44.11.15.00.00
-unspsc7#44.11.15.03.00#Desktop trays or organizers#44.11.15.00.00
-unspsc7#44.11.15.04.00#Diskette holders#44.11.15.00.00
-unspsc7#44.11.15.05.00#Copy holders#44.11.15.00.00
-unspsc7#44.11.15.06.00#Paper or pad holder#44.11.15.00.00
-unspsc7#44.11.15.07.00#Book ends#44.11.15.00.00
-unspsc7#44.11.15.08.00#Stay put pen or holder#44.11.15.00.00
-unspsc7#44.11.15.09.00#Pen or pencil holders#44.11.15.00.00
-unspsc7#44.11.15.10.00#Hanging organizers or accessories#44.11.15.00.00
-unspsc7#44.11.15.11.00#Display racks or accessories#44.11.15.00.00
-unspsc7#44.11.15.12.00#Literature rack#44.11.15.00.00
-unspsc7#44.11.15.13.00#Supports for diaries or calendars#44.11.15.00.00
-unspsc7#44.11.15.14.00#Stamp racks or organizers#44.11.15.00.00
-unspsc7#44.11.15.15.00#File storage boxes or organizers#44.11.15.00.00
-unspsc7#44.11.16.00.00#Cash handling supplies#44.11.00.00.00
-unspsc7#44.11.16.01.00#Currency bags or wallets#44.11.16.00.00
-unspsc7#44.11.16.02.00#Counterfeit bill detector pens#44.11.16.00.00
-unspsc7#44.11.16.03.00#Coin sorters#44.11.16.00.00
-unspsc7#44.11.16.04.00#Coin wrappers or bill straps#44.11.16.00.00
-unspsc7#44.11.16.05.00#Cash or ticket boxes#44.11.16.00.00
-unspsc7#44.11.16.06.00#Cash box trays#44.11.16.00.00
-unspsc7#44.11.16.07.00#Check files#44.11.16.00.00
-unspsc7#44.11.16.08.00#Coin banks#44.11.16.00.00
-unspsc7#44.11.16.09.00#Counterfeit bill detectors or supplies#44.11.16.00.00
-unspsc7#44.11.18.00.00#Drafting supplies#44.11.00.00.00
-unspsc7#44.11.18.01.00#Stencils or lettering aids#44.11.18.00.00
-unspsc7#44.11.18.02.00#Drafting films#44.11.18.00.00
-unspsc7#44.11.18.03.00#Compasses#44.11.18.00.00
-unspsc7#44.11.18.04.00#Drafting papers#44.11.18.00.00
-unspsc7#44.11.18.05.00#Curves#44.11.18.00.00
-unspsc7#44.11.18.06.00#Protractors#44.11.18.00.00
-unspsc7#44.11.18.07.00#Scales#44.11.18.00.00
-unspsc7#44.11.18.08.00#T squares#44.11.18.00.00
-unspsc7#44.11.18.09.00#Templates#44.11.18.00.00
-unspsc7#44.11.18.10.00#Triangles#44.11.18.00.00
-unspsc7#44.11.18.11.00#Color charts#44.11.18.00.00
-unspsc7#44.11.18.12.00#Drafting kits or sets#44.11.18.00.00
-unspsc7#44.11.18.13.00#Drafting dots or tapes#44.11.18.00.00
-unspsc7#44.11.19.00.00#Boards#44.11.00.00.00
-unspsc7#44.11.19.01.00#Planning boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.02.00#Electronic copyboards or accessories#44.11.19.00.00
-unspsc7#44.11.19.03.00#Easels or accessories#44.11.19.00.00
-unspsc7#44.11.19.04.00#Letter boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.05.00#Dry erase boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.06.00#Chalk boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.07.00#Bulletin boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.08.00#Magnetic boards or accessories#44.11.19.00.00
-unspsc7#44.11.19.09.00#Board cleaning kits or accessories#44.11.19.00.00
-unspsc7#44.11.20.00.00#Planning systems#44.11.00.00.00
-unspsc7#44.11.20.01.00#Address books or refills#44.11.20.00.00
-unspsc7#44.11.20.02.00#Calendars#44.11.20.00.00
-unspsc7#44.11.20.04.00#Meeting planners#44.11.20.00.00
-unspsc7#44.11.20.05.00#Appointment books or refills#44.11.20.00.00
-unspsc7#44.11.20.06.00#Diaries or refills#44.11.20.00.00
-unspsc7#44.11.20.07.00#Suggestion box#44.11.20.00.00
-unspsc7#44.11.20.08.00#Wall planners or refills#44.11.20.00.00
-unspsc7#44.12.00.00.00#Office supplies#44.00.00.00.00
-unspsc7#44.12.15.00.00#Mailing supplies#44.12.00.00.00
-unspsc7#44.12.15.01.00#Mailer tubes#44.12.15.00.00
-unspsc7#44.12.15.03.00#Mailers#44.12.15.00.00
-unspsc7#44.12.15.04.00#Window envelopes#44.12.15.00.00
-unspsc7#44.12.15.05.00#Specialty envelopes#44.12.15.00.00
-unspsc7#44.12.15.06.00#Standard envelopes#44.12.15.00.00
-unspsc7#44.12.15.07.00#Catalog or clasp envelopes#44.12.15.00.00
-unspsc7#44.12.15.08.00#Message droppers#44.12.15.00.00
-unspsc7#44.12.15.09.00#Mailing bags#44.12.15.00.00
-unspsc7#44.12.15.10.00#Mailing seals#44.12.15.00.00
-unspsc7#44.12.15.11.00#Mailing boxes#44.12.15.00.00
-unspsc7#44.12.16.00.00#Desk supplies#44.12.00.00.00
-unspsc7#44.12.16.04.00#Stamps#44.12.16.00.00
-unspsc7#44.12.16.05.00#Tape dispensers#44.12.16.00.00
-unspsc7#44.12.16.06.00#Finger stalls#44.12.16.00.00
-unspsc7#44.12.16.11.00#Paper or eyelet punches#44.12.16.00.00
-unspsc7#44.12.16.12.00#Paper cutters or refills#44.12.16.00.00
-unspsc7#44.12.16.13.00#Staple removers#44.12.16.00.00
-unspsc7#44.12.16.14.00#Call bells#44.12.16.00.00
-unspsc7#44.12.16.15.00#Staplers#44.12.16.00.00
-unspsc7#44.12.16.17.00#Manual letter openers#44.12.16.00.00
-unspsc7#44.12.16.18.00#Scissors#44.12.16.00.00
-unspsc7#44.12.16.19.00#Pencil sharpeners#44.12.16.00.00
-unspsc7#44.12.16.20.00#Finger stalls#44.12.16.00.00
-unspsc7#44.12.16.21.00#Desk pads#44.12.16.00.00
-unspsc7#44.12.16.22.00#Moisteners#44.12.16.00.00
-unspsc7#44.12.16.23.00#Mechanical letter opener#44.12.16.00.00
-unspsc7#44.12.16.24.00#Embossing tools#44.12.16.00.00
-unspsc7#44.12.16.25.00#Paper weights#44.12.16.00.00
-unspsc7#44.12.16.26.00#Adhesive remover#44.12.16.00.00
-unspsc7#44.12.16.27.00#Bookmarks#44.12.16.00.00
-unspsc7#44.12.16.28.00#Clip holders or dispensers#44.12.16.00.00
-unspsc7#44.12.16.29.00#Paper clip dispenser or holder#44.12.16.00.00
-unspsc7#44.12.16.30.00#Stapler kit#44.12.16.00.00
-unspsc7#44.12.16.31.00#Glue dispensers or refills#44.12.16.00.00
-unspsc7#44.12.17.00.00#Writing instruments#44.12.00.00.00
-unspsc7#44.12.17.01.00#Rollerball pens#44.12.17.00.00
-unspsc7#44.12.17.02.00#Pen or pencil sets#44.12.17.00.00
-unspsc7#44.12.17.03.00#Fountain pens#44.12.17.00.00
-unspsc7#44.12.17.04.00#Ball point pens#44.12.17.00.00
-unspsc7#44.12.17.05.00#Mechanical pencils#44.12.17.00.00
-unspsc7#44.12.17.06.00#Wooden pencils#44.12.17.00.00
-unspsc7#44.12.17.07.00#Colored pencils#44.12.17.00.00
-unspsc7#44.12.17.08.00#Markers#44.12.17.00.00
-unspsc7#44.12.17.09.00#Crayons#44.12.17.00.00
-unspsc7#44.12.17.10.00#Writing chalk or accessories#44.12.17.00.00
-unspsc7#44.12.17.11.00#Felt pen#44.12.17.00.00
-unspsc7#44.12.17.12.00#Marker refills#44.12.17.00.00
-unspsc7#44.12.17.13.00#Pen nibs#44.12.17.00.00
-unspsc7#44.12.17.14.00#Pencil or pen grips#44.12.17.00.00
-unspsc7#44.12.17.15.00#Combination pen or pencil#44.12.17.00.00
-unspsc7#44.12.18.00.00#Correction media#44.12.00.00.00
-unspsc7#44.12.18.01.00#Correction film or tape#44.12.18.00.00
-unspsc7#44.12.18.02.00#Correction fluid#44.12.18.00.00
-unspsc7#44.12.18.04.00#Erasers#44.12.18.00.00
-unspsc7#44.12.18.05.00#Correction pens#44.12.18.00.00
-unspsc7#44.12.18.06.00#Correction pen refills#44.12.18.00.00
-unspsc7#44.12.18.07.00#Eraser refills#44.12.18.00.00
-unspsc7#44.12.19.00.00#Ink and lead refills#44.12.00.00.00
-unspsc7#44.12.19.01.00#India ink#44.12.19.00.00
-unspsc7#44.12.19.02.00#Lead refills#44.12.19.00.00
-unspsc7#44.12.19.03.00#Pen refills#44.12.19.00.00
-unspsc7#44.12.19.04.00#Ink refills#44.12.19.00.00
-unspsc7#44.12.19.05.00#Ink or stamp pads#44.12.19.00.00
-unspsc7#44.12.20.00.00#Folders and binders and indexes#44.12.00.00.00
-unspsc7#44.12.20.01.00#Index card files#44.12.20.00.00
-unspsc7#44.12.20.02.00#Sheet protectors#44.12.20.00.00
-unspsc7#44.12.20.03.00#Binders#44.12.20.00.00
-unspsc7#44.12.20.04.00#Data binders#44.12.20.00.00
-unspsc7#44.12.20.05.00#Magazine or book covers#44.12.20.00.00
-unspsc7#44.12.20.06.00#Hanging file folders#44.12.20.00.00
-unspsc7#44.12.20.07.00#Presentation binders#44.12.20.00.00
-unspsc7#44.12.20.08.00#Tab indexes#44.12.20.00.00
-unspsc7#44.12.20.09.00#Rotary or business card files#44.12.20.00.00
-unspsc7#44.12.20.10.00#Dividers#44.12.20.00.00
-unspsc7#44.12.20.11.00#Folders#44.12.20.00.00
-unspsc7#44.12.20.12.00#Clipboards#44.12.20.00.00
-unspsc7#44.12.20.13.00#Report covers#44.12.20.00.00
-unspsc7#44.12.20.14.00#Sheet lifters#44.12.20.00.00
-unspsc7#44.12.20.15.00#File backers#44.12.20.00.00
-unspsc7#44.12.20.16.00#Document holder#44.12.20.00.00
-unspsc7#44.12.20.17.00#Hanging folders or accessories#44.12.20.00.00
-unspsc7#44.12.20.18.00#File inserts or tabs#44.12.20.00.00
-unspsc7#44.12.20.19.00#File pockets or accessories#44.12.20.00.00
-unspsc7#44.12.20.20.00#Card pockets#44.12.20.00.00
-unspsc7#44.12.20.21.00#Postage stamp albums#44.12.20.00.00
-unspsc7#44.12.20.22.00#Binding bars#44.12.20.00.00
-unspsc7#44.12.21.00.00#Fastening supplies#44.12.00.00.00
-unspsc7#44.12.21.01.00#Rubber bands#44.12.21.00.00
-unspsc7#44.12.21.02.00#Prongs#44.12.21.00.00
-unspsc7#44.12.21.03.00#Clasp fasteners#44.12.21.00.00
-unspsc7#44.12.21.04.00#Paper clips#44.12.21.00.00
-unspsc7#44.12.21.05.00#Binder or bulldog clips#44.12.21.00.00
-unspsc7#44.12.21.06.00#Pins or tacks#44.12.21.00.00
-unspsc7#44.12.21.07.00#Staples#44.12.21.00.00
-unspsc7#44.12.21.08.00#Filing pockets#44.12.21.00.00
-unspsc7#44.12.21.09.00#Velcro fasteners#44.12.21.00.00
-unspsc7#44.12.21.10.00#Adhesive mounts#44.12.21.00.00
-unspsc7#44.12.21.11.00#Hole reinforcements#44.12.21.00.00
-unspsc7#44.12.21.12.00#Round head fasteners#44.12.21.00.00
-unspsc7#44.12.21.13.00#Tag fasteners#44.12.21.00.00
-unspsc7#44.12.21.14.00#Screw posts#44.12.21.00.00
-unspsc7#44.12.21.15.00#Adhesive corners#44.12.21.00.00
-unspsc7#44.12.21.16.00#Bag clips#44.12.21.00.00
-unspsc7#44.12.21.17.00#Book rings#44.12.21.00.00
-unspsc7#45.00.00.00.00#Printing and Photographic and Audio and Visual Equipment and Supplies#45.00.00.00.00
-unspsc7#45.10.00.00.00#Printing and publishing equipment#45.00.00.00.00
-unspsc7#45.10.15.00.00#Printing machinery and equipment#45.10.00.00.00
-unspsc7#45.10.15.01.00#Heliographic printers#45.10.15.00.00
-unspsc7#45.10.15.02.00#Offset printing presses#45.10.15.00.00
-unspsc7#45.10.15.03.00#Letterpress equipment#45.10.15.00.00
-unspsc7#45.10.15.04.00#Lithographic equipment#45.10.15.00.00
-unspsc7#45.10.15.05.00#Photogravure printing machines#45.10.15.00.00
-unspsc7#45.10.15.06.00#Silk screen printing machines#45.10.15.00.00
-unspsc7#45.10.15.07.00#Printing presses#45.10.15.00.00
-unspsc7#45.10.15.08.00#Perforating machines#45.10.15.00.00
-unspsc7#45.10.15.09.00#Ultraviolet (UV) rotary printer#45.10.15.00.00
-unspsc7#45.10.15.10.00#Flexographic printer#45.10.15.00.00
-unspsc7#45.10.15.11.00#Inkjet printer for commercial printing applications#45.10.15.00.00
-unspsc7#45.10.15.12.00#Thermal transfer printer for commercial printing applications#45.10.15.00.00
-unspsc7#45.10.15.13.00#Hot stamp printer#45.10.15.00.00
-unspsc7#45.10.15.14.00#Pad printer#45.10.15.00.00
-unspsc7#45.10.15.15.00#Core printer#45.10.15.00.00
-unspsc7#45.10.16.00.00#Printing machinery accessories#45.10.00.00.00
-unspsc7#45.10.16.02.00#Offset darkroom equipment#45.10.16.00.00
-unspsc7#45.10.16.03.00#Offset printing consumables#45.10.16.00.00
-unspsc7#45.10.16.04.00#Offset printing plate processors#45.10.16.00.00
-unspsc7#45.10.16.05.00#Offset plates#45.10.16.00.00
-unspsc7#45.10.16.06.00#Offset film processors#45.10.16.00.00
-unspsc7#45.10.16.07.00#Silk screen arc lamps#45.10.16.00.00
-unspsc7#45.10.16.08.00#Silk screen screens#45.10.16.00.00
-unspsc7#45.10.16.09.00#Silk screen printing racks#45.10.16.00.00
-unspsc7#45.10.16.10.00#Silk screen vacuum printing frames#45.10.16.00.00
-unspsc7#45.10.16.11.00#Silk screen squeegees#45.10.16.00.00
-unspsc7#45.10.17.00.00#Printing accessories#45.10.00.00.00
-unspsc7#45.10.17.01.00#Printing assemblers#45.10.17.00.00
-unspsc7#45.10.17.02.00#Printing guillotines#45.10.17.00.00
-unspsc7#45.10.17.03.00#Printing collators or decollators#45.10.17.00.00
-unspsc7#45.10.17.04.00#Printing cutters#45.10.17.00.00
-unspsc7#45.10.17.05.00#Printing trimmers#45.10.17.00.00
-unspsc7#45.10.17.06.00#Printing punches#45.10.17.00.00
-unspsc7#45.10.17.07.00#Printing plates#45.10.17.00.00
-unspsc7#45.10.17.08.00#Printing awls#45.10.17.00.00
-unspsc7#45.10.18.00.00#Book binding and sewing machinery#45.10.00.00.00
-unspsc7#45.10.18.01.00#Book creasing machines#45.10.18.00.00
-unspsc7#45.10.18.02.00#Book cutting machines#45.10.18.00.00
-unspsc7#45.10.18.03.00#Book punching machines#45.10.18.00.00
-unspsc7#45.10.18.04.00#Book stitching machines#45.10.18.00.00
-unspsc7#45.10.18.05.00#Book jogging machines#45.10.18.00.00
-unspsc7#45.10.18.06.00#Book gathering machines#45.10.18.00.00
-unspsc7#45.10.18.07.00#Book folding machines#45.10.18.00.00
-unspsc7#45.10.19.00.00#Printing laboratory equipment and accessories#45.10.00.00.00
-unspsc7#45.10.19.01.00#Banding machines#45.10.19.00.00
-unspsc7#45.10.19.02.00#Platemakers#45.10.19.00.00
-unspsc7#45.10.19.03.00#Paper drilling machines#45.10.19.00.00
-unspsc7#45.10.19.04.00#Enlargers#45.10.19.00.00
-unspsc7#45.10.19.05.00#Drawing or retouching boards#45.10.19.00.00
-unspsc7#45.10.20.00.00#Composing machines and accessories#45.10.00.00.00
-unspsc7#45.10.20.01.00#Intertype composing machines#45.10.20.00.00
-unspsc7#45.10.20.02.00#Linotype composing machines#45.10.20.00.00
-unspsc7#45.10.20.03.00#Photocomposition materials#45.10.20.00.00
-unspsc7#45.10.20.04.00#Monotype composing machines#45.10.20.00.00
-unspsc7#45.10.20.05.00#Phototypesetting machines#45.10.20.00.00
-unspsc7#45.11.00.00.00#Audio and visual presentation equipment#45.00.00.00.00
-unspsc7#45.11.15.00.00#Lecterns and sound systems and accessories#45.11.00.00.00
-unspsc7#45.11.15.01.00#Free standing lecterns#45.11.15.00.00
-unspsc7#45.11.15.02.00#Table top lecterns#45.11.15.00.00
-unspsc7#45.11.16.00.00#Projectors and supplies#45.11.00.00.00
-unspsc7#45.11.16.01.00#Pointers#45.11.16.00.00
-unspsc7#45.11.16.02.00#Projection bulbs#45.11.16.00.00
-unspsc7#45.11.16.03.00#Projection screens#45.11.16.00.00
-unspsc7#45.11.16.04.00#Slide projectors#45.11.16.00.00
-unspsc7#45.11.16.05.00#Transparency equipment or supplies#45.11.16.00.00
-unspsc7#45.11.16.06.00#Liquid crystal display projection panels#45.11.16.00.00
-unspsc7#45.11.16.07.00#Overhead projectors#45.11.16.00.00
-unspsc7#45.11.16.08.00#Film projectors#45.11.16.00.00
-unspsc7#45.11.16.09.00#Computer screen projector#45.11.16.00.00
-unspsc7#45.11.16.10.00#Epidiascopes#45.11.16.00.00
-unspsc7#45.11.16.11.00#Microfiche or microfilm viewers#45.11.16.00.00
-unspsc7#45.11.16.12.00#Dissolve controls#45.11.16.00.00
-unspsc7#45.11.16.13.00#Cathode ray tube data#45.11.16.00.00
-unspsc7#45.11.16.14.00#Liquid crystal display data or video projector#45.11.16.00.00
-unspsc7#45.11.16.15.00#Projection lenses#45.11.16.00.00
-unspsc7#45.11.16.16.00#Video projectors#45.11.16.00.00
-unspsc7#45.11.16.18.00#Presentation light boxes#45.11.16.00.00
-unspsc7#45.11.17.00.00#Audio presentation equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.17.01.00#Assistive listening devices#45.11.17.00.00
-unspsc7#45.11.17.02.00#Audio jack boxes#45.11.17.00.00
-unspsc7#45.11.17.03.00#Listening centers#45.11.17.00.00
-unspsc7#45.11.18.00.00#Video and combination video and audio presentation equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.18.01.00#Media control systems#45.11.18.00.00
-unspsc7#45.11.18.02.00#Television mounts#45.11.18.00.00
-unspsc7#45.11.18.03.00#Scan converters#45.11.18.00.00
-unspsc7#45.11.18.04.00#Line doublers#45.11.18.00.00
-unspsc7#45.11.18.05.00#Video editors#45.11.18.00.00
-unspsc7#45.11.18.06.00#Distance learning systems#45.11.18.00.00
-unspsc7#45.11.18.07.00#Interfaces#45.11.18.00.00
-unspsc7#45.11.18.08.00#Lighting controls#45.11.18.00.00
-unspsc7#45.11.19.00.00#Phone and video conference equipment and hardware and controllers#45.11.00.00.00
-unspsc7#45.11.19.01.00#Audioconferencing systems#45.11.19.00.00
-unspsc7#45.11.19.02.00#Videoconferencing systems#45.11.19.00.00
-unspsc7#45.12.00.00.00#Photographic equipment#45.00.00.00.00
-unspsc7#45.12.15.00.00#Cameras#45.12.00.00.00
-unspsc7#45.12.15.01.00#Still cameras#45.12.15.00.00
-unspsc7#45.12.15.02.00#Instant print cameras#45.12.15.00.00
-unspsc7#45.12.15.03.00#Disposable cameras#45.12.15.00.00
-unspsc7#45.12.15.04.00#Digital cameras#45.12.15.00.00
-unspsc7#45.12.15.05.00#Cinematographic cameras#45.12.15.00.00
-unspsc7#45.12.15.06.00#Video conference cameras#45.12.15.00.00
-unspsc7#45.12.15.08.00#Microfilm cameras#45.12.15.00.00
-unspsc7#45.12.15.10.00#Aerial cameras#45.12.15.00.00
-unspsc7#45.12.15.11.00#High speed cameras#45.12.15.00.00
-unspsc7#45.12.15.12.00#Underwater cameras#45.12.15.00.00
-unspsc7#45.12.15.13.00#Offset cameras#45.12.15.00.00
-unspsc7#45.12.15.14.00#Photocopier cameras#45.12.15.00.00
-unspsc7#45.12.15.15.00#Hand held camcorders#45.12.15.00.00
-unspsc7#45.12.15.16.00#Digital camcorder#45.12.15.00.00
-unspsc7#45.12.15.17.00#Document camera#45.12.15.00.00
-unspsc7#45.12.15.18.00#Camera kits#45.12.15.00.00
-unspsc7#45.12.16.00.00#Camera accessories#45.12.00.00.00
-unspsc7#45.12.16.01.00#Camera flashes or lighting#45.12.16.00.00
-unspsc7#45.12.16.02.00#Camera tripods#45.12.16.00.00
-unspsc7#45.12.16.03.00#Camera lenses or filters#45.12.16.00.00
-unspsc7#45.12.16.04.00#Camera shutters#45.12.16.00.00
-unspsc7#45.12.16.05.00#Screen frames#45.12.16.00.00
-unspsc7#45.12.16.06.00#Camera harnesses#45.12.16.00.00
-unspsc7#45.12.16.07.00#Camera blocks or holders#45.12.16.00.00
-unspsc7#45.12.16.08.00#Camera assemblies#45.12.16.00.00
-unspsc7#45.12.16.09.00#Camera brackets#45.12.16.00.00
-unspsc7#45.12.16.10.00#Camera cables#45.12.16.00.00
-unspsc7#45.12.16.11.00#Lens cover#45.12.16.00.00
-unspsc7#45.12.16.12.00#Camera tables#45.12.16.00.00
-unspsc7#45.12.16.13.00#Camera enclosures or covers#45.12.16.00.00
-unspsc7#45.12.16.14.00#Retrofit kits#45.12.16.00.00
-unspsc7#45.12.16.15.00#Camera rings#45.12.16.00.00
-unspsc7#45.12.16.16.00#Pan heads#45.12.16.00.00
-unspsc7#45.12.17.00.00#Photographic processing equipment#45.12.00.00.00
-unspsc7#45.12.17.01.00#Film driers#45.12.17.00.00
-unspsc7#45.12.17.02.00#Film washers#45.12.17.00.00
-unspsc7#45.12.17.03.00#Film splicers#45.12.17.00.00
-unspsc7#45.12.17.04.00#Film editors#45.12.17.00.00
-unspsc7#45.12.17.05.00#Photographic enlargers#45.12.17.00.00
-unspsc7#45.13.00.00.00#Photographic and recording media#45.00.00.00.00
-unspsc7#45.13.15.00.00#Still picture film#45.13.00.00.00
-unspsc7#45.13.15.01.00#Color film#45.13.15.00.00
-unspsc7#45.13.15.02.00#Black and white film#45.13.15.00.00
-unspsc7#45.13.15.03.00#Instant picture film#45.13.15.00.00
-unspsc7#45.13.15.04.00#Microfilm#45.13.15.00.00
-unspsc7#45.13.15.05.00#X ray film#45.13.15.00.00
-unspsc7#45.13.15.06.00#Photography paper#45.13.15.00.00
-unspsc7#45.13.16.00.00#Moving picture media#45.13.00.00.00
-unspsc7#45.13.16.01.00#Motion picture camera film#45.13.16.00.00
-unspsc7#45.13.16.04.00#Blank video tapes#45.13.16.00.00
-unspsc7#45.13.17.00.00#Media storage#45.13.00.00.00
-unspsc7#45.13.17.01.00#Slide trays#45.13.17.00.00
-unspsc7#45.14.00.00.00#Photographic filmmaking supplies#45.00.00.00.00
-unspsc7#45.14.15.00.00#Photographic processing chemicals#45.14.00.00.00
-unspsc7#45.14.15.01.00#Developer solution#45.14.15.00.00
-unspsc7#45.14.15.02.00#Fixative#45.14.15.00.00
-unspsc7#45.14.16.00.00#Darkroom supplies#45.14.00.00.00
-unspsc7#45.14.16.01.00#Developing trays#45.14.16.00.00
-unspsc7#45.14.16.02.00#Developing tanks#45.14.16.00.00
-unspsc7#45.14.16.03.00#Developing tongs#45.14.16.00.00
-unspsc7#46.00.00.00.00#Defense and Law Enforcement and Security and Safety Equipment and Supplies#46.00.00.00.00
-unspsc7#46.10.00.00.00#Light weapons and ammunition#46.00.00.00.00
-unspsc7#46.10.15.00.00#Firearms#46.10.00.00.00
-unspsc7#46.10.15.01.00#Machine guns#46.10.15.00.00
-unspsc7#46.10.15.02.00#Police or security shotguns#46.10.15.00.00
-unspsc7#46.10.15.03.00#Military rifles#46.10.15.00.00
-unspsc7#46.10.15.04.00#Handguns#46.10.15.00.00
-unspsc7#46.10.15.05.00#Air rifles or air handguns#46.10.15.00.00
-unspsc7#46.10.15.06.00#Parts of guns or pistols#46.10.15.00.00
-unspsc7#46.10.16.00.00#Ammunition#46.10.00.00.00
-unspsc7#46.10.16.01.00#Defense or law enforcement ammunition#46.10.16.00.00
-unspsc7#46.10.17.00.00#Ammunition handling systems#46.10.00.00.00
-unspsc7#46.10.17.01.00#Tank ammunition handling systems#46.10.17.00.00
-unspsc7#46.10.17.02.00#Aircraft ammunition handling systems#46.10.17.00.00
-unspsc7#46.10.18.00.00#Arms and ammunition accessories#46.10.00.00.00
-unspsc7#46.10.18.01.00#Gun cases#46.10.18.00.00
-unspsc7#46.11.00.00.00#Conventional war weapons#46.00.00.00.00
-unspsc7#46.11.15.00.00#Bombs and grenades#46.11.00.00.00
-unspsc7#46.11.15.01.00#Grenades#46.11.15.00.00
-unspsc7#46.11.15.02.00#Mines#46.11.15.00.00
-unspsc7#46.11.15.03.00#Mortar bombs#46.11.15.00.00
-unspsc7#46.11.16.00.00#Gun systems#46.11.00.00.00
-unspsc7#46.11.16.01.00#Chain gun systems#46.11.16.00.00
-unspsc7#46.11.16.02.00#Gatling gun systems#46.11.16.00.00
-unspsc7#46.11.17.00.00#Infrared (IR) sensors#46.11.00.00.00
-unspsc7#46.11.17.01.00#Infrared (IR) coolers#46.11.17.00.00
-unspsc7#46.11.17.02.00#Infrared (IR) detectors#46.11.17.00.00
-unspsc7#46.11.18.00.00#Naval weapons#46.11.00.00.00
-unspsc7#46.11.18.01.00#Torpedoes#46.11.18.00.00
-unspsc7#46.12.00.00.00#Missiles#46.00.00.00.00
-unspsc7#46.12.15.00.00#Guided missiles#46.12.00.00.00
-unspsc7#46.12.15.01.00#Air to air missiles#46.12.15.00.00
-unspsc7#46.12.15.02.00#Antiaircraft missiles#46.12.15.00.00
-unspsc7#46.12.15.03.00#Antimissile missiles#46.12.15.00.00
-unspsc7#46.12.15.04.00#Antiship missiles#46.12.15.00.00
-unspsc7#46.12.15.05.00#Antitank missiles#46.12.15.00.00
-unspsc7#46.12.15.06.00#Ballistic missiles#46.12.15.00.00
-unspsc7#46.12.15.07.00#Cruise missiles#46.12.15.00.00
-unspsc7#46.12.15.08.00#Surface to air missiles#46.12.15.00.00
-unspsc7#46.12.15.09.00#Antiballistic missiles#46.12.15.00.00
-unspsc7#46.12.15.10.00#Surface to surface missiles#46.12.15.00.00
-unspsc7#46.12.15.11.00#Air to surface missiles#46.12.15.00.00
-unspsc7#46.12.15.12.00#Training missiles#46.12.15.00.00
-unspsc7#46.12.16.00.00#Missile subsystems#46.12.00.00.00
-unspsc7#46.12.16.01.00#Electronic safe or arm devices#46.12.16.00.00
-unspsc7#46.12.16.02.00#Solid missile boosters#46.12.16.00.00
-unspsc7#46.12.16.03.00#Missile warheads#46.12.16.00.00
-unspsc7#46.12.16.04.00#Safety pin pullers#46.12.16.00.00
-unspsc7#46.12.16.05.00#Jet reaction control assemblies#46.12.16.00.00
-unspsc7#46.13.00.00.00#Rockets and subsystems#46.00.00.00.00
-unspsc7#46.13.15.00.00#Launch vehicles and rockets#46.13.00.00.00
-unspsc7#46.13.15.01.00#Multi stage rockets#46.13.15.00.00
-unspsc7#46.13.15.02.00#Reusable rockets#46.13.15.00.00
-unspsc7#46.13.15.03.00#Single stage rockets#46.13.15.00.00
-unspsc7#46.13.15.04.00#Liquid rockets#46.13.15.00.00
-unspsc7#46.13.15.05.00#Solid rockets#46.13.15.00.00
-unspsc7#46.13.16.00.00#Boosters#46.13.00.00.00
-unspsc7#46.13.16.01.00#Reusable boosters#46.13.16.00.00
-unspsc7#46.13.16.02.00#Solid boosters#46.13.16.00.00
-unspsc7#46.13.16.03.00#Multi stage boosters#46.13.16.00.00
-unspsc7#46.13.16.04.00#Liquid boosters#46.13.16.00.00
-unspsc7#46.14.00.00.00#Launchers#46.00.00.00.00
-unspsc7#46.14.15.00.00#Missile and rocket launchers#46.14.00.00.00
-unspsc7#46.14.15.01.00#Missile launchers#46.14.15.00.00
-unspsc7#46.14.15.02.00#Rocket launchers#46.14.15.00.00
-unspsc7#46.15.00.00.00#Law enforcement#46.00.00.00.00
-unspsc7#46.15.15.00.00#Crowd control equipment#46.15.00.00.00
-unspsc7#46.15.15.01.00#Barricades#46.15.15.00.00
-unspsc7#46.15.15.02.00#Riot helmets#46.15.15.00.00
-unspsc7#46.15.15.03.00#Riot shields#46.15.15.00.00
-unspsc7#46.15.15.04.00#Body armour#46.15.15.00.00
-unspsc7#46.15.15.05.00#Barriers#46.15.15.00.00
-unspsc7#46.15.16.00.00#Security and control equipment#46.15.00.00.00
-unspsc7#46.15.16.01.00#Handcuffs#46.15.16.00.00
-unspsc7#46.15.16.02.00#Night sticks#46.15.16.00.00
-unspsc7#46.15.16.03.00#Fingerprint equipment#46.15.16.00.00
-unspsc7#46.15.16.04.00#Alcohol analysers#46.15.16.00.00
-unspsc7#46.15.16.05.00#Weapons or explosives detectors#46.15.16.00.00
-unspsc7#46.15.16.06.00#Narcotic test kits#46.15.16.00.00
-unspsc7#46.16.00.00.00#Public safety and control#46.00.00.00.00
-unspsc7#46.16.15.00.00#Traffic control#46.16.00.00.00
-unspsc7#46.16.15.01.00#Airport signaling systems#46.16.15.00.00
-unspsc7#46.16.15.02.00#Railway signaling systems#46.16.15.00.00
-unspsc7#46.16.15.03.00#Marine signaling systems#46.16.15.00.00
-unspsc7#46.16.15.04.00#Traffic signals#46.16.15.00.00
-unspsc7#46.16.15.05.00#Parking meters#46.16.15.00.00
-unspsc7#46.16.15.06.00#Snow or ice melter#46.16.15.00.00
-unspsc7#46.16.15.07.00#Barrier tape#46.16.15.00.00
-unspsc7#46.16.15.08.00#Traffic or floor cones#46.16.15.00.00
-unspsc7#46.16.15.09.00#Speed stoppers#46.16.15.00.00
-unspsc7#46.16.16.00.00#Water safety#46.16.00.00.00
-unspsc7#46.16.16.01.00#Rope float lines#46.16.16.00.00
-unspsc7#46.16.16.02.00#Life rings#46.16.16.00.00
-unspsc7#46.16.16.03.00#Pool alarms#46.16.16.00.00
-unspsc7#46.16.16.04.00#Life vests or preservers#46.16.16.00.00
-unspsc7#46.17.00.00.00#Security surveillance and detection#46.00.00.00.00
-unspsc7#46.17.15.00.00#Locks and security hardware#46.17.00.00.00
-unspsc7#46.17.15.01.00#Padlocks#46.17.15.00.00
-unspsc7#46.17.15.02.00#Cable locks#46.17.15.00.00
-unspsc7#46.17.15.03.00#Lock sets#46.17.15.00.00
-unspsc7#46.17.15.04.00#Pushbutton locks#46.17.15.00.00
-unspsc7#46.17.15.05.00#Keys or accessories#46.17.15.00.00
-unspsc7#46.17.15.06.00#Safes#46.17.15.00.00
-unspsc7#46.17.15.07.00#Security bars#46.17.15.00.00
-unspsc7#46.17.15.08.00#Number locks#46.17.15.00.00
-unspsc7#46.17.15.09.00#Key cabinets#46.17.15.00.00
-unspsc7#46.17.15.10.00#Time locks#46.17.15.00.00
-unspsc7#46.17.15.11.00#Lockout devices#46.17.15.00.00
-unspsc7#46.17.15.12.00#Instrument locks#46.17.15.00.00
-unspsc7#46.17.15.13.00#Locking cam#46.17.15.00.00
-unspsc7#46.17.15.14.00#Security chains or accessories#46.17.15.00.00
-unspsc7#46.17.16.00.00#Surveillance and detection equipment#46.17.00.00.00
-unspsc7#46.17.16.02.00#Safety horns#46.17.16.00.00
-unspsc7#46.17.16.03.00#Clock timers#46.17.16.00.00
-unspsc7#46.17.16.04.00#Alarm systems#46.17.16.00.00
-unspsc7#46.17.16.05.00#Door chimes#46.17.16.00.00
-unspsc7#46.17.16.06.00#Sirens#46.17.16.00.00
-unspsc7#46.17.16.07.00#Buzzers#46.17.16.00.00
-unspsc7#46.17.16.08.00#Motion detectors#46.17.16.00.00
-unspsc7#46.17.16.09.00#Convex security mirrors#46.17.16.00.00
-unspsc7#46.17.16.10.00#Security cameras#46.17.16.00.00
-unspsc7#46.17.16.11.00#Video identification systems#46.17.16.00.00
-unspsc7#46.17.16.12.00#Video monitors#46.17.16.00.00
-unspsc7#46.17.16.13.00#Gas detectors#46.17.16.00.00
-unspsc7#46.17.16.14.00#Surveillance cameras#46.17.16.00.00
-unspsc7#46.17.16.15.00#Light enhancing cameras or vision devices#46.17.16.00.00
-unspsc7#46.17.16.16.00#Radar detectors#46.17.16.00.00
-unspsc7#46.17.16.17.00#Door eyes#46.17.16.00.00
-unspsc7#46.17.16.18.00#Door bells#46.17.16.00.00
-unspsc7#46.18.00.00.00#Personal safety and protection#46.00.00.00.00
-unspsc7#46.18.15.00.00#Safety apparel#46.18.00.00.00
-unspsc7#46.18.15.01.00#Protective aprons#46.18.15.00.00
-unspsc7#46.18.15.02.00#Bullet proof vests#46.18.15.00.00
-unspsc7#46.18.15.03.00#Protective coveralls#46.18.15.00.00
-unspsc7#46.18.15.04.00#Protective gloves#46.18.15.00.00
-unspsc7#46.18.15.05.00#Protective knee pads#46.18.15.00.00
-unspsc7#46.18.15.06.00#Protective ponchos#46.18.15.00.00
-unspsc7#46.18.15.07.00#Safety vests#46.18.15.00.00
-unspsc7#46.18.15.08.00#Fire retardant apparel#46.18.15.00.00
-unspsc7#46.18.15.09.00#Hazardous material protective apparel#46.18.15.00.00
-unspsc7#46.18.15.10.00#Fire retardant gloves#46.18.15.00.00
-unspsc7#46.18.15.11.00#Hazardous material protective goods#46.18.15.00.00
-unspsc7#46.18.15.12.00#Cleanroom apparel#46.18.15.00.00
-unspsc7#46.18.15.13.00#Cleanroom gloves#46.18.15.00.00
-unspsc7#46.18.15.14.00#Elbow protectors#46.18.15.00.00
-unspsc7#46.18.15.15.00#Insecticide protective clothing#46.18.15.00.00
-unspsc7#46.18.15.16.00#Safety sleeves#46.18.15.00.00
-unspsc7#46.18.15.17.00#Insulated or flotation suits#46.18.15.00.00
-unspsc7#46.18.15.18.00#Heat resistant clothing#46.18.15.00.00
-unspsc7#46.18.15.19.00#Safety harnesses or belts#46.18.15.00.00
-unspsc7#46.18.15.20.00#Leg protectors#46.18.15.00.00
-unspsc7#46.18.15.21.00#Radiation protection clothing or coats#46.18.15.00.00
-unspsc7#46.18.15.22.00#Safety hoods#46.18.15.00.00
-unspsc7#46.18.15.23.00#Insulated clothing for cold environments#46.18.15.00.00
-unspsc7#46.18.15.24.00#Personal flotation devices#46.18.15.00.00
-unspsc7#46.18.15.25.00#Protective rainwear or wet environment apparel#46.18.15.00.00
-unspsc7#46.18.15.26.00#Protective shirts#46.18.15.00.00
-unspsc7#46.18.15.27.00#Protective pants#46.18.15.00.00
-unspsc7#46.18.15.28.00#Protective frock#46.18.15.00.00
-unspsc7#46.18.15.29.00#Insulated clothing for cold environments#46.18.15.00.00
-unspsc7#46.18.15.30.00#Protective finger cots#46.18.15.00.00
-unspsc7#46.18.15.31.00#Reflective suspenders#46.18.15.00.00
-unspsc7#46.18.15.32.00#Lab coats#46.18.15.00.00
-unspsc7#46.18.16.00.00#Safety footwear#46.18.00.00.00
-unspsc7#46.18.16.01.00#Fire retardant footwear#46.18.16.00.00
-unspsc7#46.18.16.02.00#Hazardous material protective footwear#46.18.16.00.00
-unspsc7#46.18.16.03.00#Cleanroom footwear#46.18.16.00.00
-unspsc7#46.18.16.04.00#Safety boots#46.18.16.00.00
-unspsc7#46.18.16.05.00#Safety shoes#46.18.16.00.00
-unspsc7#46.18.16.06.00#Footwear covers#46.18.16.00.00
-unspsc7#46.18.17.00.00#Face and head protection#46.18.00.00.00
-unspsc7#46.18.17.01.00#Hard hats#46.18.17.00.00
-unspsc7#46.18.17.02.00#Facial shields#46.18.17.00.00
-unspsc7#46.18.17.03.00#Welding masks#46.18.17.00.00
-unspsc7#46.18.17.04.00#Safety helmets#46.18.17.00.00
-unspsc7#46.18.17.05.00#Motorcycle helmets#46.18.17.00.00
-unspsc7#46.18.17.06.00#Helmet parts or accessories#46.18.17.00.00
-unspsc7#46.18.18.00.00#Vision protection and accessories#46.18.00.00.00
-unspsc7#46.18.18.01.00#Eyewear holders#46.18.18.00.00
-unspsc7#46.18.18.02.00#Safety glasses#46.18.18.00.00
-unspsc7#46.18.18.03.00#Eye shields#46.18.18.00.00
-unspsc7#46.18.18.04.00#Goggles#46.18.18.00.00
-unspsc7#46.18.18.05.00#Video display filters#46.18.18.00.00
-unspsc7#46.18.18.06.00#Lens cleaner#46.18.18.00.00
-unspsc7#46.18.19.00.00#Hearing protectors#46.18.00.00.00
-unspsc7#46.18.19.01.00#Ear plugs#46.18.19.00.00
-unspsc7#46.18.19.02.00#Ear muffs#46.18.19.00.00
-unspsc7#46.18.20.00.00#Respiratory protection#46.18.00.00.00
-unspsc7#46.18.20.01.00#Masks#46.18.20.00.00
-unspsc7#46.18.20.02.00#Respirators#46.18.20.00.00
-unspsc7#46.18.20.03.00#Gas masks#46.18.20.00.00
-unspsc7#46.18.20.04.00#Respiration air supplying self contained breathing apparatus (SCBA)#46.18.20.00.00
-unspsc7#46.18.20.05.00#Mask filters#46.18.20.00.00
-unspsc7#46.18.21.00.00#Anti static equipment and supplies#46.18.00.00.00
-unspsc7#46.18.21.01.00#Antistatic wrist straps#46.18.21.00.00
-unspsc7#46.18.21.02.00#Heel grounding straps#46.18.21.00.00
-unspsc7#46.18.21.03.00#Grounding hardware#46.18.21.00.00
-unspsc7#46.18.21.04.00#Anti static floor mats#46.18.21.00.00
-unspsc7#46.18.21.05.00#Anti static worktable mats#46.18.21.00.00
-unspsc7#46.18.21.06.00#Antistatic belts#46.18.21.00.00
-unspsc7#46.18.21.07.00#Antistatic maintenance kits#46.18.21.00.00
-unspsc7#46.18.21.08.00#Antistatic toe straps#46.18.21.00.00
-unspsc7#46.18.22.00.00#Ergonomic support aids#46.18.00.00.00
-unspsc7#46.18.22.01.00#Back support belts#46.18.22.00.00
-unspsc7#46.18.22.02.00#Elbow supports#46.18.22.00.00
-unspsc7#46.18.22.03.00#Back support rests#46.18.22.00.00
-unspsc7#46.18.22.04.00#Wrist braces#46.18.22.00.00
-unspsc7#46.18.22.05.00#Foot rests#46.18.22.00.00
-unspsc7#46.18.22.06.00#Wrist rests#46.18.22.00.00
-unspsc7#46.18.22.07.00#Ankle supports#46.18.22.00.00
-unspsc7#46.18.22.08.00#Shoe insoles#46.18.22.00.00
-unspsc7#46.18.23.00.00#Fall protection#46.18.00.00.00
-unspsc7#46.18.23.01.00#Lifelines or lifeline equipment#46.18.23.00.00
-unspsc7#46.18.23.02.00#Fall protection lanyard#46.18.23.00.00
-unspsc7#46.18.23.03.00#Safety harness winders#46.18.23.00.00
-unspsc7#46.18.23.04.00#Anchorage connector#46.18.23.00.00
-unspsc7#46.18.23.05.00#Self retracting lanyard#46.18.23.00.00
-unspsc7#46.18.24.00.00#Decontamination aids#46.18.00.00.00
-unspsc7#46.18.24.01.00#Decontamination shower#46.18.24.00.00
-unspsc7#46.18.25.00.00#Personal safety devices or weapons#46.18.00.00.00
-unspsc7#46.18.25.01.00#Repellents for canine attacks#46.18.25.00.00
-unspsc7#46.19.00.00.00#Fire protection#46.00.00.00.00
-unspsc7#46.19.15.00.00#Fire prevention#46.19.00.00.00
-unspsc7#46.19.15.01.00#Smoke detectors#46.19.15.00.00
-unspsc7#46.19.15.02.00#Heat detectors#46.19.15.00.00
-unspsc7#46.19.15.03.00#Fire resistant coatings or putties or sealants#46.19.15.00.00
-unspsc7#46.19.16.00.00#Fire fighting equipment#46.19.00.00.00
-unspsc7#46.19.16.01.00#Fire extinguishers#46.19.16.00.00
-unspsc7#46.19.16.02.00#Fire sprinkler systems#46.19.16.00.00
-unspsc7#46.19.16.03.00#Fire hoses or nozzles#46.19.16.00.00
-unspsc7#46.19.16.04.00#Fire blankets#46.19.16.00.00
-unspsc7#46.19.16.05.00#Fire suppression hand tools#46.19.16.00.00
-unspsc7#46.19.16.06.00#Fire suppression foam or similar compounds#46.19.16.00.00
-unspsc7#46.19.16.07.00#Fire breathing apparatus#46.19.16.00.00
-unspsc7#47.00.00.00.00#Cleaning Equipment and Supplies#47.00.00.00.00
-unspsc7#47.10.00.00.00#Water and wastewater treatment supply and disposal#47.00.00.00.00
-unspsc7#47.10.15.00.00#Water treatment and supply equipment#47.10.00.00.00
-unspsc7#47.10.15.01.00#Activated carbon equipment#47.10.15.00.00
-unspsc7#47.10.15.02.00#Ammonia removal equipment#47.10.15.00.00
-unspsc7#47.10.15.03.00#Carbon filtration equipment#47.10.15.00.00
-unspsc7#47.10.15.04.00#Bacterial removal equipment#47.10.15.00.00
-unspsc7#47.10.15.05.00#Chlorine handling equipment#47.10.15.00.00
-unspsc7#47.10.15.06.00#Corrosion control equipment#47.10.15.00.00
-unspsc7#47.10.15.07.00#Grit chambers#47.10.15.00.00
-unspsc7#47.10.15.08.00#Desalination equipment#47.10.15.00.00
-unspsc7#47.10.15.09.00#Fluoridation equipment#47.10.15.00.00
-unspsc7#47.10.15.10.00#Iron removal equipment#47.10.15.00.00
-unspsc7#47.10.15.11.00#Ion exchange equipment#47.10.15.00.00
-unspsc7#47.10.15.12.00#Mixers or agitators#47.10.15.00.00
-unspsc7#47.10.15.13.00#Oxygen generators#47.10.15.00.00
-unspsc7#47.10.15.14.00#Water purification equipment#47.10.15.00.00
-unspsc7#47.10.15.16.00#Turbidimeters#47.10.15.00.00
-unspsc7#47.10.15.17.00#Ultraviolet disinfection equipment#47.10.15.00.00
-unspsc7#47.10.15.18.00#Water conditioners#47.10.15.00.00
-unspsc7#47.10.15.19.00#Water softening accessories#47.10.15.00.00
-unspsc7#47.10.15.21.00#Ultrafiltration equipment#47.10.15.00.00
-unspsc7#47.10.15.22.00#Packaged water treatment systems#47.10.15.00.00
-unspsc7#47.10.15.23.00#Collection tanks#47.10.15.00.00
-unspsc7#47.10.15.24.00#Sludge or sewage composting equipment#47.10.15.00.00
-unspsc7#47.10.15.25.00#Dewatering equipment#47.10.15.00.00
-unspsc7#47.10.15.26.00#Sludge pelletizers#47.10.15.00.00
-unspsc7#47.10.15.27.00#Sludge shredders#47.10.15.00.00
-unspsc7#47.10.15.28.00#Water treatment dryers#47.10.15.00.00
-unspsc7#47.10.15.29.00#Incinerators#47.10.15.00.00
-unspsc7#47.10.15.30.00#Odor control equipment#47.10.15.00.00
-unspsc7#47.10.15.31.00#Septic tanks#47.10.15.00.00
-unspsc7#47.10.15.32.00#Settling tanks#47.10.15.00.00
-unspsc7#47.10.15.33.00#Lift stations#47.10.15.00.00
-unspsc7#47.10.15.34.00#Sewage distributors#47.10.15.00.00
-unspsc7#47.10.15.35.00#Sludge disposal equipment#47.10.15.00.00
-unspsc7#47.10.15.36.00#Sludge collectors#47.10.15.00.00
-unspsc7#47.10.15.37.00#Sludge conditioning equipment#47.10.15.00.00
-unspsc7#47.10.15.38.00#Sludge or sewage digesters#47.10.15.00.00
-unspsc7#47.10.15.39.00#Sludge or sewage removal equipment#47.10.15.00.00
-unspsc7#47.10.16.00.00#Water treatment consumables#47.10.00.00.00
-unspsc7#47.10.16.01.00#Algaecides#47.10.16.00.00
-unspsc7#47.10.16.02.00#Antiscalants#47.10.16.00.00
-unspsc7#47.10.16.03.00#Descalers#47.10.16.00.00
-unspsc7#47.10.16.04.00#Boiler feed chemicals#47.10.16.00.00
-unspsc7#47.10.16.05.00#Bacterial removal chemicals#47.10.16.00.00
-unspsc7#47.10.16.06.00#Corrosion control chemicals#47.10.16.00.00
-unspsc7#47.10.16.07.00#Odor control chemicals#47.10.16.00.00
-unspsc7#47.10.16.08.00#Flocculents#47.10.16.00.00
-unspsc7#47.10.16.09.00#Microbiocides#47.10.16.00.00
-unspsc7#47.10.16.10.00#Water softening compounds#47.10.16.00.00
-unspsc7#47.10.16.11.00#Demulsifiers#47.10.16.00.00
-unspsc7#47.10.16.12.00#Polyelectrolytes#47.10.16.00.00
-unspsc7#47.11.00.00.00#Industrial laundry and dry cleaning equipment#47.00.00.00.00
-unspsc7#47.11.15.00.00#Washing and drying equipment#47.11.00.00.00
-unspsc7#47.11.15.01.00#Laundry type combined washing or drying machines#47.11.15.00.00
-unspsc7#47.11.15.02.00#Laundry type washing machines#47.11.15.00.00
-unspsc7#47.11.15.03.00#Clothes dryers#47.11.15.00.00
-unspsc7#47.11.15.04.00#Laundry type drying machines#47.11.15.00.00
-unspsc7#47.11.15.05.00#Laundry equipment stands#47.11.15.00.00
-unspsc7#47.11.16.00.00#Ironing equipment#47.11.00.00.00
-unspsc7#47.11.16.01.00#Ironing machines or presses#47.11.16.00.00
-unspsc7#47.11.16.02.00#Folding machines#47.11.16.00.00
-unspsc7#47.11.16.03.00#Steam pressing machines#47.11.16.00.00
-unspsc7#47.11.17.00.00#Dry cleaning equipment#47.11.00.00.00
-unspsc7#47.11.17.01.00#Dry cleaning machines#47.11.17.00.00
-unspsc7#47.12.00.00.00#Janitorial equipment#47.00.00.00.00
-unspsc7#47.12.15.00.00#Janitor carts and accessories#47.12.00.00.00
-unspsc7#47.12.15.01.00#Janitor carts#47.12.15.00.00
-unspsc7#47.12.15.02.00#Janitor cart accessories#47.12.15.00.00
-unspsc7#47.12.16.00.00#Floor machines and accessories#47.12.00.00.00
-unspsc7#47.12.16.02.00#Vacuum cleaners#47.12.16.00.00
-unspsc7#47.12.16.03.00#Floor polishers#47.12.16.00.00
-unspsc7#47.12.16.04.00#Wet or dry combination vacuum cleaners#47.12.16.00.00
-unspsc7#47.12.16.05.00#Floor scrubbers#47.12.16.00.00
-unspsc7#47.12.16.06.00#Carpet sweepers#47.12.16.00.00
-unspsc7#47.12.16.07.00#Vacuum cleaner supplies or accessories#47.12.16.00.00
-unspsc7#47.12.16.08.00#Floor machine pads#47.12.16.00.00
-unspsc7#47.12.16.09.00#Carpet cleaning equipment#47.12.16.00.00
-unspsc7#47.12.16.10.00#Floor washing machine#47.12.16.00.00
-unspsc7#47.12.17.00.00#Waste containers and accessories#47.12.00.00.00
-unspsc7#47.12.17.01.00#Trash bags#47.12.17.00.00
-unspsc7#47.12.17.02.00#Waste containers or rigid liners#47.12.17.00.00
-unspsc7#47.12.17.03.00#Smoking urns or accessories#47.12.17.00.00
-unspsc7#47.12.17.04.00#Waste container lids#47.12.17.00.00
-unspsc7#47.12.17.05.00#Urn sand bags#47.12.17.00.00
-unspsc7#47.12.17.06.00#Ash trays#47.12.17.00.00
-unspsc7#47.12.17.07.00#Motion sickness bags#47.12.17.00.00
-unspsc7#47.12.18.00.00#Cleaning equipment#47.12.00.00.00
-unspsc7#47.12.18.01.00#Cleaning dusters#47.12.18.00.00
-unspsc7#47.12.18.02.00#Lint removers#47.12.18.00.00
-unspsc7#47.12.18.03.00#Squeeges or washers#47.12.18.00.00
-unspsc7#47.12.18.04.00#Cleaning pails or buckets#47.12.18.00.00
-unspsc7#47.12.18.05.00#Pressure or steam cleaners#47.12.18.00.00
-unspsc7#47.12.18.06.00#Mop wringer#47.12.18.00.00
-unspsc7#47.12.18.07.00#Drain or toilet plunger#47.12.18.00.00
-unspsc7#47.12.18.08.00#Drain or pipe cleaning equipment#47.12.18.00.00
-unspsc7#47.12.18.09.00#Degreasing pans#47.12.18.00.00
-unspsc7#47.12.18.10.00#Cleaning rag dispenser#47.12.18.00.00
-unspsc7#47.12.18.11.00#Duct cleaning machines#47.12.18.00.00
-unspsc7#47.13.00.00.00#Cleaning and janitorial supplies#47.00.00.00.00
-unspsc7#47.13.15.00.00#Cleaning rags and cloths and wipes#47.13.00.00.00
-unspsc7#47.13.15.01.00#Rags#47.13.15.00.00
-unspsc7#47.13.15.02.00#Wipes#47.13.15.00.00
-unspsc7#47.13.16.00.00#Brooms and mops and brushes and accessories#47.13.00.00.00
-unspsc7#47.13.16.01.00#Dust brushes or pans#47.13.16.00.00
-unspsc7#47.13.16.02.00#Scouring pads#47.13.16.00.00
-unspsc7#47.13.16.03.00#Sponges#47.13.16.00.00
-unspsc7#47.13.16.04.00#Brooms#47.13.16.00.00
-unspsc7#47.13.16.05.00#Cleaning brushes#47.13.16.00.00
-unspsc7#47.13.16.06.00#Dust mops#47.13.16.00.00
-unspsc7#47.13.16.07.00#Wet mops#47.13.16.00.00
-unspsc7#47.13.16.08.00#Toilet brushes#47.13.16.00.00
-unspsc7#47.13.16.09.00#Broom or mop handles#47.13.16.00.00
-unspsc7#47.13.16.10.00#Floor finish applicator#47.13.16.00.00
-unspsc7#47.13.16.11.00#Trash picker#47.13.16.00.00
-unspsc7#47.13.16.12.00#Replacement rubbers#47.13.16.00.00
-unspsc7#47.13.16.13.00#Mop or broom holder#47.13.16.00.00
-unspsc7#47.13.16.14.00#Cleaning equipment clamps#47.13.16.00.00
-unspsc7#47.13.17.00.00#Restroom supplies#47.13.00.00.00
-unspsc7#47.13.17.01.00#Paper towel dispensers#47.13.17.00.00
-unspsc7#47.13.17.02.00#Sanitary goods dispensers#47.13.17.00.00
-unspsc7#47.13.17.03.00#Sanitary waste receptacles#47.13.17.00.00
-unspsc7#47.13.17.04.00#Institutional soap or lotion dispensers#47.13.17.00.00
-unspsc7#47.13.17.05.00#Urinal or toilet accessories#47.13.17.00.00
-unspsc7#47.13.17.06.00#Air freshener dispensers#47.13.17.00.00
-unspsc7#47.13.17.07.00#Institutional hand dryers#47.13.17.00.00
-unspsc7#47.13.17.08.00#Bathroom tissue dispenser#47.13.17.00.00
-unspsc7#47.13.17.09.00#Facial tissue dispensers#47.13.17.00.00
-unspsc7#47.13.17.10.00#Toilet tissue dispensers#47.13.17.00.00
-unspsc7#47.13.17.11.00#Cleaner dispenser#47.13.17.00.00
-unspsc7#47.13.18.00.00#Cleaning and disinfecting solutions#47.13.00.00.00
-unspsc7#47.13.18.01.00#Floor cleaners#47.13.18.00.00
-unspsc7#47.13.18.02.00#Floor waxes#47.13.18.00.00
-unspsc7#47.13.18.03.00#Household disinfectants#47.13.18.00.00
-unspsc7#47.13.18.04.00#Ammonias#47.13.18.00.00
-unspsc7#47.13.18.05.00#General purpose cleaners#47.13.18.00.00
-unspsc7#47.13.18.06.00#Furniture polish or waxes#47.13.18.00.00
-unspsc7#47.13.18.07.00#Bleaches#47.13.18.00.00
-unspsc7#47.13.18.08.00#Dry germicidal#47.13.18.00.00
-unspsc7#47.13.18.09.00#Shoe cleaning or polishing products#47.13.18.00.00
-unspsc7#47.13.18.10.00#Dishwashing products#47.13.18.00.00
-unspsc7#47.13.18.11.00#Laundry products#47.13.18.00.00
-unspsc7#47.13.18.12.00#Air freshener#47.13.18.00.00
-unspsc7#47.13.18.13.00#Screen cleaner#47.13.18.00.00
-unspsc7#47.13.18.14.00#Metal cleaners or polishes#47.13.18.00.00
-unspsc7#47.13.18.15.00#Drain cleaner#47.13.18.00.00
-unspsc7#47.13.18.16.00#Deodorizers#47.13.18.00.00
-unspsc7#47.13.18.17.00#Household or automotive protectants#47.13.18.00.00
-unspsc7#47.13.18.18.00#Air sanitizer#47.13.18.00.00
-unspsc7#47.13.18.19.00#Caustic cleaners#47.13.18.00.00
-unspsc7#47.13.18.20.00#Petroleum derivative cleaners#47.13.18.00.00
-unspsc7#47.13.18.21.00#Degreasing compounds#47.13.18.00.00
-unspsc7#47.13.18.22.00#Carbon removing compounds#47.13.18.00.00
-unspsc7#47.13.18.23.00#Deicers and defrosters#47.13.18.00.00
-unspsc7#47.13.18.24.00#Glass or window cleaners#47.13.18.00.00
-unspsc7#47.13.18.25.00#Contact surface cleaners#47.13.18.00.00
-unspsc7#47.13.19.00.00#Absorbents#47.13.00.00.00
-unspsc7#47.13.19.01.00#Mats#47.13.19.00.00
-unspsc7#47.13.19.02.00#Granular absorbent#47.13.19.00.00
-unspsc7#47.13.19.03.00#Plugging compound#47.13.19.00.00
-unspsc7#47.13.19.04.00#Absorbent socks#47.13.19.00.00
-unspsc7#47.13.19.05.00#Spill kits#47.13.19.00.00
-unspsc7#47.13.19.06.00#Pans#47.13.19.00.00
-unspsc7#47.13.19.07.00#Absorbent booms#47.13.19.00.00
-unspsc7#47.13.19.08.00#Absorbent pillows#47.13.19.00.00
-unspsc7#47.13.20.00.00#Mats#47.13.00.00.00
-unspsc7#47.13.21.00.00#Cleaning kits#47.13.00.00.00
-unspsc7#47.13.21.01.00#Industrial cleaning kits#47.13.21.00.00
-unspsc7#47.13.21.02.00#General purpose cleaning kits#47.13.21.00.00
-unspsc7#48.00.00.00.00#Service Industry Machinery and Equipment and Supplies#48.00.00.00.00
-unspsc7#48.10.00.00.00#Institutional food services equipment#48.00.00.00.00
-unspsc7#48.10.15.00.00#Cooking and warming equipment#48.10.00.00.00
-unspsc7#48.10.15.01.00#Commercial use bain maries#48.10.15.00.00
-unspsc7#48.10.15.02.00#Commercial use barbeque ovens#48.10.15.00.00
-unspsc7#48.10.15.03.00#Commercial use broilers#48.10.15.00.00
-unspsc7#48.10.15.04.00#Commercial use charcoal grills#48.10.15.00.00
-unspsc7#48.10.15.05.00#Commercial use coffee or iced tea makers#48.10.15.00.00
-unspsc7#48.10.15.06.00#Commercial use coffee warmers#48.10.15.00.00
-unspsc7#48.10.15.07.00#Commercial use convection ovens#48.10.15.00.00
-unspsc7#48.10.15.08.00#Commercial use conveyer toasters#48.10.15.00.00
-unspsc7#48.10.15.09.00#Commercial use deep fryers#48.10.15.00.00
-unspsc7#48.10.15.10.00#Commercial use food warmers#48.10.15.00.00
-unspsc7#48.10.15.11.00#Commercial use griddles#48.10.15.00.00
-unspsc7#48.10.15.12.00#Commercial use grills#48.10.15.00.00
-unspsc7#48.10.15.13.00#Commercial use heat lamps#48.10.15.00.00
-unspsc7#48.10.15.14.00#Commercial use high pressure steamers#48.10.15.00.00
-unspsc7#48.10.15.15.00#Commercial use hot dog grills#48.10.15.00.00
-unspsc7#48.10.15.16.00#Commercial use microwave ovens#48.10.15.00.00
-unspsc7#48.10.15.17.00#Commercial use ovens#48.10.15.00.00
-unspsc7#48.10.15.18.00#Commercial use pasta cookers#48.10.15.00.00
-unspsc7#48.10.15.19.00#Commercial use pizza ovens#48.10.15.00.00
-unspsc7#48.10.15.20.00#Commercial use popcorn machines#48.10.15.00.00
-unspsc7#48.10.15.21.00#Commercial use ranges#48.10.15.00.00
-unspsc7#48.10.15.22.00#Commercial use rotisseries#48.10.15.00.00
-unspsc7#48.10.15.23.00#Commercial use smokers or smoke ovens#48.10.15.00.00
-unspsc7#48.10.15.24.00#Commercial use steamers#48.10.15.00.00
-unspsc7#48.10.15.25.00#Commercial use toasters#48.10.15.00.00
-unspsc7#48.10.15.26.00#Commercial use waffle irons#48.10.15.00.00
-unspsc7#48.10.15.27.00#Barbecues#48.10.15.00.00
-unspsc7#48.10.15.28.00#Commercial use crepe machines#48.10.15.00.00
-unspsc7#48.10.15.29.00#Pressure cookers or pressure fryers#48.10.15.00.00
-unspsc7#48.10.15.30.00#Commercial use rice cookers#48.10.15.00.00
-unspsc7#48.10.15.31.00#Commercial salmon poachers or kettles#48.10.15.00.00
-unspsc7#48.10.16.00.00#Food preparation equipment#48.10.00.00.00
-unspsc7#48.10.16.01.00#Commercial use blenders#48.10.16.00.00
-unspsc7#48.10.16.02.00#Commercial use electric can openers#48.10.16.00.00
-unspsc7#48.10.16.03.00#Commercial use food choppers or cubers or dicers#48.10.16.00.00
-unspsc7#48.10.16.04.00#Commercial use coffee grinders#48.10.16.00.00
-unspsc7#48.10.16.05.00#Commercial use food grinders#48.10.16.00.00
-unspsc7#48.10.16.06.00#Commercial use graters#48.10.16.00.00
-unspsc7#48.10.16.07.00#Commercial use juicers#48.10.16.00.00
-unspsc7#48.10.16.08.00#Commercial use mixers#48.10.16.00.00
-unspsc7#48.10.16.09.00#Commercial use pasta machines#48.10.16.00.00
-unspsc7#48.10.16.10.00#Commercial use peelers#48.10.16.00.00
-unspsc7#48.10.16.11.00#Commercial use scales#48.10.16.00.00
-unspsc7#48.10.16.12.00#Commercial use food processors#48.10.16.00.00
-unspsc7#48.10.16.13.00#Commercial use dough machines#48.10.16.00.00
-unspsc7#48.10.16.14.00#Commercial use icing sets or bags#48.10.16.00.00
-unspsc7#48.10.16.15.00#Commercial use dishwashers#48.10.16.00.00
-unspsc7#48.10.16.16.00#Commercial use bread slicers#48.10.16.00.00
-unspsc7#48.10.16.17.00#Commercial use plastic shovels#48.10.16.00.00
-unspsc7#48.10.17.00.00#Food and beverage dispensing equipment#48.10.00.00.00
-unspsc7#48.10.17.01.00#Carbonated beverage dispenser#48.10.17.00.00
-unspsc7#48.10.17.02.00#Non carbonated beverage dispenser#48.10.17.00.00
-unspsc7#48.10.17.03.00#Milk dispensers#48.10.17.00.00
-unspsc7#48.10.17.04.00#Syrup pumps#48.10.17.00.00
-unspsc7#48.10.17.05.00#Cappuccino or espresso machines#48.10.17.00.00
-unspsc7#48.10.17.06.00#Milkshake machines#48.10.17.00.00
-unspsc7#48.10.17.07.00#Soft serve machines#48.10.17.00.00
-unspsc7#48.10.17.08.00#Slush machines#48.10.17.00.00
-unspsc7#48.10.17.09.00#Ice dispensers#48.10.17.00.00
-unspsc7#48.10.17.10.00#Drinking fountains or bubblers#48.10.17.00.00
-unspsc7#48.10.17.11.00#Bottled water dispensers or accessories#48.10.17.00.00
-unspsc7#48.10.17.12.00#Cup dispenser#48.10.17.00.00
-unspsc7#48.10.17.13.00#Cocktail shakers or accessories#48.10.17.00.00
-unspsc7#48.10.17.14.00#Hot water dispenser#48.10.17.00.00
-unspsc7#48.10.18.00.00#Cookware and kitchen tools#48.10.00.00.00
-unspsc7#48.10.18.01.00#Commercial use cutlery#48.10.18.00.00
-unspsc7#48.10.18.02.00#Commercial use molds#48.10.18.00.00
-unspsc7#48.10.18.03.00#Commercial use scoops#48.10.18.00.00
-unspsc7#48.10.18.04.00#Commercial use measuring cups#48.10.18.00.00
-unspsc7#48.10.18.05.00#Commercial use mixing bowls#48.10.18.00.00
-unspsc7#48.10.18.06.00#Commercial use cake or pie pans#48.10.18.00.00
-unspsc7#48.10.18.07.00#Commercial use pizza pans#48.10.18.00.00
-unspsc7#48.10.18.08.00#Commercial use sauce or saute pans#48.10.18.00.00
-unspsc7#48.10.18.09.00#Commercial use stock or sauce pots#48.10.18.00.00
-unspsc7#48.10.18.10.00#Commercial use pot or pan covers#48.10.18.00.00
-unspsc7#48.10.18.11.00#Commercial use rolling pins#48.10.18.00.00
-unspsc7#48.10.18.12.00#Commercial use strainers#48.10.18.00.00
-unspsc7#48.10.18.13.00#Commercial use whisks#48.10.18.00.00
-unspsc7#48.10.18.14.00#Commercial use woks#48.10.18.00.00
-unspsc7#48.10.18.15.00#Commercial use ladles#48.10.18.00.00
-unspsc7#48.10.18.16.00#Commercial use cutlery pouch#48.10.18.00.00
-unspsc7#48.10.18.17.00#Cake decorating equipment or moulds#48.10.18.00.00
-unspsc7#48.10.19.00.00#Tabletop and serving equipment#48.10.00.00.00
-unspsc7#48.10.19.01.00#Food service dinnerware#48.10.19.00.00
-unspsc7#48.10.19.02.00#Food service flatware#48.10.19.00.00
-unspsc7#48.10.19.03.00#Food service glasses#48.10.19.00.00
-unspsc7#48.10.19.04.00#Food service stemware#48.10.19.00.00
-unspsc7#48.10.19.05.00#Food service cups or mugs#48.10.19.00.00
-unspsc7#48.10.19.06.00#Food service serving baskets#48.10.19.00.00
-unspsc7#48.10.19.07.00#Food service pitchers#48.10.19.00.00
-unspsc7#48.10.19.08.00#Food service chafers#48.10.19.00.00
-unspsc7#48.10.19.09.00#Food service coffee or tea pots#48.10.19.00.00
-unspsc7#48.10.19.10.00#Food service soup crocks#48.10.19.00.00
-unspsc7#48.10.19.11.00#Food service ice buckets or wine coolers#48.10.19.00.00
-unspsc7#48.10.19.12.00#Food service condiment dispensers#48.10.19.00.00
-unspsc7#48.10.19.13.00#Food service punch bowls#48.10.19.00.00
-unspsc7#48.10.19.14.00#Food service wine carafes#48.10.19.00.00
-unspsc7#48.10.19.15.00#Food service trays#48.10.19.00.00
-unspsc7#48.10.19.16.00#Food service napkin dispensers#48.10.19.00.00
-unspsc7#48.10.19.17.00#Food service fondue pots#48.10.19.00.00
-unspsc7#48.10.20.00.00#Restaurant furniture#48.10.00.00.00
-unspsc7#48.10.20.01.00#Restaurant chairs#48.10.20.00.00
-unspsc7#48.10.20.02.00#Booths#48.10.20.00.00
-unspsc7#48.10.20.03.00#Salad bars#48.10.20.00.00
-unspsc7#48.10.20.04.00#Tabletops#48.10.20.00.00
-unspsc7#48.10.20.05.00#Restaurant or bar stools#48.10.20.00.00
-unspsc7#48.10.20.06.00#Permanent bars#48.10.20.00.00
-unspsc7#48.10.20.07.00#Portable bars#48.10.20.00.00
-unspsc7#48.10.21.00.00#Storage and handling equipment#48.10.00.00.00
-unspsc7#48.10.21.01.00#Display cases#48.10.21.00.00
-unspsc7#48.10.21.02.00#Heated display cases#48.10.21.00.00
-unspsc7#48.10.21.03.00#Refrigerated display cases#48.10.21.00.00
-unspsc7#48.10.21.04.00#Ice cream display cases#48.10.21.00.00
-unspsc7#48.10.21.05.00#Glass chilling equipment#48.10.21.00.00
-unspsc7#48.10.21.06.00#Cool containers#48.10.21.00.00
-unspsc7#48.11.00.00.00#Vending machines#48.00.00.00.00
-unspsc7#48.11.10.00.00#Liquid vending machines#48.11.00.00.00
-unspsc7#48.11.10.01.00#Machines dispensing single servings with cups#48.11.10.00.00
-unspsc7#48.11.10.02.00#Machines dispensing bulk quantities#48.11.10.00.00
-unspsc7#48.11.11.00.00#Piece and part vending machines#48.11.00.00.00
-unspsc7#48.11.11.01.00#Bottle or can vending machines#48.11.11.00.00
-unspsc7#48.11.11.02.00#Gumball candy or childrens novelties machines#48.11.11.00.00
-unspsc7#48.11.11.03.00#Snack or small package goods display machines#48.11.11.00.00
-unspsc7#48.11.11.04.00#A la carte foods vending machines#48.11.11.00.00
-unspsc7#48.11.11.05.00#Frozen confections machines#48.11.11.00.00
-unspsc7#48.11.11.06.00#Personal accommodation item dispensers#48.11.11.00.00
-unspsc7#48.11.11.07.00#Cigarette machines#48.11.11.00.00
-unspsc7#48.11.12.00.00#Prepared to order food vending machines#48.11.00.00.00
-unspsc7#48.11.12.01.00#French fry vending machines#48.11.12.00.00
-unspsc7#48.11.12.02.00#Popcorn vending machines#48.11.12.00.00
-unspsc7#48.11.13.00.00#Service and ticket vending machines#48.11.00.00.00
-unspsc7#48.11.13.01.00#Ticket dispensing machines#48.11.13.00.00
-unspsc7#48.11.13.02.00#Insurance policy vending machines#48.11.13.00.00
-unspsc7#48.11.13.03.00#Stamp machines#48.11.13.00.00
-unspsc7#48.11.14.00.00#Currency vending machines#48.11.00.00.00
-unspsc7#48.11.14.01.00#Automatic teller machines (ATMs)#48.11.14.00.00
-unspsc7#48.11.14.02.00#Bill to coin changers#48.11.14.00.00
-unspsc7#48.11.14.03.00#Foreign currency exchange machines#48.11.14.00.00
-unspsc7#48.11.14.04.00#Electronic funds transfer point of sale equipment#48.11.14.00.00
-unspsc7#48.12.00.00.00#Gambling or wagering equipment#48.00.00.00.00
-unspsc7#48.12.11.00.00#Coin operated gambling machines#48.12.00.00.00
-unspsc7#48.12.11.01.00#Poker or slot machines#48.12.11.00.00
-unspsc7#48.12.12.00.00#Gambling tables and games#48.12.00.00.00
-unspsc7#48.12.12.01.00#Roulette wheels#48.12.12.00.00
-unspsc7#48.12.12.02.00#Card tables#48.12.12.00.00
-unspsc7#48.12.13.00.00#Gambling management and networked wagering systems#48.12.00.00.00
-unspsc7#48.12.13.01.00#Table gambling management systems#48.12.13.00.00
-unspsc7#48.12.13.02.00#Networked wagering games#48.12.13.00.00
-unspsc7#49.00.00.00.00#Sports and Recreational Equipment and Supplies and Accessories#49.00.00.00.00
-unspsc7#49.10.00.00.00#Collectibles and awards#49.00.00.00.00
-unspsc7#49.10.15.00.00#Art#49.10.00.00.00
-unspsc7#49.10.15.01.00#Paintings#49.10.15.00.00
-unspsc7#49.10.15.02.00#Sculptures#49.10.15.00.00
-unspsc7#49.10.15.03.00#Statuary#49.10.15.00.00
-unspsc7#49.10.15.04.00#Portraits#49.10.15.00.00
-unspsc7#49.10.15.05.00#Drawings#49.10.15.00.00
-unspsc7#49.10.15.06.00#Pictures#49.10.15.00.00
-unspsc7#49.10.15.07.00#Lithographs#49.10.15.00.00
-unspsc7#49.10.15.08.00#Posters#49.10.15.00.00
-unspsc7#49.10.15.09.00#Decorative pot#49.10.15.00.00
-unspsc7#49.10.15.10.00#Scrolls#49.10.15.00.00
-unspsc7#49.10.15.11.00#Photographs#49.10.15.00.00
-unspsc7#49.10.15.12.00#Flower vases#49.10.15.00.00
-unspsc7#49.10.16.00.00#Collectibles#49.10.00.00.00
-unspsc7#49.10.16.01.00#Antiques#49.10.16.00.00
-unspsc7#49.10.16.02.00#Souvenirs#49.10.16.00.00
-unspsc7#49.10.16.03.00#Mint coin collections#49.10.16.00.00
-unspsc7#49.10.16.04.00#Stamp collections#49.10.16.00.00
-unspsc7#49.10.16.05.00#Antique rugs#49.10.16.00.00
-unspsc7#49.10.16.06.00#Diggings#49.10.16.00.00
-unspsc7#49.10.16.07.00#Comic book collections#49.10.16.00.00
-unspsc7#49.10.16.08.00#Antique musical instruments#49.10.16.00.00
-unspsc7#49.10.16.09.00#Ornaments or decorations#49.10.16.00.00
-unspsc7#49.10.16.10.00#Key chains#49.10.16.00.00
-unspsc7#49.10.16.11.00#Charms#49.10.16.00.00
-unspsc7#49.10.16.12.00#Holograms#49.10.16.00.00
-unspsc7#49.10.16.13.00#Glass crystals#49.10.16.00.00
-unspsc7#49.10.17.00.00#Awards#49.10.00.00.00
-unspsc7#49.10.17.01.00#Medals#49.10.17.00.00
-unspsc7#49.10.17.02.00#Trophies#49.10.17.00.00
-unspsc7#49.10.17.03.00#Medallions#49.10.17.00.00
-unspsc7#49.10.17.04.00#Plaques#49.10.17.00.00
-unspsc7#49.10.17.05.00#Certificates#49.10.17.00.00
-unspsc7#49.10.17.06.00#Photo award#49.10.17.00.00
-unspsc7#49.10.17.07.00#Achievement certificate#49.10.17.00.00
-unspsc7#49.10.17.08.00#Crowns#49.10.17.00.00
-unspsc7#49.11.00.00.00#Musical instruments#49.00.00.00.00
-unspsc7#49.11.15.00.00#Keyboard instruments#49.11.00.00.00
-unspsc7#49.11.15.01.00#Musical organs#49.11.15.00.00
-unspsc7#49.11.15.02.00#Accordions#49.11.15.00.00
-unspsc7#49.11.15.03.00#Pianos#49.11.15.00.00
-unspsc7#49.11.16.00.00#Brass instruments#49.11.00.00.00
-unspsc7#49.11.16.01.00#Trumpets#49.11.16.00.00
-unspsc7#49.11.16.02.00#Trombones#49.11.16.00.00
-unspsc7#49.11.16.03.00#Sousaphones#49.11.16.00.00
-unspsc7#49.11.16.04.00#Saxophones#49.11.16.00.00
-unspsc7#49.11.16.05.00#Whistle#49.11.16.00.00
-unspsc7#49.11.17.00.00#Woodwind instruments#49.11.00.00.00
-unspsc7#49.11.17.01.00#Clarinets#49.11.17.00.00
-unspsc7#49.11.17.02.00#Oboes#49.11.17.00.00
-unspsc7#49.11.17.03.00#Musical flutes#49.11.17.00.00
-unspsc7#49.11.17.04.00#Piccoloes#49.11.17.00.00
-unspsc7#49.11.17.05.00#Musical cornets#49.11.17.00.00
-unspsc7#49.11.17.06.00#Bagpipes#49.11.17.00.00
-unspsc7#49.11.17.07.00#Harmonicas#49.11.17.00.00
-unspsc7#49.11.17.08.00#Kazoos#49.11.17.00.00
-unspsc7#49.11.18.00.00#String instruments#49.11.00.00.00
-unspsc7#49.11.18.01.00#Harpsichords#49.11.18.00.00
-unspsc7#49.11.18.02.00#Clavichords#49.11.18.00.00
-unspsc7#49.11.18.03.00#Guitars#49.11.18.00.00
-unspsc7#49.11.18.04.00#Violins#49.11.18.00.00
-unspsc7#49.11.18.05.00#Harps#49.11.18.00.00
-unspsc7#49.11.18.06.00#Banjoes#49.11.18.00.00
-unspsc7#49.11.19.00.00#Percussion instruments#49.11.00.00.00
-unspsc7#49.11.19.01.00#Cymbals#49.11.19.00.00
-unspsc7#49.11.19.02.00#Bells#49.11.19.00.00
-unspsc7#49.11.19.03.00#Tambourines#49.11.19.00.00
-unspsc7#49.11.19.04.00#Castanets#49.11.19.00.00
-unspsc7#49.11.19.05.00#Drums#49.11.19.00.00
-unspsc7#49.11.19.06.00#Xylophones#49.11.19.00.00
-unspsc7#49.11.19.07.00#Bodhran#49.11.19.00.00
-unspsc7#49.11.20.00.00#Musical instrument parts and accessories#49.11.00.00.00
-unspsc7#49.11.20.01.00#Metronomes#49.11.20.00.00
-unspsc7#49.11.20.02.00#Reeds#49.11.20.00.00
-unspsc7#49.11.20.03.00#Instrument strings or picks#49.11.20.00.00
-unspsc7#49.11.20.04.00#Tuning pins#49.11.20.00.00
-unspsc7#49.11.20.05.00#Musical instrument stands or sheet holders#49.11.20.00.00
-unspsc7#49.11.20.06.00#Accessories for stringed instruments#49.11.20.00.00
-unspsc7#49.11.20.07.00#Percussion instrument accessory#49.11.20.00.00
-unspsc7#49.11.20.08.00#Music boxes or mechanisms#49.11.20.00.00
-unspsc7#49.12.00.00.00#Camping and outdoor equipment and accessories#49.00.00.00.00
-unspsc7#49.12.15.00.00#Camping and outdoor equipment#49.12.00.00.00
-unspsc7#49.12.15.01.00#Tarpaulins#49.12.15.00.00
-unspsc7#49.12.15.02.00#Sleeping pads#49.12.15.00.00
-unspsc7#49.12.15.03.00#Tents#49.12.15.00.00
-unspsc7#49.12.15.04.00#Sleeping bags#49.12.15.00.00
-unspsc7#49.12.15.05.00#Ice chests#49.12.15.00.00
-unspsc7#49.12.15.06.00#Tent repair kits#49.12.15.00.00
-unspsc7#49.12.15.07.00#Pneumatic mattresses#49.12.15.00.00
-unspsc7#49.12.15.08.00#Mosquito nets#49.12.15.00.00
-unspsc7#49.12.15.09.00#Camping or outdoor stoves#49.12.15.00.00
-unspsc7#49.12.15.10.00#Drink coolers#49.12.15.00.00
-unspsc7#49.12.16.00.00#Camping furniture#49.12.00.00.00
-unspsc7#49.12.16.01.00#Camping chairs or stools#49.12.16.00.00
-unspsc7#49.12.16.02.00#Camping tables#49.12.16.00.00
-unspsc7#49.12.16.03.00#Camping cots#49.12.16.00.00
-unspsc7#49.13.00.00.00#Fishing and hunting equipment#49.00.00.00.00
-unspsc7#49.13.15.00.00#Fishing tackle#49.13.00.00.00
-unspsc7#49.13.15.01.00#Fishing rods#49.13.15.00.00
-unspsc7#49.13.15.02.00#Fishing line#49.13.15.00.00
-unspsc7#49.13.15.03.00#Fishing reels#49.13.15.00.00
-unspsc7#49.13.15.04.00#Fishing lures#49.13.15.00.00
-unspsc7#49.13.15.05.00#Fishing bait#49.13.15.00.00
-unspsc7#49.13.15.06.00#Fishing weights or sinkers#49.13.15.00.00
-unspsc7#49.13.16.00.00#Hunting products#49.13.00.00.00
-unspsc7#49.13.16.01.00#Animal calls#49.13.16.00.00
-unspsc7#49.13.16.02.00#Sporting decoys#49.13.16.00.00
-unspsc7#49.13.16.03.00#Sporting traps#49.13.16.00.00
-unspsc7#49.13.16.04.00#Sporting shotguns#49.13.16.00.00
-unspsc7#49.13.16.05.00#Sporting rifles#49.13.16.00.00
-unspsc7#49.13.16.06.00#Sporting ammunition#49.13.16.00.00
-unspsc7#49.13.16.07.00#Gun barrel#49.13.16.00.00
-unspsc7#49.14.00.00.00#Watersports equipment#49.00.00.00.00
-unspsc7#49.14.15.00.00#Scuba and snorkeling gear#49.14.00.00.00
-unspsc7#49.14.15.01.00#Bouyancy compensators#49.14.15.00.00
-unspsc7#49.14.15.02.00#Scuba tanks#49.14.15.00.00
-unspsc7#49.14.15.03.00#Scuba regulators#49.14.15.00.00
-unspsc7#49.14.15.04.00#Diving instruments or accessories#49.14.15.00.00
-unspsc7#49.14.15.05.00#Masks or fins or snorkels#49.14.15.00.00
-unspsc7#49.14.15.06.00#Wetsuits#49.14.15.00.00
-unspsc7#49.14.15.07.00#Drysuits#49.14.15.00.00
-unspsc7#49.14.16.00.00#Surf and swim equipment and accessories#49.14.00.00.00
-unspsc7#49.14.16.02.00#Wakeboards or kneeboards or boogieboards#49.14.16.00.00
-unspsc7#49.14.16.03.00#Water skis or accessories#49.14.16.00.00
-unspsc7#49.14.16.04.00#Windsurfing equipment#49.14.16.00.00
-unspsc7#49.14.16.05.00#Surfboards#49.14.16.00.00
-unspsc7#49.14.16.06.00#Swim goggles or swim fins#49.14.16.00.00
-unspsc7#49.14.16.07.00#Parasailing equipment#49.14.16.00.00
-unspsc7#49.15.00.00.00#Winter sports equipment#49.00.00.00.00
-unspsc7#49.15.15.00.00#Skiing and snowboarding equipment#49.15.00.00.00
-unspsc7#49.15.15.01.00#Ski boots#49.15.15.00.00
-unspsc7#49.15.15.02.00#Skis#49.15.15.00.00
-unspsc7#49.15.15.03.00#Ski poles#49.15.15.00.00
-unspsc7#49.15.15.04.00#Bindings#49.15.15.00.00
-unspsc7#49.15.15.05.00#Snowboards#49.15.15.00.00
-unspsc7#49.15.16.00.00#Skating and ice hockey equipment#49.15.00.00.00
-unspsc7#49.15.16.01.00#Hockey pucks#49.15.16.00.00
-unspsc7#49.15.16.02.00#Ice skates#49.15.16.00.00
-unspsc7#49.15.16.03.00#Hockey sticks#49.15.16.00.00
-unspsc7#49.16.00.00.00#Field and court sports equipment#49.00.00.00.00
-unspsc7#49.16.15.00.00#Field sports equipment#49.16.00.00.00
-unspsc7#49.16.15.01.00#Football blocking sleds#49.16.15.00.00
-unspsc7#49.16.15.02.00#Baseball gloves#49.16.15.00.00
-unspsc7#49.16.15.03.00#Baseballs#49.16.15.00.00
-unspsc7#49.16.15.04.00#Footballs#49.16.15.00.00
-unspsc7#49.16.15.05.00#Soccer balls#49.16.15.00.00
-unspsc7#49.16.15.06.00#Baseball bats#49.16.15.00.00
-unspsc7#49.16.15.07.00#Baseball bases#49.16.15.00.00
-unspsc7#49.16.15.08.00#Pitching machines#49.16.15.00.00
-unspsc7#49.16.15.09.00#Softballs#49.16.15.00.00
-unspsc7#49.16.15.10.00#Football tackling dummies#49.16.15.00.00
-unspsc7#49.16.15.11.00#Lacrosse sticks#49.16.15.00.00
-unspsc7#49.16.15.12.00#Lacrosse balls#49.16.15.00.00
-unspsc7#49.16.15.13.00#Field hockey sticks#49.16.15.00.00
-unspsc7#49.16.15.14.00#Field hockey balls#49.16.15.00.00
-unspsc7#49.16.15.15.00#Team handball balls#49.16.15.00.00
-unspsc7#49.16.15.16.00#Team handball school sets#49.16.15.00.00
-unspsc7#49.16.15.17.00#Baseball or softball protective gear#49.16.15.00.00
-unspsc7#49.16.15.18.00#Baseball batting aids#49.16.15.00.00
-unspsc7#49.16.15.19.00#Baseball backstops or fences#49.16.15.00.00
-unspsc7#49.16.15.20.00#Softball bats#49.16.15.00.00
-unspsc7#49.16.15.21.00#Softball gloves#49.16.15.00.00
-unspsc7#49.16.15.22.00#Football kicking tees#49.16.15.00.00
-unspsc7#49.16.15.23.00#Flag football gear#49.16.15.00.00
-unspsc7#49.16.15.24.00#Soccer field marking equipment#49.16.15.00.00
-unspsc7#49.16.15.25.00#Soccer protective equipment#49.16.15.00.00
-unspsc7#49.16.15.26.00#Soccer training aids#49.16.15.00.00
-unspsc7#49.16.16.00.00#Racquet and court sports equipment#49.16.00.00.00
-unspsc7#49.16.16.01.00#Racquetball rackets#49.16.16.00.00
-unspsc7#49.16.16.02.00#Badminton rackets#49.16.16.00.00
-unspsc7#49.16.16.03.00#Basketballs#49.16.16.00.00
-unspsc7#49.16.16.04.00#Tennis balls#49.16.16.00.00
-unspsc7#49.16.16.05.00#Racquet balls#49.16.16.00.00
-unspsc7#49.16.16.06.00#Squash balls#49.16.16.00.00
-unspsc7#49.16.16.07.00#Tennis racquets#49.16.16.00.00
-unspsc7#49.16.16.08.00#Volleyballs#49.16.16.00.00
-unspsc7#49.16.16.09.00#Badminton birdies or shuttlecocks#49.16.16.00.00
-unspsc7#49.16.16.10.00#Squash racquets#49.16.16.00.00
-unspsc7#49.16.16.11.00#Tennis training aids#49.16.16.00.00
-unspsc7#49.16.16.12.00#Tennis court equipment#49.16.16.00.00
-unspsc7#49.16.16.13.00#Volleyball storage for balls or nets#49.16.16.00.00
-unspsc7#49.16.16.14.00#Volleyball gymnasium standards#49.16.16.00.00
-unspsc7#49.16.16.15.00#Basketball complete game systems#49.16.16.00.00
-unspsc7#49.16.16.16.00#Floor hockey protective equipment#49.16.16.00.00
-unspsc7#49.16.16.17.00#Tether poles#49.16.16.00.00
-unspsc7#49.16.16.18.00#Tether balls#49.16.16.00.00
-unspsc7#49.16.17.00.00#Track sports equipment#49.16.00.00.00
-unspsc7#49.16.17.01.00#Javelins#49.16.17.00.00
-unspsc7#49.16.17.02.00#Jumping bars#49.16.17.00.00
-unspsc7#49.16.17.03.00#Discus#49.16.17.00.00
-unspsc7#49.16.17.04.00#Shotputs#49.16.17.00.00
-unspsc7#49.16.17.05.00#Vaulting poles#49.16.17.00.00
-unspsc7#49.16.17.06.00#Hurdles#49.16.17.00.00
-unspsc7#49.16.17.07.00#Batons#49.16.17.00.00
-unspsc7#49.17.00.00.00#Gymnastics and boxing equipment#49.00.00.00.00
-unspsc7#49.17.15.00.00#Gymnastics equipment#49.17.00.00.00
-unspsc7#49.17.15.01.00#Gymnastic bars or beams#49.17.15.00.00
-unspsc7#49.17.15.02.00#Gymnastic ropes or rings or climbing accessories#49.17.15.00.00
-unspsc7#49.17.15.03.00#Gymnastic vaulting equipment#49.17.15.00.00
-unspsc7#49.17.15.04.00#Gymnastic trampolines#49.17.15.00.00
-unspsc7#49.17.15.05.00#Balance equipment#49.17.15.00.00
-unspsc7#49.17.16.00.00#Boxing equipment#49.17.00.00.00
-unspsc7#49.17.16.01.00#Boxing rings#49.17.16.00.00
-unspsc7#49.17.16.02.00#Punching bags#49.17.16.00.00
-unspsc7#49.17.16.03.00#Boxing gloves#49.17.16.00.00
-unspsc7#49.18.00.00.00#Target and table games and equipment#49.00.00.00.00
-unspsc7#49.18.15.00.00#Table games and equipment#49.18.00.00.00
-unspsc7#49.18.15.01.00#Billiard tables#49.18.15.00.00
-unspsc7#49.18.15.02.00#Pool cues#49.18.15.00.00
-unspsc7#49.18.15.03.00#Shuffleboard#49.18.15.00.00
-unspsc7#49.18.15.04.00#Pinball games#49.18.15.00.00
-unspsc7#49.18.15.05.00#Billiard balls#49.18.15.00.00
-unspsc7#49.18.15.06.00#Air hockey tables or accessories#49.18.15.00.00
-unspsc7#49.18.15.07.00#Tennis tables#49.18.15.00.00
-unspsc7#49.18.15.08.00#Table tennis paddles#49.18.15.00.00
-unspsc7#49.18.15.09.00#Table tennis balls#49.18.15.00.00
-unspsc7#49.18.15.10.00#Foosball tables#49.18.15.00.00
-unspsc7#49.18.15.11.00#Foosballs#49.18.15.00.00
-unspsc7#49.18.15.12.00#Foosball replacement players#49.18.15.00.00
-unspsc7#49.18.15.13.00#Billiard cue tips#49.18.15.00.00
-unspsc7#49.18.15.14.00#Billiard chalk#49.18.15.00.00
-unspsc7#49.18.15.15.00#Billiard racks#49.18.15.00.00
-unspsc7#49.18.16.00.00#Target games and equipment#49.18.00.00.00
-unspsc7#49.18.16.01.00#Archery targets#49.18.16.00.00
-unspsc7#49.18.16.02.00#Archery bows#49.18.16.00.00
-unspsc7#49.18.16.03.00#Archery arrows#49.18.16.00.00
-unspsc7#49.18.16.04.00#Darts#49.18.16.00.00
-unspsc7#49.18.16.05.00#Dart boards#49.18.16.00.00
-unspsc7#49.18.16.06.00#Trapshooting equipment#49.18.16.00.00
-unspsc7#49.18.16.07.00#Throwing targets#49.18.16.00.00
-unspsc7#49.18.16.08.00#Archery bow strings#49.18.16.00.00
-unspsc7#49.18.16.09.00#Archery gloves#49.18.16.00.00
-unspsc7#49.18.16.10.00#Archery arm guards#49.18.16.00.00
-unspsc7#49.18.16.11.00#Archery target stands#49.18.16.00.00
-unspsc7#49.18.16.12.00#Archery backstops#49.18.16.00.00
-unspsc7#49.20.00.00.00#Fitness equipment#49.00.00.00.00
-unspsc7#49.20.15.00.00#Aerobic training equipment#49.20.00.00.00
-unspsc7#49.20.15.01.00#Treadmills#49.20.15.00.00
-unspsc7#49.20.15.02.00#Stair climbers#49.20.15.00.00
-unspsc7#49.20.15.03.00#Stationary bicycles#49.20.15.00.00
-unspsc7#49.20.15.04.00#Rowing machines#49.20.15.00.00
-unspsc7#49.20.15.12.00#Jump ropes#49.20.15.00.00
-unspsc7#49.20.15.13.00#Exercise trampolines#49.20.15.00.00
-unspsc7#49.20.15.14.00#Exercise balls#49.20.15.00.00
-unspsc7#49.20.15.15.00#Step aerobic equipment#49.20.15.00.00
-unspsc7#49.20.16.00.00#Weight and resistance training equipment#49.20.00.00.00
-unspsc7#49.20.16.01.00#Dumbbells#49.20.16.00.00
-unspsc7#49.20.16.02.00#Barbells#49.20.16.00.00
-unspsc7#49.20.16.03.00#Lower body resistance machines#49.20.16.00.00
-unspsc7#49.20.16.04.00#Weight benches or racks#49.20.16.00.00
-unspsc7#49.20.16.05.00#Upper body resistance machines#49.20.16.00.00
-unspsc7#49.20.16.06.00#Fitness weights#49.20.16.00.00
-unspsc7#49.20.16.07.00#Pilates machines#49.20.16.00.00
-unspsc7#49.20.16.08.00#Grip strengthener#49.20.16.00.00
-unspsc7#49.20.16.09.00#Resistance bands#49.20.16.00.00
-unspsc7#49.20.16.10.00#Resistance tubes#49.20.16.00.00
-unspsc7#49.21.00.00.00#Other sports#49.00.00.00.00
-unspsc7#49.21.16.00.00#Golf equipment#49.21.00.00.00
-unspsc7#49.21.16.01.00#Golf bags#49.21.16.00.00
-unspsc7#49.21.16.02.00#Golf balls#49.21.16.00.00
-unspsc7#49.21.16.03.00#Golf clubs#49.21.16.00.00
-unspsc7#49.21.16.04.00#Golf tees#49.21.16.00.00
-unspsc7#49.21.16.05.00#Golf club head covers#49.21.16.00.00
-unspsc7#49.21.16.06.00#Golf gloves#49.21.16.00.00
-unspsc7#49.21.16.07.00#Divot fixers#49.21.16.00.00
-unspsc7#49.21.17.00.00#Bowling equipment and supplies and accessories#49.21.00.00.00
-unspsc7#49.21.17.01.00#Bowling equipment#49.21.17.00.00
-unspsc7#49.21.17.02.00#Bowling supplies#49.21.17.00.00
-unspsc7#49.21.17.03.00#Bowling accessories#49.21.17.00.00
-unspsc7#49.21.18.00.00#Physical education classroom equipment#49.21.00.00.00
-unspsc7#49.21.18.01.00#Parachute equipment#49.21.18.00.00
-unspsc7#49.21.18.02.00#Hula hoops or hoop equipment#49.21.18.00.00
-unspsc7#49.21.18.03.00#Orienteering equipment#49.21.18.00.00
-unspsc7#49.21.18.04.00#Team identification materials or markers#49.21.18.00.00
-unspsc7#49.21.18.05.00#Lanyards#49.21.18.00.00
-unspsc7#49.21.18.06.00#Physical education equipment storage#49.21.18.00.00
-unspsc7#49.21.18.07.00#Physical education assessment tools#49.21.18.00.00
-unspsc7#49.22.00.00.00#Sports accessories#49.00.00.00.00
-unspsc7#49.22.15.00.00#Sport accessories#49.22.00.00.00
-unspsc7#49.22.15.01.00#Sport scoreboards#49.22.15.00.00
-unspsc7#49.22.15.02.00#Sport goals#49.22.15.00.00
-unspsc7#49.22.15.03.00#Sport safety equipment other than headgear#49.22.15.00.00
-unspsc7#49.22.15.04.00#Sport safety headgear#49.22.15.00.00
-unspsc7#49.22.15.05.00#Sport nets or netting#49.22.15.00.00
-unspsc7#49.22.15.06.00#Sport mats or padding#49.22.15.00.00
-unspsc7#49.22.15.07.00#Basketball backboards#49.22.15.00.00
-unspsc7#49.22.15.08.00#Basketball hoop#49.22.15.00.00
-unspsc7#49.22.15.09.00#Roller skates or roller blades#49.22.15.00.00
-unspsc7#49.23.00.00.00#Toys and games#49.00.00.00.00
-unspsc7#49.23.15.00.00#Toys#49.23.00.00.00
-unspsc7#49.23.15.01.00#Musical toys#49.23.15.00.00
-unspsc7#49.23.15.02.00#Educational toys#49.23.15.00.00
-unspsc7#49.23.15.03.00#Toy balloons or balls#49.23.15.00.00
-unspsc7#49.23.15.04.00#Dolls#49.23.15.00.00
-unspsc7#49.23.15.05.00#Doll houses#49.23.15.00.00
-unspsc7#49.23.15.06.00#Stuffed animals or puppets#49.23.15.00.00
-unspsc7#49.23.15.07.00#Playhouses#49.23.15.00.00
-unspsc7#49.23.15.08.00#Building blocks#49.23.15.00.00
-unspsc7#49.23.15.09.00#Riding toys#49.23.15.00.00
-unspsc7#49.23.15.10.00#Pull toys#49.23.15.00.00
-unspsc7#49.23.15.11.00#Childrens science kits#49.23.15.00.00
-unspsc7#49.23.15.12.00#Toy vehicles#49.23.15.00.00
-unspsc7#49.23.15.13.00#Toy trains#49.23.15.00.00
-unspsc7#49.23.15.14.00#Inflatable toys#49.23.15.00.00
-unspsc7#49.23.15.15.00#Doll parts or accessories#49.23.15.00.00
-unspsc7#49.23.15.16.00#Yo yos#49.23.15.00.00
-unspsc7#49.23.15.17.00#Kites#49.23.15.00.00
-unspsc7#49.23.15.18.00#Pogs#49.23.15.00.00
-unspsc7#49.23.15.19.00#Kaleidoscopes#49.23.15.00.00
-unspsc7#49.23.15.20.00#Pom poms#49.23.15.00.00
-unspsc7#49.23.15.21.00#Pinatas#49.23.15.00.00
-unspsc7#49.23.15.22.00#Boomerangs#49.23.15.00.00
-unspsc7#49.23.15.23.00#Flying discs#49.23.15.00.00
-unspsc7#49.23.15.24.00#Toy pails#49.23.15.00.00
-unspsc7#49.23.16.00.00#Games#49.23.00.00.00
-unspsc7#49.23.16.01.00#Educational games#49.23.16.00.00
-unspsc7#49.23.16.02.00#Board games#49.23.16.00.00
-unspsc7#49.23.16.03.00#Playing cards#49.23.16.00.00
-unspsc7#49.23.16.04.00#Video games#49.23.16.00.00
-unspsc7#49.23.16.05.00#Puzzles#49.23.16.00.00
-unspsc7#49.23.16.06.00#Dice#49.23.16.00.00
-unspsc7#49.24.00.00.00#Recreation and playground and swimming and spa equipment and supplies#49.00.00.00.00
-unspsc7#49.24.15.00.00#Playground equipment#49.24.00.00.00
-unspsc7#49.24.15.01.00#Playground swings#49.24.15.00.00
-unspsc7#49.24.15.02.00#Playground climbing apparatus#49.24.15.00.00
-unspsc7#49.24.15.03.00#Playground merry go rounds#49.24.15.00.00
-unspsc7#49.24.15.04.00#Playground slides#49.24.15.00.00
-unspsc7#49.24.15.05.00#Playground see saws#49.24.15.00.00
-unspsc7#49.24.15.06.00#Playground tunnels#49.24.15.00.00
-unspsc7#49.24.15.07.00#Playground sandboxes#49.24.15.00.00
-unspsc7#49.24.15.08.00#Playground bleachers#49.24.15.00.00
-unspsc7#49.24.15.09.00#Wall climbing equipment#49.24.15.00.00
-unspsc7#49.24.15.10.00#Rope climbing equipment#49.24.15.00.00
-unspsc7#49.24.16.00.00#Recreational equipment#49.24.00.00.00
-unspsc7#49.24.16.01.00#Croquet sets#49.24.16.00.00
-unspsc7#49.24.16.02.00#Lawn bowling equipment#49.24.16.00.00
-unspsc7#49.24.16.03.00#Horseshoe equipment#49.24.16.00.00
-unspsc7#49.24.16.04.00#Lawn darts#49.24.16.00.00
-unspsc7#49.24.17.00.00#Swimming pool and spa equipment and supplies#49.24.00.00.00
-unspsc7#49.24.17.01.00#Diving boards#49.24.17.00.00
-unspsc7#49.24.17.02.00#Pool slides#49.24.17.00.00
-unspsc7#49.24.17.03.00#Spa blower#49.24.17.00.00
-unspsc7#49.24.17.04.00#Water test kit or solutions#49.24.17.00.00
-unspsc7#49.24.17.05.00#Automatic pool cleaner#49.24.17.00.00
-unspsc7#49.24.17.06.00#Solar blanket#49.24.17.00.00
-unspsc7#49.24.17.07.00#Pool or spa heater#49.24.17.00.00
-unspsc7#49.24.17.08.00#Ozone generator#49.24.17.00.00
-unspsc7#49.24.17.09.00#Solar blanket reels#49.24.17.00.00
-unspsc7#49.25.00.00.00#Arts and crafts supplies#49.00.00.00.00
-unspsc7#49.25.15.00.00#Art supplies#49.25.00.00.00
-unspsc7#49.25.15.01.00#Art paints#49.25.15.00.00
-unspsc7#49.25.15.02.00#Modeling clay#49.25.15.00.00
-unspsc7#49.25.15.03.00#Art paintbrushes#49.25.15.00.00
-unspsc7#49.25.15.04.00#Picture or poster frames#49.25.15.00.00
-unspsc7#49.25.15.05.00#Picture albums or organizers#49.25.15.00.00
-unspsc7#49.25.15.06.00#Cutting mats#49.25.15.00.00
-unspsc7#49.25.15.07.00#Carving board#49.25.15.00.00
-unspsc7#49.25.15.08.00#Palettes#49.25.15.00.00
-unspsc7#49.25.15.09.00#Glitter#49.25.15.00.00
-unspsc7#49.25.15.10.00#Beads#49.25.15.00.00
-unspsc7#49.25.15.11.00#Decorative tapes or twists#49.25.15.00.00
-unspsc7#49.25.16.00.00#Craft supplies#49.25.00.00.00
-unspsc7#49.25.16.01.00#Model kits#49.25.16.00.00
-unspsc7#49.25.16.02.00#Potters wheels#49.25.16.00.00
-unspsc7#49.25.16.03.00#Decorative buttons#49.25.16.00.00
-unspsc7#49.25.16.04.00#Decorative shapes or strings#49.25.16.00.00
-unspsc7#49.25.16.05.00#Craft kits#49.25.16.00.00
-unspsc7#50.00.00.00.00#Food Beverage and Tobacco Products#50.00.00.00.00
-unspsc7#50.10.00.00.00#Fruits and vegetables and nuts and seeds#50.00.00.00.00
-unspsc7#50.10.15.00.00#Vegetables#50.10.00.00.00
-unspsc7#50.10.15.01.00#Beans#50.10.15.00.00
-unspsc7#50.10.15.02.00#Spinach#50.10.15.00.00
-unspsc7#50.10.15.03.00#Potatoes#50.10.15.00.00
-unspsc7#50.10.15.04.00#Peas#50.10.15.00.00
-unspsc7#50.10.15.05.00#Onions or other alliaceous vegetables#50.10.15.00.00
-unspsc7#50.10.15.06.00#Lettuce#50.10.15.00.00
-unspsc7#50.10.15.07.00#Cabbage#50.10.15.00.00
-unspsc7#50.10.15.08.00#Squashes#50.10.15.00.00
-unspsc7#50.10.15.09.00#Yams#50.10.15.00.00
-unspsc7#50.10.15.10.00#Carrots#50.10.15.00.00
-unspsc7#50.10.15.11.00#Rutabagas#50.10.15.00.00
-unspsc7#50.10.15.12.00#Eggplants#50.10.15.00.00
-unspsc7#50.10.15.13.00#Peppers#50.10.15.00.00
-unspsc7#50.10.15.14.00#Rhubarb#50.10.15.00.00
-unspsc7#50.10.15.15.00#Endive#50.10.15.00.00
-unspsc7#50.10.15.16.00#Asparagus#50.10.15.00.00
-unspsc7#50.10.15.17.00#Artichokes#50.10.15.00.00
-unspsc7#50.10.15.18.00#Parsnips#50.10.15.00.00
-unspsc7#50.10.15.19.00#Celery#50.10.15.00.00
-unspsc7#50.10.15.20.00#Radishes#50.10.15.00.00
-unspsc7#50.10.15.21.00#Mushrooms or other edible fungi#50.10.15.00.00
-unspsc7#50.10.15.22.00#Horseradish#50.10.15.00.00
-unspsc7#50.10.15.23.00#Turnips#50.10.15.00.00
-unspsc7#50.10.15.24.00#Mustard greens#50.10.15.00.00
-unspsc7#50.10.15.25.00#Kale#50.10.15.00.00
-unspsc7#50.10.15.26.00#Collards#50.10.15.00.00
-unspsc7#50.10.15.27.00#Brussel sprouts#50.10.15.00.00
-unspsc7#50.10.15.28.00#Broccoli#50.10.15.00.00
-unspsc7#50.10.15.29.00#Cauliflowers#50.10.15.00.00
-unspsc7#50.10.15.30.00#Okra#50.10.15.00.00
-unspsc7#50.10.15.31.00#Cucumbers#50.10.15.00.00
-unspsc7#50.10.15.32.00#Tomatoes#50.10.15.00.00
-unspsc7#50.10.15.33.00#Beets#50.10.15.00.00
-unspsc7#50.10.15.34.00#Manioc roots#50.10.15.00.00
-unspsc7#50.10.15.35.00#Lentils#50.10.15.00.00
-unspsc7#50.10.15.36.00#Corn#50.10.15.00.00
-unspsc7#50.10.15.37.00#Pumpkins#50.10.15.00.00
-unspsc7#50.10.15.38.00#Fresh vegetables#50.10.15.00.00
-unspsc7#50.10.15.39.00#Frozen vegetables#50.10.15.00.00
-unspsc7#50.10.15.40.00#Shelf stable vegetables#50.10.15.00.00
-unspsc7#50.10.16.00.00#Fruits#50.10.00.00.00
-unspsc7#50.10.16.01.00#Limes#50.10.16.00.00
-unspsc7#50.10.16.02.00#Mangoes#50.10.16.00.00
-unspsc7#50.10.16.03.00#Guavas#50.10.16.00.00
-unspsc7#50.10.16.04.00#Grapes#50.10.16.00.00
-unspsc7#50.10.16.05.00#Dates#50.10.16.00.00
-unspsc7#50.10.16.06.00#Apricots#50.10.16.00.00
-unspsc7#50.10.16.07.00#Berries#50.10.16.00.00
-unspsc7#50.10.16.08.00#Peaches#50.10.16.00.00
-unspsc7#50.10.16.09.00#Cherries#50.10.16.00.00
-unspsc7#50.10.16.10.00#Bananas#50.10.16.00.00
-unspsc7#50.10.16.11.00#Melons#50.10.16.00.00
-unspsc7#50.10.16.12.00#Pomegranates#50.10.16.00.00
-unspsc7#50.10.16.13.00#Papayas#50.10.16.00.00
-unspsc7#50.10.16.14.00#Kiwis#50.10.16.00.00
-unspsc7#50.10.16.15.00#Lichees#50.10.16.00.00
-unspsc7#50.10.16.16.00#Pears#50.10.16.00.00
-unspsc7#50.10.16.17.00#Plums#50.10.16.00.00
-unspsc7#50.10.16.18.00#Apples#50.10.16.00.00
-unspsc7#50.10.16.19.00#Passion fruit#50.10.16.00.00
-unspsc7#50.10.16.20.00#Nectarines#50.10.16.00.00
-unspsc7#50.10.16.21.00#Pineapples#50.10.16.00.00
-unspsc7#50.10.16.22.00#Figs#50.10.16.00.00
-unspsc7#50.10.16.23.00#Tangelos#50.10.16.00.00
-unspsc7#50.10.16.24.00#Mandarins#50.10.16.00.00
-unspsc7#50.10.16.25.00#Oranges#50.10.16.00.00
-unspsc7#50.10.16.26.00#Tangerines#50.10.16.00.00
-unspsc7#50.10.16.27.00#Grapefruit#50.10.16.00.00
-unspsc7#50.10.16.28.00#Lemons#50.10.16.00.00
-unspsc7#50.10.16.29.00#Durians#50.10.16.00.00
-unspsc7#50.10.16.30.00#Coconuts#50.10.16.00.00
-unspsc7#50.10.16.31.00#Avocados#50.10.16.00.00
-unspsc7#50.10.16.32.00#Quinces#50.10.16.00.00
-unspsc7#50.10.16.33.00#Olives#50.10.16.00.00
-unspsc7#50.10.16.34.00#Fresh fruit#50.10.16.00.00
-unspsc7#50.10.16.35.00#Frozen fruit#50.10.16.00.00
-unspsc7#50.10.16.36.00#Shelf stable fruit#50.10.16.00.00
-unspsc7#50.10.17.00.00#Nuts and seeds#50.10.00.00.00
-unspsc7#50.10.17.01.00#Chestnuts#50.10.17.00.00
-unspsc7#50.10.17.03.00#Pecans#50.10.17.00.00
-unspsc7#50.10.17.04.00#Brazil nuts#50.10.17.00.00
-unspsc7#50.10.17.05.00#Cashews#50.10.17.00.00
-unspsc7#50.10.17.06.00#Almonds#50.10.17.00.00
-unspsc7#50.10.17.07.00#Macadamia nuts#50.10.17.00.00
-unspsc7#50.10.17.08.00#Hazelnuts#50.10.17.00.00
-unspsc7#50.10.17.09.00#Pine nuts#50.10.17.00.00
-unspsc7#50.10.17.10.00#Pistachios#50.10.17.00.00
-unspsc7#50.10.17.11.00#Walnuts#50.10.17.00.00
-unspsc7#50.10.17.12.00#Betel nuts#50.10.17.00.00
-unspsc7#50.10.17.13.00#Peanuts or groundnuts#50.10.17.00.00
-unspsc7#50.10.17.14.00#Mixed nuts#50.10.17.00.00
-unspsc7#50.10.17.15.00#Nut meat#50.10.17.00.00
-unspsc7#50.10.17.16.00#Whole nuts or seeds#50.10.17.00.00
-unspsc7#50.10.17.17.00#Shelled#50.10.17.00.00
-unspsc7#50.11.00.00.00#Meat and poultry products#50.00.00.00.00
-unspsc7#50.11.15.00.00#Meat and poultry#50.11.00.00.00
-unspsc7#50.11.15.01.00#Chicken#50.11.15.00.00
-unspsc7#50.11.15.02.00#Turkey#50.11.15.00.00
-unspsc7#50.11.15.03.00#Duck#50.11.15.00.00
-unspsc7#50.11.15.04.00#Ostrich#50.11.15.00.00
-unspsc7#50.11.15.05.00#Partridge#50.11.15.00.00
-unspsc7#50.11.15.06.00#Dove#50.11.15.00.00
-unspsc7#50.11.15.07.00#Pheasant#50.11.15.00.00
-unspsc7#50.11.15.08.00#Quail#50.11.15.00.00
-unspsc7#50.11.15.09.00#Goose#50.11.15.00.00
-unspsc7#50.11.15.10.00#Fresh meat and poultry#50.11.15.00.00
-unspsc7#50.11.15.11.00#Frozen meat and poultry#50.11.15.00.00
-unspsc7#50.11.15.12.00#Shelf stable meat and poultry#50.11.15.00.00
-unspsc7#50.11.16.00.00#Fresh and frozen red meat and byproducts#50.11.00.00.00
-unspsc7#50.11.16.01.00#Beef#50.11.16.00.00
-unspsc7#50.11.16.02.00#Veal#50.11.16.00.00
-unspsc7#50.11.16.03.00#Mutton#50.11.16.00.00
-unspsc7#50.11.16.04.00#Lamb#50.11.16.00.00
-unspsc7#50.11.16.05.00#Buffalo#50.11.16.00.00
-unspsc7#50.11.16.06.00#Horsemeat#50.11.16.00.00
-unspsc7#50.11.16.07.00#Ass or mule or hinny meat#50.11.16.00.00
-unspsc7#50.11.17.00.00#Fresh and frozen pork and byproducts#50.11.00.00.00
-unspsc7#50.11.17.01.00#Pork#50.11.17.00.00
-unspsc7#50.11.18.00.00#Fresh and frozen organ meat and byproducts#50.11.00.00.00
-unspsc7#50.11.18.01.00#Organ meat#50.11.18.00.00
-unspsc7#50.11.18.02.00#Liver#50.11.18.00.00
-unspsc7#50.11.18.03.00#Gizzard#50.11.18.00.00
-unspsc7#50.11.18.04.00#Tripe#50.11.18.00.00
-unspsc7#50.11.18.05.00#Stomach#50.11.18.00.00
-unspsc7#50.11.18.06.00#Kidney#50.11.18.00.00
-unspsc7#50.11.18.07.00#Brains#50.11.18.00.00
-unspsc7#50.11.19.00.00#Delicatessen meat products#50.11.00.00.00
-unspsc7#50.11.19.01.00#Salami#50.11.19.00.00
-unspsc7#50.11.19.02.00#Kabana#50.11.19.00.00
-unspsc7#50.11.19.03.00#Pastrami#50.11.19.00.00
-unspsc7#50.11.19.04.00#Roast beef#50.11.19.00.00
-unspsc7#50.11.19.05.00#Corned beef or silverside#50.11.19.00.00
-unspsc7#50.11.19.06.00#Frankfurt or hot dog#50.11.19.00.00
-unspsc7#50.11.20.00.00#Processed and prepared meats#50.11.00.00.00
-unspsc7#50.11.20.01.00#Fresh processed or prepared meats#50.11.20.00.00
-unspsc7#50.11.20.02.00#Frozen processed or prepared meats#50.11.20.00.00
-unspsc7#50.11.20.03.00#Shelf stable processed or prepared meats#50.11.20.00.00
-unspsc7#50.12.00.00.00#Seafood#50.00.00.00.00
-unspsc7#50.12.15.00.00#Fish#50.12.00.00.00
-unspsc7#50.12.15.01.00#Lemonfish#50.12.15.00.00
-unspsc7#50.12.15.02.00#Dogfish#50.12.15.00.00
-unspsc7#50.12.15.03.00#Grouper#50.12.15.00.00
-unspsc7#50.12.15.04.00#Mahi mahi#50.12.15.00.00
-unspsc7#50.12.15.05.00#Monkfish#50.12.15.00.00
-unspsc7#50.12.15.06.00#Pompano#50.12.15.00.00
-unspsc7#50.12.15.07.00#Bass#50.12.15.00.00
-unspsc7#50.12.15.08.00#Shark#50.12.15.00.00
-unspsc7#50.12.15.09.00#Tilapia#50.12.15.00.00
-unspsc7#50.12.15.10.00#Swordfish#50.12.15.00.00
-unspsc7#50.12.15.11.00#Anchovies#50.12.15.00.00
-unspsc7#50.12.15.12.00#Carp#50.12.15.00.00
-unspsc7#50.12.15.13.00#Catfish#50.12.15.00.00
-unspsc7#50.12.15.14.00#Eel#50.12.15.00.00
-unspsc7#50.12.15.15.00#Sturgeon#50.12.15.00.00
-unspsc7#50.12.15.16.00#Tuna#50.12.15.00.00
-unspsc7#50.12.15.17.00#Cod#50.12.15.00.00
-unspsc7#50.12.15.18.00#Halibut#50.12.15.00.00
-unspsc7#50.12.15.19.00#Haddock#50.12.15.00.00
-unspsc7#50.12.15.20.00#Ocean perch#50.12.15.00.00
-unspsc7#50.12.15.21.00#Orange roughy#50.12.15.00.00
-unspsc7#50.12.15.22.00#Parrot fish#50.12.15.00.00
-unspsc7#50.12.15.23.00#Pike#50.12.15.00.00
-unspsc7#50.12.15.24.00#Red snapper#50.12.15.00.00
-unspsc7#50.12.15.25.00#Rockfish#50.12.15.00.00
-unspsc7#50.12.15.26.00#Smelt#50.12.15.00.00
-unspsc7#50.12.15.27.00#Sole#50.12.15.00.00
-unspsc7#50.12.15.28.00#Whiting#50.12.15.00.00
-unspsc7#50.12.15.29.00#Salmon#50.12.15.00.00
-unspsc7#50.12.15.30.00#Mackerel#50.12.15.00.00
-unspsc7#50.12.15.31.00#Sardines#50.12.15.00.00
-unspsc7#50.12.15.32.00#Trout#50.12.15.00.00
-unspsc7#50.12.15.33.00#Surimi#50.12.15.00.00
-unspsc7#50.12.15.34.00#Blackfish#50.12.15.00.00
-unspsc7#50.12.15.35.00#Herring#50.12.15.00.00
-unspsc7#50.12.15.36.00#Fresh fish#50.12.15.00.00
-unspsc7#50.12.15.37.00#Frozen fish#50.12.15.00.00
-unspsc7#50.12.15.38.00#Shelf stable fish#50.12.15.00.00
-unspsc7#50.12.15.39.00#Fresh fish#50.12.15.00.00
-unspsc7#50.12.16.00.00#Shellfish#50.12.00.00.00
-unspsc7#50.12.16.01.00#Abalone#50.12.16.00.00
-unspsc7#50.12.16.02.00#Scallops#50.12.16.00.00
-unspsc7#50.12.16.03.00#Clams#50.12.16.00.00
-unspsc7#50.12.16.04.00#Crabs#50.12.16.00.00
-unspsc7#50.12.16.05.00#Conch#50.12.16.00.00
-unspsc7#50.12.16.06.00#Crayfish#50.12.16.00.00
-unspsc7#50.12.16.07.00#Lobster#50.12.16.00.00
-unspsc7#50.12.16.08.00#Mussels#50.12.16.00.00
-unspsc7#50.12.16.09.00#Oysters#50.12.16.00.00
-unspsc7#50.12.16.10.00#Shrimp#50.12.16.00.00
-unspsc7#50.12.16.11.00#Fresh shellfish#50.12.16.00.00
-unspsc7#50.12.16.12.00#Frozen shellfish#50.12.16.00.00
-unspsc7#50.12.16.13.00#Shelf stable shellfish#50.12.16.00.00
-unspsc7#50.12.17.00.00#Aquatic invertebrates#50.12.00.00.00
-unspsc7#50.12.17.01.00#Squid#50.12.17.00.00
-unspsc7#50.12.17.02.00#Octopus#50.12.17.00.00
-unspsc7#50.12.17.03.00#Anemones#50.12.17.00.00
-unspsc7#50.12.17.04.00#Sea cucumbers#50.12.17.00.00
-unspsc7#50.12.17.05.00#Fresh aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.17.06.00#Frozen aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.17.07.00#Shelf stable aquatic invertebrates#50.12.17.00.00
-unspsc7#50.12.18.00.00#Aquatic plants#50.12.00.00.00
-unspsc7#50.12.18.01.00#Seaweeds#50.12.18.00.00
-unspsc7#50.12.18.02.00#Fresh aquatic plants#50.12.18.00.00
-unspsc7#50.12.18.03.00#Frozen aquatic plants#50.12.18.00.00
-unspsc7#50.12.18.04.00#Shelf stable aquatic plants#50.12.18.00.00
-unspsc7#50.13.00.00.00#Dairy products and eggs#50.00.00.00.00
-unspsc7#50.13.15.00.00#Dairy products and dairy substitutes#50.13.00.00.00
-unspsc7#50.13.15.01.00#Coffee creamer#50.13.15.00.00
-unspsc7#50.13.15.02.00#Butter#50.13.15.00.00
-unspsc7#50.13.15.03.00#Milk#50.13.15.00.00
-unspsc7#50.13.15.04.00#Soft cheeses#50.13.15.00.00
-unspsc7#50.13.15.05.00#Yogurts#50.13.15.00.00
-unspsc7#50.13.15.06.00#Ice creams#50.13.15.00.00
-unspsc7#50.13.15.07.00#Sour creams#50.13.15.00.00
-unspsc7#50.13.15.08.00#Hard cheeses#50.13.15.00.00
-unspsc7#50.13.15.09.00#Buttermilk#50.13.15.00.00
-unspsc7#50.13.15.10.00#Infant formula#50.13.15.00.00
-unspsc7#50.13.15.11.00#Custard#50.13.15.00.00
-unspsc7#50.13.15.12.00#Evaporated milk#50.13.15.00.00
-unspsc7#50.13.15.13.00#Sweetened condensed milk#50.13.15.00.00
-unspsc7#50.13.15.14.00#Powdered milk#50.13.15.00.00
-unspsc7#50.13.15.15.00#Cream#50.13.15.00.00
-unspsc7#50.13.15.16.00#Long life milk#50.13.15.00.00
-unspsc7#50.13.16.00.00#Eggs and egg substitutes#50.13.00.00.00
-unspsc7#50.13.16.01.00#Eggs#50.13.16.00.00
-unspsc7#50.13.16.02.00#Egg substitutes#50.13.16.00.00
-unspsc7#50.13.16.03.00#Meringue powders#50.13.16.00.00
-unspsc7#50.13.16.04.00#Egg whites#50.13.16.00.00
-unspsc7#50.13.16.05.00#Egg yolks#50.13.16.00.00
-unspsc7#50.13.16.06.00#Fresh eggs#50.13.16.00.00
-unspsc7#50.13.16.07.00#Egg substitutes#50.13.16.00.00
-unspsc7#50.13.16.08.00#Egg whites or yolks#50.13.16.00.00
-unspsc7#50.13.16.09.00#Prepared eggs#50.13.16.00.00
-unspsc7#50.13.17.00.00#Milk and butter products#50.13.00.00.00
-unspsc7#50.13.17.01.00#Fresh milk and butter products#50.13.17.00.00
-unspsc7#50.13.17.02.00#Shelf stable milk and butter products#50.13.17.00.00
-unspsc7#50.13.18.00.00#Cheese#50.13.00.00.00
-unspsc7#50.13.18.01.00#Natural cheese#50.13.18.00.00
-unspsc7#50.13.18.02.00#Processed cheese#50.13.18.00.00
-unspsc7#50.13.18.03.00#Imitation cheese#50.13.18.00.00
-unspsc7#50.14.00.00.00#Grains and cereals and their flours#50.00.00.00.00
-unspsc7#50.14.15.00.00#Grains and cereals#50.14.00.00.00
-unspsc7#50.14.15.01.00#Millet#50.14.15.00.00
-unspsc7#50.14.15.02.00#Hops#50.14.15.00.00
-unspsc7#50.14.15.03.00#Buckwheat#50.14.15.00.00
-unspsc7#50.14.15.04.00#Rye#50.14.15.00.00
-unspsc7#50.14.15.05.00#Corn cereals#50.14.15.00.00
-unspsc7#50.14.15.06.00#Sorghum#50.14.15.00.00
-unspsc7#50.14.15.07.00#Oats#50.14.15.00.00
-unspsc7#50.14.15.08.00#Rice#50.14.15.00.00
-unspsc7#50.14.15.09.00#Barley#50.14.15.00.00
-unspsc7#50.14.15.10.00#Wheat#50.14.15.00.00
-unspsc7#50.14.15.11.00#Pasta or noodle#50.14.15.00.00
-unspsc7#50.14.15.12.00#Bran#50.14.15.00.00
-unspsc7#50.14.15.13.00#short grain rice#50.14.15.00.00
-unspsc7#50.14.16.00.00#Flours#50.14.00.00.00
-unspsc7#50.14.16.01.00#Millet flour#50.14.16.00.00
-unspsc7#50.14.16.02.00#Oat flour#50.14.16.00.00
-unspsc7#50.14.16.03.00#Barley flour#50.14.16.00.00
-unspsc7#50.14.16.04.00#Rice flour#50.14.16.00.00
-unspsc7#50.14.16.05.00#Buckwheat flour#50.14.16.00.00
-unspsc7#50.14.16.06.00#Rye flour#50.14.16.00.00
-unspsc7#50.14.16.07.00#Corn flour#50.14.16.00.00
-unspsc7#50.14.16.08.00#Wheat flour#50.14.16.00.00
-unspsc7#50.14.16.09.00#Self rising flour#50.14.16.00.00
-unspsc7#50.14.16.10.00#Long Grain Rice#50.14.16.00.00
-unspsc7#50.15.00.00.00#Edible oils and fats#50.00.00.00.00
-unspsc7#50.15.15.00.00#Edible vegetable and plant oils and fats#50.15.00.00.00
-unspsc7#50.15.15.01.00#Soybean oil#50.15.15.00.00
-unspsc7#50.15.15.02.00#Corn oil#50.15.15.00.00
-unspsc7#50.15.15.03.00#Canola oil#50.15.15.00.00
-unspsc7#50.15.15.04.00#Sesame oil#50.15.15.00.00
-unspsc7#50.15.15.05.00#Peanut oil#50.15.15.00.00
-unspsc7#50.15.15.06.00#Olive oil#50.15.15.00.00
-unspsc7#50.15.15.07.00#Palm oil#50.15.15.00.00
-unspsc7#50.15.15.08.00#Safflower oil#50.15.15.00.00
-unspsc7#50.15.15.09.00#Castor oil#50.15.15.00.00
-unspsc7#50.15.15.10.00#Sunflower oil#50.15.15.00.00
-unspsc7#50.15.15.11.00#Cottonseed oil#50.15.15.00.00
-unspsc7#50.15.15.12.00#Colza oil#50.15.15.00.00
-unspsc7#50.15.15.13.00#Edible vegetable or plant oils#50.15.15.00.00
-unspsc7#50.15.15.14.00#Edible vegetable or plant fats#50.15.15.00.00
-unspsc7#50.15.16.00.00#Edible animal oils and fats#50.15.00.00.00
-unspsc7#50.15.16.01.00#Lard#50.15.16.00.00
-unspsc7#50.15.16.02.00#Tallow#50.15.16.00.00
-unspsc7#50.15.16.03.00#Cod liver oil#50.15.16.00.00
-unspsc7#50.15.16.04.00#Edible animal oils#50.15.16.00.00
-unspsc7#50.15.16.05.00#Edible animal fats#50.15.16.00.00
-unspsc7#50.15.17.00.00#Oils and fats and other#50.15.00.00.00
-unspsc7#50.15.17.01.00#Shortenings#50.15.17.00.00
-unspsc7#50.15.17.02.00#Margarine#50.15.17.00.00
-unspsc7#50.15.17.03.00#Linseed oil#50.15.17.00.00
-unspsc7#50.15.17.04.00#Cocoa butter#50.15.17.00.00
-unspsc7#50.15.17.05.00#Hop Oil#50.15.17.00.00
-unspsc7#50.15.17.06.00#Macadamia oil#50.15.17.00.00
-unspsc7#50.16.00.00.00#Chocolate and sugars and sweeteners and confectionary products#50.00.00.00.00
-unspsc7#50.16.15.00.00#Chocolate and sugars and sweetening products#50.16.00.00.00
-unspsc7#50.16.15.01.00#Brown sugar#50.16.15.00.00
-unspsc7#50.16.15.02.00#White sugars#50.16.15.00.00
-unspsc7#50.16.15.03.00#Sugar cane#50.16.15.00.00
-unspsc7#50.16.15.04.00#Fructose#50.16.15.00.00
-unspsc7#50.16.15.05.00#Palm sugar#50.16.15.00.00
-unspsc7#50.16.15.06.00#Glucose#50.16.15.00.00
-unspsc7#50.16.15.07.00#Beet sugar#50.16.15.00.00
-unspsc7#50.16.15.08.00#Raw sugar#50.16.15.00.00
-unspsc7#50.16.15.09.00#Natural sugars and sweetening products#50.16.15.00.00
-unspsc7#50.16.15.10.00#Artificial sweetening agents#50.16.15.00.00
-unspsc7#50.16.15.11.00#Chocolate and chocolate substitute#50.16.15.00.00
-unspsc7#50.16.15.12.00#Syrups#50.16.15.00.00
-unspsc7#50.16.16.00.00#Syrups and other sweeteners#50.16.00.00.00
-unspsc7#50.16.16.01.00#Molasses#50.16.16.00.00
-unspsc7#50.16.16.02.00#Honey#50.16.16.00.00
-unspsc7#50.16.16.03.00#Black treacle#50.16.16.00.00
-unspsc7#50.16.16.04.00#Corn syrup#50.16.16.00.00
-unspsc7#50.16.16.05.00#Aspertame#50.16.16.00.00
-unspsc7#50.16.16.06.00#Saccharrin#50.16.16.00.00
-unspsc7#50.16.16.07.00#Maple syrup#50.16.16.00.00
-unspsc7#50.16.17.00.00#Chocolate and carob and chocolate substitutes#50.16.00.00.00
-unspsc7#50.16.17.01.00#Chocolate#50.16.17.00.00
-unspsc7#50.16.17.02.00#Carob#50.16.17.00.00
-unspsc7#50.16.17.03.00#Cocoa#50.16.17.00.00
-unspsc7#50.16.18.00.00#Confectionary products#50.16.00.00.00
-unspsc7#50.16.18.04.00#Chewing gums#50.16.18.00.00
-unspsc7#50.16.18.05.00#Candy#50.16.18.00.00
-unspsc7#50.16.18.06.00#Licorice#50.16.18.00.00
-unspsc7#50.16.18.07.00#jellied confectionary#50.16.18.00.00
-unspsc7#50.16.18.08.00#Fudge#50.16.18.00.00
-unspsc7#50.16.18.09.00#Medicated confectionery or lozenges#50.16.18.00.00
-unspsc7#50.16.18.10.00#Sugar free confectionary#50.16.18.00.00
-unspsc7#50.16.18.11.00#Marshmallow#50.16.18.00.00
-unspsc7#50.16.18.12.00#Nougat#50.16.18.00.00
-unspsc7#50.16.18.13.00#Chocolate or chocolate substitute candy#50.16.18.00.00
-unspsc7#50.16.18.14.00#Sugar or sugar substitute candy#50.16.18.00.00
-unspsc7#50.16.18.15.00#Chewing gum#50.16.18.00.00
-unspsc7#50.17.00.00.00#Seasonings and preservatives#50.00.00.00.00
-unspsc7#50.17.15.00.00#Herbs and spices and extracts#50.17.00.00.00
-unspsc7#50.17.15.01.00#Salt#50.17.15.00.00
-unspsc7#50.17.15.03.00#Nutmeg#50.17.15.00.00
-unspsc7#50.17.15.04.00#Bay#50.17.15.00.00
-unspsc7#50.17.15.05.00#Anise#50.17.15.00.00
-unspsc7#50.17.15.06.00#Saffron#50.17.15.00.00
-unspsc7#50.17.15.07.00#Basil#50.17.15.00.00
-unspsc7#50.17.15.08.00#Ginger#50.17.15.00.00
-unspsc7#50.17.15.09.00#Lavender#50.17.15.00.00
-unspsc7#50.17.15.10.00#Mace#50.17.15.00.00
-unspsc7#50.17.15.11.00#Paprika#50.17.15.00.00
-unspsc7#50.17.15.12.00#Chicory#50.17.15.00.00
-unspsc7#50.17.15.13.00#Garlic#50.17.15.00.00
-unspsc7#50.17.15.14.00#Cumin#50.17.15.00.00
-unspsc7#50.17.15.15.00#Cloves#50.17.15.00.00
-unspsc7#50.17.15.16.00#Cinnamon#50.17.15.00.00
-unspsc7#50.17.15.17.00#Cilantro#50.17.15.00.00
-unspsc7#50.17.15.18.00#Allspice#50.17.15.00.00
-unspsc7#50.17.15.19.00#Marjoram#50.17.15.00.00
-unspsc7#50.17.15.20.00#Yarrow#50.17.15.00.00
-unspsc7#50.17.15.21.00#Thyme#50.17.15.00.00
-unspsc7#50.17.15.22.00#Tarragon#50.17.15.00.00
-unspsc7#50.17.15.23.00#Sesame#50.17.15.00.00
-unspsc7#50.17.15.24.00#Sage#50.17.15.00.00
-unspsc7#50.17.15.25.00#Rosemary#50.17.15.00.00
-unspsc7#50.17.15.26.00#Parsley#50.17.15.00.00
-unspsc7#50.17.15.27.00#Chamomile#50.17.15.00.00
-unspsc7#50.17.15.28.00#Mints#50.17.15.00.00
-unspsc7#50.17.15.29.00#Caraway#50.17.15.00.00
-unspsc7#50.17.15.30.00#Lemongrass#50.17.15.00.00
-unspsc7#50.17.15.31.00#Lemon balm#50.17.15.00.00
-unspsc7#50.17.15.32.00#Dill#50.17.15.00.00
-unspsc7#50.17.15.33.00#Fennel#50.17.15.00.00
-unspsc7#50.17.15.34.00#Curry#50.17.15.00.00
-unspsc7#50.17.15.35.00#Comfrey#50.17.15.00.00
-unspsc7#50.17.15.36.00#Chives#50.17.15.00.00
-unspsc7#50.17.15.37.00#Chervil#50.17.15.00.00
-unspsc7#50.17.15.38.00#Oregano#50.17.15.00.00
-unspsc7#50.17.15.39.00#Peppercorns#50.17.15.00.00
-unspsc7#50.17.15.40.00#Cardamom#50.17.15.00.00
-unspsc7#50.17.15.41.00#Coriander#50.17.15.00.00
-unspsc7#50.17.15.42.00#Flavoring extracts#50.17.15.00.00
-unspsc7#50.17.15.43.00#Chili powder#50.17.15.00.00
-unspsc7#50.17.15.44.00#Poppy seeds#50.17.15.00.00
-unspsc7#50.17.15.45.00#Mixed herbs#50.17.15.00.00
-unspsc7#50.17.15.46.00#Vanilla#50.17.15.00.00
-unspsc7#50.17.15.47.00#Seasoning mix#50.17.15.00.00
-unspsc7#50.17.15.48.00#Fresh herbs#50.17.15.00.00
-unspsc7#50.17.15.49.00#Dried herbs#50.17.15.00.00
-unspsc7#50.17.15.50.00#Spices or extracts#50.17.15.00.00
-unspsc7#50.17.16.00.00#Preservatives and additives#50.17.00.00.00
-unspsc7#50.17.16.01.00#Pectin#50.17.16.00.00
-unspsc7#50.17.16.02.00#Food colorings#50.17.16.00.00
-unspsc7#50.17.16.03.00#Monosodium glutamate (MSG)#50.17.16.00.00
-unspsc7#50.17.17.00.00#Vinegars and cooking wines#50.17.00.00.00
-unspsc7#50.17.17.01.00#Cider vineagar#50.17.17.00.00
-unspsc7#50.17.17.02.00#Balsamic vinegar#50.17.17.00.00
-unspsc7#50.17.17.03.00#Distilled vinegar#50.17.17.00.00
-unspsc7#50.17.17.04.00#Rice vinegar#50.17.17.00.00
-unspsc7#50.17.17.05.00#Wine vinegar#50.17.17.00.00
-unspsc7#50.17.17.06.00#Infused vinegar#50.17.17.00.00
-unspsc7#50.17.17.07.00#Vinegars#50.17.17.00.00
-unspsc7#50.17.17.08.00#Cooking wines#50.17.17.00.00
-unspsc7#50.17.18.00.00#Sauces and spreads and condiments#50.17.00.00.00
-unspsc7#50.17.18.01.00#Mustards#50.17.18.00.00
-unspsc7#50.17.18.02.00#Catsup or ketchup or tomato sauce#50.17.18.00.00
-unspsc7#50.17.18.03.00#Barbecue sauces#50.17.18.00.00
-unspsc7#50.17.18.04.00#Marinades#50.17.18.00.00
-unspsc7#50.17.18.05.00#Hot sauces#50.17.18.00.00
-unspsc7#50.17.18.06.00#Mayonnaise#50.17.18.00.00
-unspsc7#50.17.18.07.00#Soy sauce#50.17.18.00.00
-unspsc7#50.17.18.08.00#Salad dressings#50.17.18.00.00
-unspsc7#50.17.18.09.00#Worchestershire sauce#50.17.18.00.00
-unspsc7#50.17.18.10.00#Salsa#50.17.18.00.00
-unspsc7#50.17.18.11.00#Relishes or chutneys#50.17.18.00.00
-unspsc7#50.17.18.12.00#Conserve or jam#50.17.18.00.00
-unspsc7#50.17.18.13.00#Dip or chilled dipping sauce#50.17.18.00.00
-unspsc7#50.17.18.14.00#Sweet and sour sauce#50.17.18.00.00
-unspsc7#50.17.18.15.00#Tartare sauce#50.17.18.00.00
-unspsc7#50.17.18.16.00#Mint sauce#50.17.18.00.00
-unspsc7#50.17.18.17.00#Gravy sauce or powder#50.17.18.00.00
-unspsc7#50.17.18.18.00#Noodle or pasta sauce#50.17.18.00.00
-unspsc7#50.17.18.19.00#Food spreads or pastes#50.17.18.00.00
-unspsc7#50.17.18.20.00#Tomato paste#50.17.18.00.00
-unspsc7#50.17.18.21.00#Black bean sauce#50.17.18.00.00
-unspsc7#50.17.18.22.00#Satay sauce#50.17.18.00.00
-unspsc7#50.17.18.23.00#Teriyaki sauce#50.17.18.00.00
-unspsc7#50.17.18.24.00#Seafood sauce#50.17.18.00.00
-unspsc7#50.17.18.25.00#Pesto#50.17.18.00.00
-unspsc7#50.17.18.26.00#Steak sauce#50.17.18.00.00
-unspsc7#50.17.18.27.00#Oyster sauce#50.17.18.00.00
-unspsc7#50.17.18.28.00#Plum sauce#50.17.18.00.00
-unspsc7#50.17.18.29.00#White sauce#50.17.18.00.00
-unspsc7#50.17.18.30.00#Dipping sauces or condiments or spreads or marinades#50.17.18.00.00
-unspsc7#50.17.18.31.00#Cooking sauce#50.17.18.00.00
-unspsc7#50.17.18.32.00#Salad dressing or dips#50.17.18.00.00
-unspsc7#50.17.18.33.00#Savory spread or pate#50.17.18.00.00
-unspsc7#50.17.19.00.00#Pickles and relish and olives#50.17.00.00.00
-unspsc7#50.17.19.01.00#Pickles#50.17.19.00.00
-unspsc7#50.17.19.02.00#Relish#50.17.19.00.00
-unspsc7#50.17.19.03.00#Olives#50.17.19.00.00
-unspsc7#50.17.19.04.00#Chutneys#50.17.19.00.00
-unspsc7#50.18.00.00.00#Bread and bakery products#50.00.00.00.00
-unspsc7#50.18.15.00.00#Leavening agents#50.18.00.00.00
-unspsc7#50.18.15.01.00#Yeast#50.18.15.00.00
-unspsc7#50.18.15.02.00#Baking powder#50.18.15.00.00
-unspsc7#50.18.15.03.00#Baking soda#50.18.15.00.00
-unspsc7#50.18.15.04.00#Bakers ammonia#50.18.15.00.00
-unspsc7#50.18.16.00.00#Thickeners#50.18.00.00.00
-unspsc7#50.18.16.01.00#Gelatins#50.18.16.00.00
-unspsc7#50.18.16.02.00#Food grade starches#50.18.16.00.00
-unspsc7#50.18.16.03.00#Tapioca#50.18.16.00.00
-unspsc7#50.18.16.04.00#Arrowroot#50.18.16.00.00
-unspsc7#50.18.16.05.00#Food grade agar#50.18.16.00.00
-unspsc7#50.18.17.00.00#Baking mixes and supplies#50.18.00.00.00
-unspsc7#50.18.17.01.00#Food glazes#50.18.17.00.00
-unspsc7#50.18.17.02.00#Icings#50.18.17.00.00
-unspsc7#50.18.17.03.00#Cake decorations#50.18.17.00.00
-unspsc7#50.18.17.04.00#Cake or pudding mixtures#50.18.17.00.00
-unspsc7#50.18.17.05.00#Pie fillings#50.18.17.00.00
-unspsc7#50.18.17.06.00#Baking mixes#50.18.17.00.00
-unspsc7#50.18.17.07.00#Coating mix or breadcrumbs#50.18.17.00.00
-unspsc7#50.18.17.08.00#Baking mixes#50.18.17.00.00
-unspsc7#50.18.17.09.00#Baking supplies#50.18.17.00.00
-unspsc7#50.18.18.00.00#Baked goods#50.18.00.00.00
-unspsc7#50.18.18.01.00#Pastry shells#50.18.18.00.00
-unspsc7#50.18.18.02.00#Crackers or dry or savoury biscuits#50.18.18.00.00
-unspsc7#50.18.18.03.00#Bread#50.18.18.00.00
-unspsc7#50.18.18.04.00#Pastries#50.18.18.00.00
-unspsc7#50.18.18.05.00#Cakes#50.18.18.00.00
-unspsc7#50.18.18.06.00#Cookie or sweet biscuit#50.18.18.00.00
-unspsc7#50.18.18.07.00#Biscuits#50.18.18.00.00
-unspsc7#50.18.18.08.00#Unleavened bread#50.18.18.00.00
-unspsc7#50.18.18.09.00#Muffins#50.18.18.00.00
-unspsc7#50.18.18.10.00#Donuts#50.18.18.00.00
-unspsc7#50.18.18.11.00#Pizza or pizza bases#50.18.18.00.00
-unspsc7#50.18.18.12.00#Cornets or cones or waffles#50.18.18.00.00
-unspsc7#50.18.19.00.00#Bread and biscuits and cookies#50.18.00.00.00
-unspsc7#50.18.19.01.00#Fresh bread#50.18.19.00.00
-unspsc7#50.18.19.02.00#Frozen bread#50.18.19.00.00
-unspsc7#50.18.19.03.00#Plain savory biscuits#50.18.19.00.00
-unspsc7#50.18.19.04.00#Dried breads or bread shells or croutons#50.18.19.00.00
-unspsc7#50.18.19.05.00#Sweet biscuits or cookies#50.18.19.00.00
-unspsc7#50.18.20.00.00#Cakes and pies and pastries#50.18.00.00.00
-unspsc7#50.18.20.01.00#Fresh cakes or pies or pastries#50.18.20.00.00
-unspsc7#50.18.20.02.00#Frozen cakes or pies or pastries#50.18.20.00.00
-unspsc7#50.19.00.00.00#Prepared and preserved foods#50.00.00.00.00
-unspsc7#50.19.15.00.00#Prepared soups and stews#50.19.00.00.00
-unspsc7#50.19.15.01.00#Stews#50.19.15.00.00
-unspsc7#50.19.15.02.00#Soups#50.19.15.00.00
-unspsc7#50.19.15.03.00#Stock or stock cubes#50.19.15.00.00
-unspsc7#50.19.15.04.00#Stew or casserole base#50.19.15.00.00
-unspsc7#50.19.15.05.00#Fresh prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.15.06.00#Frozen prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.15.07.00#Shelf stable prepared soups or stews#50.19.15.00.00
-unspsc7#50.19.16.00.00#Frozen foods#50.19.00.00.00
-unspsc7#50.19.16.01.00#Frozen desserts#50.19.16.00.00
-unspsc7#50.19.16.02.00#Frozen meats#50.19.16.00.00
-unspsc7#50.19.16.03.00#Frozen fruits#50.19.16.00.00
-unspsc7#50.19.16.04.00#Frozen vegetables#50.19.16.00.00
-unspsc7#50.19.16.05.00#Frozen prepared meals#50.19.16.00.00
-unspsc7#50.19.16.06.00#Frozen fish#50.19.16.00.00
-unspsc7#50.19.16.07.00#Frozen crustaceans#50.19.16.00.00
-unspsc7#50.19.16.08.00#Frozen mollusks#50.19.16.00.00
-unspsc7#50.19.16.09.00#Frozen prepared pastry unbaked#50.19.16.00.00
-unspsc7#50.19.16.10.00#Frozen savouries#50.19.16.00.00
-unspsc7#50.19.17.00.00#Canned foods and bottled etc#50.19.00.00.00
-unspsc7#50.19.17.01.00#Canned fruits#50.19.17.00.00
-unspsc7#50.19.17.02.00#Canned vegetables#50.19.17.00.00
-unspsc7#50.19.17.03.00#Canned fish#50.19.17.00.00
-unspsc7#50.19.17.04.00#Canned meat#50.19.17.00.00
-unspsc7#50.19.17.05.00#Canned Infant foods#50.19.17.00.00
-unspsc7#50.19.17.06.00#Fruit jams#50.19.17.00.00
-unspsc7#50.19.17.07.00#Marmalade#50.19.17.00.00
-unspsc7#50.19.17.08.00#Canned prepared meals#50.19.17.00.00
-unspsc7#50.19.17.09.00#Canned desserts#50.19.17.00.00
-unspsc7#50.19.18.00.00#Dried foods#50.19.00.00.00
-unspsc7#50.19.18.01.00#Dried fish#50.19.18.00.00
-unspsc7#50.19.18.02.00#Dried meat#50.19.18.00.00
-unspsc7#50.19.18.03.00#Dried vegetables#50.19.18.00.00
-unspsc7#50.19.18.04.00#Dried fruits#50.19.18.00.00
-unspsc7#50.19.19.00.00#Salted and smoked foods#50.19.00.00.00
-unspsc7#50.19.19.01.00#Salted or smoked fish#50.19.19.00.00
-unspsc7#50.19.19.02.00#Salted or smoked meats#50.19.19.00.00
-unspsc7#50.19.19.03.00#Salted or smoked shellfish or crustaceans or roe#50.19.19.00.00
-unspsc7#50.19.19.04.00#Salted or smoked fruits#50.19.19.00.00
-unspsc7#50.19.19.05.00#Salted or smoked nuts#50.19.19.00.00
-unspsc7#50.19.20.00.00#Pickled foods#50.19.00.00.00
-unspsc7#50.19.20.01.00#Pickled fish#50.19.20.00.00
-unspsc7#50.19.20.02.00#Pickled crustaceans#50.19.20.00.00
-unspsc7#50.19.20.03.00#Pickled meats#50.19.20.00.00
-unspsc7#50.19.20.04.00#Pickled vegetables#50.19.20.00.00
-unspsc7#50.19.20.05.00#Pickled eggs#50.19.20.00.00
-unspsc7#50.19.21.00.00#Snack foods#50.19.00.00.00
-unspsc7#50.19.21.01.00#Pretzels#50.19.21.00.00
-unspsc7#50.19.21.02.00#Corn chips#50.19.21.00.00
-unspsc7#50.19.21.03.00#Potato chips#50.19.21.00.00
-unspsc7#50.19.21.04.00#Popcorn#50.19.21.00.00
-unspsc7#50.19.21.05.00#Fish fingers#50.19.21.00.00
-unspsc7#50.19.21.06.00#Fruit snacks#50.19.21.00.00
-unspsc7#50.19.21.07.00#Other flavoured snack foods#50.19.21.00.00
-unspsc7#50.19.21.08.00#Fruit or nut mix#50.19.21.00.00
-unspsc7#50.19.21.09.00#Crisps or chips or pretzels or mixes#50.19.21.00.00
-unspsc7#50.19.21.10.00#Nuts or dried fruits#50.19.21.00.00
-unspsc7#50.19.21.11.00#Dried or processed meats#50.19.21.00.00
-unspsc7#50.19.21.12.00#Popped corn#50.19.21.00.00
-unspsc7#50.19.22.00.00#Spreads and conserves#50.19.00.00.00
-unspsc7#50.19.22.01.00#Peanut butter#50.19.22.00.00
-unspsc7#50.19.22.02.00#Yeast or vegetable extract spreads#50.19.22.00.00
-unspsc7#50.19.22.03.00#Jams or jellies or quinces#50.19.22.00.00
-unspsc7#50.19.23.00.00#Deserts and desert toppings#50.19.00.00.00
-unspsc7#50.19.23.01.00#Prepared deserts#50.19.23.00.00
-unspsc7#50.19.23.02.00#Desert toppings#50.19.23.00.00
-unspsc7#50.19.23.03.00#Flavored ices or ice cream or ice cream deserts or frozen yogurts#50.19.23.00.00
-unspsc7#50.19.24.00.00#Jams and jellies and nut and sweet spreads and fruit conserves#50.19.00.00.00
-unspsc7#50.19.24.01.00#Jams or jellies or fruit preserves#50.19.24.00.00
-unspsc7#50.19.24.02.00#Nut or mixed spreads#50.19.24.00.00
-unspsc7#50.19.24.03.00#Honey#50.19.24.00.00
-unspsc7#50.19.25.00.00#Sandwiches and filled rolls#50.19.00.00.00
-unspsc7#50.19.25.01.00#Fresh sandwiches or filled rolls#50.19.25.00.00
-unspsc7#50.19.25.02.00#Frozen sandwiches or filled rolls#50.19.25.00.00
-unspsc7#50.19.26.00.00#Prepared potatoes and rice and pasta and stuffing#50.19.00.00.00
-unspsc7#50.19.26.01.00#Fresh prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.26.02.00#Frozen prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.26.03.00#Shelf stable prepared potatoes or rice or pasta or stuffing#50.19.26.00.00
-unspsc7#50.19.27.00.00#Packaged combination meals#50.19.00.00.00
-unspsc7#50.19.27.01.00#Fresh combination meals#50.19.27.00.00
-unspsc7#50.19.27.02.00#Frozen combination meals#50.19.27.00.00
-unspsc7#50.19.27.03.00#Shelf stable combination meals#50.19.27.00.00
-unspsc7#50.19.28.00.00#Savory pies and quiches and pasties#50.19.00.00.00
-unspsc7#50.19.28.01.00#Fresh savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.28.02.00#Frozen savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.28.03.00#Shelf stable savory pies or quiches or pasties#50.19.28.00.00
-unspsc7#50.19.29.00.00#Plain pasta and noodles#50.19.00.00.00
-unspsc7#50.19.29.01.00#Fresh plain pasta or noodles#50.19.29.00.00
-unspsc7#50.19.29.02.00#Shelf stable plain pasta or noodles#50.19.29.00.00
-unspsc7#50.19.30.00.00#Infant foods and beverages#50.19.00.00.00
-unspsc7#50.19.30.01.00#Infant foods#50.19.30.00.00
-unspsc7#50.19.30.02.00#Infant beverages#50.19.30.00.00
-unspsc7#50.20.00.00.00#Beverages#50.00.00.00.00
-unspsc7#50.20.15.00.00#Water#50.20.00.00.00
-unspsc7#50.20.15.01.00#Sparkling water#50.20.15.00.00
-unspsc7#50.20.15.02.00#Spring water#50.20.15.00.00
-unspsc7#50.20.15.03.00#Mineral water#50.20.15.00.00
-unspsc7#50.20.15.04.00#Distilled or purified water#50.20.15.00.00
-unspsc7#50.20.16.00.00#Juices#50.20.00.00.00
-unspsc7#50.20.16.01.00#Blended juices#50.20.16.00.00
-unspsc7#50.20.16.02.00#Guava juice#50.20.16.00.00
-unspsc7#50.20.16.03.00#Prune juice#50.20.16.00.00
-unspsc7#50.20.16.04.00#Tomato juice#50.20.16.00.00
-unspsc7#50.20.16.05.00#Cranberry juice#50.20.16.00.00
-unspsc7#50.20.16.06.00#Grapefruit juice#50.20.16.00.00
-unspsc7#50.20.16.07.00#Grape juice#50.20.16.00.00
-unspsc7#50.20.16.08.00#Pineapple juice#50.20.16.00.00
-unspsc7#50.20.16.09.00#Orange juice#50.20.16.00.00
-unspsc7#50.20.16.10.00#Apple juice#50.20.16.00.00
-unspsc7#50.20.16.11.00#Lemon juices or lemonade#50.20.16.00.00
-unspsc7#50.20.16.12.00#Infant juice#50.20.16.00.00
-unspsc7#50.20.17.00.00#Coffee and tea#50.20.00.00.00
-unspsc7#50.20.17.01.00#Instant coffee#50.20.17.00.00
-unspsc7#50.20.17.02.00#Ground coffee#50.20.17.00.00
-unspsc7#50.20.17.03.00#Whole bean coffee#50.20.17.00.00
-unspsc7#50.20.17.04.00#Green coffee#50.20.17.00.00
-unspsc7#50.20.17.05.00#Coffee substitutes#50.20.17.00.00
-unspsc7#50.20.17.06.00#Coffee#50.20.17.00.00
-unspsc7#50.20.17.07.00#Coffee substitutes#50.20.17.00.00
-unspsc7#50.20.17.08.00#Coffee drinks#50.20.17.00.00
-unspsc7#50.20.17.09.00#Instant coffee#50.20.17.00.00
-unspsc7#50.20.17.10.00#Leaf tea#50.20.17.00.00
-unspsc7#50.20.17.11.00#Instant tea#50.20.17.00.00
-unspsc7#50.20.17.12.00#Tea drinks#50.20.17.00.00
-unspsc7#50.20.17.13.00#Tea bags#50.20.17.00.00
-unspsc7#50.20.18.00.00#Tea#50.20.00.00.00
-unspsc7#50.20.18.01.00#Green tea#50.20.18.00.00
-unspsc7#50.20.18.02.00#Black tea#50.20.18.00.00
-unspsc7#50.20.18.03.00#Herbal tea#50.20.18.00.00
-unspsc7#50.20.18.04.00#Powdered tea#50.20.18.00.00
-unspsc7#50.20.18.05.00#Tea bags#50.20.18.00.00
-unspsc7#50.20.19.00.00#Soft drinks#50.20.00.00.00
-unspsc7#50.20.19.01.00#Non carbonated soft drinks#50.20.19.00.00
-unspsc7#50.20.19.02.00#Carbonated soft drinks#50.20.19.00.00
-unspsc7#50.20.19.03.00#Cordials or colourings#50.20.19.00.00
-unspsc7#50.20.19.04.00#Sports or high energy drinks#50.20.19.00.00
-unspsc7#50.20.19.05.00#Soy beverage#50.20.19.00.00
-unspsc7#50.20.20.00.00#Beer and wine#50.20.00.00.00
-unspsc7#50.20.20.01.00#Champagne#50.20.20.00.00
-unspsc7#50.20.20.02.00#Beer#50.20.20.00.00
-unspsc7#50.20.20.03.00#Wine#50.20.20.00.00
-unspsc7#50.20.20.04.00#Sparkling wines#50.20.20.00.00
-unspsc7#50.20.20.05.00#Fortified wine#50.20.20.00.00
-unspsc7#50.20.20.06.00#Port#50.20.20.00.00
-unspsc7#50.20.20.07.00#Sherry#50.20.20.00.00
-unspsc7#50.20.20.08.00#Wine cooler beverage#50.20.20.00.00
-unspsc7#50.20.21.00.00#Spirits and liquors#50.20.00.00.00
-unspsc7#50.20.21.01.00#Brandy#50.20.21.00.00
-unspsc7#50.20.21.02.00#Cognac or armagnac#50.20.21.00.00
-unspsc7#50.20.21.03.00#Whiskey#50.20.21.00.00
-unspsc7#50.20.21.04.00#Vodka#50.20.21.00.00
-unspsc7#50.20.21.05.00#Tequila#50.20.21.00.00
-unspsc7#50.20.21.06.00#Gin#50.20.21.00.00
-unspsc7#50.20.21.07.00#Liqueurs#50.20.21.00.00
-unspsc7#50.20.21.08.00#Rum#50.20.21.00.00
-unspsc7#50.20.21.09.00#Bourbon#50.20.21.00.00
-unspsc7#50.20.21.10.00#Scotch#50.20.21.00.00
-unspsc7#50.20.21.11.00#Cider#50.20.21.00.00
-unspsc7#50.20.21.12.00#Schnapps#50.20.21.00.00
-unspsc7#50.20.21.13.00#Ouzo#50.20.21.00.00
-unspsc7#50.20.21.14.00#Aperitifs or bitters#50.20.21.00.00
-unspsc7#50.20.21.15.00#Vermouth#50.20.21.00.00
-unspsc7#50.20.21.16.00#Sambuca#50.20.21.00.00
-unspsc7#50.20.21.17.00#Sake#50.20.21.00.00
-unspsc7#50.20.21.18.00#Muscat or madeira#50.20.21.00.00
-unspsc7#50.20.22.00.00#Alcoholic beverages#50.20.00.00.00
-unspsc7#50.20.22.01.00#Beer#50.20.22.00.00
-unspsc7#50.20.22.02.00#Cider or perry#50.20.22.00.00
-unspsc7#50.20.22.03.00#Wine#50.20.22.00.00
-unspsc7#50.20.22.04.00#Fortified wine#50.20.22.00.00
-unspsc7#50.20.22.05.00#Sparkling wine#50.20.22.00.00
-unspsc7#50.20.22.06.00#Spirits or liquors#50.20.22.00.00
-unspsc7#50.20.22.07.00#Alcohol cocktails or drink mixes#50.20.22.00.00
-unspsc7#50.20.23.00.00#Non alcoholic beverages#50.20.00.00.00
-unspsc7#50.20.23.01.00#Water#50.20.23.00.00
-unspsc7#50.20.23.02.00#Ice#50.20.23.00.00
-unspsc7#50.20.23.03.00#Frozen juices#50.20.23.00.00
-unspsc7#50.20.23.04.00#Shelf stable juice#50.20.23.00.00
-unspsc7#50.20.23.05.00#Fresh juice#50.20.23.00.00
-unspsc7#50.20.23.06.00#Soft drinks#50.20.23.00.00
-unspsc7#50.20.23.07.00#Chocolate or malt or other hot beverages#50.20.23.00.00
-unspsc7#50.20.23.08.00#Alcohol free cocktails or drink mixes#50.20.23.00.00
-unspsc7#50.20.23.09.00#Sport drink mixes#50.20.23.00.00
-unspsc7#50.20.23.10.00#Spring water#50.20.23.00.00
-unspsc7#50.21.00.00.00#Tobacco and smoking products and substitutes#50.00.00.00.00
-unspsc7#50.21.15.00.00#Tobacco and substitutes#50.21.00.00.00
-unspsc7#50.21.15.01.00#Tobacco leaf#50.21.15.00.00
-unspsc7#50.21.15.02.00#Cigarettes or cigars#50.21.15.00.00
-unspsc7#50.21.15.03.00#Pipe tobacco or leaf tobacco#50.21.15.00.00
-unspsc7#50.21.15.04.00#Chewing tobacco#50.21.15.00.00
-unspsc7#50.21.15.05.00#Herbal cigarettes#50.21.15.00.00
-unspsc7#50.21.16.00.00#Tobacco product accessories and supplies#50.21.00.00.00
-unspsc7#50.21.16.01.00#Pipe tobacco#50.21.16.00.00
-unspsc7#50.21.16.02.00#Cigars#50.21.16.00.00
-unspsc7#50.21.16.03.00#Cigarettes#50.21.16.00.00
-unspsc7#50.21.16.04.00#Smokeless tobacco#50.21.16.00.00
-unspsc7#50.21.16.05.00#Ready rubbed tobacco#50.21.16.00.00
-unspsc7#50.21.16.06.00#Cigarette papers#50.21.16.00.00
-unspsc7#50.21.16.07.00#Cigarette papers or filters#50.21.16.00.00
-unspsc7#50.21.16.08.00#Cigarette lighters or flints#50.21.16.00.00
-unspsc7#50.21.16.09.00#Smoking pipes#50.21.16.00.00
-unspsc7#50.22.00.00.00#Cereal and pulse products#50.00.00.00.00
-unspsc7#50.22.10.00.00#Pulses#50.22.00.00.00
-unspsc7#50.22.10.01.00#Pulse grains#50.22.10.00.00
-unspsc7#50.22.10.02.00#Pulse flour#50.22.10.00.00
-unspsc7#50.22.11.00.00#Cereals#50.22.00.00.00
-unspsc7#50.22.11.01.00#Cereal grains#50.22.11.00.00
-unspsc7#50.22.11.02.00#Cereal flour#50.22.11.00.00
-unspsc7#50.22.12.00.00#Processed cereals#50.22.00.00.00
-unspsc7#50.22.12.01.00#Ready to eat or hot cereals#50.22.12.00.00
-unspsc7#50.22.12.02.00#Health or breakfast bars#50.22.12.00.00
-unspsc7#51.00.00.00.00#Drugs and Pharmaceutical Products#51.00.00.00.00
-unspsc7#51.10.00.00.00#Anti infective drugs#51.00.00.00.00
-unspsc7#51.10.15.00.00#Antibiotics#51.10.00.00.00
-unspsc7#51.10.15.01.00#Aminoglycosides#51.10.15.00.00
-unspsc7#51.10.15.02.00#Cephalosporins#51.10.15.00.00
-unspsc7#51.10.15.03.00#Chloramphenicol#51.10.15.00.00
-unspsc7#51.10.15.04.00#Clindamycin or lincomycin#51.10.15.00.00
-unspsc7#51.10.15.05.00#Fluoroquinolones#51.10.15.00.00
-unspsc7#51.10.15.06.00#Macrolide#51.10.15.00.00
-unspsc7#51.10.15.07.00#Penicillins#51.10.15.00.00
-unspsc7#51.10.15.08.00#Antibiotic sulfonamides#51.10.15.00.00
-unspsc7#51.10.15.09.00#Tetracyclines#51.10.15.00.00
-unspsc7#51.10.16.00.00#Amebicides and Trichomonacides and Antiprotozoals#51.10.00.00.00
-unspsc7#51.10.16.01.00#Atovaquone#51.10.16.00.00
-unspsc7#51.10.16.02.00#Eflornithine hydrochloride#51.10.16.00.00
-unspsc7#51.10.16.03.00#Metronidazole#51.10.16.00.00
-unspsc7#51.10.17.00.00#Anthelmintics#51.10.00.00.00
-unspsc7#51.10.17.01.00#Albendadole#51.10.17.00.00
-unspsc7#51.10.17.02.00#Mebendazole#51.10.17.00.00
-unspsc7#51.10.17.03.00#Oxamniquine#51.10.17.00.00
-unspsc7#51.10.17.04.00#Piperazine citrate#51.10.17.00.00
-unspsc7#51.10.17.05.00#Praziquantel#51.10.17.00.00
-unspsc7#51.10.17.06.00#Pyrantel pamoate#51.10.17.00.00
-unspsc7#51.10.17.07.00#Thiabendazole#51.10.17.00.00
-unspsc7#51.10.18.00.00#Antifungal drugs#51.10.00.00.00
-unspsc7#51.10.18.01.00#Amphotericin b#51.10.18.00.00
-unspsc7#51.10.18.02.00#Butenafine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.03.00#Butoconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.04.00#Ciclopirox olamine#51.10.18.00.00
-unspsc7#51.10.18.05.00#Clotrimazole#51.10.18.00.00
-unspsc7#51.10.18.06.00#Econazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.07.00#Fluconazole#51.10.18.00.00
-unspsc7#51.10.18.08.00#Flucytosine#51.10.18.00.00
-unspsc7#51.10.18.09.00#Griseofulvin#51.10.18.00.00
-unspsc7#51.10.18.10.00#Itraconazole#51.10.18.00.00
-unspsc7#51.10.18.11.00#Ketoconazole#51.10.18.00.00
-unspsc7#51.10.18.12.00#Miconazole#51.10.18.00.00
-unspsc7#51.10.18.13.00#Naftifine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.14.00#Natamycin#51.10.18.00.00
-unspsc7#51.10.18.15.00#Nystatin#51.10.18.00.00
-unspsc7#51.10.18.16.00#Oxiconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.17.00#Sulconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.18.00#Terbinafine hydrochloride#51.10.18.00.00
-unspsc7#51.10.18.19.00#Terconazole nitrate#51.10.18.00.00
-unspsc7#51.10.18.20.00#Tioconazole#51.10.18.00.00
-unspsc7#51.10.18.21.00#Tolnaftate#51.10.18.00.00
-unspsc7#51.10.19.00.00#Antimalarial drugs#51.10.00.00.00
-unspsc7#51.10.19.01.00#Aminoquinolines#51.10.19.00.00
-unspsc7#51.10.19.02.00#Mefloquine hydrochloride#51.10.19.00.00
-unspsc7#51.10.19.03.00#Primaquine phosphate#51.10.19.00.00
-unspsc7#51.10.19.04.00#Quinine sulfate#51.10.19.00.00
-unspsc7#51.10.19.05.00#Chloroquine#51.10.19.00.00
-unspsc7#51.10.19.06.00#Proguanil#51.10.19.00.00
-unspsc7#51.10.19.07.00#Pyrimethamine#51.10.19.00.00
-unspsc7#51.10.20.00.00#Antitubercular drugs#51.10.00.00.00
-unspsc7#51.10.20.01.00#Cycloserine#51.10.20.00.00
-unspsc7#51.10.20.02.00#Ethambutol hydrochloride#51.10.20.00.00
-unspsc7#51.10.20.03.00#Isoniazid#51.10.20.00.00
-unspsc7#51.10.20.04.00#Rifubutin#51.10.20.00.00
-unspsc7#51.10.20.05.00#Rifampin#51.10.20.00.00
-unspsc7#51.10.21.00.00#Leprostatics#51.10.00.00.00
-unspsc7#51.10.21.01.00#Clofazimine#51.10.21.00.00
-unspsc7#51.10.21.02.00#Dapsone#51.10.21.00.00
-unspsc7#51.10.22.00.00#Urinary anti infectives and analgesics#51.10.00.00.00
-unspsc7#51.10.22.01.00#Cinoxacin#51.10.22.00.00
-unspsc7#51.10.22.02.00#Flavoxate hydrochloride#51.10.22.00.00
-unspsc7#51.10.22.03.00#Methenamine hippurate#51.10.22.00.00
-unspsc7#51.10.22.04.00#Methenamine mandelate#51.10.22.00.00
-unspsc7#51.10.22.05.00#Nalidixic acid#51.10.22.00.00
-unspsc7#51.10.22.06.00#Nitrofurantoin#51.10.22.00.00
-unspsc7#51.10.22.07.00#Oxybutynin chloride#51.10.22.00.00
-unspsc7#51.10.22.08.00#Pentosan polysulfate sodium#51.10.22.00.00
-unspsc7#51.10.22.09.00#Phenazopyridine hydrochloride#51.10.22.00.00
-unspsc7#51.10.22.10.00#Antiseptic solutions#51.10.22.00.00
-unspsc7#51.10.23.00.00#Antiviral drugs#51.10.00.00.00
-unspsc7#51.10.23.01.00#Acyclovir#51.10.23.00.00
-unspsc7#51.10.23.02.00#Amantadine hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.03.00#Cydofovir#51.10.23.00.00
-unspsc7#51.10.23.04.00#Didanosine#51.10.23.00.00
-unspsc7#51.10.23.05.00#Famciclovir#51.10.23.00.00
-unspsc7#51.10.23.06.00#Foscarnet sodium#51.10.23.00.00
-unspsc7#51.10.23.07.00#Ganciclovir sodium#51.10.23.00.00
-unspsc7#51.10.23.08.00#Idoxuridine#51.10.23.00.00
-unspsc7#51.10.23.09.00#Indinavir sulfate#51.10.23.00.00
-unspsc7#51.10.23.10.00#Lamivudine#51.10.23.00.00
-unspsc7#51.10.23.11.00#Nevirapine#51.10.23.00.00
-unspsc7#51.10.23.12.00#Ribavirin#51.10.23.00.00
-unspsc7#51.10.23.13.00#Rimantadine hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.14.00#Ritonavir#51.10.23.00.00
-unspsc7#51.10.23.15.00#Saquinavir mesylate#51.10.23.00.00
-unspsc7#51.10.23.16.00#Stavidine#51.10.23.00.00
-unspsc7#51.10.23.17.00#Trifluradine#51.10.23.00.00
-unspsc7#51.10.23.18.00#Valacyclovir hydrochloride#51.10.23.00.00
-unspsc7#51.10.23.19.00#Vidarabine#51.10.23.00.00
-unspsc7#51.10.23.20.00#Zalcitabine#51.10.23.00.00
-unspsc7#51.10.23.21.00#Zidovudine#51.10.23.00.00
-unspsc7#51.11.00.00.00#Antineoplastic agents#51.00.00.00.00
-unspsc7#51.11.15.00.00#Alkylating agents#51.11.00.00.00
-unspsc7#51.11.15.01.00#Amifostine#51.11.15.00.00
-unspsc7#51.11.15.02.00#Busulfan#51.11.15.00.00
-unspsc7#51.11.15.03.00#Carboplatin#51.11.15.00.00
-unspsc7#51.11.15.04.00#Carmustine#51.11.15.00.00
-unspsc7#51.11.15.05.00#Chlorambucil#51.11.15.00.00
-unspsc7#51.11.15.06.00#Cisplatin#51.11.15.00.00
-unspsc7#51.11.15.07.00#Cyclophosphamide#51.11.15.00.00
-unspsc7#51.11.15.08.00#Dacarbazine#51.11.15.00.00
-unspsc7#51.11.15.09.00#Ifosfamide#51.11.15.00.00
-unspsc7#51.11.15.10.00#Lomustine#51.11.15.00.00
-unspsc7#51.11.15.11.00#Mechlorethamine hydrochloride#51.11.15.00.00
-unspsc7#51.11.15.12.00#Melphalan#51.11.15.00.00
-unspsc7#51.11.15.13.00#Mesna#51.11.15.00.00
-unspsc7#51.11.15.14.00#Pipobroman#51.11.15.00.00
-unspsc7#51.11.15.15.00#Streptozocin#51.11.15.00.00
-unspsc7#51.11.15.16.00#Thiotepa#51.11.15.00.00
-unspsc7#51.11.15.17.00#Uracil mustard#51.11.15.00.00
-unspsc7#51.11.16.00.00#Antimetabolites#51.11.00.00.00
-unspsc7#51.11.16.01.00#Cladribine#51.11.16.00.00
-unspsc7#51.11.16.02.00#Cytarabine#51.11.16.00.00
-unspsc7#51.11.16.03.00#Floxuridine#51.11.16.00.00
-unspsc7#51.11.16.04.00#Fludarabine phosphate#51.11.16.00.00
-unspsc7#51.11.16.05.00#Fluorouracil#51.11.16.00.00
-unspsc7#51.11.16.06.00#Hydroxyurea#51.11.16.00.00
-unspsc7#51.11.16.07.00#Idarubicin hydrochloride#51.11.16.00.00
-unspsc7#51.11.16.08.00#Levamisole hydrochloride#51.11.16.00.00
-unspsc7#51.11.16.09.00#Mercaptopurine#51.11.16.00.00
-unspsc7#51.11.16.10.00#Methotrexate#51.11.16.00.00
-unspsc7#51.11.16.11.00#Teniposide#51.11.16.00.00
-unspsc7#51.11.16.12.00#Thioguanine#51.11.16.00.00
-unspsc7#51.11.17.00.00#Antineoplastic antibiotics#51.11.00.00.00
-unspsc7#51.11.17.01.00#Bleomycin sulfate#51.11.17.00.00
-unspsc7#51.11.17.02.00#Dactinomycin#51.11.17.00.00
-unspsc7#51.11.17.03.00#Daunorubicins#51.11.17.00.00
-unspsc7#51.11.17.04.00#Mitomycin#51.11.17.00.00
-unspsc7#51.11.17.05.00#Mitotane#51.11.17.00.00
-unspsc7#51.11.17.06.00#Mitoxantrone hydrochloride#51.11.17.00.00
-unspsc7#51.11.17.07.00#Pentostatin#51.11.17.00.00
-unspsc7#51.11.17.08.00#Plicamycin#51.11.17.00.00
-unspsc7#51.11.18.00.00#Hormones and antihormones#51.11.00.00.00
-unspsc7#51.11.18.01.00#Anastrozole#51.11.18.00.00
-unspsc7#51.11.18.02.00#Bicalutamide#51.11.18.00.00
-unspsc7#51.11.18.03.00#Estramustine phosphate sodium#51.11.18.00.00
-unspsc7#51.11.18.04.00#Flutamide#51.11.18.00.00
-unspsc7#51.11.18.05.00#Goserelin acetate#51.11.18.00.00
-unspsc7#51.11.18.06.00#Irinotecan hydrochloride#51.11.18.00.00
-unspsc7#51.11.18.07.00#Leuprolide acetate#51.11.18.00.00
-unspsc7#51.11.18.08.00#Nilutamide#51.11.18.00.00
-unspsc7#51.11.18.09.00#Tamoxifen#51.11.18.00.00
-unspsc7#51.11.18.10.00#Testolactone#51.11.18.00.00
-unspsc7#51.11.18.11.00#Topotecan hydrochloride#51.11.18.00.00
-unspsc7#51.11.18.12.00#Vinblastine sulfate#51.11.18.00.00
-unspsc7#51.11.18.13.00#Vincristine sulfate#51.11.18.00.00
-unspsc7#51.11.18.14.00#Vinorelbine tartrate#51.11.18.00.00
-unspsc7#51.11.19.00.00#Natural antineoplastic products#51.11.00.00.00
-unspsc7#51.11.19.01.00#Asparaginase#51.11.19.00.00
-unspsc7#51.11.19.02.00#Docetaxel#51.11.19.00.00
-unspsc7#51.11.19.03.00#Interferon#51.11.19.00.00
-unspsc7#51.11.19.04.00#Paclitaxel#51.11.19.00.00
-unspsc7#51.11.19.05.00#Porfimer sodium#51.11.19.00.00
-unspsc7#51.12.00.00.00#Cardiovascular drugs#51.00.00.00.00
-unspsc7#51.12.15.00.00#Antiarrythmic agents#51.12.00.00.00
-unspsc7#51.12.15.01.00#Adenosine#51.12.15.00.00
-unspsc7#51.12.15.02.00#Digoxin#51.12.15.00.00
-unspsc7#51.12.15.03.00#Quinidine gluconate#51.12.15.00.00
-unspsc7#51.12.16.00.00#Antianginal drugs#51.12.00.00.00
-unspsc7#51.12.16.01.00#Amyl nitrate#51.12.16.00.00
-unspsc7#51.12.16.02.00#Isosorbide dinitrate#51.12.16.00.00
-unspsc7#51.12.16.03.00#Nitroglycerin#51.12.16.00.00
-unspsc7#51.12.16.04.00#Pentaerythritol tetranitrate#51.12.16.00.00
-unspsc7#51.12.17.00.00#Antihypertensive drugs#51.12.00.00.00
-unspsc7#51.12.17.01.00#Diazoxide#51.12.17.00.00
-unspsc7#51.12.17.02.00#Terazosin#51.12.17.00.00
-unspsc7#51.12.17.03.00#Captopril#51.12.17.00.00
-unspsc7#51.12.17.04.00#Lisinopril#51.12.17.00.00
-unspsc7#51.12.17.05.00#Felodipine#51.12.17.00.00
-unspsc7#51.12.17.06.00#Isradipine#51.12.17.00.00
-unspsc7#51.12.17.07.00#Verapamil#51.12.17.00.00
-unspsc7#51.12.17.08.00#Methyldopa#51.12.17.00.00
-unspsc7#51.12.17.09.00#Carvedilol#51.12.17.00.00
-unspsc7#51.12.17.10.00#Losartan potassium#51.12.17.00.00
-unspsc7#51.12.17.11.00#Minoxidil#51.12.17.00.00
-unspsc7#51.12.18.00.00#Antihyperlipidemic and hypocholesterolemic agents#51.12.00.00.00
-unspsc7#51.12.18.01.00#Fluvastatin sodium#51.12.18.00.00
-unspsc7#51.12.18.02.00#Lovastatin#51.12.18.00.00
-unspsc7#51.12.18.03.00#Simvastatin#51.12.18.00.00
-unspsc7#51.12.18.04.00#Clofibrate#51.12.18.00.00
-unspsc7#51.12.18.05.00#Gemfibrozil#51.12.18.00.00
-unspsc7#51.12.19.00.00#Drugs used for congestive heart failure#51.12.00.00.00
-unspsc7#51.12.19.01.00#Amrinone lactate#51.12.19.00.00
-unspsc7#51.12.19.02.00#Milrinone lactate#51.12.19.00.00
-unspsc7#51.12.19.03.00#Digitoxin#51.12.19.00.00
-unspsc7#51.13.00.00.00#Hematolic drugs#51.00.00.00.00
-unspsc7#51.13.15.00.00#Antianemic drugs#51.13.00.00.00
-unspsc7#51.13.15.01.00#Ferrous fumarate#51.13.15.00.00
-unspsc7#51.13.15.02.00#Ferrous gluconate#51.13.15.00.00
-unspsc7#51.13.15.03.00#Ferrous sulfate#51.13.15.00.00
-unspsc7#51.13.16.00.00#Anticoagulants#51.13.00.00.00
-unspsc7#51.13.16.01.00#Aprotinin#51.13.16.00.00
-unspsc7#51.13.16.02.00#Heparin calcium#51.13.16.00.00
-unspsc7#51.13.16.03.00#Heparin sodium#51.13.16.00.00
-unspsc7#51.13.16.04.00#Warfarin sodium#51.13.16.00.00
-unspsc7#51.13.17.00.00#Thrombolytic drugs and platelet aggregation inhibitors#51.13.00.00.00
-unspsc7#51.13.17.01.00#Abciximab#51.13.17.00.00
-unspsc7#51.13.17.02.00#Alteplase#51.13.17.00.00
-unspsc7#51.13.17.03.00#Streptokinase#51.13.17.00.00
-unspsc7#51.13.17.04.00#Urokinase#51.13.17.00.00
-unspsc7#51.14.00.00.00#Central nervous system drugs#51.00.00.00.00
-unspsc7#51.14.15.00.00#Anticonvulsants#51.14.00.00.00
-unspsc7#51.14.15.01.00#Acetazolamide#51.14.15.00.00
-unspsc7#51.14.15.02.00#Clonazepam#51.14.15.00.00
-unspsc7#51.14.15.03.00#Felbamate#51.14.15.00.00
-unspsc7#51.14.15.04.00#Lamotrigine#51.14.15.00.00
-unspsc7#51.14.15.05.00#Phenobarbital#51.14.15.00.00
-unspsc7#51.14.15.06.00#Phenobarbital sodium#51.14.15.00.00
-unspsc7#51.14.15.07.00#Phenytoin#51.14.15.00.00
-unspsc7#51.14.15.08.00#Ethosuximide#51.14.15.00.00
-unspsc7#51.14.16.00.00#Antidepressants#51.14.00.00.00
-unspsc7#51.14.16.01.00#Amitriptyline hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.02.00#Doxepin hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.03.00#Imipramine pamoate#51.14.16.00.00
-unspsc7#51.14.16.04.00#Mirtazapine#51.14.16.00.00
-unspsc7#51.14.16.05.00#Paroxetine hydrochloride#51.14.16.00.00
-unspsc7#51.14.16.06.00#Trazodone hydrochloride#51.14.16.00.00
-unspsc7#51.14.17.00.00#Antipsychotic agents#51.14.00.00.00
-unspsc7#51.14.17.01.00#Phenothiazines#51.14.17.00.00
-unspsc7#51.14.17.02.00#Haloperidol#51.14.17.00.00
-unspsc7#51.14.17.03.00#Olanzapine#51.14.17.00.00
-unspsc7#51.14.17.04.00#Risperidone#51.14.17.00.00
-unspsc7#51.14.18.00.00#Hypnotics#51.14.00.00.00
-unspsc7#51.14.18.01.00#Pentobarbital#51.14.18.00.00
-unspsc7#51.14.18.02.00#Secobarbital sodium#51.14.18.00.00
-unspsc7#51.14.18.03.00#Chloral hydrate#51.14.18.00.00
-unspsc7#51.14.18.04.00#Estazolam#51.14.18.00.00
-unspsc7#51.14.18.05.00#Triazolam#51.14.18.00.00
-unspsc7#51.14.19.00.00#Tranquilizers and antimanic drugs#51.14.00.00.00
-unspsc7#51.14.19.01.00#Alprazolam#51.14.19.00.00
-unspsc7#51.14.19.02.00#Diazepam#51.14.19.00.00
-unspsc7#51.14.19.03.00#Lithium carbonate#51.14.19.00.00
-unspsc7#51.14.19.04.00#Lithium citrate#51.14.19.00.00
-unspsc7#51.14.19.05.00#Midazolam hydrochloride#51.14.19.00.00
-unspsc7#51.14.19.06.00#Temazepam#51.14.19.00.00
-unspsc7#51.14.20.00.00#Non narcotic analgesics and antipyretics#51.14.00.00.00
-unspsc7#51.14.20.01.00#Acetaminophen#51.14.20.00.00
-unspsc7#51.14.20.02.00#Acetylsalicylic acid#51.14.20.00.00
-unspsc7#51.14.20.03.00#Mesalamine#51.14.20.00.00
-unspsc7#51.14.20.04.00#Meprobromate#51.14.20.00.00
-unspsc7#51.14.21.00.00#Nonsteroidal anti inflammatory drugs (NSAIDs)#51.14.00.00.00
-unspsc7#51.14.21.01.00#Auranofin#51.14.21.00.00
-unspsc7#51.14.21.02.00#Carpofen#51.14.21.00.00
-unspsc7#51.14.21.03.00#Diclofenac potassium#51.14.21.00.00
-unspsc7#51.14.21.04.00#Diclofenac sodium#51.14.21.00.00
-unspsc7#51.14.21.05.00#Flurbiprofen#51.14.21.00.00
-unspsc7#51.14.21.06.00#Ibuprofen#51.14.21.00.00
-unspsc7#51.14.21.07.00#Indomethacin#51.14.21.00.00
-unspsc7#51.14.21.08.00#Ketoprofen#51.14.21.00.00
-unspsc7#51.14.21.09.00#Naproxen#51.14.21.00.00
-unspsc7#51.14.21.10.00#Naproxen sodium#51.14.21.00.00
-unspsc7#51.14.21.11.00#Oxaprozin#51.14.21.00.00
-unspsc7#51.14.21.12.00#Sulindac#51.14.21.00.00
-unspsc7#51.14.21.13.00#Suprofen#51.14.21.00.00
-unspsc7#51.14.22.00.00#Narcotic analgesics#51.14.00.00.00
-unspsc7#51.14.22.01.00#Butorphanol tartrate#51.14.22.00.00
-unspsc7#51.14.22.02.00#Codeine phosphate#51.14.22.00.00
-unspsc7#51.14.22.03.00#Codeine sulfate#51.14.22.00.00
-unspsc7#51.14.22.05.00#Meperidine hydrochloride#51.14.22.00.00
-unspsc7#51.14.22.06.00#Morphine sulfate#51.14.22.00.00
-unspsc7#51.14.22.07.00#Oxycodone#51.14.22.00.00
-unspsc7#51.14.22.08.00#Sufentanil#51.14.22.00.00
-unspsc7#51.14.23.00.00#Narcotic antagonists#51.14.00.00.00
-unspsc7#51.14.23.01.00#Nalmefene hydrochloride#51.14.23.00.00
-unspsc7#51.14.23.02.00#Naloxone hydrochloride#51.14.23.00.00
-unspsc7#51.14.23.03.00#Naltrexone#51.14.23.00.00
-unspsc7#51.14.24.00.00#Drugs used for vascular and migraine headaches#51.14.00.00.00
-unspsc7#51.14.24.01.00#Methysergide maleate#51.14.24.00.00
-unspsc7#51.14.24.02.00#Sumatriptan succinate#51.14.24.00.00
-unspsc7#51.14.25.00.00#Antiparkinson drugs#51.14.00.00.00
-unspsc7#51.14.25.01.00#Bromocriptine mesylate#51.14.25.00.00
-unspsc7#51.14.25.02.00#Carbidopa#51.14.25.00.00
-unspsc7#51.14.25.03.00#Levodopa#51.14.25.00.00
-unspsc7#51.14.25.04.00#Selegiline hydrochloride#51.14.25.00.00
-unspsc7#51.14.26.00.00#Stimulants and anorexiants#51.14.00.00.00
-unspsc7#51.14.26.01.00#Amphetamine sulfate#51.14.26.00.00
-unspsc7#51.14.26.02.00#Fenfluramine#51.14.26.00.00
-unspsc7#51.14.26.03.00#Mazindol#51.14.26.00.00
-unspsc7#51.14.26.04.00#Pemoline#51.14.26.00.00
-unspsc7#51.14.26.05.00#Phendimetrazine tartrate#51.14.26.00.00
-unspsc7#51.15.00.00.00#Autonomic nervous system drugs#51.00.00.00.00
-unspsc7#51.15.15.00.00#Cholinergic drugs and cholinesterase inhibitors#51.15.00.00.00
-unspsc7#51.15.15.01.00#Bethanechol chloride#51.15.15.00.00
-unspsc7#51.15.15.02.00#Edrophonium chloride#51.15.15.00.00
-unspsc7#51.15.15.03.00#Physostigmine salicylate#51.15.15.00.00
-unspsc7#51.15.15.04.00#Pilocarpine nitrate#51.15.15.00.00
-unspsc7#51.15.16.00.00#Cholinergic blocking agents#51.15.00.00.00
-unspsc7#51.15.16.01.00#Atropine sulfate#51.15.16.00.00
-unspsc7#51.15.16.02.00#Benztropine mesylate#51.15.16.00.00
-unspsc7#51.15.16.03.00#Procyclidine hydrochloride#51.15.16.00.00
-unspsc7#51.15.16.04.00#Trihexyphenidyl hydrochloride#51.15.16.00.00
-unspsc7#51.15.17.00.00#Sympathomimetic or adrenergic drugs#51.15.00.00.00
-unspsc7#51.15.17.01.00#Albuterol#51.15.17.00.00
-unspsc7#51.15.17.02.00#Brimonidine tartrate#51.15.17.00.00
-unspsc7#51.15.17.03.00#Epinephrine#51.15.17.00.00
-unspsc7#51.15.17.04.00#Epinephrine borate#51.15.17.00.00
-unspsc7#51.15.17.05.00#Epinephrine hydrochloride#51.15.17.00.00
-unspsc7#51.15.17.06.00#Isoproterenol#51.15.17.00.00
-unspsc7#51.15.17.07.00#Isoproterenol sulfate#51.15.17.00.00
-unspsc7#51.15.17.08.00#Levarterenol bitartrate#51.15.17.00.00
-unspsc7#51.15.17.09.00#Phenylpropanolamine hydrochloride#51.15.17.00.00
-unspsc7#51.15.18.00.00#Adrenergic blocking agents#51.15.00.00.00
-unspsc7#51.15.18.01.00#Atenolol#51.15.18.00.00
-unspsc7#51.15.18.02.00#Esmolol hydrochloride#51.15.18.00.00
-unspsc7#51.15.18.03.00#Nadolol#51.15.18.00.00
-unspsc7#51.15.18.04.00#Pindolol#51.15.18.00.00
-unspsc7#51.15.18.05.00#Timolol maleate#51.15.18.00.00
-unspsc7#51.15.18.10.00#Phentolamine mesylate#51.15.18.00.00
-unspsc7#51.15.19.00.00#Skeletal muscle relaxants and centrally acting#51.15.00.00.00
-unspsc7#51.15.19.01.00#Baclofen#51.15.19.00.00
-unspsc7#51.15.19.02.00#Chlorzoxazone#51.15.19.00.00
-unspsc7#51.15.19.03.00#Dantrolene sodium#51.15.19.00.00
-unspsc7#51.15.19.04.00#Methocarbamol#51.15.19.00.00
-unspsc7#51.15.19.05.00#Carisoprodol#51.15.19.00.00
-unspsc7#51.15.20.00.00#Neuromuscular blocking agents#51.15.00.00.00
-unspsc7#51.15.20.01.00#Atracurium besylate#51.15.20.00.00
-unspsc7#51.15.20.02.00#Mivacurium chyloride#51.15.20.00.00
-unspsc7#51.15.20.03.00#Rocuronium bromide#51.15.20.00.00
-unspsc7#51.15.20.04.00#Vecuronium bromide#51.15.20.00.00
-unspsc7#51.16.00.00.00#Drugs affecting the respiratory tract#51.00.00.00.00
-unspsc7#51.16.15.00.00#Antiasthmatic drugs#51.16.00.00.00
-unspsc7#51.16.15.01.00#Bitolterol mesylate#51.16.15.00.00
-unspsc7#51.16.15.02.00#Nedocromil sodium#51.16.15.00.00
-unspsc7#51.16.15.03.00#Pirbuterol acetate#51.16.15.00.00
-unspsc7#51.16.15.04.00#Aminophylline#51.16.15.00.00
-unspsc7#51.16.15.05.00#Theophylline#51.16.15.00.00
-unspsc7#51.16.16.00.00#Antihistamines or H1 blockers#51.16.00.00.00
-unspsc7#51.16.16.01.00#Astemizole#51.16.16.00.00
-unspsc7#51.16.16.02.00#Clemastine fumarate#51.16.16.00.00
-unspsc7#51.16.16.03.00#Dexchlorpheniramine maleate#51.16.16.00.00
-unspsc7#51.16.16.04.00#Dimenhydrinate#51.16.16.00.00
-unspsc7#51.16.16.05.00#Levocabastine hydrochloride#51.16.16.00.00
-unspsc7#51.16.16.06.00#Loratidine#51.16.16.00.00
-unspsc7#51.16.16.07.00#Terfenadine#51.16.16.00.00
-unspsc7#51.16.17.00.00#Drugs used for respiratory tract disorders#51.16.00.00.00
-unspsc7#51.16.17.01.00#Acetylcysteine#51.16.17.00.00
-unspsc7#51.16.17.02.00#Beractant#51.16.17.00.00
-unspsc7#51.16.17.03.00#Budesonide#51.16.17.00.00
-unspsc7#51.16.17.04.00#Colfosceril palmitate#51.16.17.00.00
-unspsc7#51.16.17.05.00#Ipratropium bromide#51.16.17.00.00
-unspsc7#51.16.18.00.00#Cough and cold and antiallergy products#51.16.00.00.00
-unspsc7#51.16.18.01.00#Benzonatate#51.16.18.00.00
-unspsc7#51.16.18.02.00#Guaifenesin#51.16.18.00.00
-unspsc7#51.16.19.00.00#Nasal decongestants#51.16.00.00.00
-unspsc7#51.16.19.01.00#Oxymetazoline hydrochloride#51.16.19.00.00
-unspsc7#51.16.19.02.00#Pseudoephedrine hydrochloride#51.16.19.00.00
-unspsc7#51.16.19.03.00#Xylometazoline hydrochloride#51.16.19.00.00
-unspsc7#51.17.00.00.00#Drugs affecting the gastrointestinal system#51.00.00.00.00
-unspsc7#51.17.15.00.00#Antacids#51.17.00.00.00
-unspsc7#51.17.15.01.00#Calcium carbonate#51.17.15.00.00
-unspsc7#51.17.15.02.00#Magaldrate#51.17.15.00.00
-unspsc7#51.17.15.03.00#Magnesium hydroxide#51.17.15.00.00
-unspsc7#51.17.15.04.00#Sodium bicarbonate antacids#51.17.15.00.00
-unspsc7#51.17.16.00.00#Laxatives#51.17.00.00.00
-unspsc7#51.17.16.01.00#Cascara sagrada#51.17.16.00.00
-unspsc7#51.17.16.02.00#Docusate calcium#51.17.16.00.00
-unspsc7#51.17.16.03.00#Docusate potassium#51.17.16.00.00
-unspsc7#51.17.16.04.00#Docusate sodium#51.17.16.00.00
-unspsc7#51.17.16.05.00#Lactulose#51.17.16.00.00
-unspsc7#51.17.16.06.00#Magnesium sulfate#51.17.16.00.00
-unspsc7#51.17.16.07.00#Psyllium hydrophilic muciloid#51.17.16.00.00
-unspsc7#51.17.17.00.00#Antidiarrheals#51.17.00.00.00
-unspsc7#51.17.17.01.00#Difenoxin hydrochloride#51.17.17.00.00
-unspsc7#51.17.17.02.00#Loperamide hydrochloride#51.17.17.00.00
-unspsc7#51.17.17.03.00#Paregoric#51.17.17.00.00
-unspsc7#51.17.18.00.00#Antiemetics and antinauseants#51.17.00.00.00
-unspsc7#51.17.18.01.00#Dronabinol#51.17.18.00.00
-unspsc7#51.17.18.02.00#Granisetron hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.03.00#Meclizine hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.04.00#Ondansetron hydrochloride#51.17.18.00.00
-unspsc7#51.17.18.05.00#Trimethobenzamide hydrochloride#51.17.18.00.00
-unspsc7#51.17.19.00.00#Antiulcer and related gastrointestinal (GI) drugs#51.17.00.00.00
-unspsc7#51.17.19.01.00#Cimetidine#51.17.19.00.00
-unspsc7#51.17.19.02.00#Famotidine#51.17.19.00.00
-unspsc7#51.17.19.03.00#Nizatidine#51.17.19.00.00
-unspsc7#51.17.19.04.00#Ranitidine hydrochloride#51.17.19.00.00
-unspsc7#51.17.19.05.00#Cisapride#51.17.19.00.00
-unspsc7#51.17.19.06.00#Lansoprazole#51.17.19.00.00
-unspsc7#51.17.19.07.00#Librax#51.17.19.00.00
-unspsc7#51.17.19.08.00#Misoprostol#51.17.19.00.00
-unspsc7#51.17.20.00.00#Drugs used for gallbladder disease#51.17.00.00.00
-unspsc7#51.17.20.01.00#Chenodiol#51.17.20.00.00
-unspsc7#51.17.20.02.00#Monoctanoin#51.17.20.00.00
-unspsc7#51.17.20.03.00#Ursodiol#51.17.20.00.00
-unspsc7#51.18.00.00.00#Hormones and hormone antagonists#51.00.00.00.00
-unspsc7#51.18.15.00.00#Antidiabetic agents and hyperglycemic agents#51.18.00.00.00
-unspsc7#51.18.15.01.00#Acarbose#51.18.15.00.00
-unspsc7#51.18.15.02.00#Acetohexamide#51.18.15.00.00
-unspsc7#51.18.15.03.00#Chlorpropamide#51.18.15.00.00
-unspsc7#51.18.15.04.00#Glimepiride#51.18.15.00.00
-unspsc7#51.18.15.05.00#Glipizide#51.18.15.00.00
-unspsc7#51.18.15.06.00#Insulin#51.18.15.00.00
-unspsc7#51.18.15.08.00#Glucagon#51.18.15.00.00
-unspsc7#51.18.16.00.00#Thyroid and antithyroid drugs#51.18.00.00.00
-unspsc7#51.18.16.01.00#Levothyroxine sodium#51.18.16.00.00
-unspsc7#51.18.16.02.00#Liothyronine sodium#51.18.16.00.00
-unspsc7#51.18.16.03.00#Liotrix#51.18.16.00.00
-unspsc7#51.18.16.04.00#Thyrotropin#51.18.16.00.00
-unspsc7#51.18.16.05.00#Methimazole#51.18.16.00.00
-unspsc7#51.18.16.06.00#Propylthiouracil#51.18.16.00.00
-unspsc7#51.18.17.00.00#Corticosteroids#51.18.00.00.00
-unspsc7#51.18.17.01.00#Betamethasone#51.18.17.00.00
-unspsc7#51.18.17.02.00#Corticotropin#51.18.17.00.00
-unspsc7#51.18.17.03.00#Cosyntropin#51.18.17.00.00
-unspsc7#51.18.17.04.00#Dexamethasone#51.18.17.00.00
-unspsc7#51.18.17.05.00#Flunisolide#51.18.17.00.00
-unspsc7#51.18.17.06.00#Hydrocortisone#51.18.17.00.00
-unspsc7#51.18.17.07.00#Methylprednisolone#51.18.17.00.00
-unspsc7#51.18.17.08.00#Prednisolone#51.18.17.00.00
-unspsc7#51.18.17.09.00#Triamcinolone#51.18.17.00.00
-unspsc7#51.18.18.00.00#Estrogens and progestins and internal contraceptives#51.18.00.00.00
-unspsc7#51.18.18.01.00#Chlorotrianisene#51.18.18.00.00
-unspsc7#51.18.18.02.00#Estrone#51.18.18.00.00
-unspsc7#51.18.18.03.00#Estrogens conjugated#51.18.18.00.00
-unspsc7#51.18.18.04.00#Estropipate#51.18.18.00.00
-unspsc7#51.18.18.05.00#Levonorgestrel#51.18.18.00.00
-unspsc7#51.18.18.06.00#Megestrol acetate#51.18.18.00.00
-unspsc7#51.18.18.07.00#Ethinyl estradiol#51.18.18.00.00
-unspsc7#51.18.18.08.00#Mestranol#51.18.18.00.00
-unspsc7#51.18.19.00.00#Gonadotropic hormones and ovarian stimulants and inhibitors#51.18.00.00.00
-unspsc7#51.18.19.01.00#Chorionic gonadotropin#51.18.19.00.00
-unspsc7#51.18.19.02.00#Danazol#51.18.19.00.00
-unspsc7#51.18.19.03.00#Gonadorelin acetate#51.18.19.00.00
-unspsc7#51.18.19.04.00#Histrelin acetate#51.18.19.00.00
-unspsc7#51.18.19.05.00#Menotropins#51.18.19.00.00
-unspsc7#51.18.19.06.00#Urofollitropin#51.18.19.00.00
-unspsc7#51.18.20.00.00#Androgens and androgen inhibitors#51.18.00.00.00
-unspsc7#51.18.20.01.00#Finasteride#51.18.20.00.00
-unspsc7#51.18.20.02.00#Testosterone#51.18.20.00.00
-unspsc7#51.18.20.03.00#Testosterone cypionate#51.18.20.00.00
-unspsc7#51.18.20.04.00#Testosterone enanthate#51.18.20.00.00
-unspsc7#51.18.20.05.00#Testosterone propionate#51.18.20.00.00
-unspsc7#51.18.21.00.00#Posterior pituitary hormones#51.18.00.00.00
-unspsc7#51.18.21.01.00#Desmopressin acetate#51.18.21.00.00
-unspsc7#51.18.21.02.00#Vasopressin#51.18.21.00.00
-unspsc7#51.18.22.00.00#Drugs for inducing labor#51.18.00.00.00
-unspsc7#51.18.22.01.00#Dinoprostone#51.18.22.00.00
-unspsc7#51.18.22.02.00#Methylergonovine maleate#51.18.22.00.00
-unspsc7#51.18.22.03.00#Oxytocin#51.18.22.00.00
-unspsc7#51.18.23.00.00#Growth hormones#51.18.00.00.00
-unspsc7#51.18.23.01.00#Somatrem#51.18.23.00.00
-unspsc7#51.18.23.02.00#Somatropin#51.18.23.00.00
-unspsc7#51.18.24.00.00#Calcium salts and calcium regulators#51.18.00.00.00
-unspsc7#51.18.24.01.00#Calcium chloride#51.18.24.00.00
-unspsc7#51.18.24.02.00#Calcium citrate#51.18.24.00.00
-unspsc7#51.18.24.03.00#Calcium gluconate#51.18.24.00.00
-unspsc7#51.18.24.04.00#Calcium lactate#51.18.24.00.00
-unspsc7#51.18.24.05.00#Dibase calcium phosphate#51.18.24.00.00
-unspsc7#51.18.24.06.00#Alendronate sodium#51.18.24.00.00
-unspsc7#51.18.24.07.00#Calcitonin#51.18.24.00.00
-unspsc7#51.18.24.08.00#Cellulose sodium phosphate#51.18.24.00.00
-unspsc7#51.18.24.09.00#Gallium nitrate#51.18.24.00.00
-unspsc7#51.19.00.00.00#Agents affecting water and electrolytes#51.00.00.00.00
-unspsc7#51.19.15.00.00#Diuretics#51.19.00.00.00
-unspsc7#51.19.15.01.00#Chlorothiazide#51.19.15.00.00
-unspsc7#51.19.15.02.00#Chlorthalidone#51.19.15.00.00
-unspsc7#51.19.15.03.00#Mentolazone#51.19.15.00.00
-unspsc7#51.19.15.04.00#Bumetanide#51.19.15.00.00
-unspsc7#51.19.15.05.00#Ethacrynate sodium#51.19.15.00.00
-unspsc7#51.19.15.06.00#Amiloride hydrochloride#51.19.15.00.00
-unspsc7#51.19.15.07.00#Spironolactone#51.19.15.00.00
-unspsc7#51.19.15.08.00#Triamterene#51.19.15.00.00
-unspsc7#51.19.15.09.00#Mannitol#51.19.15.00.00
-unspsc7#51.19.16.00.00#Electrolytes#51.19.00.00.00
-unspsc7#51.19.16.01.00#Dextrose#51.19.16.00.00
-unspsc7#51.19.16.02.00#Sodium chloride electrolytes#51.19.16.00.00
-unspsc7#51.19.17.00.00#Alkalinizing agents#51.19.00.00.00
-unspsc7#51.19.17.01.00#Tromethamine#51.19.17.00.00
-unspsc7#51.19.18.00.00#Potassium salts#51.19.00.00.00
-unspsc7#51.19.18.01.00#Potassium bicarbonate#51.19.18.00.00
-unspsc7#51.19.18.02.00#Potassium chloride#51.19.18.00.00
-unspsc7#51.19.18.03.00#Potassium gluconate#51.19.18.00.00
-unspsc7#51.20.00.00.00#Immunomodulating drugs#51.00.00.00.00
-unspsc7#51.20.15.00.00#Immunosuppressants#51.20.00.00.00
-unspsc7#51.20.15.01.00#Azathioprine#51.20.15.00.00
-unspsc7#51.20.15.02.00#Cyclosporine#51.20.15.00.00
-unspsc7#51.20.15.03.00#Mycophenolate mofetil#51.20.15.00.00
-unspsc7#51.20.15.04.00#Tacrolimus#51.20.15.00.00
-unspsc7#51.20.16.00.00#Vaccines#51.20.00.00.00
-unspsc7#51.20.16.01.00#Anthrax antigen#51.20.16.00.00
-unspsc7#51.20.16.02.00#Brucella antigen#51.20.16.00.00
-unspsc7#51.20.16.03.00#Cholera#51.20.16.00.00
-unspsc7#51.20.16.04.00#Diphteria#51.20.16.00.00
-unspsc7#51.20.16.05.00#Encephalitis#51.20.16.00.00
-unspsc7#51.20.16.06.00#Hemophilus influenzae#51.20.16.00.00
-unspsc7#51.20.16.07.00#Hepatitis b#51.20.16.00.00
-unspsc7#51.20.16.08.00#Influenza#51.20.16.00.00
-unspsc7#51.20.16.09.00#Measles#51.20.16.00.00
-unspsc7#51.20.16.10.00#Meningococcus#51.20.16.00.00
-unspsc7#51.20.16.11.00#Morbilli#51.20.16.00.00
-unspsc7#51.20.16.12.00#Mumps#51.20.16.00.00
-unspsc7#51.20.16.13.00#Parotitis#51.20.16.00.00
-unspsc7#51.20.16.14.00#Pertussis#51.20.16.00.00
-unspsc7#51.20.16.15.00#Pneumococcus#51.20.16.00.00
-unspsc7#51.20.16.16.00#Poliomyelitis#51.20.16.00.00
-unspsc7#51.20.16.17.00#Rabies#51.20.16.00.00
-unspsc7#51.20.16.18.00#Rota virus#51.20.16.00.00
-unspsc7#51.20.16.19.00#Rubella#51.20.16.00.00
-unspsc7#51.20.16.20.00#Smallpox#51.20.16.00.00
-unspsc7#51.20.16.21.00#Tetanus toxoid#51.20.16.00.00
-unspsc7#51.20.16.22.00#Tuberculosis#51.20.16.00.00
-unspsc7#51.20.16.23.00#Typhoid#51.20.16.00.00
-unspsc7#51.20.16.24.00#Varicella#51.20.16.00.00
-unspsc7#51.20.16.25.00#Yellow fever#51.20.16.00.00
-unspsc7#51.20.16.26.00#Hepatitis a#51.20.16.00.00
-unspsc7#51.21.00.00.00#Miscellaneous drug categories#51.00.00.00.00
-unspsc7#51.21.15.00.00#Antigout drugs#51.21.00.00.00
-unspsc7#51.21.15.01.00#Allopurinol#51.21.15.00.00
-unspsc7#51.21.15.02.00#Colchicine#51.21.15.00.00
-unspsc7#51.21.15.03.00#Probenecid#51.21.15.00.00
-unspsc7#51.21.15.04.00#Sulfinpyrazone#51.21.15.00.00
-unspsc7#51.21.16.00.00#Antidotes#51.21.00.00.00
-unspsc7#51.21.16.01.00#Deferoxamine mesylate#51.21.16.00.00
-unspsc7#51.21.16.02.00#Dexrazoxane#51.21.16.00.00
-unspsc7#51.21.16.03.00#Digoxin immune fab#51.21.16.00.00
-unspsc7#51.21.16.04.00#Dimercaprol#51.21.16.00.00
-unspsc7#51.21.16.05.00#Edetate disodium#51.21.16.00.00
-unspsc7#51.21.16.06.00#Flumazenil#51.21.16.00.00
-unspsc7#51.21.16.07.00#Ipecac#51.21.16.00.00
-unspsc7#51.21.16.08.00#Penicillamine#51.21.16.00.00
-unspsc7#51.21.16.09.00#Protamine sulfate#51.21.16.00.00
-unspsc7#51.21.16.10.00#Sodium polystyrene sulfonate#51.21.16.00.00
-unspsc7#51.21.16.11.00#Trientine#51.21.16.00.00
-unspsc7#51.21.17.00.00#Nutritious food#51.21.00.00.00
-unspsc7#51.21.17.01.00#Residue of maize germ#51.21.17.00.00
-unspsc7#51.21.18.00.00#Anaesthetic drugs#51.21.00.00.00
-unspsc7#51.21.18.01.00#Chloroform#51.21.18.00.00
-unspsc7#52.00.00.00.00#Domestic Appliances and Supplies and Consumer Electronic Products#52.00.00.00.00
-unspsc7#52.10.00.00.00#Floor coverings#52.00.00.00.00
-unspsc7#52.10.15.00.00#Rugs and mats#52.10.00.00.00
-unspsc7#52.10.15.01.00#Oriental rugs#52.10.15.00.00
-unspsc7#52.10.15.02.00#Area rugs#52.10.15.00.00
-unspsc7#52.10.15.03.00#Wool rugs#52.10.15.00.00
-unspsc7#52.10.15.04.00#Cotton rugs#52.10.15.00.00
-unspsc7#52.10.15.05.00#Synthetic rugs#52.10.15.00.00
-unspsc7#52.10.15.06.00#Braided rugs#52.10.15.00.00
-unspsc7#52.10.15.07.00#Bath mats#52.10.15.00.00
-unspsc7#52.10.15.08.00#Door mats#52.10.15.00.00
-unspsc7#52.10.15.09.00#Decorative mats#52.10.15.00.00
-unspsc7#52.10.15.10.00#Anti fatigue mats#52.10.15.00.00
-unspsc7#52.10.15.11.00#Rubber or vinyl mats#52.10.15.00.00
-unspsc7#52.10.15.12.00#Chair mat#52.10.15.00.00
-unspsc7#52.10.15.13.00#Carpet protector#52.10.15.00.00
-unspsc7#52.11.00.00.00#Accommodation furniture#52.00.00.00.00
-unspsc7#52.11.15.00.00#Furniture#52.11.00.00.00
-unspsc7#52.11.15.01.00#Sofas#52.11.15.00.00
-unspsc7#52.11.15.02.00#Stands#52.11.15.00.00
-unspsc7#52.11.15.03.00#Bookcases#52.11.15.00.00
-unspsc7#52.11.15.04.00#Entertainment centers#52.11.15.00.00
-unspsc7#52.11.15.05.00#Futons#52.11.15.00.00
-unspsc7#52.11.15.06.00#Chairs#52.11.15.00.00
-unspsc7#52.11.15.07.00#Coat racks#52.11.15.00.00
-unspsc7#52.11.15.08.00#Wall racks#52.11.15.00.00
-unspsc7#52.11.15.09.00#Mattresses#52.11.15.00.00
-unspsc7#52.11.15.10.00#Cots#52.11.15.00.00
-unspsc7#52.11.15.11.00#Beds#52.11.15.00.00
-unspsc7#52.11.15.12.00#Foot stools#52.11.15.00.00
-unspsc7#52.11.15.13.00#Tables#52.11.15.00.00
-unspsc7#52.11.15.14.00#Chests#52.11.15.00.00
-unspsc7#52.11.15.15.00#Stools#52.11.15.00.00
-unspsc7#52.11.15.16.00#Dressers#52.11.15.00.00
-unspsc7#52.11.15.17.00#Partitions#52.11.15.00.00
-unspsc7#52.11.16.00.00#Outdoor furniture#52.11.00.00.00
-unspsc7#52.11.16.01.00#Outdoor chairs#52.11.16.00.00
-unspsc7#52.11.16.02.00#Outdoor tables or picnic tables#52.11.16.00.00
-unspsc7#52.11.16.03.00#Outdoor swings#52.11.16.00.00
-unspsc7#52.11.16.04.00#Outdoor benches#52.11.16.00.00
-unspsc7#52.11.16.05.00#Outdoor umbrellas#52.11.16.00.00
-unspsc7#52.11.17.00.00#Office furniture#52.11.00.00.00
-unspsc7#52.11.17.01.00#Credenzas#52.11.17.00.00
-unspsc7#52.11.17.03.00#Desks#52.11.17.00.00
-unspsc7#52.12.00.00.00#Bedclothes and table and kitchen linen and towels#52.00.00.00.00
-unspsc7#52.12.15.00.00#Bedclothes#52.12.00.00.00
-unspsc7#52.12.15.01.00#Quilts#52.12.15.00.00
-unspsc7#52.12.15.02.00#Comforters#52.12.15.00.00
-unspsc7#52.12.15.03.00#Comforter covers#52.12.15.00.00
-unspsc7#52.12.15.04.00#Mattress covers#52.12.15.00.00
-unspsc7#52.12.15.05.00#Pillows#52.12.15.00.00
-unspsc7#52.12.15.06.00#Mattress pads#52.12.15.00.00
-unspsc7#52.12.15.07.00#Featherbeds#52.12.15.00.00
-unspsc7#52.12.15.08.00#Blankets#52.12.15.00.00
-unspsc7#52.12.15.09.00#Sheets#52.12.15.00.00
-unspsc7#52.12.15.10.00#Dust ruffles#52.12.15.00.00
-unspsc7#52.12.15.11.00#Duvets#52.12.15.00.00
-unspsc7#52.12.15.12.00#Pillow cases#52.12.15.00.00
-unspsc7#52.12.15.13.00#Bed spreads#52.12.15.00.00
-unspsc7#52.12.16.00.00#Table and kitchen linen#52.12.00.00.00
-unspsc7#52.12.16.01.00#Dish towels#52.12.16.00.00
-unspsc7#52.12.16.02.00#Napkins#52.12.16.00.00
-unspsc7#52.12.16.03.00#Table runners#52.12.16.00.00
-unspsc7#52.12.16.04.00#Table cloths#52.12.16.00.00
-unspsc7#52.12.16.05.00#Domestic oven mits or pot holders#52.12.16.00.00
-unspsc7#52.12.16.06.00#Place mats#52.12.16.00.00
-unspsc7#52.12.16.07.00#Table skirts#52.12.16.00.00
-unspsc7#52.12.17.00.00#Towels#52.12.00.00.00
-unspsc7#52.12.17.01.00#Bath towels#52.12.17.00.00
-unspsc7#52.12.17.02.00#Beach towels#52.12.17.00.00
-unspsc7#52.12.17.03.00#Wash cloths#52.12.17.00.00
-unspsc7#52.12.17.04.00#Hand towels#52.12.17.00.00
-unspsc7#52.13.00.00.00#Window treatments#52.00.00.00.00
-unspsc7#52.13.15.00.00#Curtains and draperies#52.13.00.00.00
-unspsc7#52.13.15.01.00#Curtains#52.13.15.00.00
-unspsc7#52.13.15.03.00#Draperies#52.13.15.00.00
-unspsc7#52.13.16.00.00#Blinds and shades#52.13.00.00.00
-unspsc7#52.13.16.01.00#Venetian blinds#52.13.16.00.00
-unspsc7#52.13.16.02.00#Roll up shades#52.13.16.00.00
-unspsc7#52.13.16.03.00#Interior shutters#52.13.16.00.00
-unspsc7#52.13.16.04.00#Vertical blinds#52.13.16.00.00
-unspsc7#52.13.17.00.00#Window treatment accessories and hardware#52.13.00.00.00
-unspsc7#52.13.17.01.00#Valances#52.13.17.00.00
-unspsc7#52.13.17.02.00#Curtain rods#52.13.17.00.00
-unspsc7#52.13.17.03.00#Rod finials#52.13.17.00.00
-unspsc7#52.13.17.04.00#Curtain rings or clips#52.13.17.00.00
-unspsc7#52.14.00.00.00#Domestic appliances#52.00.00.00.00
-unspsc7#52.14.15.00.00#Domestic kitchen appliances#52.14.00.00.00
-unspsc7#52.14.15.01.00#Domestic refrigerators#52.14.15.00.00
-unspsc7#52.14.15.02.00#Domestic microwave ovens#52.14.15.00.00
-unspsc7#52.14.15.03.00#Domestic garbage disposals#52.14.15.00.00
-unspsc7#52.14.15.04.00#Domestic ranges#52.14.15.00.00
-unspsc7#52.14.15.05.00#Domestic dish washers#52.14.15.00.00
-unspsc7#52.14.15.06.00#Domestic freezers#52.14.15.00.00
-unspsc7#52.14.15.07.00#Domestic upright freezers#52.14.15.00.00
-unspsc7#52.14.15.08.00#Domestic chest freezers#52.14.15.00.00
-unspsc7#52.14.15.09.00#Domestic combination refrigerator freezers#52.14.15.00.00
-unspsc7#52.14.15.10.00#Domestic portable air conditioners#52.14.15.00.00
-unspsc7#52.14.15.11.00#Domestic juicers#52.14.15.00.00
-unspsc7#52.14.15.12.00#Domestic waffle irons#52.14.15.00.00
-unspsc7#52.14.15.13.00#Domestic electric can openers#52.14.15.00.00
-unspsc7#52.14.15.14.00#Domestic food processors#52.14.15.00.00
-unspsc7#52.14.15.15.00#Domestic trash compactors#52.14.15.00.00
-unspsc7#52.14.15.16.00#Domestic deep fryers#52.14.15.00.00
-unspsc7#52.14.15.17.00#Domestic popcorn poppers#52.14.15.00.00
-unspsc7#52.14.15.18.00#Domestic bread making machines#52.14.15.00.00
-unspsc7#52.14.15.19.00#Domestic convectional ovens#52.14.15.00.00
-unspsc7#52.14.15.20.00#Domestic mixers#52.14.15.00.00
-unspsc7#52.14.15.21.00#Domestic toaster ovens#52.14.15.00.00
-unspsc7#52.14.15.22.00#Domestic toasters#52.14.15.00.00
-unspsc7#52.14.15.23.00#Domestic electrical kettles#52.14.15.00.00
-unspsc7#52.14.15.24.00#Domestic blenders#52.14.15.00.00
-unspsc7#52.14.15.25.00#Domestic hot plates#52.14.15.00.00
-unspsc7#52.14.15.26.00#Domestic coffee makers#52.14.15.00.00
-unspsc7#52.14.15.27.00#Domestic electric knives#52.14.15.00.00
-unspsc7#52.14.15.28.00#Domestic electric woks#52.14.15.00.00
-unspsc7#52.14.15.29.00#Domestic coffee grinders#52.14.15.00.00
-unspsc7#52.14.15.30.00#Parts of dishwashing machines#52.14.15.00.00
-unspsc7#52.14.15.31.00#Domestic food choppers#52.14.15.00.00
-unspsc7#52.14.15.32.00#Domestic electric skillets#52.14.15.00.00
-unspsc7#52.14.15.33.00#Domestic electric griddles#52.14.15.00.00
-unspsc7#52.14.15.34.00#Domestic electric sandwich maker#52.14.15.00.00
-unspsc7#52.14.15.35.00#Domestic indoor electric grills#52.14.15.00.00
-unspsc7#52.14.15.36.00#Domestic pizelle or cookie maker#52.14.15.00.00
-unspsc7#52.14.15.37.00#Domestic crock pot#52.14.15.00.00
-unspsc7#52.14.16.00.00#Domestic laundry appliances and supplies#52.14.00.00.00
-unspsc7#52.14.16.01.00#Domestic clothes washers#52.14.16.00.00
-unspsc7#52.14.16.02.00#Domestic tumble dryers#52.14.16.00.00
-unspsc7#52.14.16.03.00#Domestic clothing irons#52.14.16.00.00
-unspsc7#52.14.16.04.00#Footwear dryers#52.14.16.00.00
-unspsc7#52.14.16.05.00#Laundry hampers#52.14.16.00.00
-unspsc7#52.14.16.06.00#Laundry baskets#52.14.16.00.00
-unspsc7#52.14.17.00.00#Domestic bath appliances#52.14.00.00.00
-unspsc7#52.14.17.01.00#Domestic electric toothbrushes#52.14.17.00.00
-unspsc7#52.14.17.03.00#Domestic hair dryers#52.14.17.00.00
-unspsc7#52.14.17.04.00#Domestic electric razors#52.14.17.00.00
-unspsc7#52.14.17.05.00#Parts of shavers or hair removers#52.14.17.00.00
-unspsc7#52.14.17.06.00#Nail dryers#52.14.17.00.00
-unspsc7#52.14.18.00.00#Other domestic household appliances#52.14.00.00.00
-unspsc7#52.14.18.01.00#Domestic sewing machines#52.14.18.00.00
-unspsc7#52.14.18.02.00#Domestic space heaters#52.14.18.00.00
-unspsc7#52.14.18.03.00#Domestic electric blankets#52.14.18.00.00
-unspsc7#52.15.00.00.00#Domestic kitchenware#52.00.00.00.00
-unspsc7#52.15.15.00.00#Domestic disposable kitchenware#52.15.00.00.00
-unspsc7#52.15.15.01.00#Domestic disposable cookware#52.15.15.00.00
-unspsc7#52.15.15.02.00#Domestic disposable dishes#52.15.15.00.00
-unspsc7#52.15.15.03.00#Domestic disposable flatware#52.15.15.00.00
-unspsc7#52.15.15.04.00#Domestic disposable cups or glasses or lids#52.15.15.00.00
-unspsc7#52.15.15.05.00#Domestic disposable stirrers#52.15.15.00.00
-unspsc7#52.15.15.06.00#Domestic disposable food containers#52.15.15.00.00
-unspsc7#52.15.15.07.00#Domestic disposable drinking straws#52.15.15.00.00
-unspsc7#52.15.16.00.00#Domestic kitchen tools and utensils#52.15.00.00.00
-unspsc7#52.15.16.01.00#Domestic rolling pins#52.15.16.00.00
-unspsc7#52.15.16.02.00#Domestic mixing bowls#52.15.16.00.00
-unspsc7#52.15.16.03.00#Domestic graters#52.15.16.00.00
-unspsc7#52.15.16.04.00#Domestic strainers or colanders#52.15.16.00.00
-unspsc7#52.15.16.05.00#Domestic can or bottle openers#52.15.16.00.00
-unspsc7#52.15.16.06.00#Domestic cutting boards#52.15.16.00.00
-unspsc7#52.15.16.07.00#Domestic measuring cups#52.15.16.00.00
-unspsc7#52.15.16.08.00#Basters or basting brushes#52.15.16.00.00
-unspsc7#52.15.16.09.00#Vegetable peeler#52.15.16.00.00
-unspsc7#52.15.16.10.00#Cookie cutters#52.15.16.00.00
-unspsc7#52.15.16.11.00#Domestic kitchen tongs#52.15.16.00.00
-unspsc7#52.15.16.12.00#Domestic kitchen wire whips#52.15.16.00.00
-unspsc7#52.15.16.13.00#Domestic food scrapers#52.15.16.00.00
-unspsc7#52.15.16.14.00#Domestic cooling racks#52.15.16.00.00
-unspsc7#52.15.16.15.00#Domestic pizza cutters#52.15.16.00.00
-unspsc7#52.15.16.16.00#Domestic kitchen spatulas#52.15.16.00.00
-unspsc7#52.15.16.17.00#Domestic wooden spoons#52.15.16.00.00
-unspsc7#52.15.16.18.00#Domestic wooden oven paddle#52.15.16.00.00
-unspsc7#52.15.16.19.00#Domestic pastry blender#52.15.16.00.00
-unspsc7#52.15.16.20.00#Domestic sifter#52.15.16.00.00
-unspsc7#52.15.16.21.00#Domestic cookie stampers#52.15.16.00.00
-unspsc7#52.15.16.22.00#Domestic pastry decorating gun#52.15.16.00.00
-unspsc7#52.15.16.23.00#Domestic cookie press#52.15.16.00.00
-unspsc7#52.15.16.24.00#Domestic knife sharpeners#52.15.16.00.00
-unspsc7#52.15.16.25.00#Domestic biscuit cutters#52.15.16.00.00
-unspsc7#52.15.16.26.00#Domestic mandolin#52.15.16.00.00
-unspsc7#52.15.16.27.00#Domestic garlic press#52.15.16.00.00
-unspsc7#52.15.16.28.00#Domestic egg slicer#52.15.16.00.00
-unspsc7#52.15.16.29.00#Domestic egg separator#52.15.16.00.00
-unspsc7#52.15.16.30.00#Domestic cheese slicer#52.15.16.00.00
-unspsc7#52.15.16.31.00#Domestic food mill#52.15.16.00.00
-unspsc7#52.15.16.32.00#Domestic kitchen funnels#52.15.16.00.00
-unspsc7#52.15.16.33.00#Domestic garnishing tools#52.15.16.00.00
-unspsc7#52.15.16.34.00#Domestic apple corer#52.15.16.00.00
-unspsc7#52.15.16.35.00#Domestic melon or butter baller#52.15.16.00.00
-unspsc7#52.15.16.36.00#Domestic food scoops#52.15.16.00.00
-unspsc7#52.15.16.37.00#Domestic pumpkin carver#52.15.16.00.00
-unspsc7#52.15.16.38.00#Domestic vegetable brush#52.15.16.00.00
-unspsc7#52.15.16.39.00#Domestic egg beater#52.15.16.00.00
-unspsc7#52.15.16.40.00#Domestic pasta drying rack#52.15.16.00.00
-unspsc7#52.15.16.41.00#Domestic whipped cream maker#52.15.16.00.00
-unspsc7#52.15.16.42.00#Domestic dough press#52.15.16.00.00
-unspsc7#52.15.16.43.00#Domestic ravioli maker#52.15.16.00.00
-unspsc7#52.15.16.44.00#Domestic mist sprayer#52.15.16.00.00
-unspsc7#52.15.16.45.00#Domestic pastry brush#52.15.16.00.00
-unspsc7#52.15.16.46.00#Domestic kitchen or diet scales#52.15.16.00.00
-unspsc7#52.15.16.47.00#Domestic kitchen timers#52.15.16.00.00
-unspsc7#52.15.16.48.00#Domestic kitchen or food thermometers#52.15.16.00.00
-unspsc7#52.15.16.49.00#Domestic bread slicing guide#52.15.16.00.00
-unspsc7#52.15.16.50.00#Domestic drain boards#52.15.16.00.00
-unspsc7#52.15.17.00.00#Domestic flatware and cutlery#52.15.00.00.00
-unspsc7#52.15.17.01.00#Domestic serving utensils#52.15.17.00.00
-unspsc7#52.15.17.02.00#Domestic knives#52.15.17.00.00
-unspsc7#52.15.17.03.00#Domestic forks#52.15.17.00.00
-unspsc7#52.15.17.04.00#Domestic spoons#52.15.17.00.00
-unspsc7#52.15.17.05.00#Spoon rests#52.15.17.00.00
-unspsc7#52.15.17.06.00#Chopsticks#52.15.17.00.00
-unspsc7#52.15.18.00.00#Domestic cookware#52.15.00.00.00
-unspsc7#52.15.18.01.00#Domestic dutch ovens#52.15.18.00.00
-unspsc7#52.15.18.02.00#Domestic frying pans#52.15.18.00.00
-unspsc7#52.15.18.03.00#Domestic saucepans#52.15.18.00.00
-unspsc7#52.15.18.04.00#Domestic kettles#52.15.18.00.00
-unspsc7#52.15.18.05.00#Domestic woks#52.15.18.00.00
-unspsc7#52.15.18.06.00#Domestic steamers#52.15.18.00.00
-unspsc7#52.15.18.07.00#Domestic stock pots#52.15.18.00.00
-unspsc7#52.15.18.08.00#Domestic pressure cookers#52.15.18.00.00
-unspsc7#52.15.18.09.00#Domestic saute pans#52.15.18.00.00
-unspsc7#52.15.18.10.00#Domestic chafing dishes#52.15.18.00.00
-unspsc7#52.15.18.11.00#Domestic griddles#52.15.18.00.00
-unspsc7#52.15.18.12.00#Domestic double boilers#52.15.18.00.00
-unspsc7#52.15.18.13.00#Domestic splatter shield#52.15.18.00.00
-unspsc7#52.15.19.00.00#Domestic bakeware#52.15.00.00.00
-unspsc7#52.15.19.01.00#Domestic muffin pans#52.15.19.00.00
-unspsc7#52.15.19.02.00#Domestic baking pans#52.15.19.00.00
-unspsc7#52.15.19.03.00#Domestic cake or pie pans#52.15.19.00.00
-unspsc7#52.15.19.04.00#Domestic roasting pans#52.15.19.00.00
-unspsc7#52.15.19.05.00#Domestic baking sheets#52.15.19.00.00
-unspsc7#52.15.19.06.00#Domestic broiling pans#52.15.19.00.00
-unspsc7#52.15.19.07.00#Domestic baking molds#52.15.19.00.00
-unspsc7#52.15.19.08.00#Domestic pizza pans#52.15.19.00.00
-unspsc7#52.15.19.09.00#Domestic tortilla bakers#52.15.19.00.00
-unspsc7#52.15.20.00.00#Domestic dishes and servingware and storage containers#52.15.00.00.00
-unspsc7#52.15.20.01.00#Domestic pitchers#52.15.20.00.00
-unspsc7#52.15.20.02.00#Domestic food storage containers#52.15.20.00.00
-unspsc7#52.15.20.03.00#Domestic punch bowls#52.15.20.00.00
-unspsc7#52.15.20.04.00#Domestic plates#52.15.20.00.00
-unspsc7#52.15.20.05.00#Domestic saucers#52.15.20.00.00
-unspsc7#52.15.20.06.00#Domestic trays or platters#52.15.20.00.00
-unspsc7#52.15.20.07.00#Domestic serving bowls#52.15.20.00.00
-unspsc7#52.15.20.08.00#Domestic tea or coffee pots#52.15.20.00.00
-unspsc7#52.15.20.09.00#Domestic soup or salad bowls#52.15.20.00.00
-unspsc7#52.15.20.10.00#Domestic vacuum flasks#52.15.20.00.00
-unspsc7#52.15.20.11.00#Inners for vaccum flasks#52.15.20.00.00
-unspsc7#52.15.20.12.00#Ice trays#52.15.20.00.00
-unspsc7#52.15.20.13.00#Spice or salt or pepper shakers#52.15.20.00.00
-unspsc7#52.15.20.14.00#Carafe sets#52.15.20.00.00
-unspsc7#52.15.20.15.00#Domestic cake plate with dome#52.15.20.00.00
-unspsc7#52.15.21.00.00#Domestic drinking utensils#52.15.00.00.00
-unspsc7#52.15.21.01.00#Domestic coffee or tea cups#52.15.21.00.00
-unspsc7#52.15.21.02.00#Domestic drinking glasses#52.15.21.00.00
-unspsc7#52.15.21.03.00#Domestic mugs#52.15.21.00.00
-unspsc7#52.15.21.04.00#Domestic stemware#52.15.21.00.00
-unspsc7#52.15.22.00.00#Dishwashing and dish storage accessories#52.15.00.00.00
-unspsc7#52.15.22.01.00#Shelf liner#52.15.22.00.00
-unspsc7#52.15.22.02.00#Dish drainer#52.15.22.00.00
-unspsc7#52.15.22.03.00#Soap dispensing brush#52.15.22.00.00
-unspsc7#52.16.00.00.00#Consumer electronics#52.00.00.00.00
-unspsc7#52.16.15.00.00#Audio and visual equipment#52.16.00.00.00
-unspsc7#52.16.15.01.00#Compact disc players#52.16.15.00.00
-unspsc7#52.16.15.02.00#Cassette players or recorders#52.16.15.00.00
-unspsc7#52.16.15.03.00#Digital video disc players#52.16.15.00.00
-unspsc7#52.16.15.04.00#Video cassette recorders#52.16.15.00.00
-unspsc7#52.16.15.05.00#Televisions#52.16.15.00.00
-unspsc7#52.16.15.06.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.07.00#Clock radios#52.16.15.00.00
-unspsc7#52.16.15.08.00#Laser disc players#52.16.15.00.00
-unspsc7#52.16.15.09.00#Portable stereo systems#52.16.15.00.00
-unspsc7#52.16.15.10.00#Home stereo systems#52.16.15.00.00
-unspsc7#52.16.15.11.00#Radios#52.16.15.00.00
-unspsc7#52.16.15.12.00#Speakers#52.16.15.00.00
-unspsc7#52.16.15.13.00#Combination television video cassette recorders#52.16.15.00.00
-unspsc7#52.16.15.14.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.15.00#Compact disk players or recorders#52.16.15.00.00
-unspsc7#52.16.15.16.00#Digital video disk players or recorders#52.16.15.00.00
-unspsc7#52.16.15.17.00#Equalizers#52.16.15.00.00
-unspsc7#52.16.15.18.00#Global positioning system receivers#52.16.15.00.00
-unspsc7#52.16.15.19.00#Headphones#52.16.15.00.00
-unspsc7#52.16.15.20.00#Microphones#52.16.15.00.00
-unspsc7#52.16.15.21.00#Multimedia receivers#52.16.15.00.00
-unspsc7#52.16.15.22.00#Radio frequency scanners#52.16.15.00.00
-unspsc7#52.16.15.23.00#Radio frequency transmittersreceivers#52.16.15.00.00
-unspsc7#52.16.15.24.00#Radio receivers#52.16.15.00.00
-unspsc7#52.16.15.25.00#Remote control#52.16.15.00.00
-unspsc7#52.16.15.26.00#Satellite receivers#52.16.15.00.00
-unspsc7#52.16.15.27.00#Subwoofers#52.16.15.00.00
-unspsc7#52.16.15.28.00#Televisions#52.16.15.00.00
-unspsc7#52.16.15.29.00#Video cassette players or recorders#52.16.15.00.00
-unspsc7#52.16.15.30.00#Video monitors#52.16.15.00.00
-unspsc7#52.16.15.31.00#Radio phonographs#52.16.15.00.00
-unspsc7#52.16.15.32.00#Karaoke systems#52.16.15.00.00
-unspsc7#52.16.15.33.00#Megaphones#52.16.15.00.00
-unspsc7#52.16.15.34.00#Integrated circut IC chip recorder#52.16.15.00.00
-unspsc7#52.16.15.35.00#Digital voice recorders#52.16.15.00.00
-unspsc7#52.16.15.36.00#Minidisc players or recorders#52.16.15.00.00
-unspsc7#52.16.16.00.00#Audio visual equipment accessories#52.16.00.00.00
-unspsc7#52.16.16.01.00#Cassette storage#52.16.16.00.00
-unspsc7#52.16.16.02.00#Audio or video head cleaners#52.16.16.00.00
-unspsc7#52.17.00.00.00#Domestic wall treatments#52.00.00.00.00
-unspsc7#52.17.10.00.00#Bathroom wall treatments#52.17.00.00.00
-unspsc7#52.17.10.01.00#Hanging toiletry organizer or shelf#52.17.10.00.00
-unspsc7#53.00.00.00.00#Apparel and Luggage and Personal Care Products#53.00.00.00.00
-unspsc7#53.10.00.00.00#Clothing#53.00.00.00.00
-unspsc7#53.10.15.00.00#Slacks and trousers and shorts#53.10.00.00.00
-unspsc7#53.10.15.01.00#Boys slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.02.00#Mens slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.03.00#Girls slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.04.00#Womens slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.15.05.00#Infants slacks or trousers or shorts#53.10.15.00.00
-unspsc7#53.10.16.00.00#Shirts and blouses#53.10.00.00.00
-unspsc7#53.10.16.01.00#Boys shirts#53.10.16.00.00
-unspsc7#53.10.16.02.00#Mens shirts#53.10.16.00.00
-unspsc7#53.10.16.03.00#Girls shirts or blouses#53.10.16.00.00
-unspsc7#53.10.16.04.00#Womens shirts or blouses#53.10.16.00.00
-unspsc7#53.10.16.05.00#Infants shirts or blouses#53.10.16.00.00
-unspsc7#53.10.17.00.00#Sweaters#53.10.00.00.00
-unspsc7#53.10.17.01.00#Boys sweaters#53.10.17.00.00
-unspsc7#53.10.17.02.00#Mens sweaters#53.10.17.00.00
-unspsc7#53.10.17.03.00#Girls sweaters#53.10.17.00.00
-unspsc7#53.10.17.04.00#Womens sweaters#53.10.17.00.00
-unspsc7#53.10.17.05.00#Infants sweaters#53.10.17.00.00
-unspsc7#53.10.18.00.00#Coats and jackets#53.10.00.00.00
-unspsc7#53.10.18.01.00#Boys coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.02.00#Mens coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.03.00#Girls coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.04.00#Womens coats or jackets#53.10.18.00.00
-unspsc7#53.10.18.05.00#Infants coats or jackets#53.10.18.00.00
-unspsc7#53.10.19.00.00#Suits#53.10.00.00.00
-unspsc7#53.10.19.01.00#Boys suits#53.10.19.00.00
-unspsc7#53.10.19.02.00#Mens suits#53.10.19.00.00
-unspsc7#53.10.19.03.00#Girls suits#53.10.19.00.00
-unspsc7#53.10.19.04.00#Womens suits#53.10.19.00.00
-unspsc7#53.10.19.05.00#Infants suits#53.10.19.00.00
-unspsc7#53.10.20.00.00#Dresses and skirts and saris and kimonos#53.10.00.00.00
-unspsc7#53.10.20.01.00#Girls dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.20.02.00#Womens dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.20.03.00#Infants dresses or skirts or saris or kimonos#53.10.20.00.00
-unspsc7#53.10.21.00.00#Overalls and coveralls#53.10.00.00.00
-unspsc7#53.10.21.01.00#Boys overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.02.00#Mens overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.03.00#Girls overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.04.00#Womens overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.21.05.00#Infants overalls or coveralls#53.10.21.00.00
-unspsc7#53.10.22.00.00#Folkloric clothing#53.10.00.00.00
-unspsc7#53.10.22.01.00#Boys folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.02.00#Mens folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.03.00#Girls folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.04.00#Womens folkloric clothing#53.10.22.00.00
-unspsc7#53.10.22.05.00#Infants folkloric clothing#53.10.22.00.00
-unspsc7#53.10.23.00.00#Undergarments#53.10.00.00.00
-unspsc7#53.10.23.01.00#Undershirts#53.10.23.00.00
-unspsc7#53.10.23.02.00#Slips#53.10.23.00.00
-unspsc7#53.10.23.03.00#Underpants#53.10.23.00.00
-unspsc7#53.10.23.04.00#Brassieres#53.10.23.00.00
-unspsc7#53.10.23.05.00#Infant diapers#53.10.23.00.00
-unspsc7#53.10.23.06.00#Adult diapers#53.10.23.00.00
-unspsc7#53.10.23.07.00#Body shaping garments#53.10.23.00.00
-unspsc7#53.10.24.00.00#Hosiery#53.10.00.00.00
-unspsc7#53.10.24.01.00#Stockings#53.10.24.00.00
-unspsc7#53.10.24.02.00#Socks#53.10.24.00.00
-unspsc7#53.10.24.03.00#Panty hose#53.10.24.00.00
-unspsc7#53.10.24.04.00#Tights#53.10.24.00.00
-unspsc7#53.10.25.00.00#Clothing accessories#53.10.00.00.00
-unspsc7#53.10.25.01.00#Belts or suspenders#53.10.25.00.00
-unspsc7#53.10.25.02.00#Ties or scarves or mufflers#53.10.25.00.00
-unspsc7#53.10.25.03.00#Hats#53.10.25.00.00
-unspsc7#53.10.25.04.00#Gloves or mittens#53.10.25.00.00
-unspsc7#53.10.25.05.00#Umbrellas#53.10.25.00.00
-unspsc7#53.10.25.06.00#Sweat bands#53.10.25.00.00
-unspsc7#53.10.25.07.00#Clothing hangers#53.10.25.00.00
-unspsc7#53.10.25.08.00#Armbands#53.10.25.00.00
-unspsc7#53.10.25.09.00#Garters#53.10.25.00.00
-unspsc7#53.10.25.10.00#Tassles#53.10.25.00.00
-unspsc7#53.10.25.11.00#Bandannas#53.10.25.00.00
-unspsc7#53.10.25.12.00#Handkerchiefs#53.10.25.00.00
-unspsc7#53.10.25.13.00#Headbands#53.10.25.00.00
-unspsc7#53.10.25.14.00#Pocket protectors#53.10.25.00.00
-unspsc7#53.10.25.15.00#Button covers#53.10.25.00.00
-unspsc7#53.10.26.00.00#Nightwear#53.10.00.00.00
-unspsc7#53.10.26.01.00#Boys pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.02.00#Mens pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.03.00#Girls pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.04.00#Womens pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.05.00#Infants pajamas or nightshirts#53.10.26.00.00
-unspsc7#53.10.26.06.00#Bath robes#53.10.26.00.00
-unspsc7#53.10.27.00.00#Uniforms#53.10.00.00.00
-unspsc7#53.10.27.01.00#Military uniforms#53.10.27.00.00
-unspsc7#53.10.27.02.00#Customs uniforms#53.10.27.00.00
-unspsc7#53.10.27.03.00#Police uniforms#53.10.27.00.00
-unspsc7#53.10.28.00.00#Swimwear#53.10.00.00.00
-unspsc7#53.10.28.01.00#Mens swimwear#53.10.28.00.00
-unspsc7#53.10.28.02.00#Womens swimwear#53.10.28.00.00
-unspsc7#53.10.28.03.00#Boys swimwear#53.10.28.00.00
-unspsc7#53.10.28.04.00#Girls swimwear#53.10.28.00.00
-unspsc7#53.10.28.05.00#Infants swimwear#53.10.28.00.00
-unspsc7#53.10.29.00.00#Athletic wear#53.10.00.00.00
-unspsc7#53.10.29.01.00#Womens athletic wear#53.10.29.00.00
-unspsc7#53.10.29.02.00#Mens athletic wear#53.10.29.00.00
-unspsc7#53.10.29.03.00#Boys athletic wear#53.10.29.00.00
-unspsc7#53.10.29.04.00#Girls athletic wear#53.10.29.00.00
-unspsc7#53.11.00.00.00#Footwear#53.00.00.00.00
-unspsc7#53.11.15.00.00#Boots#53.11.00.00.00
-unspsc7#53.11.15.01.00#Mens boots#53.11.15.00.00
-unspsc7#53.11.15.02.00#Womens boots#53.11.15.00.00
-unspsc7#53.11.15.03.00#Boys boots#53.11.15.00.00
-unspsc7#53.11.15.04.00#Girls boots#53.11.15.00.00
-unspsc7#53.11.15.05.00#Infants boots#53.11.15.00.00
-unspsc7#53.11.16.00.00#Shoes#53.11.00.00.00
-unspsc7#53.11.16.01.00#Mens shoes#53.11.16.00.00
-unspsc7#53.11.16.02.00#Womens shoes#53.11.16.00.00
-unspsc7#53.11.16.03.00#Boys shoes#53.11.16.00.00
-unspsc7#53.11.16.04.00#Girls shoes#53.11.16.00.00
-unspsc7#53.11.16.05.00#Infants shoes#53.11.16.00.00
-unspsc7#53.11.17.00.00#Slippers#53.11.00.00.00
-unspsc7#53.11.17.01.00#Mens slippers#53.11.17.00.00
-unspsc7#53.11.17.02.00#Womens slippers#53.11.17.00.00
-unspsc7#53.11.17.03.00#Boys slippers#53.11.17.00.00
-unspsc7#53.11.17.04.00#Girls slippers#53.11.17.00.00
-unspsc7#53.11.17.05.00#Infants slippers#53.11.17.00.00
-unspsc7#53.11.18.00.00#Sandals#53.11.00.00.00
-unspsc7#53.11.18.01.00#Mens sandals#53.11.18.00.00
-unspsc7#53.11.18.02.00#Womens sandals#53.11.18.00.00
-unspsc7#53.11.18.03.00#Boys sandals#53.11.18.00.00
-unspsc7#53.11.18.04.00#Girls sandals#53.11.18.00.00
-unspsc7#53.11.18.05.00#Infants sandals#53.11.18.00.00
-unspsc7#53.11.19.00.00#Athletic footwear#53.11.00.00.00
-unspsc7#53.11.19.01.00#Mens athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.02.00#Womens athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.03.00#Boys athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.04.00#Girls athletic footwear#53.11.19.00.00
-unspsc7#53.11.19.05.00#Infants athletic footwear#53.11.19.00.00
-unspsc7#53.11.20.00.00#Shoe accessories#53.11.00.00.00
-unspsc7#53.11.20.01.00#Shoehorns#53.11.20.00.00
-unspsc7#53.11.20.02.00#Shoelaces#53.11.20.00.00
-unspsc7#53.12.00.00.00#Luggage and handbags and packs and cases#53.00.00.00.00
-unspsc7#53.12.15.00.00#Luggage#53.12.00.00.00
-unspsc7#53.12.15.01.00#Garment bags#53.12.15.00.00
-unspsc7#53.12.15.02.00#Luggage sets#53.12.15.00.00
-unspsc7#53.12.15.03.00#Individual luggage pieces#53.12.15.00.00
-unspsc7#53.12.16.00.00#Purses and handbags and bags#53.12.00.00.00
-unspsc7#53.12.16.01.00#Handbags or purses#53.12.16.00.00
-unspsc7#53.12.16.02.00#Duffle bags#53.12.16.00.00
-unspsc7#53.12.16.03.00#Backpacks#53.12.16.00.00
-unspsc7#53.12.16.04.00#Eyeglass cases#53.12.16.00.00
-unspsc7#53.12.16.05.00#Coin purses#53.12.16.00.00
-unspsc7#53.12.16.06.00#Lipstick cases#53.12.16.00.00
-unspsc7#53.12.16.07.00#Cigar case#53.12.16.00.00
-unspsc7#53.12.17.00.00#Business cases#53.12.00.00.00
-unspsc7#53.12.17.01.00#Briefcases#53.12.17.00.00
-unspsc7#53.12.17.02.00#Attaches#53.12.17.00.00
-unspsc7#53.12.17.04.00#Portfolios#53.12.17.00.00
-unspsc7#53.12.17.05.00#Equipment cases#53.12.17.00.00
-unspsc7#53.12.17.06.00#Computer bags#53.12.17.00.00
-unspsc7#53.12.18.00.00#Travel kits and accessories#53.12.00.00.00
-unspsc7#53.12.18.01.00#Travel kits#53.12.18.00.00
-unspsc7#53.12.18.02.00#Travel carts#53.12.18.00.00
-unspsc7#53.12.18.03.00#Garment brushes#53.12.18.00.00
-unspsc7#53.12.18.04.00#Makeup or manicure cases#53.12.18.00.00
-unspsc7#53.13.00.00.00#Personal care products#53.00.00.00.00
-unspsc7#53.13.15.00.00#Dental#53.13.00.00.00
-unspsc7#53.13.15.01.00#Mouthwash#53.13.15.00.00
-unspsc7#53.13.15.02.00#Toothpaste#53.13.15.00.00
-unspsc7#53.13.15.03.00#Toothbrushes#53.13.15.00.00
-unspsc7#53.13.15.04.00#Dental floss#53.13.15.00.00
-unspsc7#53.13.15.05.00#Infant soother or pacifier or dummy#53.13.15.00.00
-unspsc7#53.13.15.06.00#Dental kits#53.13.15.00.00
-unspsc7#53.13.15.07.00#Toothpicks#53.13.15.00.00
-unspsc7#53.13.15.08.00#Denture cleaning tablets#53.13.15.00.00
-unspsc7#53.13.16.00.00#Bath and body#53.13.00.00.00
-unspsc7#53.13.16.01.00#Shower caps#53.13.16.00.00
-unspsc7#53.13.16.02.00#Hair care supplies#53.13.16.00.00
-unspsc7#53.13.16.03.00#Razors#53.13.16.00.00
-unspsc7#53.13.16.04.00#Hair combs or brushes#53.13.16.00.00
-unspsc7#53.13.16.05.00#Vanity kits#53.13.16.00.00
-unspsc7#53.13.16.06.00#Deodorants#53.13.16.00.00
-unspsc7#53.13.16.07.00#Hand or body lotions#53.13.16.00.00
-unspsc7#53.13.16.08.00#Soaps#53.13.16.00.00
-unspsc7#53.13.16.09.00#Sun protection products#53.13.16.00.00
-unspsc7#53.13.16.10.00#Eye care supplies#53.13.16.00.00
-unspsc7#53.13.16.11.00#Shaving creams#53.13.16.00.00
-unspsc7#53.13.16.12.00#Bath gels#53.13.16.00.00
-unspsc7#53.13.16.13.00#Skin care products#53.13.16.00.00
-unspsc7#53.13.16.14.00#Foot care products#53.13.16.00.00
-unspsc7#53.13.16.15.00#Feminine hygiene products#53.13.16.00.00
-unspsc7#53.13.16.16.00#Para pharmaceutical creams or lotions#53.13.16.00.00
-unspsc7#53.13.16.17.00#Manicure implements#53.13.16.00.00
-unspsc7#53.13.16.18.00#Pedicure implements#53.13.16.00.00
-unspsc7#53.13.16.19.00#Cosmetics#53.13.16.00.00
-unspsc7#53.13.16.20.00#Perfumes or colognes or fragrances#53.13.16.00.00
-unspsc7#53.13.16.21.00#Nail clippers#53.13.16.00.00
-unspsc7#53.13.16.22.00#Condoms#53.13.16.00.00
-unspsc7#53.13.16.23.00#Hair removal or depilatory products#53.13.16.00.00
-unspsc7#53.13.16.24.00#Disposable personal wipes#53.13.16.00.00
-unspsc7#53.13.16.25.00#Hair or beard nets#53.13.16.00.00
-unspsc7#53.13.16.26.00#Hand sanitizer#53.13.16.00.00
-unspsc7#53.13.16.27.00#Hand cleaner#53.13.16.00.00
-unspsc7#53.13.16.28.00#Shampoos#53.13.16.00.00
-unspsc7#53.13.16.29.00#Makeup kits#53.13.16.00.00
-unspsc7#53.13.16.30.00#Lip balm#53.13.16.00.00
-unspsc7#53.13.16.31.00#Tattoos#53.13.16.00.00
-unspsc7#53.13.16.32.00#Hot rollers#53.13.16.00.00
-unspsc7#53.13.16.33.00#Barrettes#53.13.16.00.00
-unspsc7#53.13.16.34.00#Chemical protection products#53.13.16.00.00
-unspsc7#53.13.16.35.00#Shaving brushes#53.13.16.00.00
-unspsc7#53.13.17.00.00#Eyewear#53.13.00.00.00
-unspsc7#53.13.17.01.00#Optical glasses or spectacles#53.13.17.00.00
-unspsc7#53.13.17.02.00#Contact lenses#53.13.17.00.00
-unspsc7#53.13.17.03.00#Sunglasses#53.13.17.00.00
-unspsc7#53.14.00.00.00#Sewing supplies and accessories#53.00.00.00.00
-unspsc7#53.14.15.00.00#Sewing fasteners#53.14.00.00.00
-unspsc7#53.14.15.01.00#Straight pins#53.14.15.00.00
-unspsc7#53.14.15.02.00#Safety pins#53.14.15.00.00
-unspsc7#53.14.15.03.00#Zippers#53.14.15.00.00
-unspsc7#53.14.15.04.00#Buckles#53.14.15.00.00
-unspsc7#53.14.15.05.00#Buttons#53.14.15.00.00
-unspsc7#53.14.15.06.00#Snaps#53.14.15.00.00
-unspsc7#53.14.15.07.00#Clasps#53.14.15.00.00
-unspsc7#53.14.15.08.00#Garment rivet#53.14.15.00.00
-unspsc7#53.14.16.00.00#Miscellaneous sewing supplies#53.14.00.00.00
-unspsc7#53.14.16.01.00#Pin cushions#53.14.16.00.00
-unspsc7#53.14.16.02.00#Sewing kits#53.14.16.00.00
-unspsc7#53.14.16.03.00#Thimbles#53.14.16.00.00
-unspsc7#53.14.16.04.00#Sewing patterns#53.14.16.00.00
-unspsc7#53.14.16.05.00#Sewing needles#53.14.16.00.00
-unspsc7#53.14.16.06.00#Bobbins or bobbin holders#53.14.16.00.00
-unspsc7#53.14.16.07.00#Seam gauge#53.14.16.00.00
-unspsc7#53.14.16.08.00#Bodkin#53.14.16.00.00
-unspsc7#53.14.16.09.00#Loop turner#53.14.16.00.00
-unspsc7#53.14.16.10.00#Fabric or tailors chalk holders#53.14.16.00.00
-unspsc7#53.14.16.11.00#Fabric markers or fabric pencils or fabric chalk#53.14.16.00.00
-unspsc7#53.14.16.12.00#Serrated pattern tracing wheel#53.14.16.00.00
-unspsc7#53.14.16.13.00#Transfer paper#53.14.16.00.00
-unspsc7#53.14.16.14.00#Tapestry needles#53.14.16.00.00
-unspsc7#53.14.16.15.00#Weaving needles#53.14.16.00.00
-unspsc7#53.14.16.16.00#Looper looms#53.14.16.00.00
-unspsc7#53.14.16.17.00#Cotton jersey loops#53.14.16.00.00
-unspsc7#53.14.16.18.00#Needlepoint canvas#53.14.16.00.00
-unspsc7#53.14.16.19.00#Magnet wands#53.14.16.00.00
-unspsc7#53.14.16.20.00#Seam ripper#53.14.16.00.00
-unspsc7#53.14.16.21.00#Needle threader#53.14.16.00.00
-unspsc7#53.14.16.22.00#Dressmakers ruler#53.14.16.00.00
-unspsc7#53.14.16.23.00#Liquid thread lock or reinforcer#53.14.16.00.00
-unspsc7#53.14.16.24.00#Cross stitch fabric or needles#53.14.16.00.00
-unspsc7#53.14.16.25.00#Cross stitch designs#53.14.16.00.00
-unspsc7#53.14.16.26.00#Embroidery hoops#53.14.16.00.00
-unspsc7#53.14.16.27.00#Crochet hooks#53.14.16.00.00
-unspsc7#53.14.16.28.00#Quilters basting tools#53.14.16.00.00
-unspsc7#53.14.16.29.00#Quilters pins#53.14.16.00.00
-unspsc7#53.14.16.30.00#Pattern cutting mats or boards#53.14.16.00.00
-unspsc7#54.00.00.00.00#Timepieces and Jewelry and Gemstone Products#54.00.00.00.00
-unspsc7#54.10.00.00.00#Jewelry#54.00.00.00.00
-unspsc7#54.10.15.00.00#Fine jewelry#54.10.00.00.00
-unspsc7#54.10.15.01.00#Gold or silver or platinum chains#54.10.15.00.00
-unspsc7#54.10.15.02.00#Fine jewelry necklaces#54.10.15.00.00
-unspsc7#54.10.15.03.00#Fine jewelry rings#54.10.15.00.00
-unspsc7#54.10.15.04.00#Fine jewelry earrings#54.10.15.00.00
-unspsc7#54.10.15.05.00#Fine body jewelry#54.10.15.00.00
-unspsc7#54.10.15.06.00#Fine jewelry bracelets#54.10.15.00.00
-unspsc7#54.10.15.07.00#Tiaras#54.10.15.00.00
-unspsc7#54.10.16.00.00#Imitation jewelry#54.10.00.00.00
-unspsc7#54.10.16.01.00#Bracelets#54.10.16.00.00
-unspsc7#54.10.16.02.00#Necklaces#54.10.16.00.00
-unspsc7#54.10.16.03.00#Rings#54.10.16.00.00
-unspsc7#54.10.16.04.00#Earrings#54.10.16.00.00
-unspsc7#54.10.16.05.00#Body jewelry#54.10.16.00.00
-unspsc7#54.11.00.00.00#Timepieces#54.00.00.00.00
-unspsc7#54.11.15.00.00#Watches#54.11.00.00.00
-unspsc7#54.11.15.01.00#Wrist watches#54.11.15.00.00
-unspsc7#54.11.15.02.00#Pocket watches#54.11.15.00.00
-unspsc7#54.11.16.00.00#Clocks#54.11.00.00.00
-unspsc7#54.11.16.01.00#Wall clocks#54.11.16.00.00
-unspsc7#54.11.16.02.00#Mantel or table clocks#54.11.16.00.00
-unspsc7#54.11.16.03.00#Free standing clocks#54.11.16.00.00
-unspsc7#54.11.16.04.00#Hourglasses#54.11.16.00.00
-unspsc7#54.11.17.00.00#Watch or clock parts#54.11.00.00.00
-unspsc7#54.11.17.01.00#Watch or clock dials#54.11.17.00.00
-unspsc7#54.11.17.02.00#Watch or clock crystals#54.11.17.00.00
-unspsc7#54.11.17.03.00#Watch or clock plates or bridges#54.11.17.00.00
-unspsc7#54.11.17.04.00#Watch straps or bands or bracelets or fobs#54.11.17.00.00
-unspsc7#54.12.00.00.00#Gemstones#54.00.00.00.00
-unspsc7#54.12.15.00.00#Precious stones#54.12.00.00.00
-unspsc7#54.12.15.01.00#Diamond gemstones#54.12.15.00.00
-unspsc7#54.12.15.02.00#Emerald gemstones#54.12.15.00.00
-unspsc7#54.12.15.03.00#Ruby gemstones#54.12.15.00.00
-unspsc7#54.12.15.04.00#Sapphire gemstones#54.12.15.00.00
-unspsc7#54.12.16.00.00#Semi precious stones#54.12.00.00.00
-unspsc7#54.12.16.01.00#Garnet gemstones#54.12.16.00.00
-unspsc7#54.12.16.02.00#Jade gemstones#54.12.16.00.00
-unspsc7#54.12.16.03.00#Opal gemstones#54.12.16.00.00
-unspsc7#54.12.17.00.00#Pearls#54.12.00.00.00
-unspsc7#54.12.17.01.00#Cultured pearls#54.12.17.00.00
-unspsc7#54.12.17.02.00#Natural pearls#54.12.17.00.00
-unspsc7#54.12.18.00.00#Industrial precious and semi precious stones#54.12.00.00.00
-unspsc7#54.12.18.01.00#Industrial diamonds#54.12.18.00.00
-unspsc7#54.12.18.02.00#Industrial garnets#54.12.18.00.00
-unspsc7#55.00.00.00.00#Published Products#55.00.00.00.00
-unspsc7#55.10.00.00.00#Printed media#55.00.00.00.00
-unspsc7#55.10.15.00.00#Printed publications#55.10.00.00.00
-unspsc7#55.10.15.01.00#Charts or maps or atlases#55.10.15.00.00
-unspsc7#55.10.15.02.00#Directories#55.10.15.00.00
-unspsc7#55.10.15.03.00#Catalogs#55.10.15.00.00
-unspsc7#55.10.15.04.00#Newspapers#55.10.15.00.00
-unspsc7#55.10.15.05.00#Comic books#55.10.15.00.00
-unspsc7#55.10.15.06.00#Magazines#55.10.15.00.00
-unspsc7#55.10.15.07.00#Picture or drawing or coloring books for children#55.10.15.00.00
-unspsc7#55.10.15.08.00#Encyclopedias#55.10.15.00.00
-unspsc7#55.10.15.09.00#Educational or vocational textbooks#55.10.15.00.00
-unspsc7#55.10.15.10.00#Leisure reading books#55.10.15.00.00
-unspsc7#55.10.15.11.00#Reference books#55.10.15.00.00
-unspsc7#55.10.15.12.00#Dictionaries#55.10.15.00.00
-unspsc7#55.10.15.13.00#Trading cards#55.10.15.00.00
-unspsc7#55.10.15.14.00#Sheet music#55.10.15.00.00
-unspsc7#55.10.15.15.00#Promotional material or annual reports#55.10.15.00.00
-unspsc7#55.10.15.16.00#Operation and instruction manuals#55.10.15.00.00
-unspsc7#55.10.15.17.00#Clearance and dimensional drawings#55.10.15.00.00
-unspsc7#55.10.15.18.00#Technical diagrams or drawings#55.10.15.00.00
-unspsc7#55.10.15.19.00#Periodicals#55.10.15.00.00
-unspsc7#55.10.15.20.00#Instruction sheets or booklets#55.10.15.00.00
-unspsc7#55.10.15.21.00#Owner or user manuals#55.10.15.00.00
-unspsc7#55.10.15.22.00#Terrestrial or celestial globes#55.10.15.00.00
-unspsc7#55.10.15.23.00#Exercise books#55.10.15.00.00
-unspsc7#55.10.15.24.00#Reference books#55.10.15.00.00
-unspsc7#55.10.15.25.00#Encyclopedias#55.10.15.00.00
-unspsc7#55.10.15.26.00#Dictionaries#55.10.15.00.00
-unspsc7#55.11.00.00.00#Electronic reference material#55.00.00.00.00
-unspsc7#55.11.15.00.00#Electronic publications and music#55.11.00.00.00
-unspsc7#55.11.15.01.00#Electronic directories#55.11.15.00.00
-unspsc7#55.11.15.02.00#Electronic dictionaries#55.11.15.00.00
-unspsc7#55.11.15.03.00#Electronic encyclopedias#55.11.15.00.00
-unspsc7#55.11.15.04.00#Electronic catalogs#55.11.15.00.00
-unspsc7#55.11.15.05.00#Books on tape or compact disc#55.11.15.00.00
-unspsc7#55.11.15.06.00#Electronic magazines#55.11.15.00.00
-unspsc7#55.11.15.07.00#Electronic newspapers#55.11.15.00.00
-unspsc7#55.11.15.08.00#Electronic charts or maps or atlases#55.11.15.00.00
-unspsc7#55.11.15.09.00#Background music#55.11.15.00.00
-unspsc7#55.11.15.10.00#Motion pictures on celluloid#55.11.15.00.00
-unspsc7#55.11.15.11.00#Motion pictures on video tape#55.11.15.00.00
-unspsc7#55.11.15.12.00#Music on tape or compact disc#55.11.15.00.00
-unspsc7#55.11.16.00.00#Electronic Software reference material#55.11.00.00.00
-unspsc7#55.11.16.01.00#Electronic Software Documentation and User Manuals#55.11.16.00.00
-unspsc7#55.12.00.00.00#Signage and accessories#55.00.00.00.00
-unspsc7#55.12.15.00.00#Tags#55.12.00.00.00
-unspsc7#55.12.15.01.00#Luggage tags#55.12.15.00.00
-unspsc7#55.12.15.02.00#Security tags#55.12.15.00.00
-unspsc7#55.12.15.03.00#Identification tags#55.12.15.00.00
-unspsc7#55.12.16.00.00#Labels#55.12.00.00.00
-unspsc7#55.12.16.01.00#Label removing kits#55.12.16.00.00
-unspsc7#55.12.16.02.00#Clothing labels#55.12.16.00.00
-unspsc7#55.12.16.03.00#Pressure sensitive labels#55.12.16.00.00
-unspsc7#55.12.16.04.00#Canning or bottling labels#55.12.16.00.00
-unspsc7#55.12.16.05.00#Addressing or mailing labels#55.12.16.00.00
-unspsc7#55.12.16.06.00#Self adhesive labels#55.12.16.00.00
-unspsc7#55.12.16.07.00#Decals#55.12.16.00.00
-unspsc7#55.12.16.08.00#Bar code labels#55.12.16.00.00
-unspsc7#55.12.16.09.00#Packaging labels#55.12.16.00.00
-unspsc7#55.12.16.10.00#Consecutively numbered labels#55.12.16.00.00
-unspsc7#55.12.16.11.00#Label making tapes#55.12.16.00.00
-unspsc7#55.12.16.12.00#Printer labels#55.12.16.00.00
-unspsc7#55.12.16.13.00#Color coding labels#55.12.16.00.00
-unspsc7#55.12.16.14.00#Removable labels#55.12.16.00.00
-unspsc7#55.12.16.15.00#Adhesive dots or arrows#55.12.16.00.00
-unspsc7#55.12.16.16.00#Self adhesive flags#55.12.16.00.00
-unspsc7#55.12.17.00.00#Signage#55.12.00.00.00
-unspsc7#55.12.17.01.00#Metallic nameplates#55.12.17.00.00
-unspsc7#55.12.17.02.00#Non metallic nameplates#55.12.17.00.00
-unspsc7#55.12.17.03.00#Illuminated signs#55.12.17.00.00
-unspsc7#55.12.17.04.00#Safety signs#55.12.17.00.00
-unspsc7#55.12.17.05.00#Self adhesive signs#55.12.17.00.00
-unspsc7#55.12.17.06.00#Banners#55.12.17.00.00
-unspsc7#55.12.17.07.00#Magnetic signs#55.12.17.00.00
-unspsc7#55.12.17.08.00#Neon signs#55.12.17.00.00
-unspsc7#55.12.17.09.00#Moving message signs#55.12.17.00.00
-unspsc7#55.12.17.10.00#Traffic signs#55.12.17.00.00
-unspsc7#55.12.17.11.00#Billboards#55.12.17.00.00
-unspsc7#55.12.17.12.00#Directional signs#55.12.17.00.00
-unspsc7#55.12.17.13.00#Point of purchase signs#55.12.17.00.00
-unspsc7#55.12.17.14.00#Pennants#55.12.17.00.00
-unspsc7#55.12.17.15.00#Flags#55.12.17.00.00
-unspsc7#55.12.17.16.00#Wooden signs#55.12.17.00.00
-unspsc7#55.12.17.17.00#Marker plates#55.12.17.00.00
-unspsc7#55.12.17.18.00#Informational signs#55.12.17.00.00
-unspsc7#55.12.17.19.00#Signalling components#55.12.17.00.00
-unspsc7#55.12.17.20.00#Emblems#55.12.17.00.00
-unspsc7#55.12.17.21.00#Vinyl letters or numbers#55.12.17.00.00
-unspsc7#55.12.17.22.00#Flagpoles#55.12.17.00.00
-unspsc7#55.12.17.23.00#Sign holders#55.12.17.00.00
-unspsc7#55.12.18.00.00#Identification documents#55.12.00.00.00
-unspsc7#55.12.18.01.00#Car tax discs#55.12.18.00.00
-unspsc7#55.12.18.02.00#Identification cards#55.12.18.00.00
-unspsc7#55.12.18.03.00#Passports#55.12.18.00.00
-unspsc7#55.12.18.04.00#Badges or badge holders#55.12.18.00.00
-unspsc7#56.00.00.00.00#Furniture and Furnishings#56.00.00.00.00
-unspsc7#56.10.00.00.00#Accommodation furniture#56.00.00.00.00
-unspsc7#56.10.15.00.00#Furniture#56.10.00.00.00
-unspsc7#56.10.15.01.00#Stands#56.10.15.00.00
-unspsc7#56.10.15.02.00#Sofas#56.10.15.00.00
-unspsc7#56.10.15.03.00#Coat racks#56.10.15.00.00
-unspsc7#56.10.15.04.00#Chairs#56.10.15.00.00
-unspsc7#56.10.15.05.00#Entertainment centers#56.10.15.00.00
-unspsc7#56.10.15.06.00#Futons#56.10.15.00.00
-unspsc7#56.10.15.07.00#Bookcases#56.10.15.00.00
-unspsc7#56.10.15.08.00#Mattresses#56.10.15.00.00
-unspsc7#56.10.15.09.00#Dressers or armoires#56.10.15.00.00
-unspsc7#56.10.15.10.00#Partitions#56.10.15.00.00
-unspsc7#56.10.15.12.00#Stools#56.10.15.00.00
-unspsc7#56.10.15.13.00#Cots#56.10.15.00.00
-unspsc7#56.10.15.14.00#Foot stools#56.10.15.00.00
-unspsc7#56.10.15.15.00#Beds#56.10.15.00.00
-unspsc7#56.10.15.16.00#Chests#56.10.15.00.00
-unspsc7#56.10.15.18.00#Wall racks#56.10.15.00.00
-unspsc7#56.10.15.19.00#Tables#56.10.15.00.00
-unspsc7#56.10.15.20.00#Lockers#56.10.15.00.00
-unspsc7#56.10.15.21.00#Bed headboard or footboard#56.10.15.00.00
-unspsc7#56.10.15.22.00#Arm chair#56.10.15.00.00
-unspsc7#56.10.15.23.00#Umbrella stands#56.10.15.00.00
-unspsc7#56.10.15.24.00#Ironing boards#56.10.15.00.00
-unspsc7#56.10.15.25.00#Ironing board covers#56.10.15.00.00
-unspsc7#56.10.15.26.00#Fridge bar#56.10.15.00.00
-unspsc7#56.10.15.27.00#Household type linen driers#56.10.15.00.00
-unspsc7#56.10.15.28.00#Artificial plants#56.10.15.00.00
-unspsc7#56.10.15.29.00#Magazine racks#56.10.15.00.00
-unspsc7#56.10.16.00.00#Outdoor furniture#56.10.00.00.00
-unspsc7#56.10.16.01.00#Outdoor umbrellas#56.10.16.00.00
-unspsc7#56.10.16.02.00#Outdoor chairs#56.10.16.00.00
-unspsc7#56.10.16.03.00#Outdoor tables or picnic tables#56.10.16.00.00
-unspsc7#56.10.16.04.00#Outdoor swings#56.10.16.00.00
-unspsc7#56.10.16.05.00#Outdoor benches#56.10.16.00.00
-unspsc7#56.10.16.06.00#Flower stands#56.10.16.00.00
-unspsc7#56.10.16.07.00#Outside clothes dryer#56.10.16.00.00
-unspsc7#56.10.17.00.00#Office furniture#56.10.00.00.00
-unspsc7#56.10.17.01.00#Credenzas#56.10.17.00.00
-unspsc7#56.10.17.02.00#Filing cabinets or accesories#56.10.17.00.00
-unspsc7#56.10.17.03.00#Desks#56.10.17.00.00
-unspsc7#56.10.17.04.00#Table base#56.10.17.00.00
-unspsc7#56.10.17.05.00#Showcases#56.10.17.00.00
-unspsc7#56.10.17.06.00#Conferencing tables#56.10.17.00.00
-unspsc7#56.10.17.07.00#Drafting tables#56.10.17.00.00
-unspsc7#56.10.17.08.00#Mobile files or equipment carts#56.10.17.00.00
-unspsc7#56.10.17.09.00#Table tops#56.10.17.00.00
-unspsc7#56.10.18.00.00#Baby and toddler furniture and accessories#56.10.00.00.00
-unspsc7#56.10.18.03.00#Carriages or perambulators or strollers#56.10.18.00.00
-unspsc7#56.10.18.04.00#Cribs or playpens#56.10.18.00.00
-unspsc7#56.10.18.05.00#Car seats#56.10.18.00.00
-unspsc7#56.10.18.06.00#High chairs or accessories#56.10.18.00.00
-unspsc7#56.10.18.07.00#Bouncer seats or jumpers#56.10.18.00.00
-unspsc7#56.10.18.08.00#Swings or jumpers or accessories#56.10.18.00.00
-unspsc7#56.10.18.09.00#Potty seats#56.10.18.00.00
-unspsc7#56.10.18.10.00#Baby baths or tubs#56.10.18.00.00
-unspsc7#56.10.18.11.00#Bassinets or cradles#56.10.18.00.00
-unspsc7#56.10.18.12.00#Changing tables or accessories#56.10.18.00.00
-unspsc7#56.11.00.00.00#Commercial and industrial furniture#56.00.00.00.00
-unspsc7#56.11.15.00.00#Workstations and office packages#56.11.00.00.00
-unspsc7#56.11.15.01.00#Modular reception office packages#56.11.15.00.00
-unspsc7#56.11.15.02.00#Casegood or non modular executive office packages#56.11.15.00.00
-unspsc7#56.11.15.03.00#Modular executive office packages#56.11.15.00.00
-unspsc7#56.11.15.04.00#Casegood or non modular managerial office packages#56.11.15.00.00
-unspsc7#56.11.15.05.00#Modular managerial office packages#56.11.15.00.00
-unspsc7#56.11.15.06.00#Casegood or non modular staff office packages#56.11.15.00.00
-unspsc7#56.11.15.07.00#Modular staff office packages#56.11.15.00.00
-unspsc7#56.11.15.08.00#Casegood or non modular technical office packages#56.11.15.00.00
-unspsc7#56.11.15.09.00#Modular technical office packages#56.11.15.00.00
-unspsc7#56.11.15.10.00#Casegood or non modular clerical office packages#56.11.15.00.00
-unspsc7#56.11.15.11.00#Modular clerical office packages#56.11.15.00.00
-unspsc7#56.11.15.12.00#Casegood or non modular reception office packages#56.11.15.00.00
-unspsc7#56.11.15.13.00#Conference or non modular room packages#56.11.15.00.00
-unspsc7#56.11.16.00.00#Panel systems#56.11.00.00.00
-unspsc7#56.11.16.01.00#Screens for panel systems#56.11.16.00.00
-unspsc7#56.11.16.02.00#Storage for panel systems#56.11.16.00.00
-unspsc7#56.11.16.03.00#Organization for panel systems#56.11.16.00.00
-unspsc7#56.11.16.04.00#Work surfaces for panel systems#56.11.16.00.00
-unspsc7#56.11.16.05.00#Lighting or power or data componets for panel systems#56.11.16.00.00
-unspsc7#56.11.16.06.00#Parts or accessories panel systems#56.11.16.00.00
-unspsc7#56.11.17.00.00#Casegood and non modular systems#56.11.00.00.00
-unspsc7#56.11.17.01.00#Casegood or non modular desk#56.11.17.00.00
-unspsc7#56.11.17.02.00#Casegood or non modular credenza#56.11.17.00.00
-unspsc7#56.11.17.03.00#Casegood or non modular storage#56.11.17.00.00
-unspsc7#56.11.17.04.00#Casegood or non modular organization#56.11.17.00.00
-unspsc7#56.11.17.05.00#Casegood or non modular lighting or power or data components#56.11.17.00.00
-unspsc7#56.11.17.06.00#Casegood or non modular parts or accessories#56.11.17.00.00
-unspsc7#56.11.18.00.00#Freestanding furniture#56.11.00.00.00
-unspsc7#56.11.18.01.00#Freestanding lighting or power or data components#56.11.18.00.00
-unspsc7#56.11.18.02.00#Freestanding tables#56.11.18.00.00
-unspsc7#56.11.18.03.00#Freestanding storage#56.11.18.00.00
-unspsc7#56.11.18.04.00#Freestanding organization#56.11.18.00.00
-unspsc7#56.11.18.05.00#Freestanding parts or accessories#56.11.18.00.00
-unspsc7#56.11.19.00.00#Industrial furniture#56.11.00.00.00
-unspsc7#56.11.19.01.00#Industrial lighting or power or data components#56.11.19.00.00
-unspsc7#56.11.19.02.00#Industrial work surfaces#56.11.19.00.00
-unspsc7#56.11.19.03.00#Industrial storage units#56.11.19.00.00
-unspsc7#56.11.19.04.00#Industrial organization#56.11.19.00.00
-unspsc7#56.11.19.05.00#Industrial parts or accessories#56.11.19.00.00
-unspsc7#56.11.20.00.00#Computer support furniture#56.11.00.00.00
-unspsc7#56.11.20.01.00#Computer support lighting or power or data components#56.11.20.00.00
-unspsc7#56.11.20.02.00#Computer support work surfaces#56.11.20.00.00
-unspsc7#56.11.20.03.00#Computer support storage accessories#56.11.20.00.00
-unspsc7#56.11.20.04.00#Computer support organization#56.11.20.00.00
-unspsc7#56.11.20.05.00#Computer support parts or accessories#56.11.20.00.00
-unspsc7#56.11.21.00.00#Seating#56.11.00.00.00
-unspsc7#56.11.21.01.00#Auditorium or stadium or special use seating#56.11.21.00.00
-unspsc7#56.11.21.02.00#Task seating#56.11.21.00.00
-unspsc7#56.11.21.03.00#Guest seating#56.11.21.00.00
-unspsc7#56.11.21.04.00#Executive seating#56.11.21.00.00
-unspsc7#56.11.21.05.00#Lounge seating#56.11.21.00.00
-unspsc7#56.11.21.06.00#Stool seating#56.11.21.00.00
-unspsc7#56.11.21.07.00#Seating parts or accessories#56.11.21.00.00
-unspsc7#56.11.21.08.00#Combination chair with desk#56.11.21.00.00
-unspsc7#56.11.21.09.00#Benches#56.11.21.00.00
-unspsc7#56.12.00.00.00#Classroom and instructional and institutional furniture and fixtures#56.00.00.00.00
-unspsc7#56.12.10.00.00#Library furnishings#56.12.00.00.00
-unspsc7#56.12.10.01.00#Book carts or book trucks#56.12.10.00.00
-unspsc7#56.12.10.02.00#Circulation or librarian desks or components#56.12.10.00.00
-unspsc7#56.12.10.03.00#Book returns#56.12.10.00.00
-unspsc7#56.12.10.04.00#Card catalog units#56.12.10.00.00
-unspsc7#56.12.10.05.00#Dictionary stands#56.12.10.00.00
-unspsc7#56.12.10.06.00#Upholstered benches#56.12.10.00.00
-unspsc7#56.12.10.07.00#Public access tables#56.12.10.00.00
-unspsc7#56.12.10.08.00#Book browser units#56.12.10.00.00
-unspsc7#56.12.10.09.00#Sloped reading tables#56.12.10.00.00
-unspsc7#56.12.10.10.00#Book kiosks#56.12.10.00.00
-unspsc7#56.12.10.11.00#Library compact disc or audio cassette displayers#56.12.10.00.00
-unspsc7#56.12.10.12.00#Rotary island stands#56.12.10.00.00
-unspsc7#56.12.10.14.00#Hang up bag racks or bags#56.12.10.00.00
-unspsc7#56.12.11.00.00#Art classroom furnishings#56.12.00.00.00
-unspsc7#56.12.11.01.00#Art horse#56.12.11.00.00
-unspsc7#56.12.11.02.00#Art student bench#56.12.11.00.00
-unspsc7#56.12.12.00.00#First aid room furnishings#56.12.00.00.00
-unspsc7#56.12.12.01.00#First aid couches#56.12.12.00.00
-unspsc7#56.12.13.00.00#General educational facility fixtures#56.12.00.00.00
-unspsc7#56.12.13.01.00#Standing risers#56.12.13.00.00
-unspsc7#56.12.13.02.00#Table or chair movers or caddys#56.12.13.00.00
-unspsc7#56.12.13.03.00#Rubber brush floor matting#56.12.13.00.00
-unspsc7#56.12.13.04.00#Planning tables#56.12.13.00.00
-unspsc7#56.12.14.00.00#Cafeteria and lunchroom furnishings#56.12.00.00.00
-unspsc7#56.12.14.01.00#Mobile bench tables#56.12.14.00.00
-unspsc7#56.12.14.02.00#Mobile stool tables#56.12.14.00.00
-unspsc7#56.12.14.03.00#Mobile tables#56.12.14.00.00
-unspsc7#56.12.15.00.00#General classroom furnishings#56.12.00.00.00
-unspsc7#56.12.15.01.00#Activity tables#56.12.15.00.00
-unspsc7#56.12.15.02.00#Classroom chairs#56.12.15.00.00
-unspsc7#56.12.15.03.00#Classroom benches#56.12.15.00.00
-unspsc7#56.12.15.04.00#Clasroom stools#56.12.15.00.00
-unspsc7#56.12.15.05.00#Classroom tables#56.12.15.00.00
-unspsc7#56.12.15.06.00#Student desks#56.12.15.00.00
-unspsc7#56.12.15.07.00#Study carrels#56.12.15.00.00
-unspsc7#56.12.15.08.00#Student computer desks#56.12.15.00.00
-unspsc7#56.12.15.09.00#Student computer tables#56.12.15.00.00
-unspsc7#56.12.16.00.00#Creative play and rest time furnishings for daycare and early childhood facilities#56.12.00.00.00
-unspsc7#56.12.16.01.00#Toddler or child size living room sets#56.12.16.00.00
-unspsc7#56.12.16.02.00#Toddler or child size sofas#56.12.16.00.00
-unspsc7#56.12.16.03.00#Toddler or child size easy chairs#56.12.16.00.00
-unspsc7#56.12.16.04.00#Toddler or child size bean bag chairs#56.12.16.00.00
-unspsc7#56.12.16.05.00#Low rise room dividers or play panels#56.12.16.00.00
-unspsc7#56.12.16.06.00#Childs rest mats#56.12.16.00.00
-unspsc7#56.12.16.07.00#Childs rest mat racks or holders#56.12.16.00.00
-unspsc7#56.12.16.08.00#Childrens cots#56.12.16.00.00
-unspsc7#56.12.16.09.00#Childrens cot carriers#56.12.16.00.00
-unspsc7#56.12.16.10.00#Childrens cot activity systems#56.12.16.00.00
-unspsc7#56.12.17.00.00#Book and general storage units for classrooms#56.12.00.00.00
-unspsc7#56.12.17.01.00#General storage units#56.12.17.00.00
-unspsc7#56.12.17.02.00#Book storage units#56.12.17.00.00
-unspsc7#56.12.17.03.00#Cubbie units#56.12.17.00.00
-unspsc7#56.12.17.04.00#Institutional Storage Cabinets#56.12.17.00.00
-unspsc7#56.12.18.00.00#Vocational classroom furnishings and fixtures#56.12.00.00.00
-unspsc7#56.12.18.01.00#Technical education tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.02.00#General shop tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.03.00#Wordworking tool storage cabinets or cabinets with tools#56.12.18.00.00
-unspsc7#56.12.18.04.00#Instructors technical desk#56.12.18.00.00
-unspsc7#56.12.18.05.00#Flat files#56.12.18.00.00
-unspsc7#56.12.19.00.00#Demonstration furnishings#56.12.00.00.00
-unspsc7#56.12.19.01.00#Sewing machine demonstrator tables#56.12.19.00.00
-unspsc7#56.12.20.00.00#Laboratory furniture#56.12.00.00.00
-unspsc7#56.12.20.01.00#Laboratory benches#56.12.20.00.00
-unspsc7#56.12.20.02.00#Laboratory storage units or accessories#56.12.20.00.00
-unspsc7#56.12.20.03.00#Laboratory workstations#56.12.20.00.00
-unspsc7#60.00.00.00.00#Musical Instruments and Games and Toys and Arts and Crafts and Educational Equipment and Materials and Accessories and Supplies#60.00.00.00.00
-unspsc7#60.10.00.00.00#Developmental and professional teaching aids and materials and accessories and supplies#60.00.00.00.00
-unspsc7#60.10.10.00.00#Math kits#60.10.00.00.00
-unspsc7#60.10.10.01.00#Addition math kits#60.10.10.00.00
-unspsc7#60.10.10.02.00#Division math kits#60.10.10.00.00
-unspsc7#60.10.10.03.00#Fraction math kits#60.10.10.00.00
-unspsc7#60.10.10.04.00#Middle School math kits#60.10.10.00.00
-unspsc7#60.10.10.05.00#Early childhood math kits#60.10.10.00.00
-unspsc7#60.10.10.06.00#Measurement math kits#60.10.10.00.00
-unspsc7#60.10.10.07.00#Multiplication math kits#60.10.10.00.00
-unspsc7#60.10.10.08.00#Elementary math kits#60.10.10.00.00
-unspsc7#60.10.10.09.00#Subtraction math kits#60.10.10.00.00
-unspsc7#60.10.10.10.00#High school math kits#60.10.10.00.00
-unspsc7#60.10.11.00.00#Electronic learning aids#60.10.00.00.00
-unspsc7#60.10.11.01.00#Electronic card readers#60.10.11.00.00
-unspsc7#60.10.11.02.00#Curriculum based electronic learning aids#60.10.11.00.00
-unspsc7#60.10.11.03.00#Electronic globes#60.10.11.00.00
-unspsc7#60.10.11.04.00#Electronic quiz machines#60.10.11.00.00
-unspsc7#60.10.12.00.00#Educational incentives#60.10.00.00.00
-unspsc7#60.10.12.01.00#Bible based chart stickers#60.10.12.00.00
-unspsc7#60.10.12.02.00#Bible based incentive charts#60.10.12.00.00
-unspsc7#60.10.12.03.00#Incentive chart stickers#60.10.12.00.00
-unspsc7#60.10.12.04.00#Incentive charts#60.10.12.00.00
-unspsc7#60.10.12.05.00#Incentive punchcards#60.10.12.00.00
-unspsc7#60.10.13.00.00#Educational stickers and supplies#60.10.00.00.00
-unspsc7#60.10.13.01.00#Bible based stickers#60.10.13.00.00
-unspsc7#60.10.13.02.00#Giant stickers#60.10.13.00.00
-unspsc7#60.10.13.03.00#Notary seal stickers#60.10.13.00.00
-unspsc7#60.10.13.04.00#Photo stickers#60.10.13.00.00
-unspsc7#60.10.13.05.00#Reward stickers#60.10.13.00.00
-unspsc7#60.10.13.06.00#Scented stickers#60.10.13.00.00
-unspsc7#60.10.13.07.00#Shape stickers#60.10.13.00.00
-unspsc7#60.10.13.08.00#Sparkle stickers#60.10.13.00.00
-unspsc7#60.10.13.09.00#Reward star stickers#60.10.13.00.00
-unspsc7#60.10.13.10.00#Sticker assortments#60.10.13.00.00
-unspsc7#60.10.13.11.00#Sticker books#60.10.13.00.00
-unspsc7#60.10.13.12.00#Sticker boxes#60.10.13.00.00
-unspsc7#60.10.13.13.00#Tattoo stickers#60.10.13.00.00
-unspsc7#60.10.13.14.00#Addition flash cards#60.10.13.00.00
-unspsc7#60.10.13.15.00#All facts flash cards#60.10.13.00.00
-unspsc7#60.10.13.16.00#Blank flash cards#60.10.13.00.00
-unspsc7#60.10.13.17.00#Division flash cards#60.10.13.00.00
-unspsc7#60.10.13.18.00#Electronic flash cards#60.10.13.00.00
-unspsc7#60.10.13.19.00#Equivalent flash cards#60.10.13.00.00
-unspsc7#60.10.13.20.00#Fraction flash cards#60.10.13.00.00
-unspsc7#60.10.13.21.00#Greater than or less than flash cards#60.10.13.00.00
-unspsc7#60.10.13.22.00#Multiplication flash cards#60.10.13.00.00
-unspsc7#60.10.13.23.00#Subtraction flash cards#60.10.13.00.00
-unspsc7#60.10.13.24.00#Alphabet flash cards#60.10.13.00.00
-unspsc7#60.10.13.25.00#Word building flash cards#60.10.13.00.00
-unspsc7#60.10.13.26.00#Phonics flash cards#60.10.13.00.00
-unspsc7#60.10.13.27.00#Handwriting or writing flash cards#60.10.13.00.00
-unspsc7#60.10.13.28.00#Number clash cards#60.10.13.00.00
-unspsc7#60.10.13.29.00#Money flash cards#60.10.13.00.00
-unspsc7#60.10.13.30.00#Time flash cards#60.10.13.00.00
-unspsc7#60.10.13.31.00#State flash cards#60.10.13.00.00
-unspsc7#60.10.14.00.00#Classroom awards#60.10.00.00.00
-unspsc7#60.10.14.01.00#Badges#60.10.14.00.00
-unspsc7#60.10.14.02.00#Award buttons#60.10.14.00.00
-unspsc7#60.10.14.03.00#Celebration crowns#60.10.14.00.00
-unspsc7#60.10.14.04.00#Reward jewlery#60.10.14.00.00
-unspsc7#60.10.14.05.00#Classroom ribbons or rosettes#60.10.14.00.00
-unspsc7#60.10.16.00.00#Educational certificates or diplomas#60.10.00.00.00
-unspsc7#60.10.16.01.00#Bible based certificates#60.10.16.00.00
-unspsc7#60.10.16.02.00#Blank certificates#60.10.16.00.00
-unspsc7#60.10.16.03.00#Certificate frames#60.10.16.00.00
-unspsc7#60.10.16.04.00#Certificate holders#60.10.16.00.00
-unspsc7#60.10.16.05.00#Certificate ribbons#60.10.16.00.00
-unspsc7#60.10.16.06.00#Diplomas#60.10.16.00.00
-unspsc7#60.10.16.07.00#Foreign language certificates#60.10.16.00.00
-unspsc7#60.10.16.08.00#General praise certificates#60.10.16.00.00
-unspsc7#60.10.16.09.00#Grade specific certificates#60.10.16.00.00
-unspsc7#60.10.16.10.00#Subject specific certificates#60.10.16.00.00
-unspsc7#60.10.17.00.00#Teacher resource materials#60.10.00.00.00
-unspsc7#60.10.17.01.00#Assessment resource books#60.10.17.00.00
-unspsc7#60.10.17.02.00#Calendars or cut outs#60.10.17.00.00
-unspsc7#60.10.17.03.00#Character education resource materials#60.10.17.00.00
-unspsc7#60.10.17.04.00#Classroom activity books#60.10.17.00.00
-unspsc7#60.10.17.05.00#Critical thinking resource materials#60.10.17.00.00
-unspsc7#60.10.17.06.00#Cross curriculum guides#60.10.17.00.00
-unspsc7#60.10.17.07.00#Curriculum guides#60.10.17.00.00
-unspsc7#60.10.17.08.00#Fabric charts#60.10.17.00.00
-unspsc7#60.10.17.09.00#Flannel board aids#60.10.17.00.00
-unspsc7#60.10.17.10.00#Educator gifts#60.10.17.00.00
-unspsc7#60.10.17.11.00#Grading stamps#60.10.17.00.00
-unspsc7#60.10.17.12.00#Hall passes#60.10.17.00.00
-unspsc7#60.10.17.13.00#Home education resource materials#60.10.17.00.00
-unspsc7#60.10.17.14.00#Homework assignment resources#60.10.17.00.00
-unspsc7#60.10.17.15.00#Idea books#60.10.17.00.00
-unspsc7#60.10.17.16.00#Magnetic board aids#60.10.17.00.00
-unspsc7#60.10.17.17.00#Name plates or tags#60.10.17.00.00
-unspsc7#60.10.17.18.00#Teacher plan books#60.10.17.00.00
-unspsc7#60.10.17.19.00#Pocket charts#60.10.17.00.00
-unspsc7#60.10.17.20.00#Teacher communication postcards#60.10.17.00.00
-unspsc7#60.10.17.21.00#Professional teacher resource books#60.10.17.00.00
-unspsc7#60.10.17.22.00#Teacher classroom grading books#60.10.17.00.00
-unspsc7#60.10.17.23.00#Classroom student seating charts#60.10.17.00.00
-unspsc7#60.10.17.24.00#Substitute teacher folders or forms#60.10.17.00.00
-unspsc7#60.10.17.25.00#Technology activity or resource books#60.10.17.00.00
-unspsc7#60.10.17.26.00#Technology reference guides#60.10.17.00.00
-unspsc7#60.10.17.27.00#Test taking resource materials#60.10.17.00.00
-unspsc7#60.10.17.28.00#Theme unit resource materials#60.10.17.00.00
-unspsc7#60.10.17.29.00#Middle or junior school teaching kits#60.10.17.00.00
-unspsc7#60.10.17.30.00#Laboratory manuals#60.10.17.00.00
-unspsc7#60.10.18.00.00#Church school educational resources#60.10.00.00.00
-unspsc7#60.10.18.01.00#Bible reference guides#60.10.18.00.00
-unspsc7#60.10.18.02.00#Bible based dramas#60.10.18.00.00
-unspsc7#60.10.18.03.00#Bible based resource or activity books#60.10.18.00.00
-unspsc7#60.10.18.04.00#Sunday school activity resource books#60.10.18.00.00
-unspsc7#60.10.18.05.00#Vacation bible school resources#60.10.18.00.00
-unspsc7#60.10.19.00.00#Alphabet skills materials and resources#60.10.00.00.00
-unspsc7#60.10.19.01.00#Alphabet activity books#60.10.19.00.00
-unspsc7#60.10.19.02.00#Alphabet cubes#60.10.19.00.00
-unspsc7#60.10.19.03.00#Alphabet desk tapes#60.10.19.00.00
-unspsc7#60.10.19.04.00#Alphabet kits#60.10.19.00.00
-unspsc7#60.10.19.05.00#Alphabet letter tiles#60.10.19.00.00
-unspsc7#60.10.19.06.00#Alphabet poster cards#60.10.19.00.00
-unspsc7#60.10.19.07.00#Alphabet reference guides#60.10.19.00.00
-unspsc7#60.10.19.08.00#Alphabet resource books#60.10.19.00.00
-unspsc7#60.10.19.09.00#Alphabet stamps#60.10.19.00.00
-unspsc7#60.10.19.10.00#Alphabet wall cards#60.10.19.00.00
-unspsc7#60.10.19.11.00#Tactile alphabets#60.10.19.00.00
-unspsc7#60.10.20.00.00#Word building resource materials and accessories#60.10.00.00.00
-unspsc7#60.10.20.01.00#Speech mirror#60.10.20.00.00
-unspsc7#60.10.20.02.00#Spelling resource materials#60.10.20.00.00
-unspsc7#60.10.20.03.00#Word building activity books#60.10.20.00.00
-unspsc7#60.10.20.04.00#Word building kits#60.10.20.00.00
-unspsc7#60.10.20.05.00#Word building resource books#60.10.20.00.00
-unspsc7#60.10.20.06.00#Word building tiles#60.10.20.00.00
-unspsc7#60.10.20.07.00#Word walls#60.10.20.00.00
-unspsc7#60.10.21.00.00#Language arts resource materials#60.10.00.00.00
-unspsc7#60.10.21.01.00#Adjective resource books#60.10.21.00.00
-unspsc7#60.10.21.02.00#Adverb resource books#60.10.21.00.00
-unspsc7#60.10.21.03.00#Grammar resource books#60.10.21.00.00
-unspsc7#60.10.21.04.00#Noun resource books#60.10.21.00.00
-unspsc7#60.10.21.05.00#Punctutation resource books#60.10.21.00.00
-unspsc7#60.10.21.06.00#Verb resource books#60.10.21.00.00
-unspsc7#60.10.22.00.00#Phonics resource materials and accessories#60.10.00.00.00
-unspsc7#60.10.22.01.00#Phonics activity books#60.10.22.00.00
-unspsc7#60.10.22.02.00#Phonics drill cards#60.10.22.00.00
-unspsc7#60.10.22.03.00#Phonics kit#60.10.22.00.00
-unspsc7#60.10.22.04.00#Phonics picture cards#60.10.22.00.00
-unspsc7#60.10.22.05.00#Phonics resource books#60.10.22.00.00
-unspsc7#60.10.22.06.00#Phonics tiles#60.10.22.00.00
-unspsc7#60.10.23.00.00#Reading books and resources#60.10.00.00.00
-unspsc7#60.10.23.01.00#Reading activity books#60.10.23.00.00
-unspsc7#60.10.23.02.00#Beginning reading books#60.10.23.00.00
-unspsc7#60.10.23.03.00#Bible based childrens literature books#60.10.23.00.00
-unspsc7#60.10.23.04.00#Childrens literature books#60.10.23.00.00
-unspsc7#60.10.23.05.00#Critical reading skills#60.10.23.00.00
-unspsc7#60.10.23.06.00#Flannel boards#60.10.23.00.00
-unspsc7#60.10.23.07.00#Poetry resource books#60.10.23.00.00
-unspsc7#60.10.23.08.00#Reading comprehension materials#60.10.23.00.00
-unspsc7#60.10.23.09.00#Reading development materials or kits#60.10.23.00.00
-unspsc7#60.10.23.10.00#Reading resource books#60.10.23.00.00
-unspsc7#60.10.23.11.00#Reading thematic units#60.10.23.00.00
-unspsc7#60.10.23.12.00#Vocabulary activity or resource books#60.10.23.00.00
-unspsc7#60.10.24.00.00#Early learning math and counting resources and accessories#60.10.00.00.00
-unspsc7#60.10.24.01.00#Abacus or counting frames#60.10.24.00.00
-unspsc7#60.10.24.02.00#Activity or resource books for working with early math manipulatives#60.10.24.00.00
-unspsc7#60.10.24.03.00#Activity cards for working with early math manipulatives#60.10.24.00.00
-unspsc7#60.10.24.04.00#Beads or bead activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.05.00#Counters or counter activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.06.00#Counting or sorting trays or bowls for early math#60.10.24.00.00
-unspsc7#60.10.24.07.00#Laces or lacing sets for early math#60.10.24.00.00
-unspsc7#60.10.24.08.00#Linking manipulatives or linking activity sets for early math#60.10.24.00.00
-unspsc7#60.10.24.09.00#Math game chips or tokens#60.10.24.00.00
-unspsc7#60.10.24.10.00#Number cards#60.10.24.00.00
-unspsc7#60.10.24.11.00#Number forms models or accessories#60.10.24.00.00
-unspsc7#60.10.24.12.00#Pegboards for early math#60.10.24.00.00
-unspsc7#60.10.24.13.00#Pegs for early math#60.10.24.00.00
-unspsc7#60.10.24.14.00#Sorting manipulatives or sorting activity sets for early math#60.10.24.00.00
-unspsc7#60.10.25.00.00#Basic math operations and numeration resources and materials#60.10.00.00.00
-unspsc7#60.10.25.01.00#Addition activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.02.00#Basic operations models#60.10.25.00.00
-unspsc7#60.10.25.03.00#Basic operations reference guides#60.10.25.00.00
-unspsc7#60.10.25.04.00#Division activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.05.00#Multiplication activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.06.00#Subtraction activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.07.00#Number desk tapes#60.10.25.00.00
-unspsc7#60.10.25.08.00#Hundreds charts or boards#60.10.25.00.00
-unspsc7#60.10.25.09.00#Hundreds number tiles#60.10.25.00.00
-unspsc7#60.10.25.10.00#Number kits#60.10.25.00.00
-unspsc7#60.10.25.11.00#Number lines#60.10.25.00.00
-unspsc7#60.10.25.12.00#Numberation activity or resource books#60.10.25.00.00
-unspsc7#60.10.25.13.00#Dominoes#60.10.25.00.00
-unspsc7#60.10.26.00.00#Probability or chance or data or problem solving teacher resource materials#60.10.00.00.00
-unspsc7#60.10.26.01.00#Two sided counters or tokens#60.10.26.00.00
-unspsc7#60.10.26.02.00#Spinners#60.10.26.00.00
-unspsc7#60.10.26.03.00#Dice sets#60.10.26.00.00
-unspsc7#60.10.26.04.00#Probability activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.05.00#Logic activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.06.00#Attribute blocks#60.10.26.00.00
-unspsc7#60.10.26.07.00#Attribute blocks activity cards#60.10.26.00.00
-unspsc7#60.10.26.08.00#Attribute activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.09.00#Graphing mat#60.10.26.00.00
-unspsc7#60.10.26.10.00#Graphing activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.11.00#Logic games#60.10.26.00.00
-unspsc7#60.10.26.12.00#Attribute sets or kits#60.10.26.00.00
-unspsc7#60.10.26.13.00#Problem solving activity or resource books#60.10.26.00.00
-unspsc7#60.10.26.14.00#Problem solving activity cards#60.10.26.00.00
-unspsc7#60.10.27.00.00#Patterning or matching or spatial perception or logical thinking teacher resource materials#60.10.00.00.00
-unspsc7#60.10.27.01.00#Pattern blocks or parquetry blocks activity or resource books#60.10.27.00.00
-unspsc7#60.10.27.02.00#Pattern blocks#60.10.27.00.00
-unspsc7#60.10.27.03.00#Pattern block activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.04.00#Pattern block games or activity sets#60.10.27.00.00
-unspsc7#60.10.27.05.00#Pattern block stickers#60.10.27.00.00
-unspsc7#60.10.27.06.00#Pattern blocks mirror#60.10.27.00.00
-unspsc7#60.10.27.07.00#Pattern blocks charts or posters#60.10.27.00.00
-unspsc7#60.10.27.08.00#Parquetry blocks#60.10.27.00.00
-unspsc7#60.10.27.09.00#Parquetry blocks activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.10.00#Parquetry blocks activity sets#60.10.27.00.00
-unspsc7#60.10.27.11.00#Tangrams activity or resource books#60.10.27.00.00
-unspsc7#60.10.27.12.00#Tangram activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.13.00#Tangram puzzle activity sets#60.10.27.00.00
-unspsc7#60.10.27.14.00#Tangrams puzzles#60.10.27.00.00
-unspsc7#60.10.27.15.00#Pentominoes activity and resource books#60.10.27.00.00
-unspsc7#60.10.27.16.00#Pentominoes activity or pattern cards#60.10.27.00.00
-unspsc7#60.10.27.17.00#Pentominoes#60.10.27.00.00
-unspsc7#60.10.27.18.00#Pentominoes activity sets#60.10.27.00.00
-unspsc7#60.10.28.00.00#Base ten and place value teacher resource materials#60.10.00.00.00
-unspsc7#60.10.28.01.00#Base ten blocks#60.10.28.00.00
-unspsc7#60.10.28.02.00#Base ten or place value activity or resource books#60.10.28.00.00
-unspsc7#60.10.28.03.00#Base ten or place value activity cards#60.10.28.00.00
-unspsc7#60.10.28.04.00#Base ten rubber stamps#60.10.28.00.00
-unspsc7#60.10.28.05.00#Place value grids#60.10.28.00.00
-unspsc7#60.10.28.06.00#Place value games or activity sets#60.10.28.00.00
-unspsc7#60.10.28.07.00#Place value models or accessories#60.10.28.00.00
-unspsc7#60.10.29.00.00#Money and time teacher resource materials#60.10.00.00.00
-unspsc7#60.10.29.01.00#Money activity or resource books#60.10.29.00.00
-unspsc7#60.10.29.02.00#Bulk bills for the classroom#60.10.29.00.00
-unspsc7#60.10.29.03.00#Bulk coins for the classroom#60.10.29.00.00
-unspsc7#60.10.29.04.00#Coin cubes or dice#60.10.29.00.00
-unspsc7#60.10.29.05.00#Magnetic money#60.10.29.00.00
-unspsc7#60.10.29.06.00#Overhead bills#60.10.29.00.00
-unspsc7#60.10.29.07.00#Overhead coins#60.10.29.00.00
-unspsc7#60.10.29.08.00#Money puzzles#60.10.29.00.00
-unspsc7#60.10.29.09.00#Money rubber stamps#60.10.29.00.00
-unspsc7#60.10.29.10.00#Coin bank#60.10.29.00.00
-unspsc7#60.10.29.11.00#Money games or kits#60.10.29.00.00
-unspsc7#60.10.29.12.00#Play cash registers#60.10.29.00.00
-unspsc7#60.10.29.13.00#Money reference guides#60.10.29.00.00
-unspsc7#60.10.29.14.00#Time activity or resource books#60.10.29.00.00
-unspsc7#60.10.29.15.00#Time rubber stamps#60.10.29.00.00
-unspsc7#60.10.29.16.00#Time kits#60.10.29.00.00
-unspsc7#60.10.29.17.00#Time reference guides#60.10.29.00.00
-unspsc7#60.10.30.00.00#Fractions and pentominoes and decimals teaching aids#60.10.00.00.00
-unspsc7#60.10.30.01.00#Fraction circles or squares#60.10.30.00.00
-unspsc7#60.10.30.02.00#Decimal squares#60.10.30.00.00
-unspsc7#60.10.30.03.00#Fraction activity books#60.10.30.00.00
-unspsc7#60.10.30.04.00#Fraction bars#60.10.30.00.00
-unspsc7#60.10.30.05.00#Fraction charts#60.10.30.00.00
-unspsc7#60.10.30.06.00#Fraction dice#60.10.30.00.00
-unspsc7#60.10.30.07.00#Fraction games#60.10.30.00.00
-unspsc7#60.10.30.08.00#Fraction kits#60.10.30.00.00
-unspsc7#60.10.30.09.00#Fraction tiles#60.10.30.00.00
-unspsc7#60.10.30.10.00#Fractions discs#60.10.30.00.00
-unspsc7#60.10.30.12.00#Pentominoes activity book#60.10.30.00.00
-unspsc7#60.10.30.13.00#Pentominoes pattern cards#60.10.30.00.00
-unspsc7#60.10.31.00.00#Geometry teacher resource materials#60.10.00.00.00
-unspsc7#60.10.31.01.00#Geometry activity or resource books#60.10.31.00.00
-unspsc7#60.10.31.02.00#Geometry charts or posters#60.10.31.00.00
-unspsc7#60.10.31.03.00#Geoboards#60.10.31.00.00
-unspsc7#60.10.31.04.00#Geometric construction sets#60.10.31.00.00
-unspsc7#60.10.31.05.00#Double sided geoboards#60.10.31.00.00
-unspsc7#60.10.31.06.00#Geoboard games or activity kits#60.10.31.00.00
-unspsc7#60.10.31.07.00#Geoboard rubber bands#60.10.31.00.00
-unspsc7#60.10.31.08.00#Geoboards activity cards#60.10.31.00.00
-unspsc7#60.10.31.09.00#Geometric chalkboard drawing instruments#60.10.31.00.00
-unspsc7#60.10.31.10.00#Geometry reference guides#60.10.31.00.00
-unspsc7#60.10.31.11.00#GeoMirror#60.10.31.00.00
-unspsc7#60.10.31.12.00#Geometric solids models#60.10.31.00.00
-unspsc7#60.10.32.00.00#Algebra teacher resource materials#60.10.00.00.00
-unspsc7#60.10.32.01.00#Algebra activity or resource books#60.10.32.00.00
-unspsc7#60.10.32.02.00#Centimeter cubes#60.10.32.00.00
-unspsc7#60.10.32.03.00#Algebra or pre algebra reference guides#60.10.32.00.00
-unspsc7#60.10.32.04.00#Algebra models or accessories#60.10.32.00.00
-unspsc7#60.10.33.00.00#Precalculus and calculus teacher resource materials#60.10.00.00.00
-unspsc7#60.10.33.01.00#Calculus activity or resources books#60.10.33.00.00
-unspsc7#60.10.33.02.00#Precalculus or calculus reference guides#60.10.33.00.00
-unspsc7#60.10.33.03.00#Precalculus activity or resource books#60.10.33.00.00
-unspsc7#60.10.34.00.00#Geography and map skills resources and accessories#60.10.00.00.00
-unspsc7#60.10.34.01.00#Goegraphy charts or posters#60.10.34.00.00
-unspsc7#60.10.34.02.00#Continents activity or resource books#60.10.34.00.00
-unspsc7#60.10.34.03.00#Electronic social studies learning aids#60.10.34.00.00
-unspsc7#60.10.34.04.00#Geography reference guides#60.10.34.00.00
-unspsc7#60.10.34.05.00#Map racks#60.10.34.00.00
-unspsc7#60.10.34.06.00#Map stencil kits#60.10.34.00.00
-unspsc7#60.10.34.07.00#Portable wall maps#60.10.34.00.00
-unspsc7#60.10.34.08.00#Geography resource or activity books#60.10.34.00.00
-unspsc7#60.10.35.00.00#Political science#60.10.00.00.00
-unspsc7#60.10.35.01.00#Economics activity or resource books#60.10.35.00.00
-unspsc7#60.10.35.02.00#Government activity or resource books#60.10.35.00.00
-unspsc7#60.10.35.03.00#Government reference guides#60.10.35.00.00
-unspsc7#60.10.35.04.00#State theme units#60.10.35.00.00
-unspsc7#60.10.36.00.00#Multicultural activities and resources#60.10.00.00.00
-unspsc7#60.10.36.01.00#Ancient civilizations resources#60.10.36.00.00
-unspsc7#60.10.36.02.00#Customs or rituals or traditions resources#60.10.36.00.00
-unspsc7#60.10.36.03.00#Ethnic diversity resources#60.10.36.00.00
-unspsc7#60.10.36.04.00#Genealogy resources#60.10.36.00.00
-unspsc7#60.10.36.05.00#Multicultural holidays resources#60.10.36.00.00
-unspsc7#60.10.36.06.00#Multicultural theme units#60.10.36.00.00
-unspsc7#60.10.37.00.00#Foreign languages resources#60.10.00.00.00
-unspsc7#60.10.37.01.00#Resources for Learning to speak spanish#60.10.37.00.00
-unspsc7#60.10.37.02.00#Resources for Learning to speak french#60.10.37.00.00
-unspsc7#60.10.37.03.00#Resources for Learning to speak german#60.10.37.00.00
-unspsc7#60.10.37.04.00#Resources for Learning to speak english#60.10.37.00.00
-unspsc7#60.10.37.05.00#Resources for Learning to speak latin#60.10.37.00.00
-unspsc7#60.10.37.06.00#Resources for Learning to speak italian#60.10.37.00.00
-unspsc7#60.10.38.00.00#History teaching resources#60.10.00.00.00
-unspsc7#60.10.38.01.00#African history resource books#60.10.38.00.00
-unspsc7#60.10.38.02.00#History charts or posters#60.10.38.00.00
-unspsc7#60.10.38.03.00#European history resource books#60.10.38.00.00
-unspsc7#60.10.38.04.00#Historical maps#60.10.38.00.00
-unspsc7#60.10.38.05.00#History theme units#60.10.38.00.00
-unspsc7#60.10.38.06.00#History photo cards#60.10.38.00.00
-unspsc7#60.10.38.07.00#History resource books#60.10.38.00.00
-unspsc7#60.10.38.08.00#Womans history resources#60.10.38.00.00
-unspsc7#60.10.38.09.00#World history resources#60.10.38.00.00
-unspsc7#60.10.39.00.00#Living organisms and preserved specimens and related materials#60.10.00.00.00
-unspsc7#60.10.39.01.00#Live amphibia#60.10.39.00.00
-unspsc7#60.10.39.02.00#Preserved amphibia#60.10.39.00.00
-unspsc7#60.10.39.03.00#Amphibia models#60.10.39.00.00
-unspsc7#60.10.39.04.00#Fungi cultures#60.10.39.00.00
-unspsc7#60.10.39.05.00#Culture kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.06.00#Protozoan cultures#60.10.39.00.00
-unspsc7#60.10.39.07.00#Aquaria plants#60.10.39.00.00
-unspsc7#60.10.39.08.00#Terrarium plants#60.10.39.00.00
-unspsc7#60.10.39.09.00#Live invertebrates#60.10.39.00.00
-unspsc7#60.10.39.10.00#Preserved invertebrates#60.10.39.00.00
-unspsc7#60.10.39.11.00#Live vertebrates#60.10.39.00.00
-unspsc7#60.10.39.12.00#Preserved vertebrates#60.10.39.00.00
-unspsc7#60.10.39.13.00#Live reptilia#60.10.39.00.00
-unspsc7#60.10.39.14.00#Preserved reptilla#60.10.39.00.00
-unspsc7#60.10.39.15.00#Dissection kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.18.00#Biospheres#60.10.39.00.00
-unspsc7#60.10.39.19.00#Biology experiment kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.20.00#Staining kits or supplies#60.10.39.00.00
-unspsc7#60.10.39.21.00#Preserved life cycle specimens#60.10.39.00.00
-unspsc7#60.10.39.22.00#Biology reference guides#60.10.39.00.00
-unspsc7#60.10.39.23.00#Skeleton or bone or shell specimen#60.10.39.00.00
-unspsc7#60.10.39.24.00#Biology resource or activity books#60.10.39.00.00
-unspsc7#60.10.39.25.00#Biology study or activity kits#60.10.39.00.00
-unspsc7#60.10.39.26.00#Biology charts or posters#60.10.39.00.00
-unspsc7#60.10.39.27.00#Preserved plant body or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.28.00#Biology activity or photo cards#60.10.39.00.00
-unspsc7#60.10.39.29.00#Plant life cycle specimens#60.10.39.00.00
-unspsc7#60.10.39.30.00#Combination organism specimens#60.10.39.00.00
-unspsc7#60.10.39.31.00#Animal body or body part or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.32.00#Ecosystem displays#60.10.39.00.00
-unspsc7#60.10.39.33.00#Human body or body part or organ specimens#60.10.39.00.00
-unspsc7#60.10.39.34.00#Tissue cultures#60.10.39.00.00
-unspsc7#60.10.40.00.00#Biotechnology and bio chemistry and genetics and microbiology and related materials#60.10.00.00.00
-unspsc7#60.10.40.01.00#Deoxyribonucleic acid DNA models#60.10.40.00.00
-unspsc7#60.10.40.02.00#Deoxyribonucleic acid DNA experiment kits#60.10.40.00.00
-unspsc7#60.10.40.03.00#Genetic books#60.10.40.00.00
-unspsc7#60.10.40.04.00#Genetic kits#60.10.40.00.00
-unspsc7#60.10.40.05.00#Bacteria teaching kits#60.10.40.00.00
-unspsc7#60.10.40.06.00#Bacteria testing supplies#60.10.40.00.00
-unspsc7#60.10.40.07.00#Enzymology kits or supplies#60.10.40.00.00
-unspsc7#60.10.40.08.00#Protein testing kits or supplies#60.10.40.00.00
-unspsc7#60.10.41.00.00#Body systems and related materials#60.10.00.00.00
-unspsc7#60.10.41.01.00#Body models#60.10.41.00.00
-unspsc7#60.10.41.02.00#Cell models#60.10.41.00.00
-unspsc7#60.10.41.03.00#Cell teaching kits#60.10.41.00.00
-unspsc7#60.10.41.04.00#Body systems teaching kits#60.10.41.00.00
-unspsc7#60.10.41.05.00#Body systems teaching aids#60.10.41.00.00
-unspsc7#60.10.42.00.00#Water testing and conservation and ecology#60.10.00.00.00
-unspsc7#60.10.42.01.00#Water testing chemicals#60.10.42.00.00
-unspsc7#60.10.42.02.00#Water testing and sampling kits#60.10.42.00.00
-unspsc7#60.10.42.03.00#Water models#60.10.42.00.00
-unspsc7#60.10.42.04.00#Water ecology supplies#60.10.42.00.00
-unspsc7#60.10.43.00.00#Astronomy#60.10.00.00.00
-unspsc7#60.10.43.01.00#Astronomy models#60.10.43.00.00
-unspsc7#60.10.43.02.00#Astronomy charts#60.10.43.00.00
-unspsc7#60.10.43.03.00#Astronomy study kits#60.10.43.00.00
-unspsc7#60.10.44.00.00#Geology and earth science#60.10.00.00.00
-unspsc7#60.10.44.01.00#Rock specimen sets#60.10.44.00.00
-unspsc7#60.10.44.02.00#Rock specimens#60.10.44.00.00
-unspsc7#60.10.44.03.00#Fossils#60.10.44.00.00
-unspsc7#60.10.44.04.00#Landform models#60.10.44.00.00
-unspsc7#60.10.44.05.00#Fossil models#60.10.44.00.00
-unspsc7#60.10.44.06.00#Geology tools or field#60.10.44.00.00
-unspsc7#60.10.44.07.00#Stream tables#60.10.44.00.00
-unspsc7#60.10.44.08.00#Geology study kits#60.10.44.00.00
-unspsc7#60.10.45.00.00#Chemistry and electrochemistry and microchemistry#60.10.00.00.00
-unspsc7#60.10.45.01.00#Periodic table posters or boards#60.10.45.00.00
-unspsc7#60.10.45.02.00#Consumer analysis kits#60.10.45.00.00
-unspsc7#60.10.45.03.00#Chemistry class kits#60.10.45.00.00
-unspsc7#60.10.45.04.00#Chemistry demonstration kits#60.10.45.00.00
-unspsc7#60.10.45.05.00#Atomic models#60.10.45.00.00
-unspsc7#60.10.45.06.00#Molecular models#60.10.45.00.00
-unspsc7#60.10.45.07.00#Electrochemical demonstration tools#60.10.45.00.00
-unspsc7#60.10.45.08.00#Electrochemical kits#60.10.45.00.00
-unspsc7#60.10.45.09.00#Fuel cells#60.10.45.00.00
-unspsc7#60.10.45.10.00#Microchemistry kits#60.10.45.00.00
-unspsc7#60.10.45.11.00#Microchemistry tools#60.10.45.00.00
-unspsc7#60.10.46.00.00#Mechanical physics materials#60.10.00.00.00
-unspsc7#60.10.46.01.00#Force tables#60.10.46.00.00
-unspsc7#60.10.46.02.00#Gravity models or model sets#60.10.46.00.00
-unspsc7#60.10.46.04.00#Inclined planes#60.10.46.00.00
-unspsc7#60.10.46.05.00#Friction apparatus#60.10.46.00.00
-unspsc7#60.10.46.06.00#Physic cars#60.10.46.00.00
-unspsc7#60.10.46.07.00#Pendulum apparatus#60.10.46.00.00
-unspsc7#60.10.46.08.00#Torque apparatus#60.10.46.00.00
-unspsc7#60.10.46.09.00#Projectile apparatus#60.10.46.00.00
-unspsc7#60.10.46.10.00#Air tables#60.10.46.00.00
-unspsc7#60.10.46.11.00#Air apparatus#60.10.46.00.00
-unspsc7#60.10.46.12.00#Light or photo apparatus#60.10.46.00.00
-unspsc7#60.10.47.00.00#Energy and power physics materials#60.10.00.00.00
-unspsc7#60.10.47.01.00#Solar collecting devices#60.10.47.00.00
-unspsc7#60.10.47.02.00#Solar kits#60.10.47.00.00
-unspsc7#60.10.47.03.00#Energy demonstration kits#60.10.47.00.00
-unspsc7#60.10.47.04.00#Energy class kits#60.10.47.00.00
-unspsc7#60.10.47.05.00#Matter demonstration kits#60.10.47.00.00
-unspsc7#60.10.47.06.00#Matter class kits#60.10.47.00.00
-unspsc7#60.10.47.07.00#Monometers#60.10.47.00.00
-unspsc7#60.10.47.08.00#Gas diffusion apparatus#60.10.47.00.00
-unspsc7#60.10.48.00.00#Wave and sound physics materials#60.10.00.00.00
-unspsc7#60.10.48.01.00#Wave generators#60.10.48.00.00
-unspsc7#60.10.48.02.00#Wave tanks#60.10.48.00.00
-unspsc7#60.10.48.03.00#Wave springs#60.10.48.00.00
-unspsc7#60.10.48.04.00#Wave demonstration sets#60.10.48.00.00
-unspsc7#60.10.48.05.00#Tuning forks#60.10.48.00.00
-unspsc7#60.10.48.06.00#Doppler demonstrators#60.10.48.00.00
-unspsc7#60.10.48.07.00#Resonance apparatus#60.10.48.00.00
-unspsc7#60.10.48.08.00#Sound meters#60.10.48.00.00
-unspsc7#60.10.48.09.00#Wave apparatus#60.10.48.00.00
-unspsc7#60.10.48.10.00#Spectroscopes#60.10.48.00.00
-unspsc7#60.10.48.11.00#Spectrum charts#60.10.48.00.00
-unspsc7#60.10.48.12.00#Light demonstration kits#60.10.48.00.00
-unspsc7#60.10.48.13.00#Color charts or samples#60.10.48.00.00
-unspsc7#60.10.48.14.00#Radiometer#60.10.48.00.00
-unspsc7#60.10.48.15.00#Reflection or refraction apparatus#60.10.48.00.00
-unspsc7#60.10.48.16.00#Optics sets or kits#60.10.48.00.00
-unspsc7#60.10.49.00.00#Electrical physics materials#60.10.00.00.00
-unspsc7#60.10.49.01.00#Van degraff generators#60.10.49.00.00
-unspsc7#60.10.49.02.00#Electrostatic apparatus#60.10.49.00.00
-unspsc7#60.10.49.03.00#Electrostatic kits#60.10.49.00.00
-unspsc7#60.10.49.04.00#Electricity kits#60.10.49.00.00
-unspsc7#60.10.49.05.00#Electricity demonstration boards#60.10.49.00.00
-unspsc7#60.10.49.06.00#Battery kits#60.10.49.00.00
-unspsc7#60.10.49.07.00#Hand held generators#60.10.49.00.00
-unspsc7#60.10.49.08.00#Electromagnetic apparatus#60.10.49.00.00
-unspsc7#60.10.49.09.00#Magnetism apparatus#60.10.49.00.00
-unspsc7#60.10.49.10.00#Electromagnets#60.10.49.00.00
-unspsc7#60.10.49.11.00#Electric bells#60.10.49.00.00
-unspsc7#60.10.49.12.00#Electric lead wires or cables#60.10.49.00.00
-unspsc7#60.10.50.00.00#Nuclear physics materials#60.10.00.00.00
-unspsc7#60.10.50.01.00#Radioactivity sets#60.10.50.00.00
-unspsc7#60.10.50.02.00#Geiger counters#60.10.50.00.00
-unspsc7#60.10.50.03.00#Electron apparatus#60.10.50.00.00
-unspsc7#60.10.50.04.00#Radiation warning signs#60.10.50.00.00
-unspsc7#60.10.50.05.00#Nuclear physics transparencies#60.10.50.00.00
-unspsc7#60.10.50.06.00#Nuclear physics charts#60.10.50.00.00
-unspsc7#60.10.51.00.00#Rocketry and flight materials and supplies#60.10.00.00.00
-unspsc7#60.10.51.01.00#Rocket sets#60.10.51.00.00
-unspsc7#60.10.51.02.00#Launching apparatus#60.10.51.00.00
-unspsc7#60.10.51.03.00#Altitude measuring devices#60.10.51.00.00
-unspsc7#60.10.51.04.00#Airplane kits#60.10.51.00.00
-unspsc7#60.10.52.00.00#Life skills resources instructional materials#60.10.00.00.00
-unspsc7#60.10.52.01.00#Building listening skills instructional materials#60.10.52.00.00
-unspsc7#60.10.52.02.00#Study skills instructional materials#60.10.52.00.00
-unspsc7#60.10.52.03.00#Test preparation instructional materials#60.10.52.00.00
-unspsc7#60.10.53.00.00#Career education instructional materials#60.10.00.00.00
-unspsc7#60.10.53.01.00#Career education or planning or decision making skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.02.00#Basic job skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.03.00#Job search skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.04.00#Time management skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.05.00#Interview skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.06.00#Resume skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.07.00#Work ethics or attitude training instructional materials#60.10.53.00.00
-unspsc7#60.10.53.08.00#Team building skills instructional materials#60.10.53.00.00
-unspsc7#60.10.53.09.00#Business etiquette instructional materials#60.10.53.00.00
-unspsc7#60.10.54.00.00#Consumer economics and money management and independent living instructional materials#60.10.00.00.00
-unspsc7#60.10.54.01.00#Personal finance or money management education instructional materials#60.10.54.00.00
-unspsc7#60.10.54.02.00#Shopping or consumer skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.03.00#Independent living instructional materials#60.10.54.00.00
-unspsc7#60.10.54.04.00#Understanding consumer credit or loans instructional materials#60.10.54.00.00
-unspsc7#60.10.54.05.00#Insurance coverage or insurance comparison instructional materials#60.10.54.00.00
-unspsc7#60.10.54.06.00#Home buying instructional materials#60.10.54.00.00
-unspsc7#60.10.54.07.00#Apartment rental instructional materials#60.10.54.00.00
-unspsc7#60.10.54.08.00#Car buying educational aids#60.10.54.00.00
-unspsc7#60.10.54.09.00#Brand marketing or advertising instructional materials#60.10.54.00.00
-unspsc7#60.10.54.10.00#Relationship building or family life skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.11.00#Developing self concept and self esteem instuctional materials#60.10.54.00.00
-unspsc7#60.10.54.12.00#Violence avoidance education or violence prevention instructional materials#60.10.54.00.00
-unspsc7#60.10.54.13.00#Anger resolution training instructional materials#60.10.54.00.00
-unspsc7#60.10.54.14.00#Teaching patience skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.15.00#Tolerance training instructional materials#60.10.54.00.00
-unspsc7#60.10.54.16.00#Personal safety instructional materials#60.10.54.00.00
-unspsc7#60.10.54.17.00#Personal conflict resolution instructional materials#60.10.54.00.00
-unspsc7#60.10.54.18.00#Practical teen advice guides#60.10.54.00.00
-unspsc7#60.10.54.19.00#Developing social skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.20.00#Manners or etiquette or courtesy instructional aids#60.10.54.00.00
-unspsc7#60.10.54.21.00#Understanding or dealing with cultural diversity instructional materials#60.10.54.00.00
-unspsc7#60.10.54.22.00#How to read body language instructional materials#60.10.54.00.00
-unspsc7#60.10.54.23.00#Developing resiliency instructional materials#60.10.54.00.00
-unspsc7#60.10.54.24.00#Understanding community service instructional materials#60.10.54.00.00
-unspsc7#60.10.54.25.00#Developing refusal skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.26.00#Responsibility or Ddecision making skills instructional materials#60.10.54.00.00
-unspsc7#60.10.54.27.00#Understanding teens legal rights instructional materials#60.10.54.00.00
-unspsc7#60.10.54.28.00#Repercussions of dropping out of school instructional materials#60.10.54.00.00
-unspsc7#60.10.54.29.00#Race relations videos#60.10.54.00.00
-unspsc7#60.10.55.00.00#Home and interior design instructional materials#60.10.00.00.00
-unspsc7#60.10.55.01.00#Feng shui instructional materials#60.10.55.00.00
-unspsc7#60.10.55.02.00#Instructional materials for using color or paint for home decoration#60.10.55.00.00
-unspsc7#60.10.55.03.00#Instructional materials for home planning or design#60.10.55.00.00
-unspsc7#60.10.55.04.00#Landscaping design instructional materials#60.10.55.00.00
-unspsc7#60.10.55.05.00#Instructional materials for home decorating or furnishing#60.10.55.00.00
-unspsc7#60.10.56.00.00#Health education and nutrition and food preparation instructional materials#60.10.00.00.00
-unspsc7#60.10.56.01.00#Dietary guidelines or balanced diets educational resources#60.10.56.00.00
-unspsc7#60.10.56.02.00#Nutritional curriculum menu planning skills instructional materials#60.10.56.00.00
-unspsc7#60.10.56.03.00#Understanding nutrition labeling instructional materials#60.10.56.00.00
-unspsc7#60.10.56.04.00#Food shopping instructional materials#60.10.56.00.00
-unspsc7#60.10.56.05.00#Healthy food choices demonstration units#60.10.56.00.00
-unspsc7#60.10.56.06.00#Understanding the effects of dietary fat instructional materials#60.10.56.00.00
-unspsc7#60.10.56.07.00#Understanding vegetarianism instructional materials#60.10.56.00.00
-unspsc7#60.10.56.08.00#Recipe books or cook books#60.10.56.00.00
-unspsc7#60.10.56.09.00#Eating disorders education instructional materials#60.10.56.00.00
-unspsc7#60.10.56.10.00#Weight control or exercise instructional materials#60.10.56.00.00
-unspsc7#60.10.56.11.00#Kitchen measurements of solids or liquids instructional aids#60.10.56.00.00
-unspsc7#60.10.56.12.00#Kitchen equivalants or kitchen math instructional aids#60.10.56.00.00
-unspsc7#60.10.56.13.00#Kitchen utensils instructional aids#60.10.56.00.00
-unspsc7#60.10.56.14.00#Kitchen safety or sanitation instructional materials#60.10.56.00.00
-unspsc7#60.10.56.15.00#Food safety instructional materials#60.10.56.00.00
-unspsc7#60.10.56.16.00#Food science activities instructional materials#60.10.56.00.00
-unspsc7#60.10.56.17.00#Cooking skills instruction instructional materials#60.10.56.00.00
-unspsc7#60.10.56.18.00#Table manners or eating etiquette instructional materials#60.10.56.00.00
-unspsc7#60.10.56.19.00#Table setting instructional materials#60.10.56.00.00
-unspsc7#60.10.56.20.00#Food service training instructional materials#60.10.56.00.00
-unspsc7#60.10.56.21.00#Drug or tobacco or alcohol abuse education instructional materials#60.10.56.00.00
-unspsc7#60.10.56.22.00#Smoking Simulators#60.10.56.00.00
-unspsc7#60.10.56.23.00#Understanding addiction or addiction avoidance instructional materials#60.10.56.00.00
-unspsc7#60.10.56.24.00#Teen depression symptoms instructional materials#60.10.56.00.00
-unspsc7#60.10.56.25.00#Teen suicide avoidance training instructional materials#60.10.56.00.00
-unspsc7#60.10.56.26.00#Coping with stress instructional materials#60.10.56.00.00
-unspsc7#60.10.57.00.00#Memory books and supplies#60.10.00.00.00
-unspsc7#60.10.57.01.00#Memory books#60.10.57.00.00
-unspsc7#60.10.57.02.00#Memory book posts or extenders#60.10.57.00.00
-unspsc7#60.10.57.03.00#Memory book paper#60.10.57.00.00
-unspsc7#60.10.57.04.00#Acid free memory book glue sticks#60.10.57.00.00
-unspsc7#60.10.57.05.00#Acid free memory book tape#60.10.57.00.00
-unspsc7#60.10.58.00.00#Clothing and textile design instructional materials#60.10.00.00.00
-unspsc7#60.10.58.01.00#Sewing skills instructional materials#60.10.58.00.00
-unspsc7#60.10.58.02.00#Sewing project materials#60.10.58.00.00
-unspsc7#60.10.58.03.00#Understanding clothing construction or workmanship instructional materials#60.10.58.00.00
-unspsc7#60.10.58.04.00#Clothing design or fashion instructional materials#60.10.58.00.00
-unspsc7#60.10.58.05.00#Personal color analysis instructional materials#60.10.58.00.00
-unspsc7#60.10.58.06.00#Fashion merchandising or retail fundamentals instructional materials#60.10.58.00.00
-unspsc7#60.10.58.07.00#Science of fabrics or fibers instructional materials#60.10.58.00.00
-unspsc7#60.10.58.08.00#Clothing care or maintenance or laundering instructional materials#60.10.58.00.00
-unspsc7#60.10.58.09.00#Materials for teaching the art of design color on fabric#60.10.58.00.00
-unspsc7#60.10.58.10.00#Fabric dyes or paints instructional materials#60.10.58.00.00
-unspsc7#60.10.58.11.00#Quilting projects instructional materials#60.10.58.00.00
-unspsc7#60.10.59.00.00#Dating and sex and teen pregnancy and parenting skills and child development instructional materials#60.10.00.00.00
-unspsc7#60.10.59.01.00#Sex education or sexually transmitted disease instructional materials#60.10.59.00.00
-unspsc7#60.10.59.02.00#Prenatal nutrition resources or fetal abuse instructional materials#60.10.59.00.00
-unspsc7#60.10.59.03.00#Parenting skills instructional materials#60.10.59.00.00
-unspsc7#60.10.59.04.00#Child development instructional materials#60.10.59.00.00
-unspsc7#60.10.59.05.00#Understanding date rape or dating skills or harassment instructional materials#60.10.59.00.00
-unspsc7#60.10.59.06.00#Childbirth education instructional materials#60.10.59.00.00
-unspsc7#60.10.59.07.00#Pregnancy from conception through birth instructional materials#60.10.59.00.00
-unspsc7#60.10.59.08.00#Understanding the risks of birth defects instructional materials#60.10.59.00.00
-unspsc7#60.10.59.09.00#Pregnancy simulators#60.10.59.00.00
-unspsc7#60.10.59.10.00#Infant simulators and accessories#60.10.59.00.00
-unspsc7#60.10.59.11.00#Infant care training instructional materials#60.10.59.00.00
-unspsc7#60.10.59.12.00#Understanding physical or emotional child abuse instructional materials#60.10.59.00.00
-unspsc7#60.10.59.13.00#Discipline skill education instructional materials for parents#60.10.59.00.00
-unspsc7#60.10.59.14.00#Home safety or childproofing instructional materials#60.10.59.00.00
-unspsc7#60.10.59.15.00#Cardio pulmonary resusitation or basic life support instructional materials#60.10.59.00.00
-unspsc7#60.10.59.16.00#Understanding childhood illnesses instructional materials#60.10.59.00.00
-unspsc7#60.10.59.17.00#Understanding attention deficit hyperactivity disorder instructional materials#60.10.59.00.00
-unspsc7#60.10.59.18.00#Child caregiver instructional materials#60.10.59.00.00
-unspsc7#60.10.59.19.00#Babysitting instructional materials#60.10.59.00.00
-unspsc7#60.10.60.00.00#Curriculum guides and projects and activities and lessons#60.10.00.00.00
-unspsc7#60.10.60.01.00#Middle school curriculum resource or idea books#60.10.60.00.00
-unspsc7#60.10.60.02.00#High School curriculum resource or idea books#60.10.60.00.00
-unspsc7#60.10.60.03.00#Home economics independent study projects#60.10.60.00.00
-unspsc7#60.10.60.04.00#Home economics projects or activities resources or guides#60.10.60.00.00
-unspsc7#60.10.61.00.00#Vocational teaching aids and materials#60.10.00.00.00
-unspsc7#60.10.61.01.00#Automotive teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.02.00#Construction teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.03.00#Drafting or design teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.04.00#Electronics or electricity teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.05.00#Graphic arts or photography teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.06.00#Horticulture teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.61.07.00#Manufacturing teaching aids or materials#60.10.61.00.00
-unspsc7#60.10.62.00.00#Technology teaching aids and materials#60.10.00.00.00
-unspsc7#60.10.62.01.00#Agriculture teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.02.00#Biotechnology teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.03.00#Communications teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.04.00#Computer science teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.05.00#Energy or power teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.06.00#Environmental teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.07.00#Materials teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.08.00#Medical teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.62.09.00#Transportation teaching aids or materials#60.10.62.00.00
-unspsc7#60.10.63.00.00#Forensic science teaching equipment and supplies#60.10.00.00.00
-unspsc7#60.10.63.01.00#Forensic science kits#60.10.63.00.00
-unspsc7#60.10.64.00.00#Electronics teaching supplies and equipment#60.10.00.00.00
-unspsc7#60.10.64.01.00#Electronics kits#60.10.64.00.00
-unspsc7#60.10.64.02.00#Electronics teaching supplies#60.10.64.00.00
-unspsc7#60.10.64.03.00#Forensic science teaching supplies#60.10.64.00.00
-unspsc7#60.11.00.00.00#Classroom decoratives and supplies#60.00.00.00.00
-unspsc7#60.11.10.00.00#Classroom Charts or classroom posters#60.11.00.00.00
-unspsc7#60.11.10.01.00#Chart packs#60.11.10.00.00
-unspsc7#60.11.10.02.00#Classroom charts#60.11.10.00.00
-unspsc7#60.11.10.03.00#Classroom posters or sets#60.11.10.00.00
-unspsc7#60.11.10.04.00#Do it yourself posters#60.11.10.00.00
-unspsc7#60.11.11.00.00#Bulletin board sets#60.11.00.00.00
-unspsc7#60.11.11.01.00#Big bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.02.00#Calendar bulleting board sets#60.11.11.00.00
-unspsc7#60.11.11.03.00#Early childhood bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.04.00#Language bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.05.00#Math bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.06.00#Multipurpose bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.07.00#Science bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.08.00#Seasonal bulletin board sets#60.11.11.00.00
-unspsc7#60.11.11.09.00#Social studies bulletin board sets#60.11.11.00.00
-unspsc7#60.11.12.00.00#Bulletin board borders and trimmers#60.11.00.00.00
-unspsc7#60.11.12.01.00#Classroom banners#60.11.12.00.00
-unspsc7#60.11.12.02.00#Border packs#60.11.12.00.00
-unspsc7#60.11.12.03.00#Classroom headers#60.11.12.00.00
-unspsc7#60.11.12.04.00#Corriguated borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.05.00#Die cut shaped scalloped borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.06.00#Sparkle borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.07.00#Straight borders or trimmers#60.11.12.00.00
-unspsc7#60.11.12.08.00#Border or Trimmer storage#60.11.12.00.00
-unspsc7#60.11.13.00.00#Decorative letters and numbers#60.11.00.00.00
-unspsc7#60.11.13.01.00#Lettered or numbered blocks#60.11.13.00.00
-unspsc7#60.11.13.02.00#Casual letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.03.00#Italic letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.04.00#Self adhesive letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.05.00#Sparkle letters or numbers#60.11.13.00.00
-unspsc7#60.11.13.06.00#Tracing letters or numbers#60.11.13.00.00
-unspsc7#60.11.14.00.00#Specialty decoratives for the classroom and decorative accessories#60.11.00.00.00
-unspsc7#60.11.14.01.00#Classroom decorative kits#60.11.14.00.00
-unspsc7#60.11.14.02.00#Door decorations#60.11.14.00.00
-unspsc7#60.11.14.03.00#Mobiles#60.11.14.00.00
-unspsc7#60.11.14.04.00#Two sided decorations#60.11.14.00.00
-unspsc7#60.11.14.05.00#Window cling decorations#60.11.14.00.00
-unspsc7#60.11.14.07.00#Decorative Storage Systems#60.11.14.00.00
-unspsc7#60.11.14.08.00#Decorative tapes or twists#60.11.14.00.00
-unspsc7#60.11.14.09.00#Decorative buttons#60.11.14.00.00
-unspsc7#60.11.14.10.00#Decorative shapes or strings#60.11.14.00.00
-unspsc7#60.12.00.00.00#Arts and crafts equipment and accessories and supplies#60.00.00.00.00
-unspsc7#60.12.10.00.00#Art#60.12.00.00.00
-unspsc7#60.12.10.01.00#Paintings#60.12.10.00.00
-unspsc7#60.12.10.02.00#Sculptures#60.12.10.00.00
-unspsc7#60.12.10.03.00#Statuary#60.12.10.00.00
-unspsc7#60.12.10.04.00#Portraits#60.12.10.00.00
-unspsc7#60.12.10.05.00#Drawings#60.12.10.00.00
-unspsc7#60.12.10.06.00#Pictures#60.12.10.00.00
-unspsc7#60.12.10.07.00#Lithographs#60.12.10.00.00
-unspsc7#60.12.10.08.00#Posters#60.12.10.00.00
-unspsc7#60.12.10.09.00#Decorative pot#60.12.10.00.00
-unspsc7#60.12.10.10.00#Scrolls#60.12.10.00.00
-unspsc7#60.12.10.11.00#Photographs#60.12.10.00.00
-unspsc7#60.12.11.00.00#Canvases and films and boards and artists papers#60.12.00.00.00
-unspsc7#60.12.11.01.00#Sulphite drawing paper#60.12.11.00.00
-unspsc7#60.12.11.02.00#Groundwood drawing paper#60.12.11.00.00
-unspsc7#60.12.11.03.00#Tracing or vellum drawing paper#60.12.11.00.00
-unspsc7#60.12.11.04.00#Bond drawing paper#60.12.11.00.00
-unspsc7#60.12.11.05.00#Charcoal or pastel drawing paper#60.12.11.00.00
-unspsc7#60.12.11.06.00#Bristol drawing paper#60.12.11.00.00
-unspsc7#60.12.11.07.00#Watercolor paper sheets#60.12.11.00.00
-unspsc7#60.12.11.08.00#Watercolor paper pads#60.12.11.00.00
-unspsc7#60.12.11.09.00#Watercolor paper blocks#60.12.11.00.00
-unspsc7#60.12.11.10.00#Finger paint paper#60.12.11.00.00
-unspsc7#60.12.11.11.00#Sulphite construction paper#60.12.11.00.00
-unspsc7#60.12.11.12.00#Groundwood construction paper#60.12.11.00.00
-unspsc7#60.12.11.13.00#Foil construction paper#60.12.11.00.00
-unspsc7#60.12.11.14.00#Origami craft papers#60.12.11.00.00
-unspsc7#60.12.11.15.00#Paper or plastic Confetti#60.12.11.00.00
-unspsc7#60.12.11.16.00#Crepe paper for crafts#60.12.11.00.00
-unspsc7#60.12.11.17.00#Craft tissue paper#60.12.11.00.00
-unspsc7#60.12.11.18.00#Corrugated craft paper#60.12.11.00.00
-unspsc7#60.12.11.19.00#Pattern printed craft paper#60.12.11.00.00
-unspsc7#60.12.11.20.00#Self adhesive craft paper#60.12.11.00.00
-unspsc7#60.12.11.21.00#Glow in the dark paper#60.12.11.00.00
-unspsc7#60.12.11.23.00#Hand made paper#60.12.11.00.00
-unspsc7#60.12.11.24.00#Kraft paper#60.12.11.00.00
-unspsc7#60.12.11.25.00#Canvas panels#60.12.11.00.00
-unspsc7#60.12.11.26.00#Prestretched canvas#60.12.11.00.00
-unspsc7#60.12.11.27.00#Primed canvas#60.12.11.00.00
-unspsc7#60.12.11.28.00#Unprimed canvas#60.12.11.00.00
-unspsc7#60.12.11.29.00#Masonite panels#60.12.11.00.00
-unspsc7#60.12.11.30.00#Canvas like paper pads#60.12.11.00.00
-unspsc7#60.12.11.31.00#Japanese printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.32.00#Lithography or intaglio printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.33.00#Blockprinting printmaking paper#60.12.11.00.00
-unspsc7#60.12.11.34.00#Foil paper#60.12.11.00.00
-unspsc7#60.12.11.35.00#Acetate or vinyl or polyester films#60.12.11.00.00
-unspsc7#60.12.11.36.00#Cellophane films#60.12.11.00.00
-unspsc7#60.12.11.37.00#Acrylic sheets#60.12.11.00.00
-unspsc7#60.12.11.38.00#Illustration boards#60.12.11.00.00
-unspsc7#60.12.11.39.00#Mat boards#60.12.11.00.00
-unspsc7#60.12.11.40.00#Mounting board#60.12.11.00.00
-unspsc7#60.12.11.41.00#Foam core mounting board#60.12.11.00.00
-unspsc7#60.12.11.42.00#Tagboard or railroad board#60.12.11.00.00
-unspsc7#60.12.11.43.00#Display board#60.12.11.00.00
-unspsc7#60.12.11.44.00#Scratch art papers#60.12.11.00.00
-unspsc7#60.12.11.45.00#Scratch art boards#60.12.11.00.00
-unspsc7#60.12.11.46.00#Scratch art accessories#60.12.11.00.00
-unspsc7#60.12.12.00.00#Classroom and fine art paint and mediums and applicators and accessories#60.12.00.00.00
-unspsc7#60.12.12.01.00#Traditional liquid tempera paint#60.12.12.00.00
-unspsc7#60.12.12.02.00#Contemporary liquid tempera paint#60.12.12.00.00
-unspsc7#60.12.12.03.00#Powdered tempera paint#60.12.12.00.00
-unspsc7#60.12.12.04.00#Washable tempera paint#60.12.12.00.00
-unspsc7#60.12.12.05.00#Tempera cakes#60.12.12.00.00
-unspsc7#60.12.12.06.00#Liquid face or body paint#60.12.12.00.00
-unspsc7#60.12.12.07.00#Cake face or body paint#60.12.12.00.00
-unspsc7#60.12.12.08.00#Marker face or body paint#60.12.12.00.00
-unspsc7#60.12.12.09.00#Temporary tattoo paint#60.12.12.00.00
-unspsc7#60.12.12.10.00#Washable finger paint#60.12.12.00.00
-unspsc7#60.12.12.11.00#School style acrylic paint#60.12.12.00.00
-unspsc7#60.12.12.12.00#Acrylic airbrush paint#60.12.12.00.00
-unspsc7#60.12.12.13.00#Synthetic heat treated oil paint or mediums#60.12.12.00.00
-unspsc7#60.12.12.14.00#Water soluble oil paint or mediums#60.12.12.00.00
-unspsc7#60.12.12.15.00#Low viscosity removable glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.16.00#Low viscosity permanent glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.17.00#High viscosity Gel removable glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.18.00#High viscosity Gel permanent glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.19.00#Oven baked glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.20.00#Marker delivery system glass or ceramic paint#60.12.12.00.00
-unspsc7#60.12.12.21.00#Pan watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.22.00#Tube watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.23.00#Liquid watercolor paint#60.12.12.00.00
-unspsc7#60.12.12.24.00#Liquid watercolor frisket paint#60.12.12.00.00
-unspsc7#60.12.12.25.00#Watercolor painting mediums#60.12.12.00.00
-unspsc7#60.12.12.26.00#Watercolor brushes#60.12.12.00.00
-unspsc7#60.12.12.27.00#Oriental brushes#60.12.12.00.00
-unspsc7#60.12.12.28.00#Utility brushes#60.12.12.00.00
-unspsc7#60.12.12.29.00#Specialty brushes#60.12.12.00.00
-unspsc7#60.12.12.30.00#Easel brushes#60.12.12.00.00
-unspsc7#60.12.12.31.00#Palette knives#60.12.12.00.00
-unspsc7#60.12.12.32.00#Brayers for hand printing#60.12.12.00.00
-unspsc7#60.12.12.33.00#Sponge stamps#60.12.12.00.00
-unspsc7#60.12.12.34.00#Scrapers for paint application#60.12.12.00.00
-unspsc7#60.12.12.35.00#Pipettes for paint or dye mixing#60.12.12.00.00
-unspsc7#60.12.12.36.00#Combs or tools for paint or ink application#60.12.12.00.00
-unspsc7#60.12.12.37.00#Palettes for paint or ink mixing#60.12.12.00.00
-unspsc7#60.12.12.38.00#Paint pots for paint storage or mixing#60.12.12.00.00
-unspsc7#60.12.12.39.00#Paint cups or bottles#60.12.12.00.00
-unspsc7#60.12.12.41.00#Brush or tool cleaners#60.12.12.00.00
-unspsc7#60.12.12.42.00#Paint aprons#60.12.12.00.00
-unspsc7#60.12.12.43.00#Artists Smocks#60.12.12.00.00
-unspsc7#60.12.12.44.00#Stretcher strips#60.12.12.00.00
-unspsc7#60.12.12.45.00#Canvas stretchers#60.12.12.00.00
-unspsc7#60.12.12.46.00#Metal easels#60.12.12.00.00
-unspsc7#60.12.12.47.00#Wood easels#60.12.12.00.00
-unspsc7#60.12.12.48.00#Table top easels#60.12.12.00.00
-unspsc7#60.12.12.49.00#Presentation easels#60.12.12.00.00
-unspsc7#60.12.13.00.00#Art and craft cutting products#60.12.00.00.00
-unspsc7#60.12.13.01.00#Guillotine paper trimmers#60.12.13.00.00
-unspsc7#60.12.13.02.00#Mat cutter#60.12.13.00.00
-unspsc7#60.12.13.03.00#Mat knives#60.12.13.00.00
-unspsc7#60.12.13.04.00#Artist knives#60.12.13.00.00
-unspsc7#60.12.13.05.00#Rotary paper or fabric cutter#60.12.13.00.00
-unspsc7#60.12.13.06.00#Circle or oval paper cutters#60.12.13.00.00
-unspsc7#60.12.14.00.00#Picture Framing#60.12.00.00.00
-unspsc7#60.12.14.01.00#Pre assembled wood picture frames#60.12.14.00.00
-unspsc7#60.12.14.02.00#Wood section picture frames#60.12.14.00.00
-unspsc7#60.12.14.03.00#Pre assembled metal picture frames#60.12.14.00.00
-unspsc7#60.12.14.04.00#Metal section picture frames#60.12.14.00.00
-unspsc7#60.12.14.05.00#Adjustable picture frames#60.12.14.00.00
-unspsc7#60.12.14.06.00#Plastic picture frames#60.12.14.00.00
-unspsc7#60.12.14.07.00#Clear box picture frame#60.12.14.00.00
-unspsc7#60.12.14.08.00#Point drivers or accessories for picture frames#60.12.14.00.00
-unspsc7#60.12.14.09.00#Mitre box#60.12.14.00.00
-unspsc7#60.12.14.10.00#Picture Hanging devices#60.12.14.00.00
-unspsc7#60.12.14.11.00#Acrylic panels for picture frames#60.12.14.00.00
-unspsc7#60.12.14.12.00#Glass panels for picture frames#60.12.14.00.00
-unspsc7#60.12.15.00.00#Drawing tools and supplies and accessories#60.12.00.00.00
-unspsc7#60.12.15.01.00#Water based markers#60.12.15.00.00
-unspsc7#60.12.15.02.00#Solvent based markers#60.12.15.00.00
-unspsc7#60.12.15.03.00#Washable markers#60.12.15.00.00
-unspsc7#60.12.15.04.00#Calligraphy markers#60.12.15.00.00
-unspsc7#60.12.15.05.00#Fabric markers#60.12.15.00.00
-unspsc7#60.12.15.06.00#Metallic markers#60.12.15.00.00
-unspsc7#60.12.15.07.00#Tempera or chalk window markers#60.12.15.00.00
-unspsc7#60.12.15.08.00#Paint markers#60.12.15.00.00
-unspsc7#60.12.15.09.00#Wax based crayons#60.12.15.00.00
-unspsc7#60.12.15.10.00#Soy based crayons#60.12.15.00.00
-unspsc7#60.12.15.11.00#Specialty crayons#60.12.15.00.00
-unspsc7#60.12.15.12.00#Watercolor crayons#60.12.15.00.00
-unspsc7#60.12.15.13.00#Dry pastel#60.12.15.00.00
-unspsc7#60.12.15.14.00#Chalk pastel#60.12.15.00.00
-unspsc7#60.12.15.15.00#Oil based pastel#60.12.15.00.00
-unspsc7#60.12.15.16.00#Compressed charcoal#60.12.15.00.00
-unspsc7#60.12.15.17.00#Vine charcoal#60.12.15.00.00
-unspsc7#60.12.15.18.00#Graphite pencils#60.12.15.00.00
-unspsc7#60.12.15.19.00#Wax based colored drawing pencils#60.12.15.00.00
-unspsc7#60.12.15.20.00#Charcoal pencils#60.12.15.00.00
-unspsc7#60.12.15.21.00#Watercolor pencils#60.12.15.00.00
-unspsc7#60.12.15.22.00#Waterbased pens#60.12.15.00.00
-unspsc7#60.12.15.23.00#Permanent pens#60.12.15.00.00
-unspsc7#60.12.15.24.00#Gel pens#60.12.15.00.00
-unspsc7#60.12.15.25.00#Technical pens#60.12.15.00.00
-unspsc7#60.12.15.26.00#Calligraphy pens#60.12.15.00.00
-unspsc7#60.12.15.28.00#Water based drawing ink#60.12.15.00.00
-unspsc7#60.12.15.29.00#Solvent based drawing ink#60.12.15.00.00
-unspsc7#60.12.15.30.00#Calligraphy drawing ink#60.12.15.00.00
-unspsc7#60.12.15.31.00#Pink pencil erasers#60.12.15.00.00
-unspsc7#60.12.15.32.00#Kneaded erasers#60.12.15.00.00
-unspsc7#60.12.15.33.00#Vinyl erasers#60.12.15.00.00
-unspsc7#60.12.15.34.00#Plastic erasers#60.12.15.00.00
-unspsc7#60.12.15.35.00#Gum erasers#60.12.15.00.00
-unspsc7#60.12.16.00.00#Studio aids#60.12.00.00.00
-unspsc7#60.12.16.01.00#Wood Mannequins#60.12.16.00.00
-unspsc7#60.12.16.02.00#Clear acrylic mirrors or panels#60.12.16.00.00
-unspsc7#60.12.16.03.00#Plastic Rubbing plates#60.12.16.00.00
-unspsc7#60.12.16.04.00#Studio aid accessories#60.12.16.00.00
-unspsc7#60.12.16.05.00#Anatomical models#60.12.16.00.00
-unspsc7#60.12.17.00.00#Printmaking supplies and accessories#60.12.00.00.00
-unspsc7#60.12.17.01.00#Rubber stamping stamps#60.12.17.00.00
-unspsc7#60.12.17.02.00#Rubber stamping stamp pads#60.12.17.00.00
-unspsc7#60.12.17.03.00#Rubber stamping accessories#60.12.17.00.00
-unspsc7#60.12.17.04.00#Linoleum for block printing#60.12.17.00.00
-unspsc7#60.12.17.05.00#Wood blocks for printing#60.12.17.00.00
-unspsc7#60.12.17.06.00#Synthetic blocks for printing#60.12.17.00.00
-unspsc7#60.12.17.07.00#Block printing accessories#60.12.17.00.00
-unspsc7#60.12.17.08.00#Intaglio or lithography plates#60.12.17.00.00
-unspsc7#60.12.17.09.00#Intaglio or lithography blankets#60.12.17.00.00
-unspsc7#60.12.17.10.00#Intaglio or lithography wipes#60.12.17.00.00
-unspsc7#60.12.17.11.00#Intaglio or lithography hot plates#60.12.17.00.00
-unspsc7#60.12.17.12.00#Intaglio or lithography printing presses#60.12.17.00.00
-unspsc7#60.12.17.13.00#Printing Barens and Brayers#60.12.17.00.00
-unspsc7#60.12.17.14.00#Intaglio Etching or engraving tools#60.12.17.00.00
-unspsc7#60.12.17.15.00#Silkscreen screens or printing stations#60.12.17.00.00
-unspsc7#60.12.17.16.00#Silkscreen accessories#60.12.17.00.00
-unspsc7#60.12.18.00.00#Printing and drawing inks#60.12.00.00.00
-unspsc7#60.12.18.01.00#Water based poster inks#60.12.18.00.00
-unspsc7#60.12.18.02.00#Water based acrylic inks#60.12.18.00.00
-unspsc7#60.12.18.03.00#Oil based silkscreen inks#60.12.18.00.00
-unspsc7#60.12.18.04.00#Water based Textile inks#60.12.18.00.00
-unspsc7#60.12.18.05.00#Oil based textile inks#60.12.18.00.00
-unspsc7#60.12.18.06.00#Printmaking sublimation inks#60.12.18.00.00
-unspsc7#60.12.18.07.00#Oil based intaglio or lithography inks#60.12.18.00.00
-unspsc7#60.12.18.08.00#Oil based monoprint inks#60.12.18.00.00
-unspsc7#60.12.18.09.00#Water based monoprint inks#60.12.18.00.00
-unspsc7#60.12.18.10.00#Water based drawing inks#60.12.18.00.00
-unspsc7#60.12.18.11.00#Solvent based drawing inks#60.12.18.00.00
-unspsc7#60.12.18.12.00#Calligraphy drawing inks#60.12.18.00.00
-unspsc7#60.12.18.13.00#Silkscreen inks#60.12.18.00.00
-unspsc7#60.12.19.00.00#Art fabric and fabric decoration materials and supplies#60.12.00.00.00
-unspsc7#60.12.19.01.00#Muslin#60.12.19.00.00
-unspsc7#60.12.19.02.00#Felt#60.12.19.00.00
-unspsc7#60.12.19.03.00#Craft fur#60.12.19.00.00
-unspsc7#60.12.19.04.00#Cotton blends#60.12.19.00.00
-unspsc7#60.12.19.05.00#Canvas imprintables#60.12.19.00.00
-unspsc7#60.12.19.06.00#Pre sensitized imprintables#60.12.19.00.00
-unspsc7#60.12.19.07.00#Cotton imprintables#60.12.19.00.00
-unspsc7#60.12.19.08.00#Blended imprintables#60.12.19.00.00
-unspsc7#60.12.19.09.00#Batik waxes#60.12.19.00.00
-unspsc7#60.12.19.10.00#Batik accessories#60.12.19.00.00
-unspsc7#60.12.19.11.00#Batik fabric#60.12.19.00.00
-unspsc7#60.12.20.00.00#Sewing and stitchery and weaving equipment and accessories#60.12.00.00.00
-unspsc7#60.12.20.01.00#Weaving or tapestry needles#60.12.20.00.00
-unspsc7#60.12.20.02.00#Weaving accessories#60.12.20.00.00
-unspsc7#60.12.20.03.00#Hand sewing needles#60.12.20.00.00
-unspsc7#60.12.20.04.00#String art kits#60.12.20.00.00
-unspsc7#60.12.20.05.00#Hand looms#60.12.20.00.00
-unspsc7#60.12.20.06.00#Table looms#60.12.20.00.00
-unspsc7#60.12.20.07.00#Floor looms#60.12.20.00.00
-unspsc7#60.12.20.08.00#Rexlace#60.12.20.00.00
-unspsc7#60.12.20.09.00#Lacing or stringing accessories#60.12.20.00.00
-unspsc7#60.12.21.00.00#Candlemaking#60.12.00.00.00
-unspsc7#60.12.21.01.00#Candlemaking wicks#60.12.21.00.00
-unspsc7#60.12.21.02.00#Candlemaking forms#60.12.21.00.00
-unspsc7#60.12.21.03.00#Candlemaking accessories#60.12.21.00.00
-unspsc7#60.12.22.00.00#Wood crafts#60.12.00.00.00
-unspsc7#60.12.22.01.00#Wood craft materials#60.12.22.00.00
-unspsc7#60.12.22.02.00#Finishing materials#60.12.22.00.00
-unspsc7#60.12.22.03.00#Wood burning tools#60.12.22.00.00
-unspsc7#60.12.22.04.00#Carving tools#60.12.22.00.00
-unspsc7#60.12.23.00.00#Basketry making supplies#60.12.00.00.00
-unspsc7#60.12.23.01.00#Basketry reed#60.12.23.00.00
-unspsc7#60.12.23.02.00#Basketry project kits#60.12.23.00.00
-unspsc7#60.12.24.00.00#Stained glass making supplies#60.12.00.00.00
-unspsc7#60.12.24.01.00#Stained Glass fragments#60.12.24.00.00
-unspsc7#60.12.24.02.00#Stained glass tools or accessories#60.12.24.00.00
-unspsc7#60.12.25.00.00#Paper crafts and hand made papermaking#60.12.00.00.00
-unspsc7#60.12.25.01.00#Paper shaping tools#60.12.25.00.00
-unspsc7#60.12.25.02.00#Paper picture frames#60.12.25.00.00
-unspsc7#60.12.25.03.00#Paper plates or trays#60.12.25.00.00
-unspsc7#60.12.25.04.00#Paper filters#60.12.25.00.00
-unspsc7#60.12.25.05.00#Corrugated cardboard shapes#60.12.25.00.00
-unspsc7#60.12.25.06.00#Paper Doilies#60.12.25.00.00
-unspsc7#60.12.25.07.00#Deckles or molds for hand made paper#60.12.25.00.00
-unspsc7#60.12.25.08.00#Couch sheets or felts for hand made paper#60.12.25.00.00
-unspsc7#60.12.25.09.00#Pulp or raw materials for hand made paper#60.12.25.00.00
-unspsc7#60.12.26.00.00#Mosaics#60.12.00.00.00
-unspsc7#60.12.26.01.00#Mosaic tiles#60.12.26.00.00
-unspsc7#60.12.26.02.00#Mosaic molds#60.12.26.00.00
-unspsc7#60.12.26.03.00#Mosaic tools#60.12.26.00.00
-unspsc7#60.12.26.04.00#Mosaic accessories#60.12.26.00.00
-unspsc7#60.12.27.00.00#Enameling paints and accessories#60.12.00.00.00
-unspsc7#60.12.27.01.00#Enameling paints or mediums#60.12.27.00.00
-unspsc7#60.12.27.02.00#Copper shapes#60.12.27.00.00
-unspsc7#60.12.27.03.00#Enameling accessories#60.12.27.00.00
-unspsc7#60.12.27.04.00#Enameling Kilns#60.12.27.00.00
-unspsc7#60.12.28.00.00#Maskmaking#60.12.00.00.00
-unspsc7#60.12.28.01.00#Maskmaking forms#60.12.28.00.00
-unspsc7#60.12.29.00.00#Beads or beading accessories#60.12.00.00.00
-unspsc7#60.12.29.01.00#Seed beads#60.12.29.00.00
-unspsc7#60.12.29.02.00#Pony beads#60.12.29.00.00
-unspsc7#60.12.29.03.00#Wood beads#60.12.29.00.00
-unspsc7#60.12.29.04.00#Straw beads#60.12.29.00.00
-unspsc7#60.12.29.05.00#Ceramic beads#60.12.29.00.00
-unspsc7#60.12.29.06.00#Glass beads#60.12.29.00.00
-unspsc7#60.12.29.07.00#Assorted or decorative beads#60.12.29.00.00
-unspsc7#60.12.29.08.00#Bead accessories#60.12.29.00.00
-unspsc7#60.12.30.00.00#Foam crafts#60.12.00.00.00
-unspsc7#60.12.30.01.00#Styrofoam shapes#60.12.30.00.00
-unspsc7#60.12.30.02.00#Tools for foam crafts#60.12.30.00.00
-unspsc7#60.12.31.00.00#Chenille stem crafts#60.12.00.00.00
-unspsc7#60.12.31.01.00#Jumbo chenille stems#60.12.31.00.00
-unspsc7#60.12.31.02.00#Cotton chenille stems#60.12.31.00.00
-unspsc7#60.12.31.03.00#Bumps chenille stems#60.12.31.00.00
-unspsc7#60.12.32.00.00#Ribbon making materials#60.12.00.00.00
-unspsc7#60.12.32.01.00#Paper ribbons#60.12.32.00.00
-unspsc7#60.12.32.02.00#Silk ribbons#60.12.32.00.00
-unspsc7#60.12.32.03.00#Synthetic ribbons#60.12.32.00.00
-unspsc7#60.12.32.04.00#Decorative ribbons#60.12.32.00.00
-unspsc7#60.12.33.00.00#Craft Poms#60.12.00.00.00
-unspsc7#60.12.33.01.00#Acrylic craft poms#60.12.33.00.00
-unspsc7#60.12.33.02.00#Glitter craft poms#60.12.33.00.00
-unspsc7#60.12.33.03.00#Craft pom beadz#60.12.33.00.00
-unspsc7#60.12.34.00.00#Wiggle eyes materials#60.12.00.00.00
-unspsc7#60.12.34.01.00#Non self adhesive wiggle eyes#60.12.34.00.00
-unspsc7#60.12.34.02.00#Self adhesive wiggle eyes#60.12.34.00.00
-unspsc7#60.12.34.03.00#Decorative wiggle eyes#60.12.34.00.00
-unspsc7#60.12.35.00.00#Leather craft materials#60.12.00.00.00
-unspsc7#60.12.35.01.00#Leather or leather lacing materials#60.12.35.00.00
-unspsc7#60.12.35.02.00#Leather accessories#60.12.35.00.00
-unspsc7#60.12.36.00.00#Glitter#60.12.00.00.00
-unspsc7#60.12.36.01.00#Glitter glue#60.12.36.00.00
-unspsc7#60.12.36.02.00#Glitter dots#60.12.36.00.00
-unspsc7#60.12.36.03.00#Glitter jewels#60.12.36.00.00
-unspsc7#60.12.36.04.00#Plastic glitter#60.12.36.00.00
-unspsc7#60.12.36.05.00#Irridescent glitter#60.12.36.00.00
-unspsc7#60.12.36.06.00#Metallic glitter#60.12.36.00.00
-unspsc7#60.12.37.00.00#Macrame craft materials and accessories#60.12.00.00.00
-unspsc7#60.12.37.01.00#Macrame cord#60.12.37.00.00
-unspsc7#60.12.37.02.00#Macrame beads#60.12.37.00.00
-unspsc7#60.12.37.03.00#Macrame accessories#60.12.37.00.00
-unspsc7#60.12.38.00.00#Marbling supplies and accessories#60.12.00.00.00
-unspsc7#60.12.38.01.00#Marbling inks#60.12.38.00.00
-unspsc7#60.12.38.02.00#Marbling accessories#60.12.38.00.00
-unspsc7#60.12.39.00.00#Sequins and trims#60.12.00.00.00
-unspsc7#60.12.39.01.00#Decorative sequins or trims#60.12.39.00.00
-unspsc7#60.12.40.00.00#Cork craft supplies and accessories#60.12.00.00.00
-unspsc7#60.12.40.01.00#Cork sheets#60.12.40.00.00
-unspsc7#60.12.40.02.00#Cork stoppers#60.12.40.00.00
-unspsc7#60.12.41.00.00#Multicultural project materials and accessories#60.12.00.00.00
-unspsc7#60.12.41.01.00#Multicultural painting products#60.12.41.00.00
-unspsc7#60.12.41.02.00#Multicultural crafts products#60.12.41.00.00
-unspsc7#60.12.42.00.00#Cross curricular projects#60.12.00.00.00
-unspsc7#60.12.42.01.00#Mylar sculptures#60.12.42.00.00
-unspsc7#60.12.43.00.00#Clay and modeling compounds and ceramics equipment and accessories#60.12.00.00.00
-unspsc7#60.12.43.01.00#Moist kiln fired clay#60.12.43.00.00
-unspsc7#60.12.43.02.00#Dry kiln fired clay#60.12.43.00.00
-unspsc7#60.12.43.03.00#Kiln furniture#60.12.43.00.00
-unspsc7#60.12.43.04.00#Kilns for firing ceramics#60.12.43.00.00
-unspsc7#60.12.43.05.00#Kiln accessories for firing ceramics#60.12.43.00.00
-unspsc7#60.12.43.06.00#Potters wheels for hand made ceramics#60.12.43.00.00
-unspsc7#60.12.43.07.00#Extruders for modeling materials#60.12.43.00.00
-unspsc7#60.12.43.08.00#Cones for firing kilns#60.12.43.00.00
-unspsc7#60.12.43.09.00#Pottery Batts#60.12.43.00.00
-unspsc7#60.12.43.10.00#Decorating wheels for pottery#60.12.43.00.00
-unspsc7#60.12.43.11.00#Clay or modeling tools#60.12.43.00.00
-unspsc7#60.12.43.12.00#Fired ceramic tiles#60.12.43.00.00
-unspsc7#60.12.43.13.00#Clay storage containers#60.12.43.00.00
-unspsc7#60.12.43.14.00#Plasicized non hardening modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.15.00#Oilbased nonhardening modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.16.00#Air dry clay or modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.17.00#Modeling dough#60.12.43.00.00
-unspsc7#60.12.43.18.00#Papier Mache#60.12.43.00.00
-unspsc7#60.12.43.19.00#Specialty modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.20.00#Plaster compounds#60.12.43.00.00
-unspsc7#60.12.43.21.00#Oven hardening clay or modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.22.00#Plastic modeling compounds#60.12.43.00.00
-unspsc7#60.12.43.23.00#Casts or molds for shaping modeling compounds#60.12.43.00.00
-unspsc7#60.12.44.00.00#Art metals#60.12.00.00.00
-unspsc7#60.12.44.01.00#Copper tooling foil#60.12.44.00.00
-unspsc7#60.12.44.02.00#Aluminum tooling foil#60.12.44.00.00
-unspsc7#60.12.44.03.00#Aluminum wire#60.12.44.00.00
-unspsc7#60.12.44.04.00#Brass tooling foil#60.12.44.00.00
-unspsc7#60.12.44.05.00#Brass wire#60.12.44.00.00
-unspsc7#60.12.44.06.00#Silver sheets or plates#60.12.44.00.00
-unspsc7#60.12.44.07.00#Silver wire#60.12.44.00.00
-unspsc7#60.12.44.08.00#Pewter pellets or shots#60.12.44.00.00
-unspsc7#60.12.44.09.00#Pewter ingots#60.12.44.00.00
-unspsc7#60.12.44.10.00#Nu gold sheets plates#60.12.44.00.00
-unspsc7#60.12.44.11.00#Nu gold wire#60.12.44.00.00
-unspsc7#60.12.44.12.00#Galvanized stovepipe wire#60.12.44.00.00
-unspsc7#60.12.45.00.00#Sculpture supplies and accessories#60.12.00.00.00
-unspsc7#60.12.45.01.00#Plaster wrap#60.12.45.00.00
-unspsc7#60.12.45.02.00#Casting resins#60.12.45.00.00
-unspsc7#60.12.45.03.00#Sculpture accessories#60.12.45.00.00
-unspsc7#60.12.45.04.00#Puzzle racks#60.12.45.00.00
-unspsc7#60.12.45.05.00#Bubbles or accessories#60.12.45.00.00
-unspsc7#60.12.45.06.00#Plastic sand or water tools or molds or toys#60.12.45.00.00
-unspsc7#60.12.45.07.00#Play sand#60.12.45.00.00
-unspsc7#60.12.45.08.00#Sand or water tables or activity centers#60.12.45.00.00
-unspsc7#60.12.45.09.00#Vehicle sets#60.12.45.00.00
-unspsc7#60.12.45.10.00#Waterway sets#60.12.45.00.00
-unspsc7#60.12.45.11.00#Play tools or play tool kits#60.12.45.00.00
-unspsc7#60.12.45.12.00#Scooter boards#60.12.45.00.00
-unspsc7#60.12.45.13.00#Beanbags#60.12.45.00.00
-unspsc7#60.12.45.14.00#Tactile toys#60.12.45.00.00
-unspsc7#60.12.45.15.00#Cognitive toys#60.12.45.00.00
-unspsc7#60.13.00.00.00#Musical Instruments and parts and accessories#60.00.00.00.00
-unspsc7#60.13.10.00.00#Keyboard instruments#60.13.00.00.00
-unspsc7#60.13.10.01.00#Pianos#60.13.10.00.00
-unspsc7#60.13.10.02.00#Accordions#60.13.10.00.00
-unspsc7#60.13.10.03.00#Musical organs#60.13.10.00.00
-unspsc7#60.13.11.00.00#Brass instruments#60.13.00.00.00
-unspsc7#60.13.11.01.00#Trumpets#60.13.11.00.00
-unspsc7#60.13.11.02.00#Trombones#60.13.11.00.00
-unspsc7#60.13.11.03.00#Sousaphones#60.13.11.00.00
-unspsc7#60.13.11.04.00#Saxophones#60.13.11.00.00
-unspsc7#60.13.11.05.00#Whistle#60.13.11.00.00
-unspsc7#60.13.12.00.00#Woodwind instruments#60.13.00.00.00
-unspsc7#60.13.12.01.00#Clarinets#60.13.12.00.00
-unspsc7#60.13.12.02.00#Oboes#60.13.12.00.00
-unspsc7#60.13.12.03.00#Musical flutes#60.13.12.00.00
-unspsc7#60.13.12.04.00#Piccoloes#60.13.12.00.00
-unspsc7#60.13.12.05.00#Musical cornets#60.13.12.00.00
-unspsc7#60.13.12.06.00#Bagpipes#60.13.12.00.00
-unspsc7#60.13.12.07.00#Harmonicas#60.13.12.00.00
-unspsc7#60.13.12.08.00#Kazoos#60.13.12.00.00
-unspsc7#60.13.13.00.00#String instruments#60.13.00.00.00
-unspsc7#60.13.13.01.00#Harpsichords#60.13.13.00.00
-unspsc7#60.13.13.02.00#Clavichords#60.13.13.00.00
-unspsc7#60.13.13.03.00#Guitars#60.13.13.00.00
-unspsc7#60.13.13.04.00#Violins#60.13.13.00.00
-unspsc7#60.13.13.05.00#Harps#60.13.13.00.00
-unspsc7#60.13.13.06.00#Banjoes#60.13.13.00.00
-unspsc7#60.13.14.00.00#Percussion instruments#60.13.00.00.00
-unspsc7#60.13.14.01.00#Cymbals#60.13.14.00.00
-unspsc7#60.13.14.02.00#Bells#60.13.14.00.00
-unspsc7#60.13.14.03.00#Tambourines#60.13.14.00.00
-unspsc7#60.13.14.04.00#Castanets#60.13.14.00.00
-unspsc7#60.13.14.05.00#Drums#60.13.14.00.00
-unspsc7#60.13.14.06.00#Xylophones#60.13.14.00.00
-unspsc7#60.13.15.00.00#Musical instrument parts and accessories#60.13.00.00.00
-unspsc7#60.13.15.01.00#Metronomes#60.13.15.00.00
-unspsc7#60.13.15.02.00#Reeds#60.13.15.00.00
-unspsc7#60.13.15.03.00#Instrument strings or picks#60.13.15.00.00
-unspsc7#60.13.15.04.00#Tuning pins#60.13.15.00.00
-unspsc7#60.13.15.05.00#Musical instrument stands or sheet holders#60.13.15.00.00
-unspsc7#60.13.15.06.00#Accessories for stringed instruments#60.13.15.00.00
-unspsc7#60.13.15.07.00#Percussion instrument accessory#60.13.15.00.00
-unspsc7#60.13.15.08.00#Music boxes or mechanisms#60.13.15.00.00
-unspsc7#60.13.16.00.00#Musical instrument sets#60.13.00.00.00
-unspsc7#60.13.16.01.00#Rhythm band sets#60.13.16.00.00
-unspsc7#60.13.17.00.00#Alternative sounds musical instruments#60.13.00.00.00
-unspsc7#60.13.17.01.00#Boomwhackers#60.13.17.00.00
-unspsc7#60.13.17.02.00#Disco taps#60.13.17.00.00
-unspsc7#60.13.18.00.00#Music and dance accessories#60.13.00.00.00
-unspsc7#60.13.18.01.00#Dancing scarves#60.13.18.00.00
-unspsc7#60.13.18.02.00#Rhythm sticks or lummi sticks#60.13.18.00.00
-unspsc7#60.13.18.03.00#Rhythm wands or hoops#60.13.18.00.00
-unspsc7#60.14.00.00.00#Toys and games#60.00.00.00.00
-unspsc7#60.14.10.00.00#Toys#60.14.00.00.00
-unspsc7#60.14.10.01.00#Toy balloons or balls#60.14.10.00.00
-unspsc7#60.14.10.02.00#Dolls#60.14.10.00.00
-unspsc7#60.14.10.03.00#Doll houses#60.14.10.00.00
-unspsc7#60.14.10.04.00#Stuffed animals or puppets#60.14.10.00.00
-unspsc7#60.14.10.05.00#Playhouses#60.14.10.00.00
-unspsc7#60.14.10.06.00#Building blocks#60.14.10.00.00
-unspsc7#60.14.10.07.00#Riding toys#60.14.10.00.00
-unspsc7#60.14.10.08.00#Pull toys#60.14.10.00.00
-unspsc7#60.14.10.09.00#Childrens science kits#60.14.10.00.00
-unspsc7#60.14.10.10.00#Toy vehicles#60.14.10.00.00
-unspsc7#60.14.10.11.00#Toy trains#60.14.10.00.00
-unspsc7#60.14.10.12.00#Inflatable toys#60.14.10.00.00
-unspsc7#60.14.10.13.00#Doll parts or accessories#60.14.10.00.00
-unspsc7#60.14.10.14.00#Yo yos#60.14.10.00.00
-unspsc7#60.14.10.15.00#Kites#60.14.10.00.00
-unspsc7#60.14.10.16.00#Pogs#60.14.10.00.00
-unspsc7#60.14.10.17.00#Kaleidoscopes#60.14.10.00.00
-unspsc7#60.14.10.18.00#Pom poms#60.14.10.00.00
-unspsc7#60.14.10.19.00#Pinatas#60.14.10.00.00
-unspsc7#60.14.10.20.00#Boomerangs#60.14.10.00.00
-unspsc7#60.14.10.21.00#Flying discs#60.14.10.00.00
-unspsc7#60.14.10.22.00#Toy pails#60.14.10.00.00
-unspsc7#60.14.11.00.00#Games#60.14.00.00.00
-unspsc7#60.14.11.01.00#Educational games#60.14.11.00.00
-unspsc7#60.14.11.02.00#Board games#60.14.11.00.00
-unspsc7#60.14.11.03.00#Playing cards#60.14.11.00.00
-unspsc7#60.14.11.04.00#Video games#60.14.11.00.00
-unspsc7#60.14.11.05.00#Puzzles#60.14.11.00.00
-unspsc7#60.14.11.06.00#Dice#60.14.11.00.00
-unspsc7#60.14.11.07.00#Bingo#60.14.11.00.00
-unspsc7#60.14.11.08.00#Classic games#60.14.11.00.00
-unspsc7#60.14.11.09.00#Collaborative games#60.14.11.00.00
-unspsc7#60.14.11.10.00#Strategy games#60.14.11.00.00
-unspsc7#60.14.11.11.00#Game accessories#60.14.11.00.00
-unspsc7#60.14.11.12.00#Game books#60.14.11.00.00
-unspsc7#60.14.11.13.00#Lotto games#60.14.11.00.00
-unspsc7#60.14.11.14.00#Memory games#60.14.11.00.00
-unspsc7#60.14.12.00.00#Active Play equipment and accessories#60.14.00.00.00
-unspsc7#60.14.12.01.00#Balance or gross motor equipment#60.14.12.00.00
-unspsc7#60.14.12.02.00#Ball pools or accessories#60.14.12.00.00
-unspsc7#60.14.12.03.00#Play houses or huts#60.14.12.00.00
-unspsc7#60.14.12.04.00#Trikes or wagons#60.14.12.00.00
-unspsc7#60.14.12.05.00#Soft play centers#60.14.12.00.00
-unspsc7#60.14.13.00.00#Childrens blocks and building systems#60.14.00.00.00
-unspsc7#60.14.13.02.00#Construction sets#60.14.13.00.00
-unspsc7#60.14.13.03.00#Playmats#60.14.13.00.00
-unspsc7#60.14.13.04.00#Railplay systems or accessories#60.14.13.00.00
-unspsc7#60.14.13.05.00#Unit blocks#60.14.13.00.00
-unspsc7#60.14.13.06.00#Play vehicles#60.14.13.00.00
-unspsc7#60.14.13.07.00#Play animals#60.14.13.00.00
-unspsc7#60.14.14.00.00#Dramatic play equipment and accessories#60.14.00.00.00
-unspsc7#60.14.14.01.00#Costumes or accessories#60.14.14.00.00
-unspsc7#60.14.14.02.00#Dress up Centers#60.14.14.00.00
-unspsc7#60.14.14.03.00#Housekeeping units or accessories#60.14.14.00.00
-unspsc7#60.14.14.04.00#Play food dishes or accessories#60.14.14.00.00
-unspsc7#60.14.14.05.00#Pretend play kits or supplies#60.14.14.00.00
-unspsc7#70.00.00.00.00#Farming and Fishing and Forestry and Wildlife Contracting Services#70.00.00.00.00
-unspsc7#70.10.00.00.00#Fisheries and aquaculture#70.00.00.00.00
-unspsc7#70.10.15.00.00#Fisheries operations#70.10.00.00.00
-unspsc7#70.10.15.01.00#Commercial fishing operations#70.10.15.00.00
-unspsc7#70.10.15.02.00#Fishing port services#70.10.15.00.00
-unspsc7#70.10.15.03.00#Fishing onshore facilities#70.10.15.00.00
-unspsc7#70.10.15.04.00#Deep sea fishing operations#70.10.15.00.00
-unspsc7#70.10.15.05.00#Sonar fishing#70.10.15.00.00
-unspsc7#70.10.15.06.00#Whaling#70.10.15.00.00
-unspsc7#70.10.15.07.00#Trawling#70.10.15.00.00
-unspsc7#70.10.15.08.00#Line fishing#70.10.15.00.00
-unspsc7#70.10.15.09.00#Seine operations#70.10.15.00.00
-unspsc7#70.10.15.10.00#Fishing nets#70.10.15.00.00
-unspsc7#70.10.16.00.00#Fisheries oversight#70.10.00.00.00
-unspsc7#70.10.16.01.00#Fishery information or documentation services#70.10.16.00.00
-unspsc7#70.10.16.02.00#Fishery research or experimentation services#70.10.16.00.00
-unspsc7#70.10.16.03.00#Fishery data collection or distribution#70.10.16.00.00
-unspsc7#70.10.16.04.00#Fishery commercial management#70.10.16.00.00
-unspsc7#70.10.16.05.00#Fishing fleet management#70.10.16.00.00
-unspsc7#70.10.16.06.00#Fishing cooperatives#70.10.16.00.00
-unspsc7#70.10.16.07.00#Fishery resources protection or conservation#70.10.16.00.00
-unspsc7#70.10.17.00.00#Fishery industry and technology#70.10.00.00.00
-unspsc7#70.10.17.01.00#Fishing technology services#70.10.17.00.00
-unspsc7#70.10.17.02.00#Fishery by products production services#70.10.17.00.00
-unspsc7#70.10.17.03.00#Fish production#70.10.17.00.00
-unspsc7#70.10.17.04.00#Fish storage#70.10.17.00.00
-unspsc7#70.10.18.00.00#Fisheries resources#70.10.00.00.00
-unspsc7#70.10.18.01.00#Inland water fishery resources#70.10.18.00.00
-unspsc7#70.10.18.02.00#Fish pond resources#70.10.18.00.00
-unspsc7#70.10.18.03.00#Fish hatcheries#70.10.18.00.00
-unspsc7#70.10.18.04.00#Fish ranches#70.10.18.00.00
-unspsc7#70.10.18.05.00#Fishery by product resources#70.10.18.00.00
-unspsc7#70.10.18.06.00#Fisheries resource evaluation#70.10.18.00.00
-unspsc7#70.10.19.00.00#Aquaculture#70.10.00.00.00
-unspsc7#70.10.19.01.00#Mariculture#70.10.19.00.00
-unspsc7#70.10.19.02.00#Ostreiculture#70.10.19.00.00
-unspsc7#70.10.19.03.00#Shellfish culture#70.10.19.00.00
-unspsc7#70.10.19.04.00#Shrimp farming#70.10.19.00.00
-unspsc7#70.10.19.05.00#Fish farming#70.10.19.00.00
-unspsc7#70.11.00.00.00#Horticulture#70.00.00.00.00
-unspsc7#70.11.15.00.00#Plants and ornamental trees#70.11.00.00.00
-unspsc7#70.11.15.01.00#Planting services or ornamental plant or bush or tree#70.11.15.00.00
-unspsc7#70.11.15.02.00#Pruning services or ornamental plant or bush#70.11.15.00.00
-unspsc7#70.11.15.03.00#Tree trimming services#70.11.15.00.00
-unspsc7#70.11.15.04.00#Bracing services#70.11.15.00.00
-unspsc7#70.11.15.05.00#Tree surgery services#70.11.15.00.00
-unspsc7#70.11.15.06.00#Arborist services#70.11.15.00.00
-unspsc7#70.11.15.07.00#Removal services or ornamental plant or bush or tree#70.11.15.00.00
-unspsc7#70.11.15.08.00#Plants or ornamental tree spraying services#70.11.15.00.00
-unspsc7#70.11.16.00.00#Flowering plants#70.11.00.00.00
-unspsc7#70.11.16.01.00#Planting services#70.11.16.00.00
-unspsc7#70.11.16.02.00#Nursery services#70.11.16.00.00
-unspsc7#70.11.16.03.00#Floriculture services#70.11.16.00.00
-unspsc7#70.11.17.00.00#Parks and gardens and orchards#70.11.00.00.00
-unspsc7#70.11.17.01.00#Orchard management or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.02.00#Vineyard management or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.03.00#Garden planting or maintenance services#70.11.17.00.00
-unspsc7#70.11.17.04.00#Horticultural counseling services#70.11.17.00.00
-unspsc7#70.11.17.05.00#Cemetery upkeep services#70.11.17.00.00
-unspsc7#70.11.17.06.00#Lawn care services#70.11.17.00.00
-unspsc7#70.11.17.07.00#Highway lawn maintenance services#70.11.17.00.00
-unspsc7#70.11.17.08.00#Mulching services#70.11.17.00.00
-unspsc7#70.11.17.09.00#Seeding services#70.11.17.00.00
-unspsc7#70.11.17.10.00#Mowing services#70.11.17.00.00
-unspsc7#70.11.17.11.00#Sprigging services#70.11.17.00.00
-unspsc7#70.11.17.12.00#Parks or gardens spraying services#70.11.17.00.00
-unspsc7#70.11.17.13.00#Parks management or maintenance services#70.11.17.00.00
-unspsc7#70.12.00.00.00#Livestock services#70.00.00.00.00
-unspsc7#70.12.15.00.00#Dairying#70.12.00.00.00
-unspsc7#70.12.15.01.00#Dairy herd management#70.12.15.00.00
-unspsc7#70.12.15.02.00#Dairy industry development#70.12.15.00.00
-unspsc7#70.12.15.03.00#Dairy technology#70.12.15.00.00
-unspsc7#70.12.15.04.00#Dairy laboratories services#70.12.15.00.00
-unspsc7#70.12.15.05.00#Dairy farm in house processing#70.12.15.00.00
-unspsc7#70.12.16.00.00#Livestock industry#70.12.00.00.00
-unspsc7#70.12.16.01.00#Livestock breeding#70.12.16.00.00
-unspsc7#70.12.16.02.00#Livestock genetics services#70.12.16.00.00
-unspsc7#70.12.16.03.00#Sericulture#70.12.16.00.00
-unspsc7#70.12.16.04.00#Animal husbandry#70.12.16.00.00
-unspsc7#70.12.16.05.00#Farm rearing systems#70.12.16.00.00
-unspsc7#70.12.16.06.00#Poultry production services#70.12.16.00.00
-unspsc7#70.12.16.07.00#Small animal breeding services#70.12.16.00.00
-unspsc7#70.12.16.08.00#Bovine production services#70.12.16.00.00
-unspsc7#70.12.16.10.00#Apiculture#70.12.16.00.00
-unspsc7#70.12.17.00.00#Livestock management#70.12.00.00.00
-unspsc7#70.12.17.01.00#Livestock selection#70.12.17.00.00
-unspsc7#70.12.17.02.00#Livestock showing services#70.12.17.00.00
-unspsc7#70.12.17.03.00#Livestock slaughtering services#70.12.17.00.00
-unspsc7#70.12.17.04.00#Herd management#70.12.17.00.00
-unspsc7#70.12.17.05.00#Livestock breeding or grooming services#70.12.17.00.00
-unspsc7#70.12.18.00.00#Pets industry#70.12.00.00.00
-unspsc7#70.12.18.01.00#Pet breeding services#70.12.18.00.00
-unspsc7#70.12.18.02.00#Pet grooming services#70.12.18.00.00
-unspsc7#70.12.18.03.00#Kennels services#70.12.18.00.00
-unspsc7#70.12.19.00.00#Pasture and range services#70.12.00.00.00
-unspsc7#70.12.19.01.00#Pasture improvement#70.12.19.00.00
-unspsc7#70.12.19.02.00#Range management#70.12.19.00.00
-unspsc7#70.12.19.03.00#Range research#70.12.19.00.00
-unspsc7#70.12.20.00.00#Animal health#70.12.00.00.00
-unspsc7#70.12.20.01.00#Animal nutrition#70.12.20.00.00
-unspsc7#70.12.20.02.00#Animal disease control#70.12.20.00.00
-unspsc7#70.12.20.03.00#Animal trypanosomiasis#70.12.20.00.00
-unspsc7#70.12.20.04.00#Foot or mouth control services#70.12.20.00.00
-unspsc7#70.12.20.05.00#Animal health preventive medication services#70.12.20.00.00
-unspsc7#70.12.20.06.00#Animal vaccination services#70.12.20.00.00
-unspsc7#70.12.20.07.00#Veterinary administration#70.12.20.00.00
-unspsc7#70.12.20.08.00#Veterinary laboratory technology#70.12.20.00.00
-unspsc7#70.12.20.09.00#Animal hospital services#70.12.20.00.00
-unspsc7#70.12.20.10.00#Animal health information services#70.12.20.00.00
-unspsc7#70.13.00.00.00#Land and soil preparation and management and protection#70.00.00.00.00
-unspsc7#70.13.15.00.00#Land and soil protection#70.13.00.00.00
-unspsc7#70.13.15.01.00#Desertification assessment or control services#70.13.15.00.00
-unspsc7#70.13.15.02.00#Soil conservation or protection services#70.13.15.00.00
-unspsc7#70.13.15.03.00#Erosion control services#70.13.15.00.00
-unspsc7#70.13.15.04.00#Sand dune fixation#70.13.15.00.00
-unspsc7#70.13.15.05.00#Soil conditioning#70.13.15.00.00
-unspsc7#70.13.15.06.00#Soil improvement#70.13.15.00.00
-unspsc7#70.13.16.00.00#Land and soil preparation#70.13.00.00.00
-unspsc7#70.13.16.01.00#Fertilizer application services#70.13.16.00.00
-unspsc7#70.13.16.02.00#Lime spreading services#70.13.16.00.00
-unspsc7#70.13.16.03.00#Plowing services#70.13.16.00.00
-unspsc7#70.13.16.04.00#Seed bed preparation services#70.13.16.00.00
-unspsc7#70.13.16.05.00#Soil chemical treatment services#70.13.16.00.00
-unspsc7#70.13.17.00.00#Land and soil management#70.13.00.00.00
-unspsc7#70.13.17.01.00#Land use planning#70.13.17.00.00
-unspsc7#70.13.17.02.00#Land evaluation#70.13.17.00.00
-unspsc7#70.13.17.03.00#Land reclamation#70.13.17.00.00
-unspsc7#70.13.17.04.00#Agro ecological zones assessment or planning#70.13.17.00.00
-unspsc7#70.13.17.05.00#Soil classification#70.13.17.00.00
-unspsc7#70.13.17.06.00#Watershed management#70.13.17.00.00
-unspsc7#70.13.17.07.00#Soil fertility analysis#70.13.17.00.00
-unspsc7#70.13.17.08.00#Pedology#70.13.17.00.00
-unspsc7#70.14.00.00.00#Crop production and management and protection#70.00.00.00.00
-unspsc7#70.14.15.00.00#Crop production#70.14.00.00.00
-unspsc7#70.14.15.01.00#Seed production services#70.14.15.00.00
-unspsc7#70.14.15.02.00#Hydroponics#70.14.15.00.00
-unspsc7#70.14.15.03.00#Grass or fodder production#70.14.15.00.00
-unspsc7#70.14.15.04.00#Aromatic plants production#70.14.15.00.00
-unspsc7#70.14.15.05.00#Beverage crops production#70.14.15.00.00
-unspsc7#70.14.15.06.00#Cocoa production#70.14.15.00.00
-unspsc7#70.14.15.07.00#Sugarbeet or sugarcane production#70.14.15.00.00
-unspsc7#70.14.15.08.00#Nut production#70.14.15.00.00
-unspsc7#70.14.15.09.00#Essential oil crops production#70.14.15.00.00
-unspsc7#70.14.15.10.00#Fiber crops production#70.14.15.00.00
-unspsc7#70.14.15.11.00#Fruit production#70.14.15.00.00
-unspsc7#70.14.15.12.00#Grain or legume production#70.14.15.00.00
-unspsc7#70.14.15.13.00#Insecticidal plants production#70.14.15.00.00
-unspsc7#70.14.15.14.00#Medicinal plants production#70.14.15.00.00
-unspsc7#70.14.15.15.00#Roots or tubers production#70.14.15.00.00
-unspsc7#70.14.15.16.00#Cereals production#70.14.15.00.00
-unspsc7#70.14.15.17.00#Rubber plant production#70.14.15.00.00
-unspsc7#70.14.15.18.00#Spice crops production#70.14.15.00.00
-unspsc7#70.14.15.19.00#Tobacco crop production#70.14.15.00.00
-unspsc7#70.14.15.20.00#Vegetable production#70.14.15.00.00
-unspsc7#70.14.16.00.00#Crop protection#70.14.00.00.00
-unspsc7#70.14.16.01.00#Crop spraying services#70.14.16.00.00
-unspsc7#70.14.16.02.00#Biological control services#70.14.16.00.00
-unspsc7#70.14.16.03.00#Weed control services#70.14.16.00.00
-unspsc7#70.14.16.04.00#Herbicide services#70.14.16.00.00
-unspsc7#70.14.16.05.00#Integrated pest management services#70.14.16.00.00
-unspsc7#70.14.16.06.00#Plant pathology#70.14.16.00.00
-unspsc7#70.14.16.07.00#Locust control#70.14.16.00.00
-unspsc7#70.14.17.00.00#Crop management#70.14.00.00.00
-unspsc7#70.14.17.01.00#Greenhouse services#70.14.17.00.00
-unspsc7#70.14.17.02.00#Fertilizer services#70.14.17.00.00
-unspsc7#70.14.17.03.00#Crop administration#70.14.17.00.00
-unspsc7#70.14.17.04.00#Crop substitution#70.14.17.00.00
-unspsc7#70.14.17.05.00#Extension services#70.14.17.00.00
-unspsc7#70.14.17.06.00#Crop specialization#70.14.17.00.00
-unspsc7#70.14.17.07.00#Cultivation farming system management#70.14.17.00.00
-unspsc7#70.14.17.08.00#Crop rotation or diversification counseling services#70.14.17.00.00
-unspsc7#70.14.17.09.00#Plant taxonomy services#70.14.17.00.00
-unspsc7#70.14.17.10.00#Field crop entomology#70.14.17.00.00
-unspsc7#70.14.18.00.00#Crop planting and cultivation#70.14.00.00.00
-unspsc7#70.14.18.01.00#Orchard tree or vine planting services#70.14.18.00.00
-unspsc7#70.14.18.02.00#Sprout or twig services#70.14.18.00.00
-unspsc7#70.14.18.03.00#Crop cultivating services#70.14.18.00.00
-unspsc7#70.14.18.04.00#Crop planting services#70.14.18.00.00
-unspsc7#70.14.19.00.00#Crop harvesting#70.14.00.00.00
-unspsc7#70.14.19.01.00#Cash grains harvesting services#70.14.19.00.00
-unspsc7#70.14.19.02.00#Fruit or tree nuts harvesting services#70.14.19.00.00
-unspsc7#70.14.19.03.00#Field crop harvesting services#70.14.19.00.00
-unspsc7#70.14.19.04.00#Seed harvesting services#70.14.19.00.00
-unspsc7#70.14.20.00.00#Post harvesting crop processing#70.14.00.00.00
-unspsc7#70.14.20.01.00#Silos related services#70.14.20.00.00
-unspsc7#70.14.20.02.00#Grain dryers services#70.14.20.00.00
-unspsc7#70.14.20.03.00#Crop processing services#70.14.20.00.00
-unspsc7#70.14.20.04.00#Field crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.05.00#Cash grain crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.06.00#Vegetable crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.07.00#Fruit crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.08.00#Tree nut crops market preparation services#70.14.20.00.00
-unspsc7#70.14.20.09.00#Ginning services#70.14.20.00.00
-unspsc7#70.14.20.10.00#Crop cleaning services#70.14.20.00.00
-unspsc7#70.14.20.11.00#Cooling or refrigeration services#70.14.20.00.00
-unspsc7#70.14.20.12.00#Spraying services#70.14.20.00.00
-unspsc7#70.15.00.00.00#Forestry#70.00.00.00.00
-unspsc7#70.15.15.00.00#Forestry management#70.15.00.00.00
-unspsc7#70.15.15.01.00#Forest resources management services#70.15.15.00.00
-unspsc7#70.15.15.02.00#Forest pest control#70.15.15.00.00
-unspsc7#70.15.15.03.00#Forest organizations or associations or cooperatives#70.15.15.00.00
-unspsc7#70.15.15.04.00#Forest administration services#70.15.15.00.00
-unspsc7#70.15.15.05.00#Forest inventory#70.15.15.00.00
-unspsc7#70.15.15.06.00#Forest monitoring or evaluation#70.15.15.00.00
-unspsc7#70.15.15.07.00#Afforestation services#70.15.15.00.00
-unspsc7#70.15.15.08.00#Forestry extension services#70.15.15.00.00
-unspsc7#70.15.15.09.00#Forest nursery management#70.15.15.00.00
-unspsc7#70.15.15.10.00#Forest sectoral planning#70.15.15.00.00
-unspsc7#70.15.16.00.00#Forestry industry#70.15.00.00.00
-unspsc7#70.15.16.01.00#Nonwood production services#70.15.16.00.00
-unspsc7#70.15.16.02.00#Essential oils production#70.15.16.00.00
-unspsc7#70.15.16.03.00#Timber production services#70.15.16.00.00
-unspsc7#70.15.16.04.00#Dyes production#70.15.16.00.00
-unspsc7#70.15.16.05.00#Edible forestry production#70.15.16.00.00
-unspsc7#70.15.16.06.00#Wood testing services#70.15.16.00.00
-unspsc7#70.15.16.07.00#Timber production#70.15.16.00.00
-unspsc7#70.15.17.00.00#Forestry harvesting#70.15.00.00.00
-unspsc7#70.15.17.01.00#Logging or felling#70.15.17.00.00
-unspsc7#70.15.17.02.00#Forest harvesting mountainous areas#70.15.17.00.00
-unspsc7#70.15.17.03.00#Forest harvesting specialized operations#70.15.17.00.00
-unspsc7#70.15.17.04.00#Plantation harvesting#70.15.17.00.00
-unspsc7#70.15.17.05.00#Swamp or mangrove forest harvesting#70.15.17.00.00
-unspsc7#70.15.17.06.00#Temperate forest harvesting#70.15.17.00.00
-unspsc7#70.15.17.07.00#Tropical high forests harvesting#70.15.17.00.00
-unspsc7#70.15.18.00.00#Forestry conservation services#70.15.00.00.00
-unspsc7#70.15.18.01.00#Conservation of forest genetic resources#70.15.18.00.00
-unspsc7#70.15.18.02.00#Forest protection services#70.15.18.00.00
-unspsc7#70.15.18.03.00#Forest arid land rehabilitation#70.15.18.00.00
-unspsc7#70.15.18.04.00#Forest wind breaks or shelter belts#70.15.18.00.00
-unspsc7#70.15.18.05.00#Forest reserves or parks conservation services#70.15.18.00.00
-unspsc7#70.15.18.06.00#Forestry watershed management#70.15.18.00.00
-unspsc7#70.15.18.07.00#Forestry torrent control#70.15.18.00.00
-unspsc7#70.15.19.00.00#Forestry resources#70.15.00.00.00
-unspsc7#70.15.19.01.00#Forest resources development#70.15.19.00.00
-unspsc7#70.15.19.02.00#Agroforestry resources#70.15.19.00.00
-unspsc7#70.15.19.03.00#Fuel wood resources#70.15.19.00.00
-unspsc7#70.15.19.04.00#Silviculture#70.15.19.00.00
-unspsc7#70.15.19.05.00#Arid rainfed plantation resources#70.15.19.00.00
-unspsc7#70.15.19.06.00#Broad leafed plantation resources#70.15.19.00.00
-unspsc7#70.15.19.07.00#Conifers plantations#70.15.19.00.00
-unspsc7#70.15.19.09.00#Tropical rain forest plantations#70.15.19.00.00
-unspsc7#70.15.19.10.00#Mangrove swamps resources#70.15.19.00.00
-unspsc7#70.16.00.00.00#Wildlife and flora#70.00.00.00.00
-unspsc7#70.16.15.00.00#Fauna#70.16.00.00.00
-unspsc7#70.16.15.01.00#Fauna protection#70.16.15.00.00
-unspsc7#70.16.16.00.00#Flora#70.16.00.00.00
-unspsc7#70.16.16.01.00#Flora protection#70.16.16.00.00
-unspsc7#70.16.17.00.00#Ecosystems#70.16.00.00.00
-unspsc7#70.16.17.01.00#Ecodevelopment services#70.16.17.00.00
-unspsc7#70.16.17.02.00#Marine ecosystem management services#70.16.17.00.00
-unspsc7#70.16.17.03.00#Terrestrial ecosystem management services#70.16.17.00.00
-unspsc7#70.16.17.04.00#Ecosystems protection services#70.16.17.00.00
-unspsc7#70.17.00.00.00#Water resources development and oversight#70.00.00.00.00
-unspsc7#70.17.15.00.00#Development#70.17.00.00.00
-unspsc7#70.17.15.01.00#Water quality assessment services#70.17.15.00.00
-unspsc7#70.17.15.02.00#Water resources planning services#70.17.15.00.00
-unspsc7#70.17.15.03.00#Ground or surface water surveying#70.17.15.00.00
-unspsc7#70.17.15.04.00#Water resources mapping services#70.17.15.00.00
-unspsc7#70.17.15.05.00#River basin development#70.17.15.00.00
-unspsc7#70.17.15.06.00#Ground or surface water modeling services#70.17.15.00.00
-unspsc7#70.17.16.00.00#Oversight#70.17.00.00.00
-unspsc7#70.17.16.01.00#Water quality management#70.17.16.00.00
-unspsc7#70.17.16.02.00#Water testing services#70.17.16.00.00
-unspsc7#70.17.16.03.00#Floodplain management#70.17.16.00.00
-unspsc7#70.17.16.04.00#Water conservation advisory services#70.17.16.00.00
-unspsc7#70.17.16.05.00#Water rights advisory services#70.17.16.00.00
-unspsc7#70.17.16.06.00#Water resource recovery services#70.17.16.00.00
-unspsc7#70.17.16.07.00#Water pricing services#70.17.16.00.00
-unspsc7#70.17.17.00.00#Irrigation#70.17.00.00.00
-unspsc7#70.17.17.01.00#Canal maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.02.00#Dam maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.03.00#Reservoirs maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.04.00#Pumping station maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.05.00#Pipelines maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.06.00#Dike or embankment maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.07.00#Water well maintenance or management services#70.17.17.00.00
-unspsc7#70.17.17.08.00#Irrigation advisory services#70.17.17.00.00
-unspsc7#70.17.17.09.00#Irrigation systems management services#70.17.17.00.00
-unspsc7#70.17.18.00.00#Drainage services#70.17.00.00.00
-unspsc7#70.17.18.01.00#Land drainage services#70.17.18.00.00
-unspsc7#70.17.18.02.00#Storm water drainage#70.17.18.00.00
-unspsc7#70.17.18.03.00#Flood protection or control services#70.17.18.00.00
-unspsc7#71.00.00.00.00#Mining and Oil and Gas Services#71.00.00.00.00
-unspsc7#71.10.00.00.00#Mining services#71.00.00.00.00
-unspsc7#71.10.15.00.00#Mine exploration#71.10.00.00.00
-unspsc7#71.10.15.01.00#Mine development#71.10.15.00.00
-unspsc7#71.10.15.02.00#Test boring or core drilling#71.10.15.00.00
-unspsc7#71.10.16.00.00#Mine drilling and blasting services#71.10.00.00.00
-unspsc7#71.10.16.01.00#Shaft sinking#71.10.16.00.00
-unspsc7#71.10.16.02.00#Mine blasting services#71.10.16.00.00
-unspsc7#71.10.17.00.00#Extraction#71.10.00.00.00
-unspsc7#71.10.17.01.00#Shaft mining services#71.10.17.00.00
-unspsc7#71.10.17.02.00#Open pit mining services#71.10.17.00.00
-unspsc7#71.10.17.03.00#Strip mining services#71.10.17.00.00
-unspsc7#71.10.17.04.00#In situ leaching (ISL) services#71.10.17.00.00
-unspsc7#71.10.17.05.00#Pumping or draining#71.10.17.00.00
-unspsc7#71.10.17.06.00#Overburden removal#71.10.17.00.00
-unspsc7#71.10.17.07.00#Impoundment or storage of water services#71.10.17.00.00
-unspsc7#71.10.17.08.00#Soil flushing services#71.10.17.00.00
-unspsc7#71.10.17.09.00#Mine filling services#71.10.17.00.00
-unspsc7#71.11.00.00.00#Oil and gas exploration services#71.00.00.00.00
-unspsc7#71.11.15.00.00#Oil and gas exploration#71.11.00.00.00
-unspsc7#71.11.15.01.00#Seismographic surveys#71.11.15.00.00
-unspsc7#71.11.15.02.00#Offshore exploration#71.11.15.00.00
-unspsc7#71.11.15.03.00#Well surveying#71.11.15.00.00
-unspsc7#71.11.16.00.00#Well drilling and maintenance#71.11.00.00.00
-unspsc7#71.11.16.01.00#Directional drilling#71.11.16.00.00
-unspsc7#71.11.16.02.00#Oil well drilling#71.11.16.00.00
-unspsc7#71.11.16.03.00#Drilling of water intake wells#71.11.16.00.00
-unspsc7#71.11.16.04.00#Redrilling or reworking of wells#71.11.16.00.00
-unspsc7#71.11.16.05.00#Acidizing or chemical treating of wells#71.11.16.00.00
-unspsc7#71.11.16.06.00#Tool fishing services#71.11.16.00.00
-unspsc7#71.11.16.07.00#Oil well platform maintenance services#71.11.16.00.00
-unspsc7#71.11.17.00.00#Extraction services#71.11.00.00.00
-unspsc7#71.11.17.01.00#Flow rate measurement services#71.11.17.00.00
-unspsc7#71.11.17.02.00#Oil sampling services#71.11.17.00.00
-unspsc7#71.11.17.03.00#Oil field drilling or mud services#71.11.17.00.00
-unspsc7#71.11.17.04.00#Impound or storage of water#71.11.17.00.00
-unspsc7#71.11.18.00.00#Well restoration and reclamation#71.11.00.00.00
-unspsc7#71.11.18.01.00#Cleaning or swabbing of wells#71.11.18.00.00
-unspsc7#71.11.18.02.00#Soil flushing services#71.11.18.00.00
-unspsc7#71.11.18.03.00#Mine filling services#71.11.18.00.00
-unspsc7#71.11.18.04.00#Well plugging or abandonment services#71.11.18.00.00
-unspsc7#71.11.18.05.00#Cementing services for well casings#71.11.18.00.00
-unspsc7#71.11.19.00.00#Well emergency services#71.11.00.00.00
-unspsc7#71.11.19.01.00#Well fire fighting services#71.11.19.00.00
-unspsc7#71.11.19.02.00#Well capping services#71.11.19.00.00
-unspsc7#71.11.20.00.00#Cased hole well logging services#71.11.00.00.00
-unspsc7#71.11.20.01.00#Cased hole formation sampling testing services#71.11.20.00.00
-unspsc7#71.11.20.02.00#Casing thickness measurement services#71.11.20.00.00
-unspsc7#71.11.20.03.00#Chemical cutters services#71.11.20.00.00
-unspsc7#71.11.20.04.00#Electromagnetic pipe recovery services#71.11.20.00.00
-unspsc7#71.11.20.05.00#Well flow measurement services#71.11.20.00.00
-unspsc7#71.11.20.06.00#Well fluid density measurement services#71.11.20.00.00
-unspsc7#71.11.20.07.00#Well fluid temperature measurement services#71.11.20.00.00
-unspsc7#71.11.20.08.00#Free point tool services#71.11.20.00.00
-unspsc7#71.11.20.09.00#Gamma ray services#71.11.20.00.00
-unspsc7#71.11.20.10.00#Jet cutter services#71.11.20.00.00
-unspsc7#71.11.20.11.00#Measurement while perforating services#71.11.20.00.00
-unspsc7#71.11.20.12.00#Neutron porosity services#71.11.20.00.00
-unspsc7#71.11.20.13.00#Nuclear spectroscopy services#71.11.20.00.00
-unspsc7#71.11.20.14.00#Well packer services#71.11.20.00.00
-unspsc7#71.11.20.15.00#Permanent magnets pipe recovery services#71.11.20.00.00
-unspsc7#71.11.20.16.00#Well plugging services#71.11.20.00.00
-unspsc7#71.11.20.17.00#Well pressure measurement control services#71.11.20.00.00
-unspsc7#71.11.20.18.00#Production logging borehole fluid measurement services#71.11.20.00.00
-unspsc7#71.11.20.19.00#Production logging density measurement services#71.11.20.00.00
-unspsc7#71.11.20.20.00#Production logging downhole video services#71.11.20.00.00
-unspsc7#71.11.20.21.00#Production logging flow measurement services#71.11.20.00.00
-unspsc7#71.11.20.22.00#Production logging pressure measurement services#71.11.20.00.00
-unspsc7#71.11.20.23.00#Other production logging services#71.11.20.00.00
-unspsc7#71.11.20.24.00#Production logging temperature measurement services#71.11.20.00.00
-unspsc7#71.11.20.25.00#Severing colliding services#71.11.20.00.00
-unspsc7#71.11.20.26.00#Well logging sonic services#71.11.20.00.00
-unspsc7#71.11.20.27.00#Stuck point tool services#71.11.20.00.00
-unspsc7#71.11.20.28.00#Thermal decay well logging services#71.11.20.00.00
-unspsc7#71.11.20.29.00#Well tubular corrosion evaluation services#71.11.20.00.00
-unspsc7#71.11.20.30.00#Well performance services#71.11.20.00.00
-unspsc7#71.11.20.31.00#Well tubular services#71.11.20.00.00
-unspsc7#71.11.21.00.00#Open hole well logging services#71.11.00.00.00
-unspsc7#71.11.21.01.00#Digital sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.02.00#Borehole geometry logging services#71.11.21.00.00
-unspsc7#71.11.21.03.00#Density lithology nuclear logging services#71.11.21.00.00
-unspsc7#71.11.21.04.00#Dipmeter logging services#71.11.21.00.00
-unspsc7#71.11.21.05.00#Dipole sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.06.00#Directional logging services#71.11.21.00.00
-unspsc7#71.11.21.07.00#Directional survey services#71.11.21.00.00
-unspsc7#71.11.21.08.00#Electromagnetic propagation logging services#71.11.21.00.00
-unspsc7#71.11.21.09.00#Formation testing sampling services#71.11.21.00.00
-unspsc7#71.11.21.10.00#Fracture identification logging services#71.11.21.00.00
-unspsc7#71.11.21.11.00#Gamma ray logging services#71.11.21.00.00
-unspsc7#71.11.21.12.00#Gamma ray spectroscopy logging services#71.11.21.00.00
-unspsc7#71.11.21.13.00#Geochemical nuclear logging services#71.11.21.00.00
-unspsc7#71.11.21.14.00#Well imaging services#71.11.21.00.00
-unspsc7#71.11.21.15.00#Magnetic resonance logging services#71.11.21.00.00
-unspsc7#71.11.21.16.00#Microresistivity logging services#71.11.21.00.00
-unspsc7#71.11.21.17.00#Neutron porosity logging services#71.11.21.00.00
-unspsc7#71.11.21.18.00#Petrophysics services#71.11.21.00.00
-unspsc7#71.11.21.19.00#Resistivity logging services#71.11.21.00.00
-unspsc7#71.11.21.20.00#Slim access sonic logging services#71.11.21.00.00
-unspsc7#71.11.21.21.00#Sonic cement bond ratio logging services#71.11.21.00.00
-unspsc7#71.11.21.22.00#Well sonic imaging services#71.11.21.00.00
-unspsc7#71.11.22.00.00#Other logging services#71.11.00.00.00
-unspsc7#71.11.22.01.00#Logging with coiled tubing services#71.11.22.00.00
-unspsc7#71.11.22.02.00#Logging while drilling services#71.11.22.00.00
-unspsc7#71.11.22.03.00#Logging during fishing services#71.11.22.00.00
-unspsc7#71.11.22.04.00#Logging while perforating services#71.11.22.00.00
-unspsc7#71.11.22.05.00#Drill pipe conveyed well services#71.11.22.00.00
-unspsc7#71.11.22.06.00#General well logging services#71.11.22.00.00
-unspsc7#71.11.23.00.00#Seismic services#71.11.00.00.00
-unspsc7#71.11.23.01.00#Two dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.02.00#Two dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.03.00#Two dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.04.00#Three dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.05.00#Three dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.06.00#Three dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.07.00#Four dimensional land seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.08.00#Four dimensional marine seismic acquisition services#71.11.23.00.00
-unspsc7#71.11.23.09.00#Four dimensional seismic data processing services#71.11.23.00.00
-unspsc7#71.11.23.10.00#Checkshot seismic services#71.11.23.00.00
-unspsc7#71.11.23.11.00#Cross well seismic services#71.11.23.00.00
-unspsc7#71.11.23.12.00#Deviated well seismic services#71.11.23.00.00
-unspsc7#71.11.23.13.00#Geophysics seismic services#71.11.23.00.00
-unspsc7#71.11.23.14.00#Offset seismic services#71.11.23.00.00
-unspsc7#71.11.23.15.00#Quickshot seismic services#71.11.23.00.00
-unspsc7#71.11.23.16.00#Seismic data acquisition while drilling services#71.11.23.00.00
-unspsc7#71.11.23.17.00#Slim hole seismic services#71.11.23.00.00
-unspsc7#71.11.23.18.00#Seismic survey evaluation or design services#71.11.23.00.00
-unspsc7#71.11.23.19.00#Vertical seismic services#71.11.23.00.00
-unspsc7#71.11.23.20.00#Walkaway seismic services#71.11.23.00.00
-unspsc7#71.11.23.21.00#Geological services#71.11.23.00.00
-unspsc7#71.12.00.00.00#Well drilling construction and maintenance services#71.00.00.00.00
-unspsc7#71.12.10.00.00#Cement pumping services#71.12.00.00.00
-unspsc7#71.12.10.01.00#Oilfield casing hardware services#71.12.10.00.00
-unspsc7#71.12.10.02.00#Oilfield cement lab testing services#71.12.10.00.00
-unspsc7#71.12.10.03.00#Downhole oilfield tools services#71.12.10.00.00
-unspsc7#71.12.10.04.00#Oilfield filtering services#71.12.10.00.00
-unspsc7#71.12.10.05.00#Foam cementing services#71.12.10.00.00
-unspsc7#71.12.10.06.00#Geothermal well cementing services#71.12.10.00.00
-unspsc7#71.12.10.07.00#Liner cementing services#71.12.10.00.00
-unspsc7#71.12.10.08.00#Oilwell lost circulation services#71.12.10.00.00
-unspsc7#71.12.10.09.00#Oilfield mud removal services#71.12.10.00.00
-unspsc7#71.12.10.10.00#Plug cementing services#71.12.10.00.00
-unspsc7#71.12.10.11.00#Well site pressure pumping services#71.12.10.00.00
-unspsc7#71.12.10.12.00#Oilfield pressure testing services#71.12.10.00.00
-unspsc7#71.12.10.13.00#Surface casing cementing services#71.12.10.00.00
-unspsc7#71.12.10.14.00#Intermediate casing cementing services#71.12.10.00.00
-unspsc7#71.12.10.15.00#Production string cementing services#71.12.10.00.00
-unspsc7#71.12.10.16.00#Squeeze well cementing services#71.12.10.00.00
-unspsc7#71.12.10.17.00#Well water control services#71.12.10.00.00
-unspsc7#71.12.10.18.00#Well cement evaluation services#71.12.10.00.00
-unspsc7#71.12.10.19.00#Well cement grouting services#71.12.10.00.00
-unspsc7#71.12.10.20.00#Well cementing additives services#71.12.10.00.00
-unspsc7#71.12.10.21.00#Well cementing design services#71.12.10.00.00
-unspsc7#71.12.10.22.00#Well cleaning services#71.12.10.00.00
-unspsc7#71.12.10.23.00#Well repair services#71.12.10.00.00
-unspsc7#71.12.11.00.00#Coiled tubing services#71.12.00.00.00
-unspsc7#71.12.11.01.00#Acidizing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.02.00#Cable installation through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.03.00#Cementing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.04.00#Chemical cutting through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.05.00#Clean out through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.06.00#Completion through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.07.00#Conveying inflatables through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.08.00#Coring through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.09.00#Extended reach well services#71.12.11.00.00
-unspsc7#71.12.11.10.00#Fishing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.11.00#Fracturing through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.12.00#High pressure coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.13.00#Horizontal isolation oilfield services#71.12.11.00.00
-unspsc7#71.12.11.14.00#Logging with coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.15.00#Milling through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.16.00#Nitrogen related applications through coiled tubing#71.12.11.00.00
-unspsc7#71.12.11.17.00#Perforating through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.18.00#Pipeline or flowline laying services#71.12.11.00.00
-unspsc7#71.12.11.19.00#Pipeline intervention services#71.12.11.00.00
-unspsc7#71.12.11.20.00#Sand control through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.21.00#Abrasive tubular cleaning services#71.12.11.00.00
-unspsc7#71.12.11.22.00#Well kill through coiled tubing services#71.12.11.00.00
-unspsc7#71.12.11.23.00#Casing exit with coiled tubing services#71.12.11.00.00
-unspsc7#71.12.12.00.00#Coring services#71.12.00.00.00
-unspsc7#71.12.12.01.00#Conventional coring services#71.12.12.00.00
-unspsc7#71.12.12.02.00#Core isolation services#71.12.12.00.00
-unspsc7#71.12.12.03.00#Core preservation services#71.12.12.00.00
-unspsc7#71.12.12.04.00#Horizontal coring services#71.12.12.00.00
-unspsc7#71.12.12.05.00#Oriented coring services#71.12.12.00.00
-unspsc7#71.12.12.06.00#Rig site core analysis services#71.12.12.00.00
-unspsc7#71.12.12.07.00#Sponge coring services#71.12.12.00.00
-unspsc7#71.12.12.08.00#Wireline retrievable coring services#71.12.12.00.00
-unspsc7#71.12.13.00.00#Downhole tool services#71.12.00.00.00
-unspsc7#71.12.13.01.00#Downhole vibration control services#71.12.13.00.00
-unspsc7#71.12.13.02.00#Downhole hole opening services#71.12.13.00.00
-unspsc7#71.12.13.03.00#Reaming while drilling services#71.12.13.00.00
-unspsc7#71.12.13.04.00#Downhole torque or drag reduction services#71.12.13.00.00
-unspsc7#71.12.13.05.00#Downhole underreaming services#71.12.13.00.00
-unspsc7#71.12.14.00.00#Oilfield drilling bit services#71.12.00.00.00
-unspsc7#71.12.14.01.00#Oilfield drilling bit design services#71.12.14.00.00
-unspsc7#71.12.14.02.00#Oilfield drilling bit hydraulic optimization services#71.12.14.00.00
-unspsc7#71.12.14.03.00#Oilfield drilling bit planning services#71.12.14.00.00
-unspsc7#71.12.14.04.00#Oilfield drilling bit recording services#71.12.14.00.00
-unspsc7#71.12.14.05.00#Oilfield drilling bit repair services#71.12.14.00.00
-unspsc7#71.12.14.06.00#Oilfield drilling bit footage contracts#71.12.14.00.00
-unspsc7#71.12.14.07.00#Well site drilling optimization assistance service#71.12.14.00.00
-unspsc7#71.12.15.00.00#Drilling measurement services#71.12.00.00.00
-unspsc7#71.12.15.01.00#Acoustic measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.02.00#Acoustic telemetry when drilling services#71.12.15.00.00
-unspsc7#71.12.15.03.00#Caliper measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.04.00#Density measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.05.00#Oilfield drilling performance services#71.12.15.00.00
-unspsc7#71.12.15.06.00#Electromagnetic telemetry when drilling services#71.12.15.00.00
-unspsc7#71.12.15.07.00#Formation dip measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.08.00#Formation pressure measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.09.00#Geologically steered wells#71.12.15.00.00
-unspsc7#71.12.15.10.00#Geostopping services#71.12.15.00.00
-unspsc7#71.12.15.11.00#Mud logging services#71.12.15.00.00
-unspsc7#71.12.15.12.00#Nuclear magnetic resonance services#71.12.15.00.00
-unspsc7#71.12.15.13.00#Porosity measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.14.00#Resistivity measurement when drilling services#71.12.15.00.00
-unspsc7#71.12.15.15.00#Well surveying management services#71.12.15.00.00
-unspsc7#71.12.15.16.00#Surveying wireline services#71.12.15.00.00
-unspsc7#71.12.16.00.00#Oil well drilling services#71.12.00.00.00
-unspsc7#71.12.16.01.00#Well casing crew service#71.12.16.00.00
-unspsc7#71.12.16.02.00#Well casing planning services#71.12.16.00.00
-unspsc7#71.12.16.03.00#Well casing milling services#71.12.16.00.00
-unspsc7#71.12.16.04.00#Coiled tubing drilling services#71.12.16.00.00
-unspsc7#71.12.16.05.00#Well completion planning services#71.12.16.00.00
-unspsc7#71.12.16.06.00#Conventional well directional drilling services#71.12.16.00.00
-unspsc7#71.12.16.07.00#Well directional drilling services#71.12.16.00.00
-unspsc7#71.12.16.08.00#Well drilling contract development services#71.12.16.00.00
-unspsc7#71.12.16.09.00#Well drilling services#71.12.16.00.00
-unspsc7#71.12.16.10.00#Well drilling engineering services#71.12.16.00.00
-unspsc7#71.12.16.11.00#Well drilling mud or fluid services#71.12.16.00.00
-unspsc7#71.12.16.12.00#Well drilling of water intake well services#71.12.16.00.00
-unspsc7#71.12.16.13.00#Well drilling rig monitor services#71.12.16.00.00
-unspsc7#71.12.16.14.00#Well drilling solids control#71.12.16.00.00
-unspsc7#71.12.16.15.00#Well drilling stabilizing or hole opening services#71.12.16.00.00
-unspsc7#71.12.16.16.00#Well drilling supervision#71.12.16.00.00
-unspsc7#71.12.16.17.00#Well drilling control services#71.12.16.00.00
-unspsc7#71.12.16.18.00#Well drilling other general services#71.12.16.00.00
-unspsc7#71.12.16.19.00#Extended reach directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.20.00#Multilateral directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.21.00#Oil country tubular modification or testing services#71.12.16.00.00
-unspsc7#71.12.16.22.00#Well drilling pickup or laydown service#71.12.16.00.00
-unspsc7#71.12.16.23.00#Well drilling pipe storage#71.12.16.00.00
-unspsc7#71.12.16.24.00#Well drilling pipe threading#71.12.16.00.00
-unspsc7#71.12.16.25.00#Rathole well drilling service#71.12.16.00.00
-unspsc7#71.12.16.26.00#Short radius directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.27.00#Steerable underreaming while well drilling services#71.12.16.00.00
-unspsc7#71.12.16.28.00#Ultra short radius directional well drilling services#71.12.16.00.00
-unspsc7#71.12.16.29.00#Underbalanced well drilling services#71.12.16.00.00
-unspsc7#71.12.16.30.00#Well planning services#71.12.16.00.00
-unspsc7#71.12.16.31.00#Well redrilling or reworking services#71.12.16.00.00
-unspsc7#71.12.16.32.00#Well drilling deviation control#71.12.16.00.00
-unspsc7#71.12.16.33.00#Oilfield gravel packing services#71.12.16.00.00
-unspsc7#71.12.16.34.00#Oilfield hull systems services#71.12.16.00.00
-unspsc7#71.12.16.35.00#Rig well pulling crew services#71.12.16.00.00
-unspsc7#71.12.16.36.00#Wellhead equipment services#71.12.16.00.00
-unspsc7#71.12.16.37.00#Sidetracking with whipstock services#71.12.16.00.00
-unspsc7#71.12.17.00.00#Oilfield fishing services#71.12.00.00.00
-unspsc7#71.12.17.01.00#Oilfield fishing service design services#71.12.17.00.00
-unspsc7#71.12.17.02.00#Oilfield fishing service economic evaluation services#71.12.17.00.00
-unspsc7#71.12.17.03.00#Oilfield fishing service operation services#71.12.17.00.00
-unspsc7#71.12.17.04.00#Oilfield junk recovery services#71.12.17.00.00
-unspsc7#71.12.17.05.00#Oilfield pipe recovery service#71.12.17.00.00
-unspsc7#71.12.17.06.00#Oilfield fishing or drilling services#71.12.17.00.00
-unspsc7#71.12.18.00.00#Gas lift services#71.12.00.00.00
-unspsc7#71.12.18.01.00#Coiled tubing gas lift services#71.12.18.00.00
-unspsc7#71.12.18.02.00#Gas lift fixing or testing services#71.12.18.00.00
-unspsc7#71.12.18.03.00#Gas lift kickover services#71.12.18.00.00
-unspsc7#71.12.18.04.00#Gas lift sand containment services#71.12.18.00.00
-unspsc7#71.12.19.00.00#Down hole fluid services#71.12.00.00.00
-unspsc7#71.12.19.01.00#Down hole fluid evaluation services#71.12.19.00.00
-unspsc7#71.12.19.02.00#Down hole fluid laboratory services#71.12.19.00.00
-unspsc7#71.12.19.03.00#Down hole fluid sampling services#71.12.19.00.00
-unspsc7#71.12.20.00.00#Well perforating services#71.12.00.00.00
-unspsc7#71.12.20.01.00#Coiled tubing well perforating services#71.12.20.00.00
-unspsc7#71.12.20.02.00#Slickline well perforating services#71.12.20.00.00
-unspsc7#71.12.20.03.00#Through tubing well perforation services#71.12.20.00.00
-unspsc7#71.12.20.04.00#Tubing conveyed well perforating services#71.12.20.00.00
-unspsc7#71.12.20.05.00#Wireline well perforating services#71.12.20.00.00
-unspsc7#71.12.20.06.00#Well tubing puncher services#71.12.20.00.00
-unspsc7#71.12.21.00.00#Oilfield sand control services#71.12.00.00.00
-unspsc7#71.12.21.01.00#Acid sand control pumping services#71.12.21.00.00
-unspsc7#71.12.21.02.00#Sand control blending services#71.12.21.00.00
-unspsc7#71.12.21.03.00#Cleaning fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.04.00#Completion fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.05.00#Well consolidation services#71.12.21.00.00
-unspsc7#71.12.21.06.00#Oilfield filtering services#71.12.21.00.00
-unspsc7#71.12.21.07.00#Fracturing fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.08.00#Fracturing pre frac design testing services#71.12.21.00.00
-unspsc7#71.12.21.09.00#General sand control services#71.12.21.00.00
-unspsc7#71.12.21.10.00#Gravel carrier fluid sand control services#71.12.21.00.00
-unspsc7#71.12.21.11.00#Sand control lab testing services#71.12.21.00.00
-unspsc7#71.12.21.12.00#Multizone sand control services#71.12.21.00.00
-unspsc7#71.12.21.13.00#Sand control monitoring services#71.12.21.00.00
-unspsc7#71.12.21.14.00#Sand control temporary isolation services#71.12.21.00.00
-unspsc7#71.12.21.15.00#Well tool redressing services#71.12.21.00.00
-unspsc7#71.12.21.16.00#Non fracturing sand control pumping services#71.12.21.00.00
-unspsc7#71.12.22.00.00#Slickline services#71.12.00.00.00
-unspsc7#71.12.22.01.00#Slickline fishing services#71.12.22.00.00
-unspsc7#71.12.22.02.00#Slickline lifting services#71.12.22.00.00
-unspsc7#71.12.22.03.00#Slickline manipulation services#71.12.22.00.00
-unspsc7#71.12.23.00.00#Subsea well services#71.12.00.00.00
-unspsc7#71.12.23.01.00#Subsea well diving services#71.12.23.00.00
-unspsc7#71.12.23.02.00#Subsea well remote operation vehicle rov services#71.12.23.00.00
-unspsc7#71.12.23.03.00#Subsea well fixturing or test equipment services#71.12.23.00.00
-unspsc7#71.12.23.04.00#Subsea well intervention or completion services#71.12.23.00.00
-unspsc7#71.12.23.05.00#Subsea well safety test tree services#71.12.23.00.00
-unspsc7#71.12.23.06.00#Subsea well equipment maintenance services#71.12.23.00.00
-unspsc7#71.12.24.00.00#Well testing services#71.12.00.00.00
-unspsc7#71.12.24.01.00#Drill stem flow metering services#71.12.24.00.00
-unspsc7#71.12.24.02.00#Drill stem surface testing services#71.12.24.00.00
-unspsc7#71.12.24.03.00#Drill stem testing packer services#71.12.24.00.00
-unspsc7#71.12.24.04.00#Drill stem testing pressure control test services#71.12.24.00.00
-unspsc7#71.12.24.05.00#Drill stem testing pulse operated test services#71.12.24.00.00
-unspsc7#71.12.24.06.00#Drill stem testing for ultra high press high temp environment services#71.12.24.00.00
-unspsc7#71.12.24.07.00#Drill stem testing services#71.12.24.00.00
-unspsc7#71.12.24.08.00#Periodic well testing services#71.12.24.00.00
-unspsc7#71.12.24.09.00#Surface well testing services#71.12.24.00.00
-unspsc7#71.12.24.10.00#Underbalanced testing while drilling services#71.12.24.00.00
-unspsc7#71.12.25.00.00#Water or gas control services#71.12.00.00.00
-unspsc7#71.12.25.01.00#Water or gas control design services#71.12.25.00.00
-unspsc7#71.12.25.02.00#Water or gas control evaluation services#71.12.25.00.00
-unspsc7#71.12.25.03.00#Water or gas control isolation services#71.12.25.00.00
-unspsc7#71.12.25.04.00#Water or gas control testing services#71.12.25.00.00
-unspsc7#71.12.25.05.00#Water or gas testing services#71.12.25.00.00
-unspsc7#71.12.26.00.00#Well completion services#71.12.00.00.00
-unspsc7#71.12.26.01.00#Well casing completion services#71.12.26.00.00
-unspsc7#71.12.26.02.00#Well completion fluids services#71.12.26.00.00
-unspsc7#71.12.26.03.00#Gas lift well completion services#71.12.26.00.00
-unspsc7#71.12.26.04.00#Horizontal cased hole services#71.12.26.00.00
-unspsc7#71.12.26.05.00#Horizontal open hole services#71.12.26.00.00
-unspsc7#71.12.26.06.00#Intelligent well completion services#71.12.26.00.00
-unspsc7#71.12.26.07.00#Liner well completion services#71.12.26.00.00
-unspsc7#71.12.26.08.00#Multilateral well completion services#71.12.26.00.00
-unspsc7#71.12.26.09.00#Permanent well completion services#71.12.26.00.00
-unspsc7#71.12.26.10.00#Sand control well completion services#71.12.26.00.00
-unspsc7#71.12.26.11.00#Temporary drill stem testing well completion services#71.12.26.00.00
-unspsc7#71.12.26.12.00#Tubing well completion services#71.12.26.00.00
-unspsc7#71.12.26.13.00#Underbalanced well completion services#71.12.26.00.00
-unspsc7#71.12.27.00.00#Well maintenance services#71.12.00.00.00
-unspsc7#71.12.27.01.00#Oil well platform maintenance services#71.12.27.00.00
-unspsc7#71.12.27.02.00#Oilfield pumping unit maintenance services#71.12.27.00.00
-unspsc7#71.12.27.03.00#Oilfield rod pump repair services#71.12.27.00.00
-unspsc7#71.12.27.04.00#Oilfield snubbing service#71.12.27.00.00
-unspsc7#71.12.27.05.00#Oilfield sucker rod maintenance services#71.12.27.00.00
-unspsc7#71.12.27.06.00#Well swabbing services#71.12.27.00.00
-unspsc7#71.12.27.07.00#Oilfield tubing anchor services#71.12.27.00.00
-unspsc7#71.12.27.08.00#Oilfield pump mechanic services#71.12.27.00.00
-unspsc7#71.12.28.00.00#Well monitoring services#71.12.00.00.00
-unspsc7#71.12.28.01.00#Downhole recording services#71.12.28.00.00
-unspsc7#71.12.28.02.00#Well flow monitoring services#71.12.28.00.00
-unspsc7#71.12.28.03.00#Oil or gas well monitoring services#71.12.28.00.00
-unspsc7#71.12.28.04.00#Well site phase monitoring services#71.12.28.00.00
-unspsc7#71.12.28.05.00#Well site pump monitoring services#71.12.28.00.00
-unspsc7#71.12.28.06.00#Well site surface data acquisition services#71.12.28.00.00
-unspsc7#71.12.28.07.00#Well site surface readout services#71.12.28.00.00
-unspsc7#71.12.28.08.00#Well site surface recording services#71.12.28.00.00
-unspsc7#71.12.28.09.00#Surface well testing services#71.12.28.00.00
-unspsc7#71.12.28.10.00#Subsurface well testing services#71.12.28.00.00
-unspsc7#71.12.29.00.00#Oilfield rigs#71.12.00.00.00
-unspsc7#71.12.29.01.00#Deepwater oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.02.00#Jackup oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.03.00#Barge oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.04.00#Land oilfield rig services#71.12.29.00.00
-unspsc7#71.12.29.05.00#Platform oilfield rig services#71.12.29.00.00
-unspsc7#71.13.00.00.00#Oil and gas extraction and production enhancement services#71.00.00.00.00
-unspsc7#71.13.10.00.00#Well fracturing services#71.13.00.00.00
-unspsc7#71.13.10.01.00#Acid based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.02.00#Emulsion based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.03.00#Foam based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.04.00#Oil well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.05.00#Oil well scale control services#71.13.10.00.00
-unspsc7#71.13.10.06.00#Well fracture testing services#71.13.10.00.00
-unspsc7#71.13.10.07.00#Well fracturing downhole evaluation services#71.13.10.00.00
-unspsc7#71.13.10.08.00#Well fracturing height control services#71.13.10.00.00
-unspsc7#71.13.10.09.00#Well fracturing monitoring services#71.13.10.00.00
-unspsc7#71.13.10.10.00#Well fracturing service design services#71.13.10.00.00
-unspsc7#71.13.10.11.00#Well fracturing service evaluation services#71.13.10.00.00
-unspsc7#71.13.10.12.00#Well fracturing surface evaluation services#71.13.10.00.00
-unspsc7#71.13.10.13.00#Well fracturing treatment quality control services#71.13.10.00.00
-unspsc7#71.13.10.14.00#Oil based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.15.00#Other well fracturing services#71.13.10.00.00
-unspsc7#71.13.10.16.00#Well fracturing stress management services#71.13.10.00.00
-unspsc7#71.13.10.17.00#Water based fluid well fracturing services#71.13.10.00.00
-unspsc7#71.13.11.00.00#Matrix stimulation services#71.13.00.00.00
-unspsc7#71.13.11.01.00#Acid based matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.11.02.00#Formation sealer matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.11.03.00#Matrix organic cleanup services#71.13.11.00.00
-unspsc7#71.13.11.04.00#Matrix organic inhibition services#71.13.11.00.00
-unspsc7#71.13.11.05.00#Matrix scale cleanup services#71.13.11.00.00
-unspsc7#71.13.11.06.00#Matrix scale inhibition services#71.13.11.00.00
-unspsc7#71.13.11.07.00#Matrix treatment design services#71.13.11.00.00
-unspsc7#71.13.11.08.00#Matrix treatment diversion services#71.13.11.00.00
-unspsc7#71.13.11.09.00#Matrix treatment evaluation services#71.13.11.00.00
-unspsc7#71.13.11.10.00#Matrix treatment quality control services#71.13.11.00.00
-unspsc7#71.13.11.11.00#Non acid based matrix stimulation services#71.13.11.00.00
-unspsc7#71.13.12.00.00#Oilfield nitrogen services#71.13.00.00.00
-unspsc7#71.13.12.01.00#Nitrogen well services#71.13.12.00.00
-unspsc7#71.13.13.00.00#Other oilfield pumping services#71.13.00.00.00
-unspsc7#71.13.13.01.00#Bottom intake oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.02.00#Cable deployed oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.03.00#Co2 oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.04.00#Coiled tubing deployed oilfield pumping services#71.13.13.00.00
-unspsc7#71.13.13.05.00#Downhole pumping services#71.13.13.00.00
-unspsc7#71.13.13.06.00#Dual completion well services#71.13.13.00.00
-unspsc7#71.13.13.07.00#Horizontal pumping well services#71.13.13.00.00
-unspsc7#71.13.13.08.00#Oilfield pumping installation pull or operation services#71.13.13.00.00
-unspsc7#71.13.13.09.00#Well profile modification services#71.13.13.00.00
-unspsc7#71.13.13.10.00#Oilfield spooling services#71.13.13.00.00
-unspsc7#71.13.14.00.00#Well production services#71.13.00.00.00
-unspsc7#71.13.14.01.00#Oilfield flare system services#71.13.14.00.00
-unspsc7#71.13.14.02.00#Oilfield hot oil or water service#71.13.14.00.00
-unspsc7#71.13.14.03.00#Oilfield steaming services#71.13.14.00.00
-unspsc7#71.14.00.00.00#Oil and gas restoration and reclamation services#71.00.00.00.00
-unspsc7#71.14.10.00.00#Emergency well control services#71.14.00.00.00
-unspsc7#71.14.10.01.00#Well pressure control services#71.14.10.00.00
-unspsc7#71.14.10.02.00#Well capping services#71.14.10.00.00
-unspsc7#71.14.10.03.00#Well fire fighting services#71.14.10.00.00
-unspsc7#71.14.10.04.00#Wild well control services#71.14.10.00.00
-unspsc7#71.14.11.00.00#Well plugging and abandonment services#71.14.00.00.00
-unspsc7#71.14.11.01.00#Well abandonment services#71.14.11.00.00
-unspsc7#71.14.11.02.00#Well plugging services#71.14.11.00.00
-unspsc7#71.14.12.00.00#Well site restoration#71.14.00.00.00
-unspsc7#71.14.12.01.00#Well cleaning or swabbing services#71.14.12.00.00
-unspsc7#71.14.12.02.00#Well site restoration services#71.14.12.00.00
-unspsc7#71.15.00.00.00#Oil and gas data management and processing services#71.00.00.00.00
-unspsc7#71.15.10.00.00#Oilfield data communication services#71.15.00.00.00
-unspsc7#71.15.10.01.00#Log data transmission services#71.15.10.00.00
-unspsc7#71.15.10.02.00#Log graphics transmission services#71.15.10.00.00
-unspsc7#71.15.10.03.00#Real time well data monitoring services#71.15.10.00.00
-unspsc7#71.15.10.04.00#Satellite well data transmission services#71.15.10.00.00
-unspsc7#71.15.10.05.00#Well data transmission services#71.15.10.00.00
-unspsc7#71.15.11.00.00#Oilfield data management services#71.15.00.00.00
-unspsc7#71.15.11.01.00#Oilfield asset data management services#71.15.11.00.00
-unspsc7#71.15.11.02.00#Oilfield data mining services#71.15.11.00.00
-unspsc7#71.15.11.03.00#Log data management services#71.15.11.00.00
-unspsc7#71.15.11.04.00#Oilfield mapping data management services#71.15.11.00.00
-unspsc7#71.15.11.05.00#Seismic data management services#71.15.11.00.00
-unspsc7#71.15.12.00.00#Oilfield economic and risk model services#71.15.00.00.00
-unspsc7#71.15.12.01.00#Oilfield budgeting services#71.15.12.00.00
-unspsc7#71.15.12.02.00#Oilfield capital planning services#71.15.12.00.00
-unspsc7#71.15.12.03.00#Oilfield decision tree services#71.15.12.00.00
-unspsc7#71.15.13.00.00#Oilfield interpretation services#71.15.00.00.00
-unspsc7#71.15.13.01.00#Oilfield bubble map services#71.15.13.00.00
-unspsc7#71.15.13.02.00#Oilfield case studies#71.15.13.00.00
-unspsc7#71.15.13.03.00#Oilfield decline analysis#71.15.13.00.00
-unspsc7#71.15.13.04.00#Oilfield field studies#71.15.13.00.00
-unspsc7#71.15.13.05.00#Oilfield fracturing interpretation services#71.15.13.00.00
-unspsc7#71.15.13.06.00#Geology services#71.15.13.00.00
-unspsc7#71.15.13.07.00#Geophysics services#71.15.13.00.00
-unspsc7#71.15.13.08.00#Gravel pack interpretation services#71.15.13.00.00
-unspsc7#71.15.13.09.00#Oilfield grid mapping services#71.15.13.00.00
-unspsc7#71.15.13.10.00#Oilfield mapping or visualization services#71.15.13.00.00
-unspsc7#71.15.13.11.00#Petrophysics services#71.15.13.00.00
-unspsc7#71.15.13.12.00#Reservoir engineering services#71.15.13.00.00
-unspsc7#71.15.13.13.00#Reservoir modeling services#71.15.13.00.00
-unspsc7#71.15.13.14.00#Reservoir simulation services#71.15.13.00.00
-unspsc7#71.15.13.15.00#Rock mechanics services#71.15.13.00.00
-unspsc7#71.15.14.00.00#Well service engineering#71.15.00.00.00
-unspsc7#71.15.14.01.00#Well cementing job design services#71.15.14.00.00
-unspsc7#71.15.14.02.00#Coiled tubing job design services#71.15.14.00.00
-unspsc7#71.15.14.03.00#Well drilling job design services#71.15.14.00.00
-unspsc7#71.15.14.04.00#Well fracturing job design services#71.15.14.00.00
-unspsc7#71.15.14.05.00#Matrix stimulation job design services#71.15.14.00.00
-unspsc7#71.15.14.06.00#Well sand control job design services#71.15.14.00.00
-unspsc7#71.16.00.00.00#Oil and gas well project management services#71.00.00.00.00
-unspsc7#71.16.10.00.00#Oilfield Modeling Services#71.16.00.00.00
-unspsc7#71.16.10.01.00#Oilfield completion models#71.16.10.00.00
-unspsc7#71.16.10.02.00#Oilfield drilling models#71.16.10.00.00
-unspsc7#71.16.10.03.00#Oilfield economic models#71.16.10.00.00
-unspsc7#71.16.10.04.00#Oilfield field development models#71.16.10.00.00
-unspsc7#71.16.10.05.00#Oilfield production models#71.16.10.00.00
-unspsc7#71.16.10.06.00#Oilfield risk management services#71.16.10.00.00
-unspsc7#71.16.11.00.00#Oilfield production engineering management#71.16.00.00.00
-unspsc7#71.16.11.01.00#Oilfield artificial lift services#71.16.11.00.00
-unspsc7#71.16.11.02.00#Enhanced oil recovery services#71.16.11.00.00
-unspsc7#71.16.11.03.00#Well injection services#71.16.11.00.00
-unspsc7#71.16.11.04.00#Oilfield nodal analysis services#71.16.11.00.00
-unspsc7#71.16.11.05.00#Well perforation services#71.16.11.00.00
-unspsc7#71.16.11.06.00#Oilfield production chemistry services#71.16.11.00.00
-unspsc7#71.16.11.07.00#Oilfield production monitoring services#71.16.11.00.00
-unspsc7#71.16.11.08.00#Oilfield sand control services#71.16.11.00.00
-unspsc7#71.16.11.09.00#Well stimulation services#71.16.11.00.00
-unspsc7#71.16.11.10.00#Underground gas storage services#71.16.11.00.00
-unspsc7#71.16.11.11.00#Oilfield water management services#71.16.11.00.00
-unspsc7#71.16.12.00.00#Oilfield production operations management#71.16.00.00.00
-unspsc7#71.16.12.01.00#Oilfield hot oiling service#71.16.12.00.00
-unspsc7#71.16.12.02.00#Oilfield lease operations#71.16.12.00.00
-unspsc7#71.16.12.03.00#Oilfield logging services#71.16.12.00.00
-unspsc7#71.16.12.04.00#Oilfield paraffin cutting service#71.16.12.00.00
-unspsc7#71.16.12.05.00#Oilfield planning services#71.16.12.00.00
-unspsc7#71.16.12.06.00#Oilfield processing services#71.16.12.00.00
-unspsc7#71.16.12.07.00#Well testing services#71.16.12.00.00
-unspsc7#71.16.13.00.00#Oilfield project management services#71.16.00.00.00
-unspsc7#71.16.13.01.00#Oilfield audits or inspection services#71.16.13.00.00
-unspsc7#71.16.13.02.00#Oilfield emergency response planning services#71.16.13.00.00
-unspsc7#71.16.13.03.00#Oilfield field development services#71.16.13.00.00
-unspsc7#71.16.13.04.00#Oilfield performance monitoring services#71.16.13.00.00
-unspsc7#71.16.13.05.00#Oilfield reporting services#71.16.13.00.00
-unspsc7#71.16.13.06.00#Oilfield succession plan or handover services#71.16.13.00.00
-unspsc7#71.16.13.07.00#Oilfield training matrix services#71.16.13.00.00
-unspsc7#71.16.13.08.00#Well site logistics or procurement services#71.16.13.00.00
-unspsc7#71.16.14.00.00#Well construction management services#71.16.00.00.00
-unspsc7#71.16.14.01.00#Coiled tubing drilling services#71.16.14.00.00
-unspsc7#71.16.14.02.00#Well completion engineering services#71.16.14.00.00
-unspsc7#71.16.14.03.00#Deadman anchor services#71.16.14.00.00
-unspsc7#71.16.14.04.00#Well drilling engineering services#71.16.14.00.00
-unspsc7#71.16.14.05.00#Well site pit lining services#71.16.14.00.00
-unspsc7#71.16.14.06.00#Well plug or abandonment service#71.16.14.00.00
-unspsc7#71.16.14.07.00#Well pulling unit services#71.16.14.00.00
-unspsc7#71.16.14.08.00#Shorebase services#71.16.14.00.00
-unspsc7#71.16.14.09.00#Test pit lining services#71.16.14.00.00
-unspsc7#71.16.14.10.00#Well site vacuum truck services#71.16.14.00.00
-unspsc7#71.16.14.11.00#Underbalanced applications engineering services#71.16.14.00.00
-unspsc7#71.16.14.12.00#Well workover services#71.16.14.00.00
-unspsc7#71.16.14.13.00#Well fabrication or construction services#71.16.14.00.00
-unspsc7#71.16.15.00.00#Well site operations services#71.16.00.00.00
-unspsc7#71.16.15.01.00#Well site electrical or instrumentation services#71.16.15.00.00
-unspsc7#71.16.15.02.00#Well site heavy equipment or crane services#71.16.15.00.00
-unspsc7#71.16.15.03.00#Well site inspection or equipment testing services#71.16.15.00.00
-unspsc7#71.16.15.04.00#Well site instrument and meter services#71.16.15.00.00
-unspsc7#71.16.15.05.00#Well site valve or valve part services#71.16.15.00.00
-unspsc7#72.00.00.00.00#Building and Construction and Maintenance Services#72.00.00.00.00
-unspsc7#72.10.00.00.00#Building construction and support and maintenance and repair services#72.00.00.00.00
-unspsc7#72.10.15.00.00#Building support services#72.10.00.00.00
-unspsc7#72.10.15.01.00#Handyman services#72.10.15.00.00
-unspsc7#72.10.15.02.00#Scaffolding services#72.10.15.00.00
-unspsc7#72.10.15.03.00#Rigging services#72.10.15.00.00
-unspsc7#72.10.15.04.00#Disaster proofing or contingency services#72.10.15.00.00
-unspsc7#72.10.15.05.00#Locksmith services#72.10.15.00.00
-unspsc7#72.10.16.00.00#Roofing and siding and sheet metal work#72.10.00.00.00
-unspsc7#72.10.16.01.00#Roofing installation or repair#72.10.16.00.00
-unspsc7#72.10.16.02.00#Skylight installation#72.10.16.00.00
-unspsc7#72.10.16.03.00#Gutter or downspout services#72.10.16.00.00
-unspsc7#72.10.16.04.00#Architectural sheet metal work#72.10.16.00.00
-unspsc7#72.10.16.05.00#Ceiling erection or repair#72.10.16.00.00
-unspsc7#72.10.16.06.00#Chute installation#72.10.16.00.00
-unspsc7#72.10.16.07.00#Siding installation or repair#72.10.16.00.00
-unspsc7#72.10.17.00.00#Concrete work#72.10.00.00.00
-unspsc7#72.10.17.01.00#Exterior concrete or stucco services#72.10.17.00.00
-unspsc7#72.10.17.02.00#Grouting services#72.10.17.00.00
-unspsc7#72.10.17.03.00#Sidewalk or curb construction#72.10.17.00.00
-unspsc7#72.10.17.04.00#Foundation or slab work#72.10.17.00.00
-unspsc7#72.10.18.00.00#Exterior cleaning#72.10.00.00.00
-unspsc7#72.10.18.01.00#Sandblasting#72.10.18.00.00
-unspsc7#72.10.18.02.00#High pressure water blasting#72.10.18.00.00
-unspsc7#72.10.18.03.00#Steam cleaning#72.10.18.00.00
-unspsc7#72.10.19.00.00#Interior finishing#72.10.00.00.00
-unspsc7#72.10.19.01.00#Interior design or decorating#72.10.19.00.00
-unspsc7#72.10.19.02.00#Plastering or drywall#72.10.19.00.00
-unspsc7#72.10.19.03.00#Finish carpentry or cabinetry#72.10.19.00.00
-unspsc7#72.10.20.00.00#Coating and caulking and weather and water and fireproofing#72.10.00.00.00
-unspsc7#72.10.20.01.00#Caulking#72.10.20.00.00
-unspsc7#72.10.20.02.00#Plastic encasement or coating of structural materials#72.10.20.00.00
-unspsc7#72.10.20.03.00#Coating or glazing of metal or wood or concrete structural materials#72.10.20.00.00
-unspsc7#72.10.20.04.00#Dampproofing#72.10.20.00.00
-unspsc7#72.10.20.05.00#Fireproofing of buildings#72.10.20.00.00
-unspsc7#72.10.20.06.00#Wrapping of pipes#72.10.20.00.00
-unspsc7#72.10.21.00.00#Pest control#72.10.00.00.00
-unspsc7#72.10.21.01.00#Bird proofing services#72.10.21.00.00
-unspsc7#72.10.21.02.00#Termite control services#72.10.21.00.00
-unspsc7#72.10.21.03.00#Extermination or fumigation services#72.10.21.00.00
-unspsc7#72.10.21.04.00#Structural pest control#72.10.21.00.00
-unspsc7#72.10.21.05.00#Animal trapping#72.10.21.00.00
-unspsc7#72.10.21.06.00#Rodent control#72.10.21.00.00
-unspsc7#72.10.22.00.00#Electrical services#72.10.00.00.00
-unspsc7#72.10.22.01.00#Electric power systems installation or service#72.10.22.00.00
-unspsc7#72.10.22.02.00#Electronic controls installation#72.10.22.00.00
-unspsc7#72.10.22.03.00#Communication equipment installation#72.10.22.00.00
-unspsc7#72.10.22.04.00#Safety or security systems installation#72.10.22.00.00
-unspsc7#72.10.22.05.00#Cabling service#72.10.22.00.00
-unspsc7#72.10.23.00.00#Plumbing and heating and air conditioning#72.10.00.00.00
-unspsc7#72.10.23.01.00#Boiler installation or adjustment or maintenance or repair services#72.10.23.00.00
-unspsc7#72.10.23.02.00#Heating systems installation repair or maintenance#72.10.23.00.00
-unspsc7#72.10.23.03.00#Plumbing system construction#72.10.23.00.00
-unspsc7#72.10.23.04.00#Plumbing system maintenance or repair#72.10.23.00.00
-unspsc7#72.10.23.05.00#Air conditioning installation or maintenance or repair services#72.10.23.00.00
-unspsc7#72.10.24.00.00#Painting and paper hanging#72.10.00.00.00
-unspsc7#72.10.24.01.00#Exterior painting services#72.10.24.00.00
-unspsc7#72.10.24.02.00#Interior painting services#72.10.24.00.00
-unspsc7#72.10.24.03.00#Wallcovering services#72.10.24.00.00
-unspsc7#72.10.24.04.00#Industrial or specialized paint application for aircraft or ship or bridge#72.10.24.00.00
-unspsc7#72.10.24.05.00#Pavement marking services#72.10.24.00.00
-unspsc7#72.10.25.00.00#Masonry and stonework and tile setting#72.10.00.00.00
-unspsc7#72.10.25.01.00#Bricklaying#72.10.25.00.00
-unspsc7#72.10.25.02.00#Chimney construction or maintenance#72.10.25.00.00
-unspsc7#72.10.25.03.00#Marble or stone or tile installation#72.10.25.00.00
-unspsc7#72.10.25.04.00#Retaining wall construction#72.10.25.00.00
-unspsc7#72.10.25.05.00#Fresco work#72.10.25.00.00
-unspsc7#72.10.25.06.00#Acoustical#72.10.25.00.00
-unspsc7#72.10.25.07.00#Insulating material installation#72.10.25.00.00
-unspsc7#72.10.25.08.00#Restoration of masonry or stonework or tile#72.10.25.00.00
-unspsc7#72.10.26.00.00#Carpentry#72.10.00.00.00
-unspsc7#72.10.26.01.00#Rough carpentry#72.10.26.00.00
-unspsc7#72.10.26.02.00#Windows or door or fixture installation#72.10.26.00.00
-unspsc7#72.10.26.03.00#Furniture installation#72.10.26.00.00
-unspsc7#72.10.27.00.00#Flooring service#72.10.00.00.00
-unspsc7#72.10.27.01.00#Floor sheathing or laying or installation or finishing#72.10.27.00.00
-unspsc7#72.10.27.02.00#Floor covering installation or maintenance#72.10.27.00.00
-unspsc7#72.10.27.03.00#Floor cleaning services#72.10.27.00.00
-unspsc7#72.10.28.00.00#Refurbishing services#72.10.00.00.00
-unspsc7#72.10.28.01.00#Renovation of buildings or landmarks or monuments#72.10.28.00.00
-unspsc7#72.10.28.02.00#Restoration of buildings or landmarks or monuments#72.10.28.00.00
-unspsc7#72.10.29.00.00#Grounds maintenance services#72.10.00.00.00
-unspsc7#72.10.29.01.00#Snow Removal Services#72.10.29.00.00
-unspsc7#72.10.29.02.00#Landscaping services#72.10.29.00.00
-unspsc7#72.10.30.00.00#Site preparation services#72.10.00.00.00
-unspsc7#72.10.30.01.00#Land clearing services#72.10.30.00.00
-unspsc7#72.10.30.02.00#Land levelling services#72.10.30.00.00
-unspsc7#72.10.30.03.00#Demolition services#72.10.30.00.00
-unspsc7#72.10.30.04.00#Digging services#72.10.30.00.00
-unspsc7#72.11.00.00.00#General building construction#72.00.00.00.00
-unspsc7#72.11.15.00.00#Private housing#72.11.00.00.00
-unspsc7#72.11.15.01.00#Single family housing construction or remodeling or repair#72.11.15.00.00
-unspsc7#72.11.15.02.00#Residential multi tenant construction or remodeling or repair#72.11.15.00.00
-unspsc7#72.11.16.00.00#Industrial plants#72.11.00.00.00
-unspsc7#72.11.16.01.00#Commercial office building construction or remodeling or renovation or repair#72.11.16.00.00
-unspsc7#72.11.16.02.00#Industrial buildings or warehouse construction or remodeling or renovation or repair#72.11.16.00.00
-unspsc7#72.11.17.00.00#Public use buildings#72.11.00.00.00
-unspsc7#72.11.17.01.00#Specialized public use building construction#72.11.17.00.00
-unspsc7#72.11.17.02.00#Non residential agricultural building construction#72.11.17.00.00
-unspsc7#72.11.17.03.00#Service station or service garage construction#72.11.17.00.00
-unspsc7#72.11.17.04.00#Commercial building construction or erection or renovation or repair#72.11.17.00.00
-unspsc7#72.11.18.00.00#Commercial buildings#72.11.00.00.00
-unspsc7#72.11.18.01.00#Restaurant construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.02.00#Shopping center or store construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.03.00#Office building construction or renovation or repair or maintenance#72.11.18.00.00
-unspsc7#72.11.18.04.00#Bathroom renovation#72.11.18.00.00
-unspsc7#72.11.19.00.00#Land and building site preparation#72.11.00.00.00
-unspsc7#72.11.19.01.00#Land clearing#72.11.19.00.00
-unspsc7#72.11.19.02.00#Land leveling#72.11.19.00.00
-unspsc7#72.11.19.03.00#Building demolition#72.11.19.00.00
-unspsc7#72.12.00.00.00#Infrastructure construction and maintenance#72.00.00.00.00
-unspsc7#72.12.15.00.00#Highways and streets#72.12.00.00.00
-unspsc7#72.12.15.01.00#Highway or street or road construction#72.12.15.00.00
-unspsc7#72.12.15.02.00#Highway or street or road surfacing or paving or maintenance#72.12.15.00.00
-unspsc7#72.12.15.03.00#Highway or street guardrail construction or maintenance#72.12.15.00.00
-unspsc7#72.12.15.04.00#Highway or street sign or traffic signal installation#72.12.15.00.00
-unspsc7#72.12.16.00.00#Water and sewer and utility lines#72.12.00.00.00
-unspsc7#72.12.16.01.00#Electric power line construction or installation#72.12.16.00.00
-unspsc7#72.12.16.02.00#Cable laying#72.12.16.00.00
-unspsc7#72.12.16.03.00#Aqueduct construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.04.00#Sewer line construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.05.00#Water main construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.06.00#Voice or data line construction or maintenance#72.12.16.00.00
-unspsc7#72.12.16.07.00#Water industrial plant construction#72.12.16.00.00
-unspsc7#72.12.17.00.00#Dams and marine construction#72.12.00.00.00
-unspsc7#72.12.17.01.00#Dam construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.02.00#Pier or dock construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.03.00#Harbor or breakwater construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.04.00#Dyke or levee construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.05.00#Dredging or caisson drilling#72.12.17.00.00
-unspsc7#72.12.17.06.00#Canal or drainage or irrigation system construction or maintenance#72.12.17.00.00
-unspsc7#72.12.17.07.00#Pond construction or maintenance#72.12.17.00.00
-unspsc7#72.12.18.00.00#Railroads and subways and tramways#72.12.00.00.00
-unspsc7#72.12.18.01.00#Cutting of right of way#72.12.18.00.00
-unspsc7#72.12.18.02.00#Railroad construction or maintenance#72.12.18.00.00
-unspsc7#72.12.18.03.00#Subway construction or maintenance#72.12.18.00.00
-unspsc7#72.12.18.04.00#Tram construction or maintenance#72.12.18.00.00
-unspsc7#72.12.19.00.00#Airports and aviation#72.12.00.00.00
-unspsc7#72.12.19.01.00#Airport runway construction#72.12.19.00.00
-unspsc7#72.12.19.02.00#Airport terminal construction#72.12.19.00.00
-unspsc7#72.12.19.03.00#Helipad construction#72.12.19.00.00
-unspsc7#72.12.20.00.00#Bridges and tunnels and viaducts#72.12.00.00.00
-unspsc7#72.12.20.01.00#Bridge construction or maintenance#72.12.20.00.00
-unspsc7#72.12.20.02.00#Tunnel construction or maintenance#72.12.20.00.00
-unspsc7#72.12.20.03.00#Viaduct construction or maintenance#72.12.20.00.00
-unspsc7#72.12.21.00.00#Construction quantity surveyors#72.12.00.00.00
-unspsc7#72.12.21.01.00#Water or wastewater quantity surveyors#72.12.21.00.00
-unspsc7#72.12.22.00.00#Construction consultancy services#72.12.00.00.00
-unspsc7#72.12.22.01.00#Site supervision#72.12.22.00.00
-unspsc7#72.12.22.02.00#Industrial plant design#72.12.22.00.00
-unspsc7#73.00.00.00.00#Industrial Production and Manufacturing Services#73.00.00.00.00
-unspsc7#73.10.00.00.00#Plastic and chemical industries#73.00.00.00.00
-unspsc7#73.10.15.00.00#Petrochemical and plastic production#73.10.00.00.00
-unspsc7#73.10.15.01.00#Petroleum refining services#73.10.15.00.00
-unspsc7#73.10.15.02.00#Natural gas production services#73.10.15.00.00
-unspsc7#73.10.15.03.00#Oils or greases production services#73.10.15.00.00
-unspsc7#73.10.15.04.00#Coal production services#73.10.15.00.00
-unspsc7#73.10.15.05.00#Plastics or resins or fibers manufacturing services#73.10.15.00.00
-unspsc7#73.10.15.06.00#Credit card production or embossing services#73.10.15.00.00
-unspsc7#73.10.16.00.00#Chemicals and fertilizers production#73.10.00.00.00
-unspsc7#73.10.16.01.00#Inorganic chemicals production services#73.10.16.00.00
-unspsc7#73.10.16.02.00#Soda ash or chlorine or caustic soda production services#73.10.16.00.00
-unspsc7#73.10.16.03.00#Inorganic acids production services#73.10.16.00.00
-unspsc7#73.10.16.04.00#Organic chemical production services#73.10.16.00.00
-unspsc7#73.10.16.05.00#Acetylene or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.06.00#Ethylene or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.07.00#Ethanol or methanol or derivatives production services#73.10.16.00.00
-unspsc7#73.10.16.08.00#Fertilizers production services#73.10.16.00.00
-unspsc7#73.10.16.09.00#Potash mining or processing services#73.10.16.00.00
-unspsc7#73.10.16.10.00#Pesticide production services#73.10.16.00.00
-unspsc7#73.10.16.11.00#Paints or varnishes or lacquers production services#73.10.16.00.00
-unspsc7#73.10.16.12.00#Soap or cleaning preparations or perfumes or cosmetics production services#73.10.16.00.00
-unspsc7#73.10.16.13.00#Solvents or glycols or detergents production services#73.10.16.00.00
-unspsc7#73.10.16.14.00#Ferments or enzymes services#73.10.16.00.00
-unspsc7#73.10.17.00.00#Pharmaceutical production#73.10.00.00.00
-unspsc7#73.10.17.01.00#Drugs or medicine production services#73.10.17.00.00
-unspsc7#73.10.17.02.00#Vaccines or sera or antibiotics production services#73.10.17.00.00
-unspsc7#73.10.17.03.00#Parapharmaceutical production services#73.10.17.00.00
-unspsc7#73.10.18.00.00#Biochemical and biotechnology production#73.10.00.00.00
-unspsc7#73.10.18.01.00#Biomass production services#73.10.18.00.00
-unspsc7#73.10.18.02.00#Bioprotein production services#73.10.18.00.00
-unspsc7#73.10.19.00.00#Rubber production#73.10.00.00.00
-unspsc7#73.10.19.01.00#Rubber milling services#73.10.19.00.00
-unspsc7#73.10.19.02.00#Rubber tires or tubes production services#73.10.19.00.00
-unspsc7#73.10.19.03.00#Rubber or plastic footwear production services#73.10.19.00.00
-unspsc7#73.11.00.00.00#Wood and paper industries#73.00.00.00.00
-unspsc7#73.11.15.00.00#Wood processing#73.11.00.00.00
-unspsc7#73.11.15.01.00#Sawmilling services#73.11.15.00.00
-unspsc7#73.11.15.02.00#Veneer production services#73.11.15.00.00
-unspsc7#73.11.15.03.00#Wood base panels manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.04.00#Wooden containers manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.05.00#Furniture manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.06.00#Cork products manufacturing services#73.11.15.00.00
-unspsc7#73.11.15.07.00#Cane or wickerware processing services#73.11.15.00.00
-unspsc7#73.11.16.00.00#Pulp and paper processing#73.11.00.00.00
-unspsc7#73.11.16.01.00#Pulp production services#73.11.16.00.00
-unspsc7#73.11.16.02.00#Paper or paper board production services#73.11.16.00.00
-unspsc7#73.11.16.03.00#Hardboard or fiberboard production services#73.11.16.00.00
-unspsc7#73.11.16.04.00#Paper production or recycling services#73.11.16.00.00
-unspsc7#73.12.00.00.00#Metal and mineral industries#73.00.00.00.00
-unspsc7#73.12.15.00.00#Metal smelting and refining and forming processes#73.12.00.00.00
-unspsc7#73.12.15.01.00#Ferrous alloy production services#73.12.15.00.00
-unspsc7#73.12.15.02.00#Basic metal combination processes services#73.12.15.00.00
-unspsc7#73.12.15.03.00#Refractors services for iron or steel production#73.12.15.00.00
-unspsc7#73.12.15.04.00#Iron or steel making services#73.12.15.00.00
-unspsc7#73.12.15.05.00#Iron or steel forging services#73.12.15.00.00
-unspsc7#73.12.15.06.00#Pre finishing iron or steel processes services#73.12.15.00.00
-unspsc7#73.12.15.07.00#Finishing metal processing services#73.12.15.00.00
-unspsc7#73.12.15.08.00#Smelting metal services#73.12.15.00.00
-unspsc7#73.12.15.09.00#Refining metal services#73.12.15.00.00
-unspsc7#73.12.16.00.00#Metal finishing#73.12.00.00.00
-unspsc7#73.12.16.01.00#Metal cutting services#73.12.16.00.00
-unspsc7#73.12.16.02.00#Blacksmith services#73.12.16.00.00
-unspsc7#73.12.16.03.00#Metal heating services#73.12.16.00.00
-unspsc7#73.12.16.04.00#Metal plating or replating services#73.12.16.00.00
-unspsc7#73.12.16.05.00#Metal rolling operations#73.12.16.00.00
-unspsc7#73.12.16.06.00#Metal forging services#73.12.16.00.00
-unspsc7#73.12.16.07.00#Metal drawing services#73.12.16.00.00
-unspsc7#73.12.16.08.00#Metal extruding services#73.12.16.00.00
-unspsc7#73.12.16.09.00#Surface metal finishing or treatment services#73.12.16.00.00
-unspsc7#73.12.16.10.00#Horseshoeing services#73.12.16.00.00
-unspsc7#73.12.16.11.00#Tinsmithing services#73.12.16.00.00
-unspsc7#73.12.16.12.00#Rebabbiting services#73.12.16.00.00
-unspsc7#73.12.16.13.00#Metal casting services#73.12.16.00.00
-unspsc7#73.12.17.00.00#Welding and brazing and soldering#73.12.00.00.00
-unspsc7#73.12.17.01.00#Welding services#73.12.17.00.00
-unspsc7#73.12.17.02.00#Brazing services#73.12.17.00.00
-unspsc7#73.12.17.03.00#Soldering services#73.12.17.00.00
-unspsc7#73.12.17.04.00#Casting services#73.12.17.00.00
-unspsc7#73.12.18.00.00#Non metallic mineral products industry services#73.12.00.00.00
-unspsc7#73.12.18.01.00#Pottery or china or earthenware manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.02.00#Glass or glass products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.03.00#Structural clay products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.04.00#Cement or lime or plaster manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.05.00#Concrete or aggregates or stone products manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.06.00#Abrasives manufacturing services#73.12.18.00.00
-unspsc7#73.12.18.07.00#Asbestos products manufacturing services#73.12.18.00.00
-unspsc7#73.13.00.00.00#Food and beverage industries#73.00.00.00.00
-unspsc7#73.13.15.00.00#Beverage processing#73.13.00.00.00
-unspsc7#73.13.15.01.00#Spirits distilling or blending services#73.13.15.00.00
-unspsc7#73.13.15.02.00#Wine processing services#73.13.15.00.00
-unspsc7#73.13.15.03.00#Brewery processing services#73.13.15.00.00
-unspsc7#73.13.15.04.00#Non alcoholic fruit based beverage processing services#73.13.15.00.00
-unspsc7#73.13.15.05.00#Water beverages processing services#73.13.15.00.00
-unspsc7#73.13.15.06.00#Infused beverages processing services#73.13.15.00.00
-unspsc7#73.13.15.07.00#Coffee processing services#73.13.15.00.00
-unspsc7#73.13.15.08.00#Tea processing services#73.13.15.00.00
-unspsc7#73.13.16.00.00#Meat and poultry and seafood processing#73.13.00.00.00
-unspsc7#73.13.16.01.00#Meat products or by products processing services#73.13.16.00.00
-unspsc7#73.13.16.02.00#Fish or fish products processing services#73.13.16.00.00
-unspsc7#73.13.16.03.00#Poultry processing services#73.13.16.00.00
-unspsc7#73.13.16.04.00#Meat hygiene or inspection services#73.13.16.00.00
-unspsc7#73.13.16.05.00#Meat plant operation or management services#73.13.16.00.00
-unspsc7#73.13.16.06.00#Slaughter houses services#73.13.16.00.00
-unspsc7#73.13.16.07.00#Butcher services#73.13.16.00.00
-unspsc7#73.13.16.08.00#Cold storage services#73.13.16.00.00
-unspsc7#73.13.17.00.00#Fruits and vegetables processing#73.13.00.00.00
-unspsc7#73.13.17.01.00#Fruit or vegetable cleaning services#73.13.17.00.00
-unspsc7#73.13.17.02.00#Fruit or vegetable spraying services#73.13.17.00.00
-unspsc7#73.13.17.03.00#Fruit or vegetable packing services#73.13.17.00.00
-unspsc7#73.13.18.00.00#Dairy and eggs processing#73.13.00.00.00
-unspsc7#73.13.18.01.00#Milk processing services#73.13.18.00.00
-unspsc7#73.13.18.02.00#Egg processing services#73.13.18.00.00
-unspsc7#73.13.18.03.00#Cheese processing services#73.13.18.00.00
-unspsc7#73.13.18.04.00#Butter or cream processing services#73.13.18.00.00
-unspsc7#73.13.19.00.00#Grains and sugar and oils and fat processing#73.13.00.00.00
-unspsc7#73.13.19.01.00#Milling services#73.13.19.00.00
-unspsc7#73.13.19.02.00#Cereal products processing services#73.13.19.00.00
-unspsc7#73.13.19.03.00#Sugar or sugar products processing services#73.13.19.00.00
-unspsc7#73.13.19.04.00#Vegetable oils or fats processing services#73.13.19.00.00
-unspsc7#73.13.19.05.00#Spice processing services#73.13.19.00.00
-unspsc7#73.13.19.06.00#Bakery products processing services#73.13.19.00.00
-unspsc7#73.14.00.00.00#Fibers and textiles and fabric industries#73.00.00.00.00
-unspsc7#73.14.15.00.00#Fiber production#73.14.00.00.00
-unspsc7#73.14.15.01.00#Rayon or acetate fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.02.00#Glass fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.03.00#Silk fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.04.00#Cotton fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.05.00#Wool fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.06.00#Polyester fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.07.00#Polyamide fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.15.08.00#Acrylic fiber manufacturing services#73.14.15.00.00
-unspsc7#73.14.16.00.00#Thread and yarn processing#73.14.00.00.00
-unspsc7#73.14.16.01.00#Thread processing services#73.14.16.00.00
-unspsc7#73.14.16.02.00#Yarn processing services#73.14.16.00.00
-unspsc7#73.14.17.00.00#Fabrics and leather production#73.14.00.00.00
-unspsc7#73.14.17.01.00#Broad woven fabrics manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.02.00#Narrow woven fabrics manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.03.00#Knitwear manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.04.00#Carpet or rug manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.05.00#Cordage or rope or twine manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.06.00#Dyeing or printing or finishing services#73.14.17.00.00
-unspsc7#73.14.17.07.00#Woven suits or coats or overcoats manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.08.00#Woven outerwear clothing manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.09.00#Fur dressing or dyeing services#73.14.17.00.00
-unspsc7#73.14.17.10.00#Leather footwear manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.11.00#Leather luggage or handbags manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.12.00#Leather tanning or finishing manufacturing services#73.14.17.00.00
-unspsc7#73.14.17.13.00#Nonwoven fabric services#73.14.17.00.00
-unspsc7#73.14.17.14.00#Braided yarn or fabric services#73.14.17.00.00
-unspsc7#73.14.17.15.00#Industrial sewing services#73.14.17.00.00
-unspsc7#73.15.00.00.00#Manufacturing support services#73.00.00.00.00
-unspsc7#73.15.15.00.00#Assembly services#73.15.00.00.00
-unspsc7#73.15.15.01.00#Assembly line work#73.15.15.00.00
-unspsc7#73.15.15.02.00#Joint sealing services#73.15.15.00.00
-unspsc7#73.15.16.00.00#Packaging services#73.15.00.00.00
-unspsc7#73.15.16.01.00#Canning plants services#73.15.16.00.00
-unspsc7#73.15.16.02.00#Packaging of agricultural by products services#73.15.16.00.00
-unspsc7#73.15.16.03.00#Packaging of non food products services#73.15.16.00.00
-unspsc7#73.15.16.04.00#Packaging of pharmaceuticals services#73.15.16.00.00
-unspsc7#73.15.16.05.00#Point of purchase display packaging services#73.15.16.00.00
-unspsc7#73.15.16.06.00#Manual hand packaging services#73.15.16.00.00
-unspsc7#73.15.16.07.00#Machine assisted packaging services#73.15.16.00.00
-unspsc7#73.15.17.00.00#Material treatment#73.15.00.00.00
-unspsc7#73.15.17.01.00#Water proofing material treatment services#73.15.17.00.00
-unspsc7#73.15.17.02.00#Fire protection material treatment services#73.15.17.00.00
-unspsc7#73.15.17.03.00#Anticorrosion material treatment services#73.15.17.00.00
-unspsc7#73.15.18.00.00#Converting services#73.15.00.00.00
-unspsc7#73.15.18.01.00#Sheeting services#73.15.18.00.00
-unspsc7#73.15.18.02.00#Slitting services#73.15.18.00.00
-unspsc7#73.15.18.03.00#Die cutting services#73.15.18.00.00
-unspsc7#73.15.18.04.00#Folding services#73.15.18.00.00
-unspsc7#73.15.18.05.00#Laminating services#73.15.18.00.00
-unspsc7#73.15.19.00.00#Industrial printing services#73.15.00.00.00
-unspsc7#73.15.19.01.00#Flexographic industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.02.00#Rotogravure industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.03.00#Screen industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.04.00#Offset industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.05.00#Digital industrial printing services#73.15.19.00.00
-unspsc7#73.15.19.06.00#Thermal transfer industrial printing services#73.15.19.00.00
-unspsc7#73.15.20.00.00#Filling Services#73.15.00.00.00
-unspsc7#73.15.20.01.00#Liquid filling services#73.15.20.00.00
-unspsc7#73.15.20.02.00#Aerosol filling services#73.15.20.00.00
-unspsc7#73.15.20.03.00#Paste filling services#73.15.20.00.00
-unspsc7#73.15.20.04.00#Powder filling services#73.15.20.00.00
-unspsc7#73.15.21.00.00#Manufacturing equipment maintenance and repair services#73.15.00.00.00
-unspsc7#73.15.21.01.00#Manufacturing equipment maintenance services#73.15.21.00.00
-unspsc7#73.15.21.02.00#Manufacturing equipment repair services#73.15.21.00.00
-unspsc7#73.16.00.00.00#Machinery and transport equipment manufacture#73.00.00.00.00
-unspsc7#73.16.15.00.00#Manufacture of machinery#73.16.00.00.00
-unspsc7#73.16.15.01.00#Engine or turbine manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.02.00#Agricultural machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.03.00#Machine tools or metal or wood working manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.04.00#Special industrial plants or machinery manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.05.00#Construction machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.06.00#Mining machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.07.00#Food products machinery or equipment manufacturing services#73.16.15.00.00
-unspsc7#73.16.15.08.00#Paper printing machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.09.00#Metallurgical machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.10.00#Chemical or pharmaceutical machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.11.00#Cement plant machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.12.00#Textile machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.13.00#Power plant boilers manufacture services#73.16.15.00.00
-unspsc7#73.16.15.14.00#Furnaces or ovens manufacture services#73.16.15.00.00
-unspsc7#73.16.15.15.00#Office machinery or equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.16.00#Lifting or hoisting or conveying equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.17.00#Air conditioning or ventilating or refrigeration equipment manufacture services#73.16.15.00.00
-unspsc7#73.16.15.18.00#Domestic appliances or machines except electrical manufacture services#73.16.15.00.00
-unspsc7#73.16.15.19.00#Pumps or compressors manufacture services#73.16.15.00.00
-unspsc7#73.16.16.00.00#Manufacture of transport equipment#73.16.00.00.00
-unspsc7#73.16.16.01.00#Fishing ship or boat building services#73.16.16.00.00
-unspsc7#73.16.16.02.00#Railroad rolling stock manufacture services#73.16.16.00.00
-unspsc7#73.16.16.03.00#Locomotive manufacture services#73.16.16.00.00
-unspsc7#73.16.16.04.00#Motor vehicles manufacture services#73.16.16.00.00
-unspsc7#73.16.16.05.00#Motor vehicles parts or accessories manufacture services#73.16.16.00.00
-unspsc7#73.16.16.06.00#Motorcycle or bicycle manufacture services#73.16.16.00.00
-unspsc7#73.16.16.07.00#Air or spacecraft manufacture services#73.16.16.00.00
-unspsc7#73.17.00.00.00#Manufacture of electrical goods and precision instruments#73.00.00.00.00
-unspsc7#73.17.15.00.00#Manufacture of electrical goods#73.17.00.00.00
-unspsc7#73.17.15.01.00#Power generation or transmission or distribution equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.02.00#Dry or storage battery manufacture services#73.17.15.00.00
-unspsc7#73.17.15.03.00#Electrical tools manufacture services#73.17.15.00.00
-unspsc7#73.17.15.04.00#Measuring or testing instruments manufacture services#73.17.15.00.00
-unspsc7#73.17.15.05.00#Radio or television manufacture services#73.17.15.00.00
-unspsc7#73.17.15.06.00#Communication equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.07.00#Electrical household appliances manufacture services#73.17.15.00.00
-unspsc7#73.17.15.08.00#Insulated wire or cable manufacture services#73.17.15.00.00
-unspsc7#73.17.15.09.00#Electrical accessories manufacture services#73.17.15.00.00
-unspsc7#73.17.15.10.00#Electrical accessories or supplies manufacture services#73.17.15.00.00
-unspsc7#73.17.15.11.00#Electronic equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.15.12.00#Electronic computers or data processing equipment manufacture services#73.17.15.00.00
-unspsc7#73.17.16.00.00#Manufacture of precision instruments#73.17.00.00.00
-unspsc7#73.17.16.01.00#Scientific instruments or measuring equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.02.00#Medical or dental equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.03.00#Photographic or optical equipment manufacture services#73.17.16.00.00
-unspsc7#73.17.16.04.00#Watches or clocks manufacture services#73.17.16.00.00
-unspsc7#73.17.16.05.00#Laboratory equipment manufacture services#73.17.16.00.00
-unspsc7#73.18.00.00.00#Machining and processing services#73.00.00.00.00
-unspsc7#73.18.10.00.00#Machining services#73.18.00.00.00
-unspsc7#73.18.10.01.00#Turning services#73.18.10.00.00
-unspsc7#73.18.10.02.00#Electro discharge machining (EDM) services#73.18.10.00.00
-unspsc7#73.18.10.03.00#Electro chemical machining (ECM) services#73.18.10.00.00
-unspsc7#73.18.10.04.00#Chem milling services#73.18.10.00.00
-unspsc7#73.18.10.05.00#Punching services#73.18.10.00.00
-unspsc7#73.18.10.06.00#Stamping services#73.18.10.00.00
-unspsc7#73.18.10.07.00#Boring services#73.18.10.00.00
-unspsc7#73.18.10.08.00#Drilling services#73.18.10.00.00
-unspsc7#73.18.10.09.00#Tapping services#73.18.10.00.00
-unspsc7#73.18.10.10.00#Laser services#73.18.10.00.00
-unspsc7#73.18.10.11.00#Bending services#73.18.10.00.00
-unspsc7#73.18.10.12.00#Grinding services#73.18.10.00.00
-unspsc7#73.18.10.13.00#Shot blasting services#73.18.10.00.00
-unspsc7#73.18.10.14.00#Polishing services#73.18.10.00.00
-unspsc7#73.18.10.15.00#Flame cutting services#73.18.10.00.00
-unspsc7#73.18.10.16.00#Laser cutting services#73.18.10.00.00
-unspsc7#73.18.10.17.00#Plasma cutting services#73.18.10.00.00
-unspsc7#73.18.10.18.00#Water jet cutting services#73.18.10.00.00
-unspsc7#73.18.10.19.00#Rolling Services#73.18.10.00.00
-unspsc7#73.18.10.20.00#Surface treatment services#73.18.10.00.00
-unspsc7#73.18.10.21.00#Milling services#73.18.10.00.00
-unspsc7#73.18.10.22.00#Spraying services#73.18.10.00.00
-unspsc7#73.18.10.23.00#Sharpening service#73.18.10.00.00
-unspsc7#73.18.11.00.00#Coating services#73.18.00.00.00
-unspsc7#73.18.11.01.00#Electro coating services#73.18.11.00.00
-unspsc7#73.18.11.02.00#Dipping services#73.18.11.00.00
-unspsc7#73.18.11.03.00#Wrapping services#73.18.11.00.00
-unspsc7#73.18.11.04.00#Painting services#73.18.11.00.00
-unspsc7#73.18.11.05.00#Web coating services#73.18.11.00.00
-unspsc7#73.18.11.06.00#Plating services#73.18.11.00.00
-unspsc7#73.18.12.00.00#Forming services#73.18.00.00.00
-unspsc7#73.18.12.01.00#Draw forming services#73.18.12.00.00
-unspsc7#73.18.12.02.00#Hydro forming services#73.18.12.00.00
-unspsc7#73.18.12.03.00#Roll forming services#73.18.12.00.00
-unspsc7#73.18.12.04.00#Stretch forming services#73.18.12.00.00
-unspsc7#73.18.12.05.00#Spin forming services#73.18.12.00.00
-unspsc7#73.18.12.06.00#Explosive forming services#73.18.12.00.00
-unspsc7#73.18.13.00.00#Heat treatment services#73.18.00.00.00
-unspsc7#73.18.13.01.00#Quench and temper services#73.18.13.00.00
-unspsc7#73.18.13.02.00#Annealing services#73.18.13.00.00
-unspsc7#73.18.13.03.00#Normalizing services#73.18.13.00.00
-unspsc7#73.18.13.04.00#Aging or stabilizing services#73.18.13.00.00
-unspsc7#73.18.19.00.00#Welding and brazing and soldering services#73.18.00.00.00
-unspsc7#73.18.19.01.00#Arc welding services#73.18.19.00.00
-unspsc7#73.18.19.02.00#Metal inert gas (MIG) welding services#73.18.19.00.00
-unspsc7#73.18.19.03.00#Tungsten inert gas (TIG) welding services#73.18.19.00.00
-unspsc7#73.18.19.04.00#Laser welding services#73.18.19.00.00
-unspsc7#73.18.19.05.00#Spot welding services#73.18.19.00.00
-unspsc7#73.18.19.06.00#Projection welding services#73.18.19.00.00
-unspsc7#73.18.19.07.00#Brazing services#73.18.19.00.00
-unspsc7#73.18.19.08.00#Soldering services#73.18.19.00.00
-unspsc7#76.00.00.00.00#Industrial Cleaning Services#76.00.00.00.00
-unspsc7#76.10.00.00.00#Decontamination services#76.00.00.00.00
-unspsc7#76.10.15.00.00#Disinfection#76.10.00.00.00
-unspsc7#76.10.15.01.00#Washroom sanitation services#76.10.15.00.00
-unspsc7#76.10.15.02.00#Rest room cleaning services#76.10.15.00.00
-unspsc7#76.10.15.03.00#Disinfection or deodorizing services#76.10.15.00.00
-unspsc7#76.10.16.00.00#Hazardous material decontamination#76.10.00.00.00
-unspsc7#76.10.16.01.00#Radioactive decontamination services#76.10.16.00.00
-unspsc7#76.10.16.02.00#Asbestos decontamination or removal#76.10.16.00.00
-unspsc7#76.11.00.00.00#Cleaning and janitorial services#76.00.00.00.00
-unspsc7#76.11.15.00.00#General building and office cleaning services#76.11.00.00.00
-unspsc7#76.11.15.01.00#Building cleaning services#76.11.15.00.00
-unspsc7#76.11.15.02.00#Building maintenance or repair services#76.11.15.00.00
-unspsc7#76.11.15.03.00#Lighting maintenance services#76.11.15.00.00
-unspsc7#76.11.15.04.00#Window or window blind cleaning services#76.11.15.00.00
-unspsc7#76.11.16.00.00#Building component cleaning services#76.11.00.00.00
-unspsc7#76.11.16.01.00#Acoustical tile or ceiling cleaning services#76.11.16.00.00
-unspsc7#76.11.16.02.00#Air duct cleaning#76.11.16.00.00
-unspsc7#76.11.16.03.00#Chimney cleaning#76.11.16.00.00
-unspsc7#76.11.16.04.00#Floor waxing or carpet cleaning#76.11.16.00.00
-unspsc7#76.11.16.05.00#Exhaust hood or fan clearing#76.11.16.00.00
-unspsc7#76.11.17.00.00#Building site clean up#76.11.00.00.00
-unspsc7#76.11.17.01.00#Construction site clean up services#76.11.17.00.00
-unspsc7#76.11.17.02.00#Construction site haul away services#76.11.17.00.00
-unspsc7#76.12.00.00.00#Refuse disposal and treatment#76.00.00.00.00
-unspsc7#76.12.15.00.00#Refuse collection and disposal#76.12.00.00.00
-unspsc7#76.12.15.01.00#Garbage collection or destruction or processing or disposal#76.12.15.00.00
-unspsc7#76.12.15.02.00#Liquid waste collection or processing or disposal#76.12.15.00.00
-unspsc7#76.12.15.03.00#Street cleaning services#76.12.15.00.00
-unspsc7#76.12.16.00.00#Nonhazardous waste disposal#76.12.00.00.00
-unspsc7#76.12.16.01.00#Garbage dump#76.12.16.00.00
-unspsc7#76.12.16.02.00#Sanitary landfill operations#76.12.16.00.00
-unspsc7#76.12.16.03.00#Sludge disposal#76.12.16.00.00
-unspsc7#76.12.16.04.00#Dead animal disposal services#76.12.16.00.00
-unspsc7#76.12.17.00.00#Liquid waste treatment#76.12.00.00.00
-unspsc7#76.12.17.01.00#Sewage treatment services#76.12.17.00.00
-unspsc7#76.12.17.02.00#Chemical treatment services#76.12.17.00.00
-unspsc7#76.12.18.00.00#Refuse treatment#76.12.00.00.00
-unspsc7#76.12.18.01.00#Recycling services#76.12.18.00.00
-unspsc7#76.12.19.00.00#Hazardous waste disposal#76.12.00.00.00
-unspsc7#76.12.19.01.00#Medical waste disposal#76.12.19.00.00
-unspsc7#76.12.19.02.00#Acid waste collection or disposal#76.12.19.00.00
-unspsc7#76.12.19.03.00#Chemical detoxification#76.12.19.00.00
-unspsc7#76.13.00.00.00#Toxic and hazardous waste cleanup#76.00.00.00.00
-unspsc7#76.13.15.00.00#Nuclear waste treatment#76.13.00.00.00
-unspsc7#76.13.15.01.00#Radioactive waste material treatment#76.13.15.00.00
-unspsc7#76.13.15.02.00#Radioactive containment services#76.13.15.00.00
-unspsc7#76.13.16.00.00#Toxic spill cleanup#76.13.00.00.00
-unspsc7#76.13.16.01.00#Toxic spill containment#76.13.16.00.00
-unspsc7#76.13.16.02.00#Toxic substances spill cleanup#76.13.16.00.00
-unspsc7#76.13.17.00.00#Oil spill cleanup#76.13.00.00.00
-unspsc7#76.13.17.01.00#Oil residue disposal or control services#76.13.17.00.00
-unspsc7#76.13.17.02.00#Oil spill treatment services#76.13.17.00.00
-unspsc7#77.00.00.00.00#Environmental Services#77.00.00.00.00
-unspsc7#77.10.00.00.00#Environmental management#77.00.00.00.00
-unspsc7#77.10.15.00.00#Environmental impact assessment#77.10.00.00.00
-unspsc7#77.10.15.01.00#Risk or hazard assessment#77.10.15.00.00
-unspsc7#77.10.15.02.00#Environmental standards#77.10.15.00.00
-unspsc7#77.10.15.03.00#Environmental indicators analysis#77.10.15.00.00
-unspsc7#77.10.15.04.00#Environmental impact assessment (EIA) services#77.10.15.00.00
-unspsc7#77.10.15.05.00#Environmental monitoring#77.10.15.00.00
-unspsc7#77.10.16.00.00#Environmental planning#77.10.00.00.00
-unspsc7#77.10.16.01.00#Urban environmental development planning#77.10.16.00.00
-unspsc7#77.10.16.02.00#Forest conservation strategy planning#77.10.16.00.00
-unspsc7#77.10.16.03.00#Marine conservation strategy planning#77.10.16.00.00
-unspsc7#77.10.16.04.00#Natural resources management or conservation strategy planning services#77.10.16.00.00
-unspsc7#77.10.16.05.00#Environmental institution building or planning#77.10.16.00.00
-unspsc7#77.10.17.00.00#Environmental advisory services#77.10.00.00.00
-unspsc7#77.10.17.01.00#Environmental sciences advisory services#77.10.17.00.00
-unspsc7#77.10.17.02.00#Environmental chemistry advisory services#77.10.17.00.00
-unspsc7#77.10.17.03.00#Environmental ethics advisory services#77.10.17.00.00
-unspsc7#77.10.17.04.00#Environmental technology advisory services#77.10.17.00.00
-unspsc7#77.10.17.05.00#Environmental economics advisory services#77.10.17.00.00
-unspsc7#77.10.17.06.00#Environmental law advisory services#77.10.17.00.00
-unspsc7#77.10.17.07.00#Ecology advisory services#77.10.17.00.00
-unspsc7#77.10.18.00.00#Environmental auditing#77.10.00.00.00
-unspsc7#77.10.18.01.00#Environmental information systems#77.10.18.00.00
-unspsc7#77.10.18.02.00#Corporate environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.03.00#Sectoral environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.04.00#Activity specific environmental auditing services#77.10.18.00.00
-unspsc7#77.10.18.05.00#Environmental quality control services#77.10.18.00.00
-unspsc7#77.10.18.06.00#Environmental security control services#77.10.18.00.00
-unspsc7#77.10.19.00.00#Pollution investigation services#77.10.00.00.00
-unspsc7#77.10.19.01.00#Industrial site investigation#77.10.19.00.00
-unspsc7#77.10.19.02.00#Industrial waste site investigation#77.10.19.00.00
-unspsc7#77.10.19.03.00#Gasworks site investigation#77.10.19.00.00
-unspsc7#77.10.19.04.00#Chemical works or oil refinery waste site investigation#77.10.19.00.00
-unspsc7#77.10.19.05.00#Wood treatment plant site investigation#77.10.19.00.00
-unspsc7#77.10.19.06.00#Oil depot or terminal site investigation#77.10.19.00.00
-unspsc7#77.10.19.07.00#Dry cleaning plants site investigation#77.10.19.00.00
-unspsc7#77.10.19.08.00#Foundry site investigation#77.10.19.00.00
-unspsc7#77.10.19.09.00#Recycling plant site investigation#77.10.19.00.00
-unspsc7#77.10.19.10.00#Food processing plant site investigation#77.10.19.00.00
-unspsc7#77.11.00.00.00#Environmental protection#77.00.00.00.00
-unspsc7#77.11.15.00.00#Environmental safety services#77.11.00.00.00
-unspsc7#77.11.15.01.00#Landscape protection services#77.11.15.00.00
-unspsc7#77.11.15.02.00#Ozone protection services#77.11.15.00.00
-unspsc7#77.11.15.03.00#Food or feed contamination protection services#77.11.15.00.00
-unspsc7#77.11.15.04.00#Genetic resources protection services#77.11.15.00.00
-unspsc7#77.11.15.05.00#Toxic substances protection services#77.11.15.00.00
-unspsc7#77.11.15.06.00#Radiation protection services#77.11.15.00.00
-unspsc7#77.11.15.07.00#Endangered species protection services#77.11.15.00.00
-unspsc7#77.11.15.08.00#Natural risks or hazards protection services#77.11.15.00.00
-unspsc7#77.11.16.00.00#Environmental rehabilitation#77.11.00.00.00
-unspsc7#77.11.16.01.00#Industrial site rehabilitation#77.11.16.00.00
-unspsc7#77.11.16.02.00#Environmental decontamination services#77.11.16.00.00
-unspsc7#77.11.16.03.00#Land reclamation services#77.11.16.00.00
-unspsc7#77.12.00.00.00#Pollution tracking and monitoring and rehabilitation#77.00.00.00.00
-unspsc7#77.12.15.00.00#Air pollution#77.12.00.00.00
-unspsc7#77.12.15.01.00#Air quality management#77.12.15.00.00
-unspsc7#77.12.15.02.00#Transboundary air pollution management or control services#77.12.15.00.00
-unspsc7#77.12.15.03.00#Air pollution protection services#77.12.15.00.00
-unspsc7#77.12.15.04.00#Air pollution monitoring or measurement services#77.12.15.00.00
-unspsc7#77.12.15.05.00#Toxic gas detection services#77.12.15.00.00
-unspsc7#77.12.15.06.00#Methane monitoring#77.12.15.00.00
-unspsc7#77.12.15.07.00#Carbon dioxide monitoring services#77.12.15.00.00
-unspsc7#77.12.15.08.00#Airborne particle monitoring#77.12.15.00.00
-unspsc7#77.12.15.09.00#Ozone depletion monitoring services#77.12.15.00.00
-unspsc7#77.12.16.00.00#Soil pollution#77.12.00.00.00
-unspsc7#77.12.16.01.00#Soil pollution protection services#77.12.16.00.00
-unspsc7#77.12.16.02.00#Polluted soil removal services#77.12.16.00.00
-unspsc7#77.12.16.03.00#Polluted soil treatment or rehabilitation#77.12.16.00.00
-unspsc7#77.12.16.04.00#Soil pollution advisory services#77.12.16.00.00
-unspsc7#77.12.16.05.00#Soil pollution mapping#77.12.16.00.00
-unspsc7#77.12.16.06.00#Soil pollution measurement or monitoring#77.12.16.00.00
-unspsc7#77.12.16.07.00#Organic fertilizer pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.08.00#Pesticides pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.09.00#Nitrates pollution assessment#77.12.16.00.00
-unspsc7#77.12.16.10.00#Phosphates pollution assessment#77.12.16.00.00
-unspsc7#77.12.17.00.00#Water pollution#77.12.00.00.00
-unspsc7#77.12.17.01.00#Surface water pollution monitoring or control services#77.12.17.00.00
-unspsc7#77.12.17.02.00#Surface water pollution rehabilitation services#77.12.17.00.00
-unspsc7#77.12.17.03.00#Surface water pollution protection services#77.12.17.00.00
-unspsc7#77.12.17.04.00#Surface water treatment services#77.12.17.00.00
-unspsc7#77.12.17.05.00#Surface water pollution drainage services#77.12.17.00.00
-unspsc7#77.12.17.06.00#Transboundary water pollution management or control services#77.12.17.00.00
-unspsc7#77.12.17.07.00#Groundwater pollution monitoring or control services#77.12.17.00.00
-unspsc7#77.12.17.08.00#Groundwater pollution drainage services#77.12.17.00.00
-unspsc7#77.12.17.09.00#Groundwater pollution treatment or rehabilitation#77.12.17.00.00
-unspsc7#77.13.00.00.00#Pollutants tracking and monitoring and rehabilitation services#77.00.00.00.00
-unspsc7#77.13.15.00.00#Oil pollution#77.13.00.00.00
-unspsc7#77.13.15.01.00#Oil spillage monitoring services#77.13.15.00.00
-unspsc7#77.13.15.02.00#Oil spillage control services#77.13.15.00.00
-unspsc7#77.13.15.03.00#Oil spillage rehabilitation services#77.13.15.00.00
-unspsc7#77.13.16.00.00#Noise pollution#77.13.00.00.00
-unspsc7#77.13.16.01.00#Noise control services#77.13.16.00.00
-unspsc7#77.13.16.02.00#Noise pollution protection services#77.13.16.00.00
-unspsc7#77.13.16.03.00#Noise pollution monitoring services#77.13.16.00.00
-unspsc7#77.13.16.04.00#Noise pollution advisory services#77.13.16.00.00
-unspsc7#77.13.17.00.00#Toxic substances pollution#77.13.00.00.00
-unspsc7#77.13.17.01.00#Toxic substances monitoring services#77.13.17.00.00
-unspsc7#77.13.17.02.00#Toxic substances rehabilitation services#77.13.17.00.00
-unspsc7#78.00.00.00.00#Transportation and Storage and Mail Services#78.00.00.00.00
-unspsc7#78.10.00.00.00#Mail and cargo transport#78.00.00.00.00
-unspsc7#78.10.15.00.00#Air cargo transport#78.10.00.00.00
-unspsc7#78.10.15.01.00#Domestic air cargo tranposrt#78.10.15.00.00
-unspsc7#78.10.15.02.00#International air cargo transport#78.10.15.00.00
-unspsc7#78.10.15.03.00#Armored air transport#78.10.15.00.00
-unspsc7#78.10.16.00.00#Rail cargo transport#78.10.00.00.00
-unspsc7#78.10.16.01.00#Boxcar transport services#78.10.16.00.00
-unspsc7#78.10.16.02.00#Bulk cargo rail trasnport services#78.10.16.00.00
-unspsc7#78.10.16.03.00#Livestock rail transport#78.10.16.00.00
-unspsc7#78.10.16.04.00#Vehicle transport services#78.10.16.00.00
-unspsc7#78.10.17.00.00#Marine cargo transport#78.10.00.00.00
-unspsc7#78.10.17.01.00#Domestic vessel transport services#78.10.17.00.00
-unspsc7#78.10.17.02.00#International vessel transport services#78.10.17.00.00
-unspsc7#78.10.17.03.00#Domestic barge transport services#78.10.17.00.00
-unspsc7#78.10.17.04.00#International barge transport services#78.10.17.00.00
-unspsc7#78.10.17.05.00#Armored marine transport#78.10.17.00.00
-unspsc7#78.10.18.00.00#Road cargo transport#78.10.00.00.00
-unspsc7#78.10.18.01.00#Local area trucking services#78.10.18.00.00
-unspsc7#78.10.18.02.00#Regional or national trucking services#78.10.18.00.00
-unspsc7#78.10.18.03.00#Vehicle carrier services#78.10.18.00.00
-unspsc7#78.10.18.04.00#Relocation services#78.10.18.00.00
-unspsc7#78.10.19.00.00#Intermodal cargo transport#78.10.00.00.00
-unspsc7#78.10.19.01.00#Air to ocean transportation#78.10.19.00.00
-unspsc7#78.10.19.02.00#Ocean to rail transportation#78.10.19.00.00
-unspsc7#78.10.19.03.00#Ocean to truck transportation#78.10.19.00.00
-unspsc7#78.10.19.04.00#Air to truck transport#78.10.19.00.00
-unspsc7#78.10.19.05.00#Rail truck transportation#78.10.19.00.00
-unspsc7#78.10.20.00.00#Spacecraft cargo transport#78.10.00.00.00
-unspsc7#78.10.20.01.00#Satellite launch services#78.10.20.00.00
-unspsc7#78.10.20.02.00#Experimental payload services#78.10.20.00.00
-unspsc7#78.10.21.00.00#Pipeline services#78.10.00.00.00
-unspsc7#78.10.21.01.00#Petroleum products transport#78.10.21.00.00
-unspsc7#78.10.21.02.00#Water transport#78.10.21.00.00
-unspsc7#78.10.22.00.00#Postal and small parcel and courier services#78.10.00.00.00
-unspsc7#78.10.22.01.00#National postal delivery services#78.10.22.00.00
-unspsc7#78.10.22.02.00#Post office box services#78.10.22.00.00
-unspsc7#78.10.22.03.00#Mailing or mail pick up or delivery services#78.10.22.00.00
-unspsc7#78.10.22.04.00#Letter or small parcel worldwide delivery services#78.10.22.00.00
-unspsc7#78.10.22.05.00#Letter or small parcel local delivery services#78.10.22.00.00
-unspsc7#78.10.22.06.00#Bicycle or scooter messenger servcies#78.10.22.00.00
-unspsc7#78.11.00.00.00#Passenger transport#78.00.00.00.00
-unspsc7#78.11.15.00.00#Air transportation#78.11.00.00.00
-unspsc7#78.11.15.01.00#Helicopter services#78.11.15.00.00
-unspsc7#78.11.15.02.00#Commercial airplane travel#78.11.15.00.00
-unspsc7#78.11.15.03.00#Chartered airplane travel#78.11.15.00.00
-unspsc7#78.11.16.00.00#Railway transportation#78.11.00.00.00
-unspsc7#78.11.16.01.00#Light rail vehicle transport (LRV) services#78.11.16.00.00
-unspsc7#78.11.16.02.00#Subway transport#78.11.16.00.00
-unspsc7#78.11.16.03.00#Continental or inter continental rail services#78.11.16.00.00
-unspsc7#78.11.17.00.00#Marine transportation#78.11.00.00.00
-unspsc7#78.11.17.01.00#Water taxis#78.11.17.00.00
-unspsc7#78.11.17.02.00#Overnight ship cruises#78.11.17.00.00
-unspsc7#78.11.17.03.00#Sightseeing boat excursions#78.11.17.00.00
-unspsc7#78.11.18.00.00#Road transportation#78.11.00.00.00
-unspsc7#78.11.18.01.00#Car rental services#78.11.18.00.00
-unspsc7#78.11.18.02.00#Scheduled bus services#78.11.18.00.00
-unspsc7#78.11.18.03.00#Chartered bus services#78.11.18.00.00
-unspsc7#78.11.18.04.00#Taxicab services#78.11.18.00.00
-unspsc7#78.11.18.05.00#Transportation maintenance#78.11.18.00.00
-unspsc7#78.11.18.06.00#Vehicle rental or leasing#78.11.18.00.00
-unspsc7#78.11.19.00.00#Space transportation#78.11.00.00.00
-unspsc7#78.11.19.01.00#Experimental or educational missions#78.11.19.00.00
-unspsc7#78.12.00.00.00#Material packing and handling#78.00.00.00.00
-unspsc7#78.12.15.00.00#Packing#78.12.00.00.00
-unspsc7#78.12.15.01.00#Containerization of goods#78.12.15.00.00
-unspsc7#78.12.15.02.00#Crating services#78.12.15.00.00
-unspsc7#78.12.16.00.00#Material handling services#78.12.00.00.00
-unspsc7#78.12.16.01.00#Freight loading or unloading#78.12.16.00.00
-unspsc7#78.12.16.02.00#Weighing services#78.12.16.00.00
-unspsc7#78.13.00.00.00#Storage#78.00.00.00.00
-unspsc7#78.13.15.00.00#Farm products warehousing#78.13.00.00.00
-unspsc7#78.13.15.01.00#Silo services#78.13.15.00.00
-unspsc7#78.13.15.02.00#Grain elevator services#78.13.15.00.00
-unspsc7#78.13.16.00.00#General goods storage#78.13.00.00.00
-unspsc7#78.13.16.01.00#Palletized cargo storage#78.13.16.00.00
-unspsc7#78.13.16.02.00#File archive storage#78.13.16.00.00
-unspsc7#78.13.17.00.00#Bulk storage#78.13.00.00.00
-unspsc7#78.13.17.01.00#In ground storage services#78.13.17.00.00
-unspsc7#78.13.18.00.00#Specialized warehousing and storage#78.13.00.00.00
-unspsc7#78.13.18.01.00#Refrigerated storage#78.13.18.00.00
-unspsc7#78.13.18.02.00#Customs bonded storage services#78.13.18.00.00
-unspsc7#78.13.18.03.00#Hazardous materials storage#78.13.18.00.00
-unspsc7#78.13.18.04.00#Document storage services#78.13.18.00.00
-unspsc7#78.14.00.00.00#Transport operations#78.00.00.00.00
-unspsc7#78.14.15.00.00#Transport arrangements#78.14.00.00.00
-unspsc7#78.14.15.01.00#Freight forwarders services#78.14.15.00.00
-unspsc7#78.14.15.02.00#Customs brokerage services#78.14.15.00.00
-unspsc7#78.14.15.03.00#Transportation industry tariff comparison or freight audit services#78.14.15.00.00
-unspsc7#78.14.16.00.00#Inspection#78.14.00.00.00
-unspsc7#78.14.16.01.00#Packing inspection services#78.14.16.00.00
-unspsc7#78.14.16.02.00#Cargo survey services#78.14.16.00.00
-unspsc7#78.14.16.03.00#Pest control inspections#78.14.16.00.00
-unspsc7#78.14.17.00.00#Navigational services#78.14.00.00.00
-unspsc7#78.14.17.01.00#Tugboat services#78.14.17.00.00
-unspsc7#78.14.17.02.00#Drawbridge operations#78.14.17.00.00
-unspsc7#78.14.18.00.00#Terminal services#78.14.00.00.00
-unspsc7#78.14.18.01.00#Stevedoring services#78.14.18.00.00
-unspsc7#78.14.18.02.00#Vessel docking services#78.14.18.00.00
-unspsc7#78.14.18.03.00#Vessel stores services#78.14.18.00.00
-unspsc7#78.14.18.04.00#Parking structures#78.14.18.00.00
-unspsc7#78.15.00.00.00#Transport industry support and maintenance and repair services#78.00.00.00.00
-unspsc7#78.15.01.00.00#Panel and paint services#78.15.00.00.00
-unspsc7#78.15.01.01.00#Panelbeating services#78.15.01.00.00
-unspsc7#78.15.02.00.00#Transport fuelling and vehicle storage and support services#78.15.00.00.00
-unspsc7#78.15.02.01.00#Fuelling of vehicles#78.15.02.00.00
-unspsc7#78.15.02.02.00#Transportation storage#78.15.02.00.00
-unspsc7#78.16.00.00.00#Panel and paint services#78.00.00.00.00
-unspsc7#78.17.00.00.00#Panelbeating services#78.00.00.00.00
-unspsc7#78.18.00.00.00#Transportation or vehicle repair services#78.00.00.00.00
-unspsc7#78.18.01.00.00#Vehicle repair services#78.18.00.00.00
-unspsc7#78.18.01.01.00#Vehicle body repair or painting services#78.18.01.00.00
-unspsc7#78.18.01.02.00#Transmission repair#78.18.01.00.00
-unspsc7#78.19.00.00.00#Vehicle repair services#78.00.00.00.00
-unspsc7#78.19.11.00.00#Vehicle body repair or painting services#78.19.00.00.00
-unspsc7#78.19.12.00.00#Transmission repair#78.19.00.00.00
-unspsc7#80.00.00.00.00#Management and Business Professionals and Administrative Services#80.00.00.00.00
-unspsc7#80.10.00.00.00#Management advisory services#80.00.00.00.00
-unspsc7#80.10.15.00.00#Business and corporate management#80.10.00.00.00
-unspsc7#80.10.15.01.00#New business start up consultation services#80.10.15.00.00
-unspsc7#80.10.15.02.00#Corporate mergers consultation services#80.10.15.00.00
-unspsc7#80.10.15.03.00#Corporate divestiture consultation services#80.10.15.00.00
-unspsc7#80.10.15.04.00#Strategic planning consultation services#80.10.15.00.00
-unspsc7#80.10.15.05.00#Corporate objectives or policy development#80.10.15.00.00
-unspsc7#80.10.15.06.00#Organizational structure consultation#80.10.15.00.00
-unspsc7#80.10.15.07.00#Information technology consultation services#80.10.15.00.00
-unspsc7#80.10.16.00.00#Project management#80.10.00.00.00
-unspsc7#80.10.16.01.00#Feasibility studies or screening of project ideas#80.10.16.00.00
-unspsc7#80.10.16.02.00#Regional or location studies for projects#80.10.16.00.00
-unspsc7#80.10.16.03.00#Economic or financial evaluation of projects#80.10.16.00.00
-unspsc7#80.10.16.04.00#Project administration or planning#80.10.16.00.00
-unspsc7#80.10.17.00.00#Industrial management#80.10.00.00.00
-unspsc7#80.10.17.01.00#Factory management services#80.10.17.00.00
-unspsc7#80.10.17.02.00#Productivity or efficiency studies or implementation#80.10.17.00.00
-unspsc7#80.10.17.03.00#Specification standardization services#80.10.17.00.00
-unspsc7#80.10.17.04.00#Supply chain analysis or re engineering services#80.10.17.00.00
-unspsc7#80.10.17.05.00#Co operative or consortium services#80.10.17.00.00
-unspsc7#80.10.17.06.00#Professional procurement services#80.10.17.00.00
-unspsc7#80.11.00.00.00#Human resources services#80.00.00.00.00
-unspsc7#80.11.15.00.00#Human resource development#80.11.00.00.00
-unspsc7#80.11.15.01.00#Management development#80.11.15.00.00
-unspsc7#80.11.15.02.00#Compensation or benefits planning#80.11.15.00.00
-unspsc7#80.11.15.03.00#Labor or union relations#80.11.15.00.00
-unspsc7#80.11.15.04.00#Labor training or development#80.11.15.00.00
-unspsc7#80.11.15.05.00#Human resources productivity audits#80.11.15.00.00
-unspsc7#80.11.15.06.00#Personnel relocation#80.11.15.00.00
-unspsc7#80.11.16.00.00#Temporary personnel services#80.11.00.00.00
-unspsc7#80.11.16.01.00#Temporary clerical or adminstrative assistance#80.11.16.00.00
-unspsc7#80.11.16.02.00#Temporary marketing staff needs#80.11.16.00.00
-unspsc7#80.11.16.03.00#Temporary production staffing needs#80.11.16.00.00
-unspsc7#80.11.16.04.00#Temporary technician staffing needs#80.11.16.00.00
-unspsc7#80.11.16.05.00#Temporary financial staffing needs#80.11.16.00.00
-unspsc7#80.11.16.06.00#Temporary medical staffing needs#80.11.16.00.00
-unspsc7#80.11.16.07.00#Temporary legal staffing needs#80.11.16.00.00
-unspsc7#80.11.16.08.00#Temporary information technology software developers#80.11.16.00.00
-unspsc7#80.11.16.09.00#Temporary information technology systems or database administrators#80.11.16.00.00
-unspsc7#80.11.16.10.00#Temporary information technology networking specialists#80.11.16.00.00
-unspsc7#80.11.16.11.00#Temporary warehouse staff#80.11.16.00.00
-unspsc7#80.11.16.12.00#Temporary drivers#80.11.16.00.00
-unspsc7#80.11.16.13.00#Temporary manual labor#80.11.16.00.00
-unspsc7#80.11.16.14.00#Temporary professional staff#80.11.16.00.00
-unspsc7#80.11.16.15.00#Temporary machinist personnel#80.11.16.00.00
-unspsc7#80.11.17.00.00#Personnel recruitment#80.11.00.00.00
-unspsc7#80.11.17.01.00#Staff recruiting services#80.11.17.00.00
-unspsc7#80.11.17.02.00#Reference or background check services#80.11.17.00.00
-unspsc7#80.11.17.03.00#Resume or curriculum vitae screening services#80.11.17.00.00
-unspsc7#80.11.18.00.00#Information technology contractors#80.11.00.00.00
-unspsc7#80.11.18.01.00#Temporary information technology contractors#80.11.18.00.00
-unspsc7#80.12.00.00.00#Legal services#80.00.00.00.00
-unspsc7#80.12.15.00.00#Criminal law services#80.12.00.00.00
-unspsc7#80.12.15.01.00#Juvenile justice law services#80.12.15.00.00
-unspsc7#80.12.15.02.00#Appellate procedure services#80.12.15.00.00
-unspsc7#80.12.15.03.00#Defense or criminal law services#80.12.15.00.00
-unspsc7#80.12.16.00.00#Business law services#80.12.00.00.00
-unspsc7#80.12.16.01.00#Government antitrust or regulations law services#80.12.16.00.00
-unspsc7#80.12.16.02.00#Bankruptcy law services#80.12.16.00.00
-unspsc7#80.12.16.03.00#Partnership law#80.12.16.00.00
-unspsc7#80.12.16.04.00#Patent or trademark or copyright law#80.12.16.00.00
-unspsc7#80.12.16.05.00#Liquidation law services#80.12.16.00.00
-unspsc7#80.12.16.06.00#Real estate law#80.12.16.00.00
-unspsc7#80.12.16.07.00#Taxation law#80.12.16.00.00
-unspsc7#80.12.16.08.00#Mergers or acquisitions law#80.12.16.00.00
-unspsc7#80.12.16.09.00#Legal research services#80.12.16.00.00
-unspsc7#80.12.16.10.00#Debt collection law services#80.12.16.00.00
-unspsc7#80.12.17.00.00#Civil liability services#80.12.00.00.00
-unspsc7#80.12.17.01.00#Malpractice or negligence law services#80.12.17.00.00
-unspsc7#80.12.17.02.00#Personal injury law services#80.12.17.00.00
-unspsc7#80.12.17.03.00#Property law services#80.12.17.00.00
-unspsc7#80.12.17.04.00#Contract law services#80.12.17.00.00
-unspsc7#80.12.18.00.00#Family law services#80.12.00.00.00
-unspsc7#80.12.18.01.00#Divorce law services#80.12.18.00.00
-unspsc7#80.12.18.02.00#Adoption law services#80.12.18.00.00
-unspsc7#80.12.18.03.00#Immigration or naturalization law#80.12.18.00.00
-unspsc7#80.12.18.04.00#Guardianship or custody law services#80.12.18.00.00
-unspsc7#80.13.00.00.00#Real estate services#80.00.00.00.00
-unspsc7#80.13.15.00.00#Lease and rental of property or building#80.13.00.00.00
-unspsc7#80.13.15.01.00#Residential rental#80.13.15.00.00
-unspsc7#80.13.15.02.00#Commercial or industrial facility rental#80.13.15.00.00
-unspsc7#80.13.15.03.00#Land leases#80.13.15.00.00
-unspsc7#80.13.16.00.00#Sale of property and building#80.13.00.00.00
-unspsc7#80.13.16.01.00#Real estate brokers or agents#80.13.16.00.00
-unspsc7#80.13.16.02.00#Real estate auction#80.13.16.00.00
-unspsc7#80.13.16.03.00#Sale of residential land#80.13.16.00.00
-unspsc7#80.13.16.04.00#Sale of commercial or industrial land#80.13.16.00.00
-unspsc7#80.13.16.05.00#Sale of commercial building#80.13.16.00.00
-unspsc7#80.13.17.00.00#Escrow and title services#80.13.00.00.00
-unspsc7#80.13.17.01.00#Title reconveyance services#80.13.17.00.00
-unspsc7#80.13.17.02.00#Title search services#80.13.17.00.00
-unspsc7#80.13.17.03.00#Escrow account services#80.13.17.00.00
-unspsc7#80.13.18.00.00#Real estate management services#80.13.00.00.00
-unspsc7#80.13.18.01.00#Property management#80.13.18.00.00
-unspsc7#80.13.18.02.00#Real estate appraisal services#80.13.18.00.00
-unspsc7#80.13.18.03.00#Real estate listing services#80.13.18.00.00
-unspsc7#80.14.00.00.00#Marketing and distribution#80.00.00.00.00
-unspsc7#80.14.15.00.00#Market research#80.14.00.00.00
-unspsc7#80.14.15.01.00#Marketing analysis#80.14.15.00.00
-unspsc7#80.14.15.02.00#Distributive or service trade statistics#80.14.15.00.00
-unspsc7#80.14.15.03.00#Commodity price forecasting#80.14.15.00.00
-unspsc7#80.14.15.04.00#Preparation of commodity market surveys#80.14.15.00.00
-unspsc7#80.14.15.05.00#Marketing plans#80.14.15.00.00
-unspsc7#80.14.15.06.00#Internet based market research#80.14.15.00.00
-unspsc7#80.14.16.00.00#Sales and business promotion activities#80.14.00.00.00
-unspsc7#80.14.16.01.00#Sales promotion services#80.14.16.00.00
-unspsc7#80.14.16.02.00#Public relation services#80.14.16.00.00
-unspsc7#80.14.16.03.00#Telemarketing#80.14.16.00.00
-unspsc7#80.14.16.04.00#Branding of product naming services#80.14.16.00.00
-unspsc7#80.14.16.05.00#Promotional merchandise#80.14.16.00.00
-unspsc7#80.14.16.06.00#Direct marketing fulfillment#80.14.16.00.00
-unspsc7#80.14.16.07.00#Events management#80.14.16.00.00
-unspsc7#80.14.16.08.00#Letter shop services#80.14.16.00.00
-unspsc7#80.14.16.09.00#Sponsorship of event or celebrity#80.14.16.00.00
-unspsc7#80.14.16.10.00#Close outs#80.14.16.00.00
-unspsc7#80.14.17.00.00#Distribution#80.14.00.00.00
-unspsc7#80.14.17.01.00#Direct sales services#80.14.17.00.00
-unspsc7#80.14.17.02.00#Wholesale distribution services#80.14.17.00.00
-unspsc7#80.14.17.03.00#Retail distribution services#80.14.17.00.00
-unspsc7#80.14.17.04.00#Franchise operations#80.14.17.00.00
-unspsc7#80.14.17.05.00#Auction services#80.14.17.00.00
-unspsc7#80.14.18.00.00#Mailing services#80.14.00.00.00
-unspsc7#80.14.18.01.00#Mailing list compilation services#80.14.18.00.00
-unspsc7#80.14.18.02.00#Mailing list management service#80.14.18.00.00
-unspsc7#80.14.18.03.00#Addressing service#80.14.18.00.00
-unspsc7#80.15.00.00.00#Trade policy and services#80.00.00.00.00
-unspsc7#80.15.15.00.00#Trade facilitation#80.15.00.00.00
-unspsc7#80.15.15.01.00#Commodity policy or projections services#80.15.15.00.00
-unspsc7#80.15.15.02.00#Trade expansion#80.15.15.00.00
-unspsc7#80.15.15.03.00#Trade information services#80.15.15.00.00
-unspsc7#80.15.15.04.00#Trade promotion services#80.15.15.00.00
-unspsc7#80.15.15.05.00#Multinational marketing enterprises#80.15.15.00.00
-unspsc7#80.15.16.00.00#International trade services#80.15.00.00.00
-unspsc7#80.15.16.01.00#Export development#80.15.16.00.00
-unspsc7#80.15.16.02.00#Import planning#80.15.16.00.00
-unspsc7#80.15.16.03.00#Export projections#80.15.16.00.00
-unspsc7#80.15.16.04.00#Import procurement services#80.15.16.00.00
-unspsc7#80.16.00.00.00#Business administration services#80.00.00.00.00
-unspsc7#80.16.15.00.00#Management support services#80.16.00.00.00
-unspsc7#80.16.15.01.00#Office administration or secretarial services#80.16.15.00.00
-unspsc7#80.16.15.02.00#Meeting planning services#80.16.15.00.00
-unspsc7#80.16.15.03.00#Keyboard entry services#80.16.15.00.00
-unspsc7#80.16.15.04.00#Clerical services#80.16.15.00.00
-unspsc7#80.16.15.05.00#Fleet management services#80.16.15.00.00
-unspsc7#80.16.15.06.00#Data archiving services#80.16.15.00.00
-unspsc7#80.16.15.07.00#Audio visual services#80.16.15.00.00
-unspsc7#80.16.16.00.00#Business facilities oversight#80.16.00.00.00
-unspsc7#80.16.16.01.00#Property managment services#80.16.16.00.00
-unspsc7#81.00.00.00.00#Engineering and Research and Technology Based Services#81.00.00.00.00
-unspsc7#81.10.00.00.00#Professional engineering services#81.00.00.00.00
-unspsc7#81.10.15.00.00#Civil engineering#81.10.00.00.00
-unspsc7#81.10.15.01.00#Well engineering#81.10.15.00.00
-unspsc7#81.10.15.02.00#Technical drawing#81.10.15.00.00
-unspsc7#81.10.15.03.00#Harbor or water ports engineering#81.10.15.00.00
-unspsc7#81.10.15.05.00#Structural engineering#81.10.15.00.00
-unspsc7#81.10.15.06.00#Naval architecture#81.10.15.00.00
-unspsc7#81.10.15.07.00#Dam engineering#81.10.15.00.00
-unspsc7#81.10.15.08.00#Architectural engineering#81.10.15.00.00
-unspsc7#81.10.15.09.00#Airport engineering#81.10.15.00.00
-unspsc7#81.10.15.10.00#Highway engineering#81.10.15.00.00
-unspsc7#81.10.15.11.00#Railway engineering#81.10.15.00.00
-unspsc7#81.10.16.00.00#Mechanical engineering#81.10.00.00.00
-unspsc7#81.10.16.01.00#Mechanical drawing#81.10.16.00.00
-unspsc7#81.10.16.02.00#Mechanical product enclosures design#81.10.16.00.00
-unspsc7#81.10.16.03.00#Machine tool design#81.10.16.00.00
-unspsc7#81.10.16.04.00#Power transmission design#81.10.16.00.00
-unspsc7#81.10.17.00.00#Electrical and electronic engineering#81.10.00.00.00
-unspsc7#81.10.17.01.00#Electrical engineering services#81.10.17.00.00
-unspsc7#81.10.17.02.00#Electronic circuit design#81.10.17.00.00
-unspsc7#81.10.18.00.00#Chemical engineering#81.10.00.00.00
-unspsc7#81.10.18.01.00#Plastics engineering#81.10.18.00.00
-unspsc7#81.10.19.00.00#Oil and gas engineering#81.10.00.00.00
-unspsc7#81.10.19.01.00#Drilling engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.19.02.00#Production engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.19.03.00#Reservoir engineering for oil or gas#81.10.19.00.00
-unspsc7#81.10.20.00.00#Mining engineering#81.10.00.00.00
-unspsc7#81.10.20.01.00#Hydraulic mining#81.10.20.00.00
-unspsc7#81.10.21.00.00#Ocean engineering#81.10.00.00.00
-unspsc7#81.10.21.01.00#Coastal engineering#81.10.21.00.00
-unspsc7#81.10.22.00.00#Transportation engineering#81.10.00.00.00
-unspsc7#81.10.22.01.00#Traffic engineering#81.10.22.00.00
-unspsc7#81.10.22.02.00#Urban transport network#81.10.22.00.00
-unspsc7#81.10.22.03.00#Inland waterways#81.10.22.00.00
-unspsc7#81.10.23.00.00#Aeronautical engineering#81.10.00.00.00
-unspsc7#81.10.23.01.00#Avionics design#81.10.23.00.00
-unspsc7#81.10.24.00.00#Avionics design#81.10.00.00.00
-unspsc7#81.11.00.00.00#Computer services#81.00.00.00.00
-unspsc7#81.11.15.00.00#Software or hardware engineering#81.11.00.00.00
-unspsc7#81.11.15.01.00#Mainframe software applications design#81.11.15.00.00
-unspsc7#81.11.15.02.00#Personal computer (PC) application design#81.11.15.00.00
-unspsc7#81.11.15.03.00#Systems integration design#81.11.15.00.00
-unspsc7#81.11.15.04.00#Application programming services#81.11.15.00.00
-unspsc7#81.11.15.05.00#Operating system programming services#81.11.15.00.00
-unspsc7#81.11.15.06.00#Client or server programming services#81.11.15.00.00
-unspsc7#81.11.15.07.00#ERP or database applications programming services#81.11.15.00.00
-unspsc7#81.11.15.08.00#Application implementation services#81.11.15.00.00
-unspsc7#81.11.15.09.00#Internet or intranet client application development services#81.11.15.00.00
-unspsc7#81.11.15.10.00#Internet or intranet server application development services#81.11.15.00.00
-unspsc7#81.11.15.11.00#Human resources productivity audits#81.11.15.00.00
-unspsc7#81.11.16.00.00#Computer programmers#81.11.00.00.00
-unspsc7#81.11.16.01.00#Programming for Visual Basic#81.11.16.00.00
-unspsc7#81.11.16.02.00#Programming for Java#81.11.16.00.00
-unspsc7#81.11.16.03.00#Programming for HTML#81.11.16.00.00
-unspsc7#81.11.16.04.00#Programming for ALGOL#81.11.16.00.00
-unspsc7#81.11.16.05.00#Programming for Assembler#81.11.16.00.00
-unspsc7#81.11.16.06.00#Programming for Basic#81.11.16.00.00
-unspsc7#81.11.16.07.00#Programming for C or C++#81.11.16.00.00
-unspsc7#81.11.16.08.00#Programming for COBOL#81.11.16.00.00
-unspsc7#81.11.16.09.00#Programming for FORTRAN#81.11.16.00.00
-unspsc7#81.11.16.10.00#Programming for Pascal#81.11.16.00.00
-unspsc7#81.11.16.11.00#Programming for PL/1#81.11.16.00.00
-unspsc7#81.11.16.12.00#Programming or Proprietary Languages#81.11.16.00.00
-unspsc7#81.11.17.00.00#Management information systems (MIS)#81.11.00.00.00
-unspsc7#81.11.17.01.00#Wide area network communications design#81.11.17.00.00
-unspsc7#81.11.17.02.00#Local area network communications design#81.11.17.00.00
-unspsc7#81.11.17.03.00#Electronic data interchange (EDI) design#81.11.17.00.00
-unspsc7#81.11.17.04.00#Database design#81.11.17.00.00
-unspsc7#81.11.17.05.00#Systems architecture#81.11.17.00.00
-unspsc7#81.11.18.00.00#System administrators#81.11.00.00.00
-unspsc7#81.11.18.01.00#Computer or network or internet security#81.11.18.00.00
-unspsc7#81.11.18.02.00#Mainframe administration services#81.11.18.00.00
-unspsc7#81.11.18.03.00#Local area network (LAN) maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.04.00#Wide area network (WAN) maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.05.00#Proprietary or licensed systems maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.06.00#Database analysis#81.11.18.00.00
-unspsc7#81.11.18.07.00#Data storage#81.11.18.00.00
-unspsc7#81.11.18.08.00#Systems analysis#81.11.18.00.00
-unspsc7#81.11.18.09.00#System installation#81.11.18.00.00
-unspsc7#81.11.18.10.00#Software coding#81.11.18.00.00
-unspsc7#81.11.18.11.00#Technical support or help desk services#81.11.18.00.00
-unspsc7#81.11.18.12.00#Computer hardware maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.13.00#Computer software maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.14.00#Co location service#81.11.18.00.00
-unspsc7#81.11.18.15.00#Printer maintenance and support services#81.11.18.00.00
-unspsc7#81.11.18.16.00#Mainframe computer maintenance or support#81.11.18.00.00
-unspsc7#81.11.18.17.00#Telecom equipment maintenance or support#81.11.18.00.00
-unspsc7#81.11.19.00.00#Information retrieval systems#81.11.00.00.00
-unspsc7#81.11.19.01.00#Database information retrieval#81.11.19.00.00
-unspsc7#81.11.19.02.00#On line database information retrieval#81.11.19.00.00
-unspsc7#81.11.19.03.00#Remote database information retrieval#81.11.19.00.00
-unspsc7#81.11.20.00.00#Data services#81.11.00.00.00
-unspsc7#81.11.20.01.00#On line data processing#81.11.20.00.00
-unspsc7#81.11.20.02.00#Data processing or preparation services#81.11.20.00.00
-unspsc7#81.11.20.03.00#Data center services#81.11.20.00.00
-unspsc7#81.11.20.04.00#Disaster recovery services#81.11.20.00.00
-unspsc7#81.11.20.05.00#Document scanning service#81.11.20.00.00
-unspsc7#81.11.20.06.00#Data storage service#81.11.20.00.00
-unspsc7#81.11.20.07.00#Content or data standardization services#81.11.20.00.00
-unspsc7#81.11.21.00.00#Internet services#81.11.00.00.00
-unspsc7#81.11.21.01.00#Internet service providers (ISP)#81.11.21.00.00
-unspsc7#81.11.21.02.00#Electronic mail service provider#81.11.21.00.00
-unspsc7#81.11.21.03.00#World wide web (WWW) site design services#81.11.21.00.00
-unspsc7#81.11.21.04.00#Web search engine providers#81.11.21.00.00
-unspsc7#81.11.21.05.00#World wide web (WWW) site operation (host) services#81.11.21.00.00
-unspsc7#81.11.21.06.00#Application service providers#81.11.21.00.00
-unspsc7#81.11.21.07.00#Internet domain names#81.11.21.00.00
-unspsc7#81.11.22.00.00#Software maintenance and support#81.11.00.00.00
-unspsc7#81.11.22.01.00#Maintenance and support fees#81.11.22.00.00
-unspsc7#81.11.22.02.00#Software patches or upgrades#81.11.22.00.00
-unspsc7#81.12.00.00.00#Economics#81.00.00.00.00
-unspsc7#81.12.15.00.00#Economic analysis#81.12.00.00.00
-unspsc7#81.12.15.01.00#Macro economic analysis#81.12.15.00.00
-unspsc7#81.12.15.02.00#Micro economic analysis#81.12.15.00.00
-unspsc7#81.12.15.03.00#Econometrics#81.12.15.00.00
-unspsc7#81.12.15.04.00#Economic forecasts#81.12.15.00.00
-unspsc7#81.12.16.00.00#Monetary systems and issues#81.12.00.00.00
-unspsc7#81.12.16.01.00#Monetary policy#81.12.16.00.00
-unspsc7#81.12.16.02.00#Monetary systems#81.12.16.00.00
-unspsc7#81.12.16.03.00#Monetary analysis#81.12.16.00.00
-unspsc7#81.12.16.04.00#Monetary liquidity#81.12.16.00.00
-unspsc7#81.12.16.05.00#Precious metals reserves#81.12.16.00.00
-unspsc7#81.12.16.06.00#Foreign exchange control#81.12.16.00.00
-unspsc7#81.12.16.07.00#Currency exchange markets#81.12.16.00.00
-unspsc7#81.13.00.00.00#Statistics#81.00.00.00.00
-unspsc7#81.13.15.00.00#Methodology and analysis#81.13.00.00.00
-unspsc7#81.13.15.01.00#Factor analysis#81.13.15.00.00
-unspsc7#81.13.15.02.00#Multivariate analysis#81.13.15.00.00
-unspsc7#81.13.15.03.00#Regression analysis#81.13.15.00.00
-unspsc7#81.13.15.04.00#Sampling surveys#81.13.15.00.00
-unspsc7#81.13.15.05.00#Time series analysis#81.13.15.00.00
-unspsc7#81.14.00.00.00#Manufacturing technologies#81.00.00.00.00
-unspsc7#81.14.15.00.00#Quality control#81.14.00.00.00
-unspsc7#81.14.15.01.00#Materials testing#81.14.15.00.00
-unspsc7#81.14.15.02.00#Materials synthesis#81.14.15.00.00
-unspsc7#81.14.15.03.00#Materials inspection#81.14.15.00.00
-unspsc7#81.14.15.04.00#Equipment test or calibration#81.14.15.00.00
-unspsc7#81.14.15.05.00#Production standards development#81.14.15.00.00
-unspsc7#81.14.15.06.00#Product testing#81.14.15.00.00
-unspsc7#81.14.16.00.00#Supply chain management#81.14.00.00.00
-unspsc7#81.14.16.01.00#Logistics#81.14.16.00.00
-unspsc7#81.14.16.02.00#Transit analysis#81.14.16.00.00
-unspsc7#81.14.16.03.00#Transport finance or economics#81.14.16.00.00
-unspsc7#81.14.16.04.00#Transport facilitation#81.14.16.00.00
-unspsc7#81.14.16.05.00#Transport infrastructure#81.14.16.00.00
-unspsc7#81.14.16.06.00#Transport planning#81.14.16.00.00
-unspsc7#81.14.17.00.00#Production planning and control#81.14.00.00.00
-unspsc7#81.14.17.01.00#Production planning#81.14.17.00.00
-unspsc7#81.14.17.02.00#Production control#81.14.17.00.00
-unspsc7#81.14.17.03.00#Production scheduling#81.14.17.00.00
-unspsc7#81.14.17.04.00#Production statistics collection or analysis services#81.14.17.00.00
-unspsc7#81.14.18.00.00#Facilities management#81.14.00.00.00
-unspsc7#81.14.18.01.00#Safety or risk analysis#81.14.18.00.00
-unspsc7#81.14.18.02.00#Industrial hygiene or ventilation#81.14.18.00.00
-unspsc7#81.14.18.03.00#Acoustics or noise control#81.14.18.00.00
-unspsc7#81.14.18.04.00#Equipment inspection service#81.14.18.00.00
-unspsc7#81.14.18.05.00#Building inspection service#81.14.18.00.00
-unspsc7#81.14.18.06.00#Power line inspection service#81.14.18.00.00
-unspsc7#81.14.18.07.00#Plumbing or sewer inspection service#81.14.18.00.00
-unspsc7#81.15.00.00.00#Earth science services#81.00.00.00.00
-unspsc7#81.15.15.00.00#Meteorology#81.15.00.00.00
-unspsc7#81.15.15.01.00#Climatology#81.15.15.00.00
-unspsc7#81.15.15.02.00#Meteorological services#81.15.15.00.00
-unspsc7#81.15.15.03.00#Hydrometeorology#81.15.15.00.00
-unspsc7#81.15.16.00.00#Cartography#81.15.00.00.00
-unspsc7#81.15.16.01.00#Mapping#81.15.16.00.00
-unspsc7#81.15.16.02.00#Map production#81.15.16.00.00
-unspsc7#81.15.16.03.00#Photogrammetry#81.15.16.00.00
-unspsc7#81.15.16.04.00#Land surveying#81.15.16.00.00
-unspsc7#81.15.17.00.00#Geology#81.15.00.00.00
-unspsc7#81.15.17.01.00#Photogeology#81.15.17.00.00
-unspsc7#81.15.17.02.00#Stratigraphic geology#81.15.17.00.00
-unspsc7#81.15.17.03.00#Geological surveys#81.15.17.00.00
-unspsc7#81.15.17.04.00#Geological exploration#81.15.17.00.00
-unspsc7#81.15.17.05.00#Archaeological services#81.15.17.00.00
-unspsc7#81.15.18.00.00#Oceanography and hydrology#81.15.00.00.00
-unspsc7#81.15.18.01.00#Oceanographic survey#81.15.18.00.00
-unspsc7#81.15.18.02.00#Estuarine oceanography#81.15.18.00.00
-unspsc7#81.15.18.03.00#Physical oceanography#81.15.18.00.00
-unspsc7#81.15.18.04.00#Hydrological surveys#81.15.18.00.00
-unspsc7#81.15.18.05.00#Bathymetric surveys#81.15.18.00.00
-unspsc7#81.15.18.06.00#Underwater exploration#81.15.18.00.00
-unspsc7#81.15.19.00.00#Geophysics#81.15.00.00.00
-unspsc7#81.15.19.01.00#Geophysical surveys#81.15.19.00.00
-unspsc7#81.15.19.02.00#Geophysical exploration#81.15.19.00.00
-unspsc7#81.15.19.03.00#Geophysical photo interpretation#81.15.19.00.00
-unspsc7#81.15.19.04.00#Aero magnetic geophysics#81.15.19.00.00
-unspsc7#82.00.00.00.00#Editorial and Design and Graphic and Fine Art Services#82.00.00.00.00
-unspsc7#82.10.00.00.00#Advertising#82.00.00.00.00
-unspsc7#82.10.15.00.00#Print advertising#82.10.00.00.00
-unspsc7#82.10.15.01.00#Billboard advertising#82.10.15.00.00
-unspsc7#82.10.15.02.00#Poster advertising#82.10.15.00.00
-unspsc7#82.10.15.03.00#Magazine advertising#82.10.15.00.00
-unspsc7#82.10.15.04.00#Newspaper advertising#82.10.15.00.00
-unspsc7#82.10.15.05.00#Handbill or coupon advertising#82.10.15.00.00
-unspsc7#82.10.15.06.00#Transit advertising services#82.10.15.00.00
-unspsc7#82.10.15.07.00#Shopping news or advertising or distribution service#82.10.15.00.00
-unspsc7#82.10.15.08.00#Yellow pages advertising#82.10.15.00.00
-unspsc7#82.10.16.00.00#Broadcast advertising#82.10.00.00.00
-unspsc7#82.10.16.01.00#Radio advertising#82.10.16.00.00
-unspsc7#82.10.16.02.00#Television advertising#82.10.16.00.00
-unspsc7#82.10.16.03.00#Internet advertising#82.10.16.00.00
-unspsc7#82.10.17.00.00#Aerial advertising#82.10.00.00.00
-unspsc7#82.10.17.01.00#Banner advertising services#82.10.17.00.00
-unspsc7#82.10.17.02.00#Skywriting advertising services#82.10.17.00.00
-unspsc7#82.10.18.00.00#Advertising agency services#82.10.00.00.00
-unspsc7#82.10.18.01.00#Advertising campaign services#82.10.18.00.00
-unspsc7#82.11.00.00.00#Writing and translations#82.00.00.00.00
-unspsc7#82.11.15.00.00#Technical writing#82.11.00.00.00
-unspsc7#82.11.15.01.00#Instruction writing services#82.11.15.00.00
-unspsc7#82.11.15.02.00#Manual writing services#82.11.15.00.00
-unspsc7#82.11.15.03.00#Academic or scientific article writing#82.11.15.00.00
-unspsc7#82.11.16.00.00#Non technical writing#82.11.00.00.00
-unspsc7#82.11.16.01.00#Letter writing services#82.11.16.00.00
-unspsc7#82.11.16.02.00#Resume writing services#82.11.16.00.00
-unspsc7#82.11.16.03.00#Court reporting services#82.11.16.00.00
-unspsc7#82.11.16.04.00#Transcribing services#82.11.16.00.00
-unspsc7#82.11.17.00.00#Creative writing#82.11.00.00.00
-unspsc7#82.11.17.01.00#Article writers services#82.11.17.00.00
-unspsc7#82.11.17.02.00#Book authors services#82.11.17.00.00
-unspsc7#82.11.17.03.00#Poetry authors services#82.11.17.00.00
-unspsc7#82.11.17.04.00#Copywriting#82.11.17.00.00
-unspsc7#82.11.17.05.00#Speech writing#82.11.17.00.00
-unspsc7#82.11.18.00.00#Editorial and support services#82.11.00.00.00
-unspsc7#82.11.18.01.00#Editing services#82.11.18.00.00
-unspsc7#82.11.18.02.00#Fact checking services#82.11.18.00.00
-unspsc7#82.11.18.03.00#Proofreading services#82.11.18.00.00
-unspsc7#82.11.18.04.00#Written translation services#82.11.18.00.00
-unspsc7#82.11.19.00.00#News and publicity services#82.11.00.00.00
-unspsc7#82.11.19.01.00#Press release services#82.11.19.00.00
-unspsc7#82.11.19.02.00#Special interest newsletter services#82.11.19.00.00
-unspsc7#82.11.19.03.00#News agency wire services#82.11.19.00.00
-unspsc7#82.11.19.04.00#Newspaper or advertising material delivery services#82.11.19.00.00
-unspsc7#82.12.00.00.00#Reproduction services#82.00.00.00.00
-unspsc7#82.12.15.00.00#Printing#82.12.00.00.00
-unspsc7#82.12.15.01.00#Planning or layout of graphic production#82.12.15.00.00
-unspsc7#82.12.15.02.00#Typesetting#82.12.15.00.00
-unspsc7#82.12.15.03.00#Digital printing#82.12.15.00.00
-unspsc7#82.12.15.04.00#Letterpress or screen printing#82.12.15.00.00
-unspsc7#82.12.15.05.00#Promotional or advertising printing#82.12.15.00.00
-unspsc7#82.12.15.06.00#Publication printing#82.12.15.00.00
-unspsc7#82.12.15.07.00#Stationery or business form printing#82.12.15.00.00
-unspsc7#82.12.15.08.00#Wrap or tag or label or seal or bag printing#82.12.15.00.00
-unspsc7#82.12.15.09.00#Security or financial instruments printing#82.12.15.00.00
-unspsc7#82.12.15.10.00#Textile printing#82.12.15.00.00
-unspsc7#82.12.15.11.00#Technical manual and instruction sheet printing#82.12.15.00.00
-unspsc7#82.12.15.12.00#Embossing#82.12.15.00.00
-unspsc7#82.12.16.00.00#Engraving#82.12.00.00.00
-unspsc7#82.12.16.01.00#Currency engraving#82.12.16.00.00
-unspsc7#82.12.16.02.00#Engraved roll printing#82.12.16.00.00
-unspsc7#82.12.16.03.00#Metal plate engraving#82.12.16.00.00
-unspsc7#82.12.17.00.00#Photocopying#82.12.00.00.00
-unspsc7#82.12.17.01.00#Black and white copy or collating services#82.12.17.00.00
-unspsc7#82.12.17.02.00#Color copy or collating services#82.12.17.00.00
-unspsc7#82.12.18.00.00#Publishing#82.12.00.00.00
-unspsc7#82.12.18.01.00#Textbook or research publishing#82.12.18.00.00
-unspsc7#82.12.18.02.00#Author funded publishing services#82.12.18.00.00
-unspsc7#82.12.19.00.00#Bookbinding#82.12.00.00.00
-unspsc7#82.12.19.01.00#Thread stitch bookbinding#82.12.19.00.00
-unspsc7#82.12.19.02.00#Spiral binding#82.12.19.00.00
-unspsc7#82.12.19.03.00#Glued binding#82.12.19.00.00
-unspsc7#82.12.19.04.00#Comb or clamp type binding#82.12.19.00.00
-unspsc7#82.12.19.05.00#Binding restoration or repair#82.12.19.00.00
-unspsc7#82.12.19.06.00#Bronzing or gilding or edging or deckling#82.12.19.00.00
-unspsc7#82.13.00.00.00#Photographic services#82.00.00.00.00
-unspsc7#82.13.15.00.00#Film processing services#82.13.00.00.00
-unspsc7#82.13.15.01.00#Still film processing or reproduction#82.13.15.00.00
-unspsc7#82.13.15.02.00#Motion picture film processing or reproduction#82.13.15.00.00
-unspsc7#82.13.15.03.00#Microfiche services#82.13.15.00.00
-unspsc7#82.13.15.04.00#Color separation#82.13.15.00.00
-unspsc7#82.13.16.00.00#Photographers and cinematographers#82.13.00.00.00
-unspsc7#82.13.16.01.00#Aerial photography services#82.13.16.00.00
-unspsc7#82.13.16.02.00#Motion picture cinematography#82.13.16.00.00
-unspsc7#82.13.16.03.00#Video production services#82.13.16.00.00
-unspsc7#82.13.16.04.00#Studio photography services or still photographs#82.13.16.00.00
-unspsc7#82.14.00.00.00#Graphic design#82.00.00.00.00
-unspsc7#82.14.15.00.00#Art design services#82.14.00.00.00
-unspsc7#82.14.15.01.00#Layout or graphics editing services#82.14.15.00.00
-unspsc7#82.14.15.02.00#Art design or graphics#82.14.15.00.00
-unspsc7#82.14.15.03.00#Photocomposition#82.14.15.00.00
-unspsc7#82.14.15.04.00#Chart or graph design services#82.14.15.00.00
-unspsc7#82.14.15.05.00#Computer generated design services#82.14.15.00.00
-unspsc7#82.14.15.06.00#Package design services#82.14.15.00.00
-unspsc7#82.14.15.07.00#Silkscreen design services#82.14.15.00.00
-unspsc7#82.14.16.00.00#Graphic display services#82.14.00.00.00
-unspsc7#82.14.16.01.00#Photographic or picture mounting or framing services#82.14.16.00.00
-unspsc7#82.14.16.02.00#Article display arrangement#82.14.16.00.00
-unspsc7#82.15.00.00.00#Professional artists and performers#82.00.00.00.00
-unspsc7#82.15.15.00.00#Visual art services#82.15.00.00.00
-unspsc7#82.15.15.01.00#Painters services#82.15.15.00.00
-unspsc7#82.15.15.02.00#Lithographers services#82.15.15.00.00
-unspsc7#82.15.15.03.00#Cartoonists services#82.15.15.00.00
-unspsc7#82.15.15.04.00#Sculptors services#82.15.15.00.00
-unspsc7#82.15.15.05.00#Ceramics makers services#82.15.15.00.00
-unspsc7#82.15.15.06.00#Glass blowers services#82.15.15.00.00
-unspsc7#82.15.15.07.00#Textile spinners or loomers or weavers services#82.15.15.00.00
-unspsc7#82.15.15.08.00#Taxidermy services#82.15.15.00.00
-unspsc7#82.15.16.00.00#Circus performers#82.15.00.00.00
-unspsc7#82.15.16.01.00#Animal trainers services#82.15.16.00.00
-unspsc7#82.15.16.02.00#Acrobats services#82.15.16.00.00
-unspsc7#82.15.16.03.00#Magicians services#82.15.16.00.00
-unspsc7#82.15.16.04.00#Clowns services#82.15.16.00.00
-unspsc7#82.15.17.00.00#Performing arts professionals#82.15.00.00.00
-unspsc7#82.15.17.01.00#Acting services#82.15.17.00.00
-unspsc7#82.15.17.02.00#Comedians services#82.15.17.00.00
-unspsc7#82.15.17.03.00#Dancers services#82.15.17.00.00
-unspsc7#82.15.17.04.00#Musicians services#82.15.17.00.00
-unspsc7#82.15.17.05.00#Vocalists services#82.15.17.00.00
-unspsc7#82.15.17.06.00#Choreographic services#82.15.17.00.00
-unspsc7#83.00.00.00.00#Public Utilities and Public Sector Related Services#83.00.00.00.00
-unspsc7#83.10.00.00.00#Utilities#83.00.00.00.00
-unspsc7#83.10.15.00.00#Water and sewer utilities#83.10.00.00.00
-unspsc7#83.10.15.01.00#Supply of water#83.10.15.00.00
-unspsc7#83.10.15.02.00#Water resource management#83.10.15.00.00
-unspsc7#83.10.15.03.00#Water quality control management#83.10.15.00.00
-unspsc7#83.10.15.04.00#Water distribution management#83.10.15.00.00
-unspsc7#83.10.15.05.00#Water policy advisory services#83.10.15.00.00
-unspsc7#83.10.15.06.00#Water treatment services#83.10.15.00.00
-unspsc7#83.10.15.07.00#Desalination services#83.10.15.00.00
-unspsc7#83.10.15.08.00#Town water#83.10.15.00.00
-unspsc7#83.10.15.09.00#Service water#83.10.15.00.00
-unspsc7#83.10.15.10.00#Chilled water#83.10.15.00.00
-unspsc7#83.10.16.00.00#Oil and gas utilities#83.10.00.00.00
-unspsc7#83.10.16.01.00#Supply of natural gas#83.10.16.00.00
-unspsc7#83.10.16.02.00#Supply of fuel oil#83.10.16.00.00
-unspsc7#83.10.16.03.00#Oil pipeline services#83.10.16.00.00
-unspsc7#83.10.16.04.00#Gas pipeline services#83.10.16.00.00
-unspsc7#83.10.16.05.00#Gas facility charge#83.10.16.00.00
-unspsc7#83.10.18.00.00#Electric utilities#83.10.00.00.00
-unspsc7#83.10.18.01.00#Supply of single phase electricity#83.10.18.00.00
-unspsc7#83.10.18.02.00#Supply of two phase electricity#83.10.18.00.00
-unspsc7#83.10.18.03.00#Supply of three phase electricity#83.10.18.00.00
-unspsc7#83.10.18.04.00#Electric power transmission services#83.10.18.00.00
-unspsc7#83.10.18.05.00#Industrial electric power distribution#83.10.18.00.00
-unspsc7#83.10.18.06.00#Rural electrical power distribution#83.10.18.00.00
-unspsc7#83.10.18.07.00#Municipal electric power distribution#83.10.18.00.00
-unspsc7#83.10.19.00.00#Energy conservation#83.10.00.00.00
-unspsc7#83.10.19.01.00#Energy conservation programs#83.10.19.00.00
-unspsc7#83.10.19.02.00#Energy use reduction measures#83.10.19.00.00
-unspsc7#83.10.20.00.00#Funeral services#83.10.00.00.00
-unspsc7#83.10.20.01.00#Grave digging#83.10.20.00.00
-unspsc7#83.11.00.00.00#Telecommunications media services#83.00.00.00.00
-unspsc7#83.11.15.00.00#Local and long distance telephone communications#83.11.00.00.00
-unspsc7#83.11.15.01.00#Local telephone service#83.11.15.00.00
-unspsc7#83.11.15.02.00#Long distance telephone services#83.11.15.00.00
-unspsc7#83.11.15.03.00#Pay phone provider services#83.11.15.00.00
-unspsc7#83.11.15.04.00#Pre paid phone card services#83.11.15.00.00
-unspsc7#83.11.15.05.00#Directory assistance services#83.11.15.00.00
-unspsc7#83.11.15.06.00#Conference calling services#83.11.15.00.00
-unspsc7#83.11.15.07.00#Call centre bureau services#83.11.15.00.00
-unspsc7#83.11.15.08.00#Toll free inbound telephone service#83.11.15.00.00
-unspsc7#83.11.15.09.00#Telephone equipment repair services#83.11.15.00.00
-unspsc7#83.11.16.00.00#Mobile communications services#83.11.00.00.00
-unspsc7#83.11.16.01.00#Telecommunication signal enhancement network services#83.11.16.00.00
-unspsc7#83.11.16.02.00#Satellite or earth communication systems services#83.11.16.00.00
-unspsc7#83.11.16.03.00#Cellular telephone services#83.11.16.00.00
-unspsc7#83.11.16.04.00#Paging services#83.11.16.00.00
-unspsc7#83.11.17.00.00#Facsimile and telegraph services#83.11.00.00.00
-unspsc7#83.11.17.01.00#Facsimile transmission services#83.11.17.00.00
-unspsc7#83.11.17.02.00#Telegraph transmission services#83.11.17.00.00
-unspsc7#83.11.17.03.00#Telex transmission services#83.11.17.00.00
-unspsc7#83.11.18.00.00#Television services#83.11.00.00.00
-unspsc7#83.11.18.01.00#Cable television services#83.11.18.00.00
-unspsc7#83.11.18.02.00#Closed circuit television services#83.11.18.00.00
-unspsc7#83.11.18.03.00#Television antenna construction or rental services#83.11.18.00.00
-unspsc7#83.11.18.04.00#Television broadcasting station management#83.11.18.00.00
-unspsc7#83.11.19.00.00#Radio services#83.11.00.00.00
-unspsc7#83.11.19.01.00#Radio broadcasting station management#83.11.19.00.00
-unspsc7#83.11.19.02.00#Amateur radio networks or services#83.11.19.00.00
-unspsc7#83.11.19.03.00#Small scale radio systems#83.11.19.00.00
-unspsc7#83.11.19.04.00#Radio studio or equipment services#83.11.19.00.00
-unspsc7#83.11.20.00.00#Fiber telecommunications services#83.11.00.00.00
-unspsc7#83.11.20.01.00#Dark fiber#83.11.20.00.00
-unspsc7#83.11.20.02.00#Dense wavelength division multiplexing DWDM#83.11.20.00.00
-unspsc7#83.11.20.03.00#Wave division multiplexing WDM#83.11.20.00.00
-unspsc7#83.11.20.04.00#Ocx optical carrier service#83.11.20.00.00
-unspsc7#83.11.21.00.00#Switched dial up and leased dedicated line circuit telecommunications services#83.11.00.00.00
-unspsc7#83.11.21.01.00#High speed circuit switched dial up services#83.11.21.00.00
-unspsc7#83.11.21.02.00#ISDN integrated services digital network services#83.11.21.00.00
-unspsc7#83.11.21.03.00#Point to point digital telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.04.00#Multi point analog telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.05.00#Point to point analog telecommunications circuit#83.11.21.00.00
-unspsc7#83.11.21.06.00#xDSL digital subscriber line#83.11.21.00.00
-unspsc7#83.11.22.00.00#Enhanced telecommunications services#83.11.00.00.00
-unspsc7#83.11.22.01.00#ATM asyncronous transfer mode managed network services#83.11.22.00.00
-unspsc7#83.11.22.02.00#Frame relay public managed network services#83.11.22.00.00
-unspsc7#83.11.22.03.00#VPN virtual private network managed network services#83.11.22.00.00
-unspsc7#83.11.22.04.00#X75 managed network services#83.11.22.00.00
-unspsc7#83.11.22.05.00#X25 managed network services#83.11.22.00.00
-unspsc7#83.12.00.00.00#Information services#83.00.00.00.00
-unspsc7#83.12.15.00.00#Libraries#83.12.00.00.00
-unspsc7#83.12.15.01.00#General municipal public use libraries#83.12.15.00.00
-unspsc7#83.12.15.02.00#College or university libraries#83.12.15.00.00
-unspsc7#83.12.15.03.00#Privately owned libraries#83.12.15.00.00
-unspsc7#83.12.15.04.00#National government or military post libraries#83.12.15.00.00
-unspsc7#83.12.16.00.00#Information centers#83.12.00.00.00
-unspsc7#83.12.16.01.00#Chambers of commerce#83.12.16.00.00
-unspsc7#83.12.16.02.00#Tourism board services#83.12.16.00.00
-unspsc7#83.12.16.03.00#Computerized information retrieval systems#83.12.16.00.00
-unspsc7#83.12.16.04.00#Online database information retrieval systems#83.12.16.00.00
-unspsc7#83.12.16.05.00#Remote database information retrieval services#83.12.16.00.00
-unspsc7#83.12.16.06.00#Skip tracing#83.12.16.00.00
-unspsc7#83.12.17.00.00#Mass communication services#83.12.00.00.00
-unspsc7#83.12.17.01.00#Television related services#83.12.17.00.00
-unspsc7#83.12.17.02.00#Radio related services#83.12.17.00.00
-unspsc7#83.12.17.03.00#Internet related services#83.12.17.00.00
-unspsc7#83.12.17.04.00#Citizen warning systems#83.12.17.00.00
-unspsc7#84.00.00.00.00#Financial and Insurance Services#84.00.00.00.00
-unspsc7#84.10.00.00.00#Development finance#84.00.00.00.00
-unspsc7#84.10.15.00.00#Development assistance#84.10.00.00.00
-unspsc7#84.10.15.01.00#Financial assistance#84.10.15.00.00
-unspsc7#84.10.15.02.00#Savings mobilization programs#84.10.15.00.00
-unspsc7#84.10.15.03.00#Guarantee agreements#84.10.15.00.00
-unspsc7#84.10.16.00.00#Aid financing#84.10.00.00.00
-unspsc7#84.10.16.01.00#Co financing#84.10.16.00.00
-unspsc7#84.10.16.02.00#Bi lateral or multi lateral aid#84.10.16.00.00
-unspsc7#84.10.16.03.00#Non governmental aid#84.10.16.00.00
-unspsc7#84.10.16.04.00#Government aid#84.10.16.00.00
-unspsc7#84.10.17.00.00#Debt management#84.10.00.00.00
-unspsc7#84.10.17.01.00#Debt negotiation#84.10.17.00.00
-unspsc7#84.10.17.02.00#Debt reorganization#84.10.17.00.00
-unspsc7#84.10.17.03.00#Debt servicing#84.10.17.00.00
-unspsc7#84.10.17.04.00#Debt collection services#84.10.17.00.00
-unspsc7#84.10.17.05.00#Repossession services#84.10.17.00.00
-unspsc7#84.11.00.00.00#Accounting and auditing#84.00.00.00.00
-unspsc7#84.11.15.00.00#Accounting services#84.11.00.00.00
-unspsc7#84.11.15.01.00#Cost accounting#84.11.15.00.00
-unspsc7#84.11.15.02.00#Financial accounting#84.11.15.00.00
-unspsc7#84.11.15.03.00#Tax accounting#84.11.15.00.00
-unspsc7#84.11.15.04.00#Bookkeeping services#84.11.15.00.00
-unspsc7#84.11.15.05.00#Payroll accounting services#84.11.15.00.00
-unspsc7#84.11.15.06.00#Billing services#84.11.15.00.00
-unspsc7#84.11.15.07.00#Inventory accounting#84.11.15.00.00
-unspsc7#84.11.16.00.00#Audit services#84.11.00.00.00
-unspsc7#84.11.16.01.00#Year end audits#84.11.16.00.00
-unspsc7#84.11.16.02.00#Quarterly reviews#84.11.16.00.00
-unspsc7#84.11.16.03.00#Internal audits#84.11.16.00.00
-unspsc7#84.11.17.00.00#Corporate finance#84.11.00.00.00
-unspsc7#84.11.17.01.00#Treasury services#84.11.17.00.00
-unspsc7#84.11.17.02.00#Investor relations services or programs#84.11.17.00.00
-unspsc7#84.11.17.03.00#Budget preparation or review services#84.11.17.00.00
-unspsc7#84.11.18.00.00#Taxation issues and preparation#84.11.00.00.00
-unspsc7#84.11.18.01.00#Tax preparers#84.11.18.00.00
-unspsc7#84.11.18.02.00#Tax advisory services#84.11.18.00.00
-unspsc7#84.12.00.00.00#Banking and investment#84.00.00.00.00
-unspsc7#84.12.15.00.00#Banking institutions#84.12.00.00.00
-unspsc7#84.12.15.01.00#Privately owned banks#84.12.15.00.00
-unspsc7#84.12.15.02.00#Publicly owned banks#84.12.15.00.00
-unspsc7#84.12.15.03.00#Credit unions#84.12.15.00.00
-unspsc7#84.12.15.04.00#Development finance institutions#84.12.15.00.00
-unspsc7#84.12.16.00.00#Funds transfer and clearance and exchange services#84.12.00.00.00
-unspsc7#84.12.16.01.00#Funds clearance services#84.12.16.00.00
-unspsc7#84.12.16.02.00#Letter of credit services#84.12.16.00.00
-unspsc7#84.12.16.03.00#Currency exchange services#84.12.16.00.00
-unspsc7#84.12.16.04.00#Spot exchange transaction services#84.12.16.00.00
-unspsc7#84.12.16.05.00#Currency conversion service#84.12.16.00.00
-unspsc7#84.12.16.06.00#Remittance processing services#84.12.16.00.00
-unspsc7#84.12.17.00.00#Investment advice#84.12.00.00.00
-unspsc7#84.12.17.01.00#Investment advisers#84.12.17.00.00
-unspsc7#84.12.17.02.00#Investment policy#84.12.17.00.00
-unspsc7#84.12.17.03.00#Investment analysis#84.12.17.00.00
-unspsc7#84.12.17.04.00#Investment agreements#84.12.17.00.00
-unspsc7#84.12.17.05.00#Market data#84.12.17.00.00
-unspsc7#84.12.18.00.00#Securities and commodities markets services#84.12.00.00.00
-unspsc7#84.12.18.01.00#Stock market trading services#84.12.18.00.00
-unspsc7#84.12.18.02.00#Commodities or futures market services#84.12.18.00.00
-unspsc7#84.12.18.03.00#Government bonds#84.12.18.00.00
-unspsc7#84.12.18.04.00#Privately issued bonds#84.12.18.00.00
-unspsc7#84.12.18.05.00#Precious metals market services#84.12.18.00.00
-unspsc7#84.12.19.00.00#Mortgage banking#84.12.00.00.00
-unspsc7#84.12.19.01.00#Housing finance#84.12.19.00.00
-unspsc7#84.12.19.02.00#Re financing services#84.12.19.00.00
-unspsc7#84.12.19.03.00#Commercial mortgage finance#84.12.19.00.00
-unspsc7#84.12.20.00.00#Cash vault services#84.12.00.00.00
-unspsc7#84.12.20.01.00#Deposit verification services#84.12.20.00.00
-unspsc7#84.13.00.00.00#Insurance and retirement services#84.00.00.00.00
-unspsc7#84.13.15.00.00#Insurance services for structures and property and possessions#84.13.00.00.00
-unspsc7#84.13.15.01.00#Building or building contents insurance#84.13.15.00.00
-unspsc7#84.13.15.02.00#Homeowners or renters insurance#84.13.15.00.00
-unspsc7#84.13.15.03.00#Car or truck insurance#84.13.15.00.00
-unspsc7#84.13.15.04.00#Cargo insurance#84.13.15.00.00
-unspsc7#84.13.15.05.00#Marine insurance#84.13.15.00.00
-unspsc7#84.13.15.06.00#Reinsurance services#84.13.15.00.00
-unspsc7#84.13.16.00.00#Life and health and accident insurance#84.13.00.00.00
-unspsc7#84.13.16.01.00#Life insurance#84.13.16.00.00
-unspsc7#84.13.16.02.00#Health or hospitalization insurance#84.13.16.00.00
-unspsc7#84.13.16.03.00#Accidental injury insurance#84.13.16.00.00
-unspsc7#84.13.16.04.00#Disability insurance#84.13.16.00.00
-unspsc7#84.13.16.05.00#Workmens insurance#84.13.16.00.00
-unspsc7#84.13.16.06.00#Unemployment insurance#84.13.16.00.00
-unspsc7#84.13.16.07.00#Liability insurance#84.13.16.00.00
-unspsc7#84.13.17.00.00#Pension funds#84.13.00.00.00
-unspsc7#84.13.17.01.00#Employer administered pension funds#84.13.17.00.00
-unspsc7#84.13.17.02.00#Union or guild administered pension funds#84.13.17.00.00
-unspsc7#84.13.18.00.00#Retirement funds#84.13.00.00.00
-unspsc7#84.13.18.01.00#Self directed or employer sponsored retirement funds#84.13.18.00.00
-unspsc7#84.13.18.02.00#Self directed or self initiated retirement plans#84.13.18.00.00
-unspsc7#84.14.00.00.00#Credit agencies#84.00.00.00.00
-unspsc7#84.14.15.00.00#Governmental credit agencies#84.14.00.00.00
-unspsc7#84.14.15.01.00#Farm credit services#84.14.15.00.00
-unspsc7#84.14.15.02.00#Small business loan agencies#84.14.15.00.00
-unspsc7#84.14.15.03.00#Minority owned business programs#84.14.15.00.00
-unspsc7#84.14.16.00.00#Personal credit agencies#84.14.00.00.00
-unspsc7#84.14.16.01.00#Consumer credit gathering or reporting services#84.14.16.00.00
-unspsc7#84.14.16.02.00#Credit card service providers#84.14.16.00.00
-unspsc7#84.14.17.00.00#Business credit agencies#84.14.00.00.00
-unspsc7#84.14.17.01.00#Business credit gathering or reporting services#84.14.17.00.00
-unspsc7#84.14.17.02.00#Value added network (VAN) services#84.14.17.00.00
-unspsc7#85.00.00.00.00#Healthcare Services#85.00.00.00.00
-unspsc7#85.10.00.00.00#Comprehensive health services#85.00.00.00.00
-unspsc7#85.10.15.00.00#Healthcare centers#85.10.00.00.00
-unspsc7#85.10.15.01.00#Emergency or surgical hospital services#85.10.15.00.00
-unspsc7#85.10.15.02.00#Private specialized clinic services#85.10.15.00.00
-unspsc7#85.10.15.03.00#Medical office services#85.10.15.00.00
-unspsc7#85.10.15.04.00#Psychiatric hospital services#85.10.15.00.00
-unspsc7#85.10.15.05.00#Respiratory hospital services#85.10.15.00.00
-unspsc7#85.10.15.06.00#Substance abuse hospital services#85.10.15.00.00
-unspsc7#85.10.15.07.00#Urgent care centers#85.10.15.00.00
-unspsc7#85.10.15.08.00#Mobile healthcare centers or services#85.10.15.00.00
-unspsc7#85.10.15.09.00#Gynecological or obstetrical hospital services#85.10.15.00.00
-unspsc7#85.10.16.00.00#Healthcare provider support persons#85.10.00.00.00
-unspsc7#85.10.16.01.00#Nursing services#85.10.16.00.00
-unspsc7#85.10.16.02.00#Midwifery or child birth preparation services#85.10.16.00.00
-unspsc7#85.10.16.03.00#Personal care services in specialized institutions#85.10.16.00.00
-unspsc7#85.10.16.04.00#Physicians personnel assistance services#85.10.16.00.00
-unspsc7#85.10.16.05.00#Home health assistants#85.10.16.00.00
-unspsc7#85.10.17.00.00#Health administration services#85.10.00.00.00
-unspsc7#85.10.17.01.00#Health policy#85.10.17.00.00
-unspsc7#85.10.17.02.00#Health legislation or regulations#85.10.17.00.00
-unspsc7#85.10.17.03.00#Health service planning#85.10.17.00.00
-unspsc7#85.10.17.04.00#Health economics#85.10.17.00.00
-unspsc7#85.10.17.05.00#Public health administration#85.10.17.00.00
-unspsc7#85.10.17.06.00#Traditional healthcare services#85.10.17.00.00
-unspsc7#85.10.17.07.00#Health systems evaluation services#85.10.17.00.00
-unspsc7#85.11.00.00.00#Disease prevention and control#85.00.00.00.00
-unspsc7#85.11.15.00.00#Contagious disease prevention and control#85.11.00.00.00
-unspsc7#85.11.15.01.00#Aids prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.02.00#Parasitic disease prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.03.00#Fungal diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.04.00#Tuberculosis prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.05.00#Leprosy prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.06.00#Bacterial disease prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.07.00#Sexually transmitted diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.08.00#Viral diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.09.00#Zoonotic diseases prevention or control services#85.11.15.00.00
-unspsc7#85.11.15.10.00#Vaccination services#85.11.15.00.00
-unspsc7#85.11.15.11.00#Quarantine services#85.11.15.00.00
-unspsc7#85.11.15.12.00#Immunization services#85.11.15.00.00
-unspsc7#85.11.15.13.00#Disinsectization services#85.11.15.00.00
-unspsc7#85.11.15.14.00#Epidemics prevention or control services#85.11.15.00.00
-unspsc7#85.11.16.00.00#Non contagious disease prevention and control#85.11.00.00.00
-unspsc7#85.11.16.01.00#Bone diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.02.00#Cancer or leukemia prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.03.00#Endocrine diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.04.00#Heart diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.05.00#Immunologic prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.06.00#Allergies prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.07.00#Neurological disorders prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.08.00#Nutritional diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.09.00#Radiation sickness prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.10.00#Digestive system diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.11.00#Eye disease prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.12.00#Respiratory diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.13.00#Tropical diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.14.00#Childhood diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.15.00#Diarrheal diseases prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.16.00#Alcoholism prevention or control services#85.11.16.00.00
-unspsc7#85.11.16.17.00#Drug addiction prevention or control services#85.11.16.00.00
-unspsc7#85.11.17.00.00#Disease vectors management and control#85.11.00.00.00
-unspsc7#85.11.17.01.00#Ticks management or control services#85.11.17.00.00
-unspsc7#85.11.17.02.00#Tsetse flies management or control services#85.11.17.00.00
-unspsc7#85.11.17.03.00#Bacteria management or control services#85.11.17.00.00
-unspsc7#85.11.17.04.00#Mosquito management or control services#85.11.17.00.00
-unspsc7#85.12.00.00.00#Medical practice#85.00.00.00.00
-unspsc7#85.12.15.00.00#Primary care practitioners services#85.12.00.00.00
-unspsc7#85.12.15.01.00#Primary care physicians home visits services#85.12.15.00.00
-unspsc7#85.12.15.02.00#Primary care physicians consultation services#85.12.15.00.00
-unspsc7#85.12.15.03.00#Primary care physicians control services#85.12.15.00.00
-unspsc7#85.12.15.04.00#Primary care physicians emergency medical services#85.12.15.00.00
-unspsc7#85.12.16.00.00#Medical doctors specialist services#85.12.00.00.00
-unspsc7#85.12.16.01.00#Gynecologic or obstetric services#85.12.16.00.00
-unspsc7#85.12.16.02.00#Nephrology services#85.12.16.00.00
-unspsc7#85.12.16.03.00#Cardiology services#85.12.16.00.00
-unspsc7#85.12.16.04.00#Pulomonary specialists services#85.12.16.00.00
-unspsc7#85.12.16.05.00#Gastroenterologists services#85.12.16.00.00
-unspsc7#85.12.16.06.00#Geriatric services#85.12.16.00.00
-unspsc7#85.12.16.07.00#Psychiatrist services#85.12.16.00.00
-unspsc7#85.12.16.08.00#Psychologists services#85.12.16.00.00
-unspsc7#85.12.16.09.00#Surgery services#85.12.16.00.00
-unspsc7#85.12.16.10.00#Ophthalmologists services#85.12.16.00.00
-unspsc7#85.12.16.11.00#Dermatology services#85.12.16.00.00
-unspsc7#85.12.16.12.00#Orthopedics services#85.12.16.00.00
-unspsc7#85.12.16.13.00#Pediatric services#85.12.16.00.00
-unspsc7#85.12.16.14.00#Nervous system specialist services#85.12.16.00.00
-unspsc7#85.12.17.00.00#Healthcare providers specialists services#85.12.00.00.00
-unspsc7#85.12.17.01.00#Psychotherapists services#85.12.17.00.00
-unspsc7#85.12.17.02.00#Optometrists services#85.12.17.00.00
-unspsc7#85.12.17.03.00#Podiatrists services#85.12.17.00.00
-unspsc7#85.12.17.04.00#Speech specialists services#85.12.17.00.00
-unspsc7#85.12.17.05.00#Acupuncturists services#85.12.17.00.00
-unspsc7#85.12.17.06.00#Chiropractors services#85.12.17.00.00
-unspsc7#85.12.18.00.00#Medical laboratories#85.12.00.00.00
-unspsc7#85.12.18.01.00#Blood analysis laboratory services#85.12.18.00.00
-unspsc7#85.12.18.02.00#Bacteriological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.03.00#Biological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.04.00#Pathological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.05.00#Urinalysis laboratory services#85.12.18.00.00
-unspsc7#85.12.18.06.00#Neurological laboratory services#85.12.18.00.00
-unspsc7#85.12.18.07.00#Ultrasound laboratory services#85.12.18.00.00
-unspsc7#85.12.18.08.00#X ray laboratory services#85.12.18.00.00
-unspsc7#85.12.18.09.00#Blood or sperm or transplant organ banks services#85.12.18.00.00
-unspsc7#85.12.18.10.00#Drug or alcohol screening#85.12.18.00.00
-unspsc7#85.12.19.00.00#Pharmacists#85.12.00.00.00
-unspsc7#85.12.19.01.00#Pharmaceutical preparation services#85.12.19.00.00
-unspsc7#85.12.19.02.00#Commercial pharmaceutical services#85.12.19.00.00
-unspsc7#85.12.20.00.00#Dental services#85.12.00.00.00
-unspsc7#85.12.20.01.00#Dentists services#85.12.20.00.00
-unspsc7#85.12.20.02.00#Dental hygienists services#85.12.20.00.00
-unspsc7#85.12.20.03.00#Dentist support staff services#85.12.20.00.00
-unspsc7#85.12.20.04.00#Oral surgeons services#85.12.20.00.00
-unspsc7#85.12.20.05.00#Orthodontic services#85.12.20.00.00
-unspsc7#85.12.21.00.00#Rehabilitation services#85.12.00.00.00
-unspsc7#85.12.21.01.00#Physical therapy services#85.12.21.00.00
-unspsc7#85.12.21.02.00#Occupational therapy services#85.12.21.00.00
-unspsc7#85.12.21.03.00#Rehabilitation services for substance abuse#85.12.21.00.00
-unspsc7#85.12.21.04.00#Athletic rehabilitation services#85.12.21.00.00
-unspsc7#85.12.21.05.00#Eating disorders services#85.12.21.00.00
-unspsc7#85.12.21.06.00#Brain or spinal cord injury services#85.12.21.00.00
-unspsc7#85.12.21.07.00#Blind or vision impaired rehabilitation services#85.12.21.00.00
-unspsc7#85.12.21.08.00#Speech or language therapy#85.12.21.00.00
-unspsc7#85.12.21.09.00#Rehabilitation services for people with chronic disabilities#85.12.21.00.00
-unspsc7#85.13.00.00.00#Medical science research and experimentation#85.00.00.00.00
-unspsc7#85.13.15.00.00#Experimental medicine services#85.13.00.00.00
-unspsc7#85.13.15.01.00#Organ transplant services#85.13.15.00.00
-unspsc7#85.13.15.02.00#Clinical human drug trials#85.13.15.00.00
-unspsc7#85.13.15.03.00#Animal experimentation#85.13.15.00.00
-unspsc7#85.13.15.04.00#Human experimentation#85.13.15.00.00
-unspsc7#85.13.15.05.00#Space experimentation#85.13.15.00.00
-unspsc7#85.13.16.00.00#Medical ethics#85.13.00.00.00
-unspsc7#85.13.16.01.00#Euthanasia issues#85.13.16.00.00
-unspsc7#85.13.16.02.00#Medical code of conduct#85.13.16.00.00
-unspsc7#85.13.16.03.00#Medical societies#85.13.16.00.00
-unspsc7#85.13.16.04.00#International drug monitoring services#85.13.16.00.00
-unspsc7#85.13.17.00.00#Medical science and research#85.13.00.00.00
-unspsc7#85.13.17.01.00#Pharmaceutical research services#85.13.17.00.00
-unspsc7#85.13.17.02.00#Bacteriology research services#85.13.17.00.00
-unspsc7#85.13.17.03.00#Biomedical research services#85.13.17.00.00
-unspsc7#85.13.17.04.00#Cardiology research services#85.13.17.00.00
-unspsc7#85.13.17.05.00#Anatomy research services#85.13.17.00.00
-unspsc7#85.13.17.06.00#Pathology research services#85.13.17.00.00
-unspsc7#85.13.17.07.00#Embryology research services#85.13.17.00.00
-unspsc7#85.13.17.08.00#Epidemiology research services#85.13.17.00.00
-unspsc7#85.13.17.09.00#Genetics research services#85.13.17.00.00
-unspsc7#85.13.17.10.00#Immunology research services#85.13.17.00.00
-unspsc7#85.13.17.11.00#Physiology research services#85.13.17.00.00
-unspsc7#85.13.17.12.00#Toxicology research services#85.13.17.00.00
-unspsc7#85.13.17.13.00#Neurology research services#85.13.17.00.00
-unspsc7#85.14.00.00.00#Alternative and holistic medicine#85.00.00.00.00
-unspsc7#85.14.15.00.00#Faith healers#85.14.00.00.00
-unspsc7#85.14.15.01.00#Witch doctors or voodoo services#85.14.15.00.00
-unspsc7#85.14.15.02.00#Faith healers services#85.14.15.00.00
-unspsc7#85.14.15.03.00#Shamans#85.14.15.00.00
-unspsc7#85.14.15.04.00#Energy work#85.14.15.00.00
-unspsc7#85.14.16.00.00#Herbal treatments#85.14.00.00.00
-unspsc7#85.14.16.01.00#Herbal medicine or herbalists services#85.14.16.00.00
-unspsc7#85.14.16.02.00#Algae or sea weed medical cures#85.14.16.00.00
-unspsc7#85.14.16.03.00#Hot springs cure services#85.14.16.00.00
-unspsc7#85.14.17.00.00#Homeopathic practice#85.14.00.00.00
-unspsc7#85.14.17.01.00#Initial diagnostic assessment#85.14.17.00.00
-unspsc7#85.14.17.02.00#Remedy consultations#85.14.17.00.00
-unspsc7#85.15.00.00.00#Food and nutrition services#85.00.00.00.00
-unspsc7#85.15.15.00.00#Food technology#85.15.00.00.00
-unspsc7#85.15.15.01.00#Food hygiene control services#85.15.15.00.00
-unspsc7#85.15.15.02.00#Food contamination control services#85.15.15.00.00
-unspsc7#85.15.15.03.00#Food preservation management or control services#85.15.15.00.00
-unspsc7#85.15.15.04.00#Food preparation counseling or control services#85.15.15.00.00
-unspsc7#85.15.15.05.00#Food research services#85.15.15.00.00
-unspsc7#85.15.15.06.00#Studies on foods or food habits#85.15.15.00.00
-unspsc7#85.15.15.07.00#Food additive or quality standards services#85.15.15.00.00
-unspsc7#85.15.15.08.00#Food analysis services#85.15.15.00.00
-unspsc7#85.15.15.09.00#Food legislation services#85.15.15.00.00
-unspsc7#85.15.16.00.00#Nutrition issues#85.15.00.00.00
-unspsc7#85.15.16.01.00#Nutrition programming services#85.15.16.00.00
-unspsc7#85.15.16.02.00#Breast or bottle feeding policy#85.15.16.00.00
-unspsc7#85.15.16.03.00#Nutritional rehabilitation services#85.15.16.00.00
-unspsc7#85.15.16.04.00#Nutrition project evaluation#85.15.16.00.00
-unspsc7#85.15.16.05.00#Food or nutrition development strategies#85.15.16.00.00
-unspsc7#85.15.16.06.00#Nutrient deficiency control programs#85.15.16.00.00
-unspsc7#85.15.16.07.00#Diet control or programs#85.15.16.00.00
-unspsc7#85.15.17.00.00#Food policy planning and aid#85.15.00.00.00
-unspsc7#85.15.17.01.00#Food standards#85.15.17.00.00
-unspsc7#85.15.17.02.00#Food aid global information or early warning systems services#85.15.17.00.00
-unspsc7#85.15.17.03.00#Assessment of emergency food requirements#85.15.17.00.00
-unspsc7#85.15.17.04.00#National food intervention policy or programs#85.15.17.00.00
-unspsc7#85.15.17.05.00#Evaluation of food aid nutritional impact#85.15.17.00.00
-unspsc7#86.00.00.00.00#Education and Training Services#86.00.00.00.00
-unspsc7#86.10.00.00.00#Vocational training#86.00.00.00.00
-unspsc7#86.10.15.00.00#Agriculture and forestry and other natural resources training services#86.10.00.00.00
-unspsc7#86.10.15.01.00#Agro industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.02.00#Dairy industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.03.00#Meat industry vocational training#86.10.15.00.00
-unspsc7#86.10.15.04.00#Agriculture vocational training services#86.10.15.00.00
-unspsc7#86.10.15.05.00#Rural youth or farmers vocational training services#86.10.15.00.00
-unspsc7#86.10.15.06.00#Forestry vocational training services#86.10.15.00.00
-unspsc7#86.10.15.07.00#Fishery vocational training services#86.10.15.00.00
-unspsc7#86.10.15.08.00#Environmental vocational training services#86.10.15.00.00
-unspsc7#86.10.15.09.00#Natural resources vocational training services#86.10.15.00.00
-unspsc7#86.10.16.00.00#Scientific vocational training services#86.10.00.00.00
-unspsc7#86.10.16.01.00#Computer vocational training services#86.10.16.00.00
-unspsc7#86.10.16.02.00#Energy related vocational training services#86.10.16.00.00
-unspsc7#86.10.16.03.00#Chemistry vocational training services#86.10.16.00.00
-unspsc7#86.10.16.04.00#Biology vocational training services#86.10.16.00.00
-unspsc7#86.10.16.05.00#Medical vocational training services#86.10.16.00.00
-unspsc7#86.10.16.06.00#Electronics vocational training services#86.10.16.00.00
-unspsc7#86.10.16.07.00#Telecommunications vocational training services#86.10.16.00.00
-unspsc7#86.10.16.08.00#Hydraulics vocational training services#86.10.16.00.00
-unspsc7#86.10.16.09.00#Industrial vocational training services#86.10.16.00.00
-unspsc7#86.10.16.10.00#Engineering vocational training services#86.10.16.00.00
-unspsc7#86.10.17.00.00#Non scientific vocational training services#86.10.00.00.00
-unspsc7#86.10.17.01.00#Communications vocational training services#86.10.17.00.00
-unspsc7#86.10.17.02.00#Tourism related training#86.10.17.00.00
-unspsc7#86.10.17.03.00#Library or documentation training#86.10.17.00.00
-unspsc7#86.10.17.04.00#Procurement or supply chain training#86.10.17.00.00
-unspsc7#86.10.17.05.00#Clerical training#86.10.17.00.00
-unspsc7#86.10.17.06.00#Health assistance vocational training services#86.10.17.00.00
-unspsc7#86.10.17.07.00#Personal care vocational training services#86.10.17.00.00
-unspsc7#86.10.17.08.00#Literacy services#86.10.17.00.00
-unspsc7#86.10.17.09.00#Safety training services#86.10.17.00.00
-unspsc7#86.10.17.10.00#Teacher training services#86.10.17.00.00
-unspsc7#86.10.17.11.00#Fire fighting training services#86.10.17.00.00
-unspsc7#86.10.17.12.00#Handcrafts vocational training services#86.10.17.00.00
-unspsc7#86.10.17.13.00#Law vocational training services#86.10.17.00.00
-unspsc7#86.10.17.14.00#Law enforcement vocational training services#86.10.17.00.00
-unspsc7#86.10.17.15.00#Road or rail transportation vocational training services#86.10.17.00.00
-unspsc7#86.10.17.16.00#Shipping vocational training services#86.10.17.00.00
-unspsc7#86.10.18.00.00#In service training and manpower development#86.10.00.00.00
-unspsc7#86.10.18.01.00#Bank or finance sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.02.00#Re training or refreshing training services#86.10.18.00.00
-unspsc7#86.10.18.03.00#Vocational rehabilitation services#86.10.18.00.00
-unspsc7#86.10.18.04.00#Commercial sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.05.00#Industrial sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.06.00#Health sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.07.00#Management sector manpower development#86.10.18.00.00
-unspsc7#86.10.18.08.00#Public sector manpower development services#86.10.18.00.00
-unspsc7#86.10.18.09.00#Merchant marine vocational training services#86.10.18.00.00
-unspsc7#86.11.00.00.00#Alternative educational systems#86.00.00.00.00
-unspsc7#86.11.15.00.00#Distance learning services#86.11.00.00.00
-unspsc7#86.11.15.01.00#Distance learning guidance services#86.11.15.00.00
-unspsc7#86.11.15.02.00#Distance teaching services#86.11.15.00.00
-unspsc7#86.11.15.03.00#Certificated distance learning services#86.11.15.00.00
-unspsc7#86.11.15.04.00#Non certificated distance learning services#86.11.15.00.00
-unspsc7#86.11.15.05.00#Distance learning assessment services#86.11.15.00.00
-unspsc7#86.11.16.00.00#Adult education#86.11.00.00.00
-unspsc7#86.11.16.01.00#Evening courses#86.11.16.00.00
-unspsc7#86.11.16.02.00#Part time adult education services#86.11.16.00.00
-unspsc7#86.11.16.03.00#Parent education#86.11.16.00.00
-unspsc7#86.11.16.04.00#Employee Education#86.11.16.00.00
-unspsc7#86.11.17.00.00#Language schooling#86.11.00.00.00
-unspsc7#86.11.17.01.00#Conversational foreign language instruction#86.11.17.00.00
-unspsc7#86.11.17.02.00#Foreign language immersion instruction#86.11.17.00.00
-unspsc7#86.11.18.00.00#Educational exchanges#86.11.00.00.00
-unspsc7#86.11.18.01.00#Educational exchanges between universities#86.11.18.00.00
-unspsc7#86.11.18.02.00#Educational exchanges between schools#86.11.18.00.00
-unspsc7#86.12.00.00.00#Educational institutions#86.00.00.00.00
-unspsc7#86.12.15.00.00#Elementary and secondary schools#86.12.00.00.00
-unspsc7#86.12.15.01.00#Pre school educational services#86.12.15.00.00
-unspsc7#86.12.15.02.00#Religious elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.15.03.00#Private elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.15.04.00#Public elementary or secondary schools#86.12.15.00.00
-unspsc7#86.12.16.00.00#Junior colleges#86.12.00.00.00
-unspsc7#86.12.16.01.00#Community colleges#86.12.16.00.00
-unspsc7#86.12.16.02.00#Technical institutes#86.12.16.00.00
-unspsc7#86.12.17.00.00#University and colleges#86.12.00.00.00
-unspsc7#86.12.17.01.00#Undergraduate programs#86.12.17.00.00
-unspsc7#86.12.17.02.00#Postgraduate programs#86.12.17.00.00
-unspsc7#86.12.18.00.00#Professional schools#86.12.00.00.00
-unspsc7#86.12.18.02.00#Theological seminaries#86.12.18.00.00
-unspsc7#86.12.18.03.00#Technical professional schools#86.12.18.00.00
-unspsc7#86.12.18.04.00#Non technical professional schools#86.12.18.00.00
-unspsc7#86.13.00.00.00#Specialized educational services#86.00.00.00.00
-unspsc7#86.13.15.00.00#Fine arts#86.13.00.00.00
-unspsc7#86.13.15.01.00#Theater studies#86.13.15.00.00
-unspsc7#86.13.15.02.00#Painting#86.13.15.00.00
-unspsc7#86.13.15.03.00#Sculpture#86.13.15.00.00
-unspsc7#86.13.15.04.00#Media studies#86.13.15.00.00
-unspsc7#86.13.16.00.00#Music and drama#86.13.00.00.00
-unspsc7#86.13.16.01.00#Music schools#86.13.16.00.00
-unspsc7#86.13.16.02.00#Dance education#86.13.16.00.00
-unspsc7#86.13.16.03.00#Drama studies#86.13.16.00.00
-unspsc7#86.13.17.00.00#Driving and flying and sailing#86.13.00.00.00
-unspsc7#86.13.17.01.00#Vehicle driving schools services#86.13.17.00.00
-unspsc7#86.13.17.02.00#Flight school services#86.13.17.00.00
-unspsc7#86.13.17.03.00#Yachting or boating school services#86.13.17.00.00
-unspsc7#86.13.18.00.00#Military education#86.13.00.00.00
-unspsc7#86.13.18.01.00#Service academies#86.13.18.00.00
-unspsc7#86.13.18.02.00#Pilot schools#86.13.18.00.00
-unspsc7#86.13.18.03.00#Military police training#86.13.18.00.00
-unspsc7#86.13.18.04.00#War college#86.13.18.00.00
-unspsc7#86.13.19.00.00#Schools for people with disabilities#86.13.00.00.00
-unspsc7#86.13.19.01.00#Primary schooling services for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.02.00#Secondary schooling services for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.03.00#Specialized schools for people with disabilities#86.13.19.00.00
-unspsc7#86.13.19.04.00#Specialized rehabilitation services for people with disabilities#86.13.19.00.00
-unspsc7#86.14.00.00.00#Educational facilities#86.00.00.00.00
-unspsc7#86.14.15.00.00#Educational guidance services#86.14.00.00.00
-unspsc7#86.14.15.01.00#Educational advisory services#86.14.15.00.00
-unspsc7#86.14.15.02.00#Universities cooperation guidance services#86.14.15.00.00
-unspsc7#86.14.15.03.00#Study abroad advisory services#86.14.15.00.00
-unspsc7#86.14.16.00.00#Students organizations#86.14.00.00.00
-unspsc7#86.14.16.01.00#Students hobby clubs#86.14.16.00.00
-unspsc7#86.14.16.02.00#Students unions#86.14.16.00.00
-unspsc7#86.14.16.03.00#Students travelling organizations#86.14.16.00.00
-unspsc7#86.14.17.00.00#Educational technology#86.14.00.00.00
-unspsc7#86.14.17.01.00#Language laboratories#86.14.17.00.00
-unspsc7#86.14.17.02.00#Audio visual technology#86.14.17.00.00
-unspsc7#86.14.17.03.00#Computer programmed instruction#86.14.17.00.00
-unspsc7#86.14.17.04.00#Library or documentation services#86.14.17.00.00
-unspsc7#90.00.00.00.00#Travel and Food and Lodging and Entertainment Services#90.00.00.00.00
-unspsc7#90.10.00.00.00#Restaurants and catering#90.00.00.00.00
-unspsc7#90.10.15.00.00#Eating and drinking establishments#90.10.00.00.00
-unspsc7#90.10.15.01.00#Restaurants#90.10.15.00.00
-unspsc7#90.10.15.02.00#Bars#90.10.15.00.00
-unspsc7#90.10.15.03.00#Fast food establishments#90.10.15.00.00
-unspsc7#90.10.15.04.00#On street food vendors#90.10.15.00.00
-unspsc7#90.10.16.00.00#Banquet and catering services#90.10.00.00.00
-unspsc7#90.10.16.01.00#Banquet facilities#90.10.16.00.00
-unspsc7#90.10.16.02.00#Party tent services#90.10.16.00.00
-unspsc7#90.10.16.03.00#Catering services#90.10.16.00.00
-unspsc7#90.10.16.04.00#Construction or work site catering services#90.10.16.00.00
-unspsc7#90.10.17.00.00#Cafeteria services#90.10.00.00.00
-unspsc7#90.10.17.01.00#On site cafeteria management#90.10.17.00.00
-unspsc7#90.10.18.00.00#Carryout and takeaway services#90.10.00.00.00
-unspsc7#90.10.18.01.00#Professionally prepared carryout meals#90.10.18.00.00
-unspsc7#90.10.18.02.00#Delivered meals services#90.10.18.00.00
-unspsc7#90.11.00.00.00#Hotels and lodging and meeting facilities#90.00.00.00.00
-unspsc7#90.11.15.00.00#Hotels and motels and inns#90.11.00.00.00
-unspsc7#90.11.15.01.00#Hotels#90.11.15.00.00
-unspsc7#90.11.15.02.00#Lodges or resorts#90.11.15.00.00
-unspsc7#90.11.15.03.00#Bed and breakfast inns#90.11.15.00.00
-unspsc7#90.11.15.04.00#Cottage rental services#90.11.15.00.00
-unspsc7#90.11.16.00.00#Meeting facilities#90.11.00.00.00
-unspsc7#90.11.16.01.00#Conference centers#90.11.16.00.00
-unspsc7#90.11.16.02.00#Videoconferencing facilities#90.11.16.00.00
-unspsc7#90.11.16.03.00#Meeting or banquet rooms#90.11.16.00.00
-unspsc7#90.11.17.00.00#Camping and wilderness facilities#90.11.00.00.00
-unspsc7#90.11.17.01.00#Campsites#90.11.17.00.00
-unspsc7#90.11.17.02.00#Government owned parks#90.11.17.00.00
-unspsc7#90.11.17.03.00#Recreational vehicle campsite facilities#90.11.17.00.00
-unspsc7#90.12.00.00.00#Travel facilitation#90.00.00.00.00
-unspsc7#90.12.15.00.00#Travel agents#90.12.00.00.00
-unspsc7#90.12.15.01.00#Tour arrangement services#90.12.15.00.00
-unspsc7#90.12.15.02.00#Travel agencies#90.12.15.00.00
-unspsc7#90.12.15.03.00#Chartering services#90.12.15.00.00
-unspsc7#90.12.16.00.00#Travel document assistance#90.12.00.00.00
-unspsc7#90.12.16.01.00#Passport services#90.12.16.00.00
-unspsc7#90.12.16.02.00#Visa or auxilliary document services#90.12.16.00.00
-unspsc7#90.12.17.00.00#Guides and interpreters#90.12.00.00.00
-unspsc7#90.12.17.01.00#Area or tour guides#90.12.17.00.00
-unspsc7#90.12.17.02.00#Interpreters#90.12.17.00.00
-unspsc7#90.13.00.00.00#Performing arts#90.00.00.00.00
-unspsc7#90.13.15.00.00#Live performances#90.13.00.00.00
-unspsc7#90.13.15.01.00#Theatrical performances or plays#90.13.15.00.00
-unspsc7#90.13.15.02.00#Dance performances#90.13.15.00.00
-unspsc7#90.13.15.03.00#Opera#90.13.15.00.00
-unspsc7#90.13.15.04.00#Concerts#90.13.15.00.00
-unspsc7#90.13.16.00.00#Taped or motion picture performances#90.13.00.00.00
-unspsc7#90.13.16.01.00#Motion pictures#90.13.16.00.00
-unspsc7#90.13.16.02.00#Videotaped entertainment#90.13.16.00.00
-unspsc7#90.14.00.00.00#Commercial sports#90.00.00.00.00
-unspsc7#90.14.15.00.00#Professional sporting events#90.14.00.00.00
-unspsc7#90.14.15.01.00#League play#90.14.15.00.00
-unspsc7#90.14.15.02.00#Competitive events#90.14.15.00.00
-unspsc7#90.14.15.03.00#Exhibitions#90.14.15.00.00
-unspsc7#90.14.16.00.00#Sports event promotion and sponsorship#90.14.00.00.00
-unspsc7#90.14.16.01.00#Company sponsored professional sports events#90.14.16.00.00
-unspsc7#90.14.16.02.00#Company sponsored amateur sports events#90.14.16.00.00
-unspsc7#90.14.16.03.00#Sporting event promotion services#90.14.16.00.00
-unspsc7#90.14.17.00.00#Amateur and recreational sports#90.14.00.00.00
-unspsc7#90.14.17.01.00#Youth competitive sports leagues#90.14.17.00.00
-unspsc7#90.14.17.02.00#Adult sports leagues#90.14.17.00.00
-unspsc7#90.14.17.03.00#Youth sports#90.14.17.00.00
-unspsc7#90.15.00.00.00#Entertainment services#90.00.00.00.00
-unspsc7#90.15.15.00.00#Tourist attractions#90.15.00.00.00
-unspsc7#90.15.15.01.00#Museums#90.15.15.00.00
-unspsc7#90.15.15.02.00#Historical or cultural sites#90.15.15.00.00
-unspsc7#90.15.15.03.00#Zoological gardens#90.15.15.00.00
-unspsc7#90.15.16.00.00#Travelling shows#90.15.00.00.00
-unspsc7#90.15.16.01.00#Circuses#90.15.16.00.00
-unspsc7#90.15.16.02.00#Touring companies#90.15.16.00.00
-unspsc7#90.15.16.03.00#Art exhibitions#90.15.16.00.00
-unspsc7#90.15.17.00.00#Amusement parks#90.15.00.00.00
-unspsc7#90.15.17.01.00#Theme parks#90.15.17.00.00
-unspsc7#90.15.17.02.00#Water parks#90.15.17.00.00
-unspsc7#90.15.17.03.00#Miniature golf courses#90.15.17.00.00
-unspsc7#90.15.18.00.00#Carnivals and fairs#90.15.00.00.00
-unspsc7#90.15.18.01.00#Travelling carnivals#90.15.18.00.00
-unspsc7#90.15.18.02.00#Fair organization or management services#90.15.18.00.00
-unspsc7#90.15.19.00.00#Gambling and betting establishments#90.15.00.00.00
-unspsc7#90.15.19.01.00#Casinos#90.15.19.00.00
-unspsc7#90.15.19.02.00#Card clubs#90.15.19.00.00
-unspsc7#90.15.19.03.00#Racetracks#90.15.19.00.00
-unspsc7#90.15.20.00.00#Nightclubs and dance halls#90.15.00.00.00
-unspsc7#90.15.20.01.00#Nightclubs#90.15.20.00.00
-unspsc7#90.15.20.02.00#Dance halls#90.15.20.00.00
-unspsc7#91.00.00.00.00#Personal and Domestic Services#91.00.00.00.00
-unspsc7#91.10.00.00.00#Personal appearance#91.00.00.00.00
-unspsc7#91.10.15.00.00#Spa and workout and rejuvenation facilities#91.10.00.00.00
-unspsc7#91.10.15.01.00#Health or fitness clubs#91.10.15.00.00
-unspsc7#91.10.15.02.00#Spas#91.10.15.00.00
-unspsc7#91.10.15.03.00#Massage services#91.10.15.00.00
-unspsc7#91.10.15.04.00#Aerobics or exercise classes#91.10.15.00.00
-unspsc7#91.10.15.05.00#Turkish or steam or ritual baths#91.10.15.00.00
-unspsc7#91.10.16.00.00#Face and body care and adornment#91.10.00.00.00
-unspsc7#91.10.16.01.00#Facial or body treatments#91.10.16.00.00
-unspsc7#91.10.16.02.00#Make up consultation#91.10.16.00.00
-unspsc7#91.10.16.03.00#Tattoo services#91.10.16.00.00
-unspsc7#91.10.16.04.00#Body piercing services#91.10.16.00.00
-unspsc7#91.10.16.05.00#Electrolysis#91.10.16.00.00
-unspsc7#91.10.17.00.00#Hair care#91.10.00.00.00
-unspsc7#91.10.17.01.00#Hair cutting or color services#91.10.17.00.00
-unspsc7#91.10.17.02.00#Hair weaving or replacement services#91.10.17.00.00
-unspsc7#91.10.18.00.00#Clothing rental#91.10.00.00.00
-unspsc7#91.10.18.01.00#Tuxedo or formalwear rental#91.10.18.00.00
-unspsc7#91.10.18.02.00#Evening or bridal gown or dress rental#91.10.18.00.00
-unspsc7#91.10.18.03.00#Costume rental#91.10.18.00.00
-unspsc7#91.10.19.00.00#Fashion consultants#91.10.00.00.00
-unspsc7#91.10.19.01.00#Color consultant#91.10.19.00.00
-unspsc7#91.10.19.02.00#Fashion stylist#91.10.19.00.00
-unspsc7#91.10.19.03.00#Wardrobe consultant#91.10.19.00.00
-unspsc7#91.11.00.00.00#Domestic and personal assistance#91.00.00.00.00
-unspsc7#91.11.15.00.00#Laundering services#91.11.00.00.00
-unspsc7#91.11.15.01.00#Uniform rental#91.11.15.00.00
-unspsc7#91.11.15.02.00#Laundry services#91.11.15.00.00
-unspsc7#91.11.15.03.00#Dry cleaning#91.11.15.00.00
-unspsc7#91.11.15.04.00#Coin operated self service laundries#91.11.15.00.00
-unspsc7#91.11.16.00.00#Household assistance and care#91.11.00.00.00
-unspsc7#91.11.16.01.00#Housekeeping services#91.11.16.00.00
-unspsc7#91.11.16.02.00#Yard or pool care services#91.11.16.00.00
-unspsc7#91.11.16.03.00#Cooking or food preparation services#91.11.16.00.00
-unspsc7#91.11.17.00.00#Consumer buying and bartering services#91.11.00.00.00
-unspsc7#91.11.17.01.00#Used clothing consignment services#91.11.17.00.00
-unspsc7#91.11.17.02.00#Barter clubs or consortiums#91.11.17.00.00
-unspsc7#91.11.17.03.00#Wardrobe buying services#91.11.17.00.00
-unspsc7#91.11.18.00.00#Personal item care and storage#91.11.00.00.00
-unspsc7#91.11.18.01.00#Valet services#91.11.18.00.00
-unspsc7#91.11.18.02.00#Check room concessions#91.11.18.00.00
-unspsc7#91.11.18.03.00#Locker rental#91.11.18.00.00
-unspsc7#91.11.18.04.00#Fur storage#91.11.18.00.00
-unspsc7#91.11.19.00.00#Personal care services#91.11.00.00.00
-unspsc7#91.11.19.01.00#Infant or child daycare services#91.11.19.00.00
-unspsc7#91.11.19.02.00#Nanny or babysitting services#91.11.19.00.00
-unspsc7#91.11.19.03.00#Elderly daycare services#91.11.19.00.00
-unspsc7#91.11.19.04.00#Assisted living services#91.11.19.00.00
-unspsc7#92.00.00.00.00#National Defense and Public Order and Security and Safety Services#92.00.00.00.00
-unspsc7#92.10.00.00.00#Public order and safety#92.00.00.00.00
-unspsc7#92.10.15.00.00#Police services#92.10.00.00.00
-unspsc7#92.10.15.01.00#Policing services#92.10.15.00.00
-unspsc7#92.10.15.02.00#Special weapons and tactics (SWAT) or riot teams#92.10.15.00.00
-unspsc7#92.10.15.03.00#Community outreach programs#92.10.15.00.00
-unspsc7#92.10.15.04.00#Crime deterrence programs#92.10.15.00.00
-unspsc7#92.10.16.00.00#Fire services#92.10.00.00.00
-unspsc7#92.10.16.01.00#Municipal or national firefighting services#92.10.16.00.00
-unspsc7#92.10.16.02.00#Volunteer fire department services#92.10.16.00.00
-unspsc7#92.10.16.03.00#Fire prevention services#92.10.16.00.00
-unspsc7#92.10.16.04.00#Forest or wilderness firefighting services#92.10.16.00.00
-unspsc7#92.10.17.00.00#Jail and prison system#92.10.00.00.00
-unspsc7#92.10.17.01.00#Jail or prison or penitentiary services#92.10.17.00.00
-unspsc7#92.10.17.02.00#Youth camps or facilities services#92.10.17.00.00
-unspsc7#92.10.17.03.00#Half way house services#92.10.17.00.00
-unspsc7#92.10.17.04.00#Mentally impaired criminal facilities#92.10.17.00.00
-unspsc7#92.10.18.00.00#Court system#92.10.00.00.00
-unspsc7#92.10.18.01.00#Sheriffs services#92.10.18.00.00
-unspsc7#92.10.18.02.00#Plea bargain agreements#92.10.18.00.00
-unspsc7#92.10.18.03.00#Civil case court expenses#92.10.18.00.00
-unspsc7#92.10.18.04.00#Criminal case fees or fines#92.10.18.00.00
-unspsc7#92.10.18.05.00#Appeals process or judicial review#92.10.18.00.00
-unspsc7#92.10.19.00.00#Rescue services#92.10.00.00.00
-unspsc7#92.10.19.01.00#Search and rescue teams#92.10.19.00.00
-unspsc7#92.10.19.02.00#Ambulance services#92.10.19.00.00
-unspsc7#92.10.19.03.00#Life saving helicopter services#92.10.19.00.00
-unspsc7#92.10.19.04.00#Lifeguard services for pool or beach#92.10.19.00.00
-unspsc7#92.11.00.00.00#Military services and national defense#92.00.00.00.00
-unspsc7#92.11.15.00.00#Maintenance of international peace and security#92.11.00.00.00
-unspsc7#92.11.15.01.00#Dispute mediation or conciliation or negotiation or settlement#92.11.15.00.00
-unspsc7#92.11.15.02.00#Peace keeping operations#92.11.15.00.00
-unspsc7#92.11.15.03.00#Cease fire agreements or truce supervision#92.11.15.00.00
-unspsc7#92.11.15.04.00#Fact finding missions#92.11.15.00.00
-unspsc7#92.11.15.05.00#War prevention strategies#92.11.15.00.00
-unspsc7#92.11.15.06.00#Counterterrorism#92.11.15.00.00
-unspsc7#92.11.15.07.00#Embargoes#92.11.15.00.00
-unspsc7#92.11.16.00.00#Disarmament#92.11.00.00.00
-unspsc7#92.11.16.01.00#Arms limitations#92.11.16.00.00
-unspsc7#92.11.16.02.00#Conventional arms disarmament#92.11.16.00.00
-unspsc7#92.11.16.03.00#Nuclear freezes or disarmament#92.11.16.00.00
-unspsc7#92.11.16.04.00#Weapons destruction#92.11.16.00.00
-unspsc7#92.11.16.05.00#Disarmament negotiations or agreements#92.11.16.00.00
-unspsc7#92.11.16.06.00#Mutual or balanced force reductions#92.11.16.00.00
-unspsc7#92.11.17.00.00#Military science and research#92.11.00.00.00
-unspsc7#92.11.17.01.00#Military history#92.11.17.00.00
-unspsc7#92.11.17.02.00#Conventional weapons usage#92.11.17.00.00
-unspsc7#92.11.17.03.00#Chemical weapons usage#92.11.17.00.00
-unspsc7#92.11.17.04.00#Guerilla warfare#92.11.17.00.00
-unspsc7#92.11.17.05.00#Military strategy#92.11.17.00.00
-unspsc7#92.11.17.06.00#Aerial maneuvers#92.11.17.00.00
-unspsc7#92.11.17.07.00#Naval or submarine maneuvers#92.11.17.00.00
-unspsc7#92.11.17.08.00#Land maneuvers#92.11.17.00.00
-unspsc7#92.11.18.00.00#Military personnel and discipline#92.11.00.00.00
-unspsc7#92.11.18.01.00#Civil defense#92.11.18.00.00
-unspsc7#92.11.18.02.00#Compulsory military services#92.11.18.00.00
-unspsc7#92.11.18.03.00#Voluntary military services#92.11.18.00.00
-unspsc7#92.11.18.04.00#Military reservists#92.11.18.00.00
-unspsc7#92.11.18.05.00#Guerillas#92.11.18.00.00
-unspsc7#92.11.18.06.00#Mercenaries#92.11.18.00.00
-unspsc7#92.11.18.07.00#Veterans#92.11.18.00.00
-unspsc7#92.11.18.08.00#Military courts#92.11.18.00.00
-unspsc7#92.11.18.09.00#Military offenses#92.11.18.00.00
-unspsc7#92.11.18.10.00#Military personnel#92.11.18.00.00
-unspsc7#92.11.19.00.00#Military policy#92.11.00.00.00
-unspsc7#92.11.19.01.00#National security#92.11.19.00.00
-unspsc7#92.11.19.02.00#Defense contracts#92.11.19.00.00
-unspsc7#92.11.19.03.00#Non first use policy#92.11.19.00.00
-unspsc7#92.11.19.04.00#Arms race#92.11.19.00.00
-unspsc7#92.11.19.05.00#Military relations#92.11.19.00.00
-unspsc7#92.11.20.00.00#Military zones#92.11.00.00.00
-unspsc7#92.11.20.01.00#Demilitarized zones#92.11.20.00.00
-unspsc7#92.11.20.02.00#Nuclear or chemical weapon free zones#92.11.20.00.00
-unspsc7#92.11.20.03.00#Peace zones#92.11.20.00.00
-unspsc7#92.11.20.04.00#No fly zones#92.11.20.00.00
-unspsc7#92.11.21.00.00#Nuclear warfare#92.11.00.00.00
-unspsc7#92.11.21.01.00#Nuclear safeguards#92.11.21.00.00
-unspsc7#92.11.21.02.00#Nuclear weapon tests#92.11.21.00.00
-unspsc7#92.11.21.03.00#Nuclear non proliferation#92.11.21.00.00
-unspsc7#92.11.22.00.00#Military tactics#92.11.00.00.00
-unspsc7#92.11.22.01.00#Weapons deployment#92.11.22.00.00
-unspsc7#92.11.22.02.00#Military reconnaissance#92.11.22.00.00
-unspsc7#92.11.22.03.00#Arms transfers#92.11.22.00.00
-unspsc7#92.11.22.04.00#Military assistance#92.11.22.00.00
-unspsc7#92.11.22.05.00#Troop withdrawals#92.11.22.00.00
-unspsc7#92.11.22.06.00#Rapid deployment forces#92.11.22.00.00
-unspsc7#92.11.22.07.00#Environmental warfare#92.11.22.00.00
-unspsc7#92.11.23.00.00#Military bases#92.11.00.00.00
-unspsc7#92.11.23.01.00#Domestic military bases#92.11.23.00.00
-unspsc7#92.11.23.02.00#Foreign military bases#92.11.23.00.00
-unspsc7#92.11.23.03.00#Naval bases#92.11.23.00.00
-unspsc7#92.11.24.00.00#Armed conflicts and incidents#92.11.00.00.00
-unspsc7#92.11.24.01.00#Border incidents#92.11.24.00.00
-unspsc7#92.11.24.02.00#Limited war#92.11.24.00.00
-unspsc7#92.11.24.03.00#Nuclear war#92.11.24.00.00
-unspsc7#92.11.24.04.00#Space based war#92.11.24.00.00
-unspsc7#92.11.24.05.00#Response to terrorist attacks#92.11.24.00.00
-unspsc7#92.12.00.00.00#Security and personal safety#92.00.00.00.00
-unspsc7#92.12.15.00.00#Guard services#92.12.00.00.00
-unspsc7#92.12.15.01.00#Armored car services#92.12.15.00.00
-unspsc7#92.12.15.02.00#Burglary protection services#92.12.15.00.00
-unspsc7#92.12.15.03.00#Guard dog rental#92.12.15.00.00
-unspsc7#92.12.15.04.00#Security guard services#92.12.15.00.00
-unspsc7#92.12.16.00.00#Detective services#92.12.00.00.00
-unspsc7#92.12.16.01.00#Detective agencies#92.12.16.00.00
-unspsc7#92.12.16.02.00#Fingerprint services#92.12.16.00.00
-unspsc7#92.12.16.03.00#Lie detection services#92.12.16.00.00
-unspsc7#92.12.16.04.00#Private investigation services#92.12.16.00.00
-unspsc7#92.12.17.00.00#Security systems services#92.12.00.00.00
-unspsc7#92.12.17.01.00#Surveillance or alarm maintenance or monitoring#92.12.17.00.00
-unspsc7#92.12.17.02.00#Fire alarm maintenance or monitoring#92.12.17.00.00
-unspsc7#92.12.17.03.00#Store or business anti theft services#92.12.17.00.00
-unspsc7#92.12.17.04.00#Confinement surveillance systems maintenance or monitoring#92.12.17.00.00
-unspsc7#93.00.00.00.00#Politics and Civic Affairs Services#93.00.00.00.00
-unspsc7#93.10.00.00.00#Political systems and institutions#93.00.00.00.00
-unspsc7#93.10.15.00.00#Political bodies#93.10.00.00.00
-unspsc7#93.10.15.01.00#Political parties representation services#93.10.15.00.00
-unspsc7#93.10.15.02.00#Political parties fund raising services#93.10.15.00.00
-unspsc7#93.10.15.03.00#Political parties public appearance services#93.10.15.00.00
-unspsc7#93.10.15.04.00#Political legislature services#93.10.15.00.00
-unspsc7#93.10.15.05.00#Political judicial power or services#93.10.15.00.00
-unspsc7#93.10.15.06.00#Political executive power or services#93.10.15.00.00
-unspsc7#93.10.16.00.00#Political officials#93.10.00.00.00
-unspsc7#93.10.16.01.00#Cabinet officers services#93.10.16.00.00
-unspsc7#93.10.16.02.00#Governors services#93.10.16.00.00
-unspsc7#93.10.16.03.00#Heads of states services#93.10.16.00.00
-unspsc7#93.10.16.04.00#Presidential services#93.10.16.00.00
-unspsc7#93.10.16.05.00#Prime ministers services#93.10.16.00.00
-unspsc7#93.10.16.06.00#Monarch services#93.10.16.00.00
-unspsc7#93.10.16.07.00#Statesmen services#93.10.16.00.00
-unspsc7#93.10.16.08.00#Parliament members services#93.10.16.00.00
-unspsc7#93.10.17.00.00#Legislative bodies and practice#93.10.00.00.00
-unspsc7#93.10.17.01.00#National council services#93.10.17.00.00
-unspsc7#93.10.17.02.00#Corporate states#93.10.17.00.00
-unspsc7#93.10.17.03.00#Bill drafting services#93.10.17.00.00
-unspsc7#93.10.17.04.00#Legislative hearings services#93.10.17.00.00
-unspsc7#93.10.17.05.00#Intelligence services#93.10.17.00.00
-unspsc7#93.10.17.06.00#Legislators services#93.10.17.00.00
-unspsc7#93.10.17.07.00#Parliamentary practice services#93.10.17.00.00
-unspsc7#93.11.00.00.00#Socio political conditions#93.00.00.00.00
-unspsc7#93.11.15.00.00#Political movements#93.11.00.00.00
-unspsc7#93.11.15.01.00#Extremist movements#93.11.15.00.00
-unspsc7#93.11.15.02.00#Peace movements#93.11.15.00.00
-unspsc7#93.11.15.03.00#Protest movements#93.11.15.00.00
-unspsc7#93.11.15.04.00#Underground movements#93.11.15.00.00
-unspsc7#93.11.15.05.00#Student movements#93.11.15.00.00
-unspsc7#93.11.15.06.00#Peasant movements#93.11.15.00.00
-unspsc7#93.11.15.07.00#Opposition movements#93.11.15.00.00
-unspsc7#93.11.16.00.00#Political representation and participation#93.11.00.00.00
-unspsc7#93.11.16.01.00#Political representation#93.11.16.00.00
-unspsc7#93.11.16.02.00#Political participation#93.11.16.00.00
-unspsc7#93.11.16.03.00#Proportional representation#93.11.16.00.00
-unspsc7#93.11.16.04.00#Vote catcher services#93.11.16.00.00
-unspsc7#93.11.16.05.00#Voter registration or counting or analysis or scrutiny services#93.11.16.00.00
-unspsc7#93.11.16.06.00#Pressure groups representation or participation services#93.11.16.00.00
-unspsc7#93.11.16.07.00#Election analysis services#93.11.16.00.00
-unspsc7#93.11.16.08.00#Election organization services#93.11.16.00.00
-unspsc7#93.12.00.00.00#International relations#93.00.00.00.00
-unspsc7#93.12.15.00.00#Diplomacy#93.12.00.00.00
-unspsc7#93.12.15.01.00#Diplomatic services#93.12.15.00.00
-unspsc7#93.12.15.02.00#Consular services#93.12.15.00.00
-unspsc7#93.12.15.03.00#Diplomats security services#93.12.15.00.00
-unspsc7#93.12.15.04.00#Diplomatic privileges or immunities services#93.12.15.00.00
-unspsc7#93.12.15.05.00#State immunities services#93.12.15.00.00
-unspsc7#93.12.15.06.00#Embassies or ambassadors services#93.12.15.00.00
-unspsc7#93.12.15.07.00#State visits organization services#93.12.15.00.00
-unspsc7#93.12.15.08.00#International law prescription services#93.12.15.00.00
-unspsc7#93.12.15.09.00#International law promotion or recognition services#93.12.15.00.00
-unspsc7#93.12.16.00.00#International relations and cooperation#93.12.00.00.00
-unspsc7#93.12.16.01.00#Multilateral cooperation services#93.12.16.00.00
-unspsc7#93.12.16.02.00#Military cooperation services#93.12.16.00.00
-unspsc7#93.12.16.03.00#Political cooperation services#93.12.16.00.00
-unspsc7#93.12.16.04.00#International economic cooperation services#93.12.16.00.00
-unspsc7#93.12.16.05.00#North south cooperation services#93.12.16.00.00
-unspsc7#93.12.16.06.00#East west cooperation services#93.12.16.00.00
-unspsc7#93.12.16.07.00#International cooperation services#93.12.16.00.00
-unspsc7#93.12.16.08.00#Non governmental liaison services#93.12.16.00.00
-unspsc7#93.12.16.09.00#Non aligned countries cooperation#93.12.16.00.00
-unspsc7#93.12.16.10.00#Aligned countries cooperation#93.12.16.00.00
-unspsc7#93.12.16.11.00#Political crimes cooperation services#93.12.16.00.00
-unspsc7#93.12.16.12.00#Peace treaties cooperation#93.12.16.00.00
-unspsc7#93.12.16.13.00#Treaty signature or accessions or rectification services#93.12.16.00.00
-unspsc7#93.12.16.14.00#International watercourse cooperation services#93.12.16.00.00
-unspsc7#93.12.16.15.00#Territorial claims or negotiations third party services#93.12.16.00.00
-unspsc7#93.12.17.00.00#International organizations#93.12.00.00.00
-unspsc7#93.12.17.01.00#System of organizations services#93.12.17.00.00
-unspsc7#93.12.17.02.00#Security council services#93.12.17.00.00
-unspsc7#93.12.17.03.00#Economic or social council services#93.12.17.00.00
-unspsc7#93.12.17.04.00#Secretariat services#93.12.17.00.00
-unspsc7#93.12.17.05.00#Trustship council services#93.12.17.00.00
-unspsc7#93.12.17.06.00#General assembly services#93.12.17.00.00
-unspsc7#93.12.17.07.00#International court of justice services#93.12.17.00.00
-unspsc7#93.12.17.08.00#International political organizations services#93.12.17.00.00
-unspsc7#93.12.17.09.00#International charity organizations services#93.12.17.00.00
-unspsc7#93.12.17.10.00#International human relief organizations services#93.12.17.00.00
-unspsc7#93.12.17.11.00#International health organizations services#93.12.17.00.00
-unspsc7#93.13.00.00.00#Humanitarian aid and relief#93.00.00.00.00
-unspsc7#93.13.15.00.00#Refugee programs#93.13.00.00.00
-unspsc7#93.13.15.01.00#Protection of human rights services#93.13.15.00.00
-unspsc7#93.13.15.02.00#Promotion of human rights services#93.13.15.00.00
-unspsc7#93.13.15.03.00#Human rights education or information dissemination services#93.13.15.00.00
-unspsc7#93.13.15.04.00#Refugee emergency assistance services#93.13.15.00.00
-unspsc7#93.13.15.05.00#Refugee camps services#93.13.15.00.00
-unspsc7#93.13.15.06.00#Refugee resettlements or repatriation services#93.13.15.00.00
-unspsc7#93.13.15.07.00#Displaced persons assistance services#93.13.15.00.00
-unspsc7#93.13.16.00.00#Food and nutrition policy planning and programs#93.13.00.00.00
-unspsc7#93.13.16.01.00#Hunger eradication programs#93.13.16.00.00
-unspsc7#93.13.16.02.00#Emergency food supply services#93.13.16.00.00
-unspsc7#93.13.16.03.00#World food program services#93.13.16.00.00
-unspsc7#93.13.16.04.00#Food or agriculture organization services#93.13.16.00.00
-unspsc7#93.13.16.05.00#Common fund for commodities services#93.13.16.00.00
-unspsc7#93.13.16.06.00#International fund for agricultural development services#93.13.16.00.00
-unspsc7#93.13.16.07.00#Food distribution services#93.13.16.00.00
-unspsc7#93.13.16.08.00#Food supply services#93.13.16.00.00
-unspsc7#93.13.16.09.00#Food aid policies or programs#93.13.16.00.00
-unspsc7#93.13.16.10.00#Food planning services#93.13.16.00.00
-unspsc7#93.13.16.11.00#Food security services#93.13.16.00.00
-unspsc7#93.13.16.12.00#Food reserves management#93.13.16.00.00
-unspsc7#93.13.16.13.00#Food shortage or surplus management or control services#93.13.16.00.00
-unspsc7#93.13.17.00.00#Health programs#93.13.00.00.00
-unspsc7#93.13.17.01.00#Anti tobacco campaigns#93.13.17.00.00
-unspsc7#93.13.17.02.00#Sanitation programs#93.13.17.00.00
-unspsc7#93.13.17.03.00#Research programs#93.13.17.00.00
-unspsc7#93.13.17.04.00#Disease prevention or control services#93.13.17.00.00
-unspsc7#93.13.17.05.00#Drug abuse prevention or control programs#93.13.17.00.00
-unspsc7#93.13.18.00.00#Disaster preparedness and relief#93.13.00.00.00
-unspsc7#93.13.18.01.00#Disaster warning services#93.13.18.00.00
-unspsc7#93.13.18.02.00#Disaster preparedness response services#93.13.18.00.00
-unspsc7#93.13.18.03.00#Emergency housing services#93.13.18.00.00
-unspsc7#93.14.00.00.00#Community and social services#93.00.00.00.00
-unspsc7#93.14.15.00.00#Social development and services#93.14.00.00.00
-unspsc7#93.14.15.01.00#Social policy services#93.14.15.00.00
-unspsc7#93.14.15.02.00#Social security legislation services#93.14.15.00.00
-unspsc7#93.14.15.03.00#Social planning services#93.14.15.00.00
-unspsc7#93.14.15.04.00#Foster home care services or orphanage#93.14.15.00.00
-unspsc7#93.14.15.05.00#Adoption services#93.14.15.00.00
-unspsc7#93.14.15.06.00#Social welfare services#93.14.15.00.00
-unspsc7#93.14.15.07.00#Social work administration services#93.14.15.00.00
-unspsc7#93.14.15.08.00#Voluntary service management#93.14.15.00.00
-unspsc7#93.14.15.09.00#Social problems analysis or management services#93.14.15.00.00
-unspsc7#93.14.15.10.00#Social structure studies or related services#93.14.15.00.00
-unspsc7#93.14.15.11.00#Social groups studies or related services#93.14.15.00.00
-unspsc7#93.14.15.12.00#Youth movements or organizations services#93.14.15.00.00
-unspsc7#93.14.15.13.00#Social justice or legislation services#93.14.15.00.00
-unspsc7#93.14.15.14.00#Socio cultural services#93.14.15.00.00
-unspsc7#93.14.16.00.00#Population#93.14.00.00.00
-unspsc7#93.14.16.01.00#Population census services#93.14.16.00.00
-unspsc7#93.14.16.02.00#Population sample surveys services#93.14.16.00.00
-unspsc7#93.14.16.03.00#Birth reporting or control services#93.14.16.00.00
-unspsc7#93.14.16.04.00#Population control services#93.14.16.00.00
-unspsc7#93.14.16.05.00#Population trends or projections services#93.14.16.00.00
-unspsc7#93.14.16.06.00#Birth statistics services#93.14.16.00.00
-unspsc7#93.14.16.07.00#Marriage research or statistics services#93.14.16.00.00
-unspsc7#93.14.16.08.00#Population distribution or analysis services#93.14.16.00.00
-unspsc7#93.14.16.09.00#Population composition analysis services#93.14.16.00.00
-unspsc7#93.14.16.10.00#Demographic studies#93.14.16.00.00
-unspsc7#93.14.16.11.00#Immigration analysis or services#93.14.16.00.00
-unspsc7#93.14.16.12.00#Family planning programs or services#93.14.16.00.00
-unspsc7#93.14.16.13.00#Human reproduction analysis#93.14.16.00.00
-unspsc7#93.14.17.00.00#Culture#93.14.00.00.00
-unspsc7#93.14.17.01.00#Cultural events organizations#93.14.17.00.00
-unspsc7#93.14.17.02.00#Culture promotional services#93.14.17.00.00
-unspsc7#93.14.17.03.00#Art related services#93.14.17.00.00
-unspsc7#93.14.17.04.00#Song writing services#93.14.17.00.00
-unspsc7#93.14.17.05.00#Literary writing services#93.14.17.00.00
-unspsc7#93.14.17.06.00#Minorities protection services#93.14.17.00.00
-unspsc7#93.14.17.07.00#Cultural heritage preservation or promotion services#93.14.17.00.00
-unspsc7#93.14.17.08.00#Museum services#93.14.17.00.00
-unspsc7#93.14.17.09.00#Cultural policy services#93.14.17.00.00
-unspsc7#93.14.17.10.00#Archaic or indigenous language services#93.14.17.00.00
-unspsc7#93.14.17.11.00#Traditional handcrafts promotion services#93.14.17.00.00
-unspsc7#93.14.17.12.00#Protection of intellectual or cultural property services#93.14.17.00.00
-unspsc7#93.14.17.13.00#Historic sites or monuments protection services#93.14.17.00.00
-unspsc7#93.14.17.14.00#Mythology#93.14.17.00.00
-unspsc7#93.14.18.00.00#Employment#93.14.00.00.00
-unspsc7#93.14.18.01.00#Employment promotion or planning services#93.14.18.00.00
-unspsc7#93.14.18.02.00#Recruitment services#93.14.18.00.00
-unspsc7#93.14.18.03.00#International labor standards services#93.14.18.00.00
-unspsc7#93.14.18.04.00#International labor registration services#93.14.18.00.00
-unspsc7#93.14.18.05.00#Unemployment services#93.14.18.00.00
-unspsc7#93.14.18.06.00#Employment statistics or forecasting services#93.14.18.00.00
-unspsc7#93.14.18.07.00#Work time arrangements#93.14.18.00.00
-unspsc7#93.14.18.08.00#Occupational health or safety services#93.14.18.00.00
-unspsc7#93.14.18.10.00#Career development services#93.14.18.00.00
-unspsc7#93.14.18.11.00#Promotional services#93.14.18.00.00
-unspsc7#93.14.18.12.00#Labor inspection services#93.14.18.00.00
-unspsc7#93.14.18.13.00#Work council services#93.14.18.00.00
-unspsc7#93.14.18.14.00#International labor services#93.14.18.00.00
-unspsc7#93.14.19.00.00#Rural development#93.14.00.00.00
-unspsc7#93.14.19.01.00#Agricultural commercial banking services#93.14.19.00.00
-unspsc7#93.14.19.02.00#Rural investment services#93.14.19.00.00
-unspsc7#93.14.19.03.00#Agricultural institutions organization or management services#93.14.19.00.00
-unspsc7#93.14.19.04.00#Agricultural or rural cooperatives services#93.14.19.00.00
-unspsc7#93.14.19.05.00#Agricultural research services#93.14.19.00.00
-unspsc7#93.14.19.06.00#Farmers or peasants organizations services#93.14.19.00.00
-unspsc7#93.14.19.07.00#Womens services in agricultural production or rural development#93.14.19.00.00
-unspsc7#93.14.19.08.00#Agrarian reform or land settlement services#93.14.19.00.00
-unspsc7#93.14.19.09.00#Land administration services#93.14.19.00.00
-unspsc7#93.14.19.10.00#Island development services#93.14.19.00.00
-unspsc7#93.14.20.00.00#Urban development#93.14.00.00.00
-unspsc7#93.14.20.01.00#Urban development planning services#93.14.20.00.00
-unspsc7#93.14.20.02.00#Urban land administration services#93.14.20.00.00
-unspsc7#93.14.20.03.00#Urban investment programming services#93.14.20.00.00
-unspsc7#93.14.20.04.00#Slum redevlopment services#93.14.20.00.00
-unspsc7#93.14.20.05.00#Urban lighting services#93.14.20.00.00
-unspsc7#93.14.20.06.00#Urban development control or regulations services#93.14.20.00.00
-unspsc7#93.14.20.07.00#Urban building standards or regulations services#93.14.20.00.00
-unspsc7#93.14.20.08.00#Urban community services#93.14.20.00.00
-unspsc7#93.14.20.09.00#Urban project or program administration or management services#93.14.20.00.00
-unspsc7#93.14.21.00.00#Regional development#93.14.00.00.00
-unspsc7#93.14.21.01.00#Regional development planning services#93.14.21.00.00
-unspsc7#93.14.21.02.00#Economic cooperation services#93.14.21.00.00
-unspsc7#93.14.21.03.00#Technical cooperation services#93.14.21.00.00
-unspsc7#93.14.21.04.00#Sectoral planning services#93.14.21.00.00
-unspsc7#93.15.00.00.00#Public administration and finance services#93.00.00.00.00
-unspsc7#93.15.15.00.00#Public administration#93.15.00.00.00
-unspsc7#93.15.15.01.00#Public enterprises management or financial services#93.15.15.00.00
-unspsc7#93.15.15.02.00#Public enterprises information or control systems services#93.15.15.00.00
-unspsc7#93.15.15.03.00#Privatization programs#93.15.15.00.00
-unspsc7#93.15.15.04.00#Administrative reform services#93.15.15.00.00
-unspsc7#93.15.15.05.00#Administrative agencies services#93.15.15.00.00
-unspsc7#93.15.15.06.00#Administrative economic council services#93.15.15.00.00
-unspsc7#93.15.15.07.00#Administrative procedures or services#93.15.15.00.00
-unspsc7#93.15.15.08.00#Government departments services#93.15.15.00.00
-unspsc7#93.15.15.09.00#Government information services#93.15.15.00.00
-unspsc7#93.15.15.10.00#Administrative fees or tax collection services#93.15.15.00.00
-unspsc7#93.15.15.11.00#Administrative acts ratification or implementation services#93.15.15.00.00
-unspsc7#93.15.15.12.00#Public institutions services#93.15.15.00.00
-unspsc7#93.15.15.13.00#Multinational public corporations services#93.15.15.00.00
-unspsc7#93.15.15.14.00#Ombudsman services#93.15.15.00.00
-unspsc7#93.15.15.15.00#National planning services#93.15.15.00.00
-unspsc7#93.15.16.00.00#Public finance#93.15.00.00.00
-unspsc7#93.15.16.01.00#Program budgeting services#93.15.16.00.00
-unspsc7#93.15.16.02.00#Government budgeting services#93.15.16.00.00
-unspsc7#93.15.16.03.00#Budget or public investment management#93.15.16.00.00
-unspsc7#93.15.16.04.00#Military expenditures budgeting services#93.15.16.00.00
-unspsc7#93.15.16.05.00#Government finance services#93.15.16.00.00
-unspsc7#93.15.16.06.00#Government accounting services#93.15.16.00.00
-unspsc7#93.15.16.07.00#Government auditing services#93.15.16.00.00
-unspsc7#93.15.16.08.00#Government or central bank services#93.15.16.00.00
-unspsc7#93.15.16.09.00#Lotteries services#93.15.16.00.00
-unspsc7#93.15.16.10.00#Tax collection services#93.15.16.00.00
-unspsc7#93.15.16.11.00#Subsidies#93.15.16.00.00
-unspsc7#93.15.17.00.00#Currency#93.15.00.00.00
-unspsc7#93.15.17.01.00#Currencies or coinage#93.15.17.00.00
-unspsc7#93.15.17.02.00#National bank notes#93.15.17.00.00
-unspsc7#93.16.00.00.00#Taxation#93.00.00.00.00
-unspsc7#93.16.15.00.00#Income tax#93.16.00.00.00
-unspsc7#93.16.15.01.00#National income tax#93.16.15.00.00
-unspsc7#93.16.15.02.00#Municipal income tax#93.16.15.00.00
-unspsc7#93.16.15.03.00#Capital gains tax#93.16.15.00.00
-unspsc7#93.16.15.04.00#Excess profits tax#93.16.15.00.00
-unspsc7#93.16.16.00.00#Taxes other than income tax#93.16.00.00.00
-unspsc7#93.16.16.01.00#Property tax#93.16.16.00.00
-unspsc7#93.16.16.02.00#Land tax#93.16.16.00.00
-unspsc7#93.16.16.03.00#Value added tax (VAT)#93.16.16.00.00
-unspsc7#93.16.16.04.00#Payroll tax#93.16.16.00.00
-unspsc7#93.16.16.05.00#Sales tax#93.16.16.00.00
-unspsc7#93.16.16.06.00#Social security tax#93.16.16.00.00
-unspsc7#93.16.16.07.00#Inheritance or transfer tax#93.16.16.00.00
-unspsc7#93.16.17.00.00#Tax administration#93.16.00.00.00
-unspsc7#93.16.17.01.00#Tax collation#93.16.17.00.00
-unspsc7#93.16.17.02.00#Tax incentives#93.16.17.00.00
-unspsc7#93.16.17.03.00#Tax systems#93.16.17.00.00
-unspsc7#93.16.17.04.00#Tax revenue administration#93.16.17.00.00
-unspsc7#93.16.18.00.00#Taxation issues#93.16.00.00.00
-unspsc7#93.16.18.01.00#Tax reform#93.16.18.00.00
-unspsc7#93.16.18.02.00#Taxation policy#93.16.18.00.00
-unspsc7#93.16.18.03.00#Tax research#93.16.18.00.00
-unspsc7#93.16.18.04.00#Investment tax credit#93.16.18.00.00
-unspsc7#93.16.18.05.00#Tax deductions#93.16.18.00.00
-unspsc7#93.16.18.06.00#Tax evasion#93.16.18.00.00
-unspsc7#93.16.18.07.00#Tax shelters or havens#93.16.18.00.00
-unspsc7#93.16.18.08.00#Tax returns#93.16.18.00.00
-unspsc7#93.17.00.00.00#Trade policy and regulation#93.00.00.00.00
-unspsc7#93.17.15.00.00#Trade policy#93.17.00.00.00
-unspsc7#93.17.15.01.00#Trade agreements#93.17.15.00.00
-unspsc7#93.17.15.02.00#Trade negotiations#93.17.15.00.00
-unspsc7#93.17.15.03.00#Formulation of national commodity policies#93.17.15.00.00
-unspsc7#93.17.15.04.00#Development of small scale industries#93.17.15.00.00
-unspsc7#93.17.16.00.00#International trade#93.17.00.00.00
-unspsc7#93.17.16.01.00#International commodity agreements#93.17.16.00.00
-unspsc7#93.17.16.02.00#Export policy#93.17.16.00.00
-unspsc7#93.17.16.03.00#Global trade policies or procedures#93.17.16.00.00
-unspsc7#93.17.16.04.00#Bilateral trade agreements#93.17.16.00.00
-unspsc7#93.17.17.00.00#Customs administration and compliance#93.17.00.00.00
-unspsc7#93.17.17.01.00#Customs conventions#93.17.17.00.00
-unspsc7#93.17.17.02.00#Customs formalities#93.17.17.00.00
-unspsc7#93.17.17.03.00#Customs offences#93.17.17.00.00
-unspsc7#93.17.18.00.00#Trade analysis#93.17.00.00.00
-unspsc7#93.17.18.01.00#Trade projections#93.17.18.00.00
-unspsc7#93.17.18.02.00#Balance of trade projections#93.17.18.00.00
-unspsc7#93.17.18.03.00#Trade statistics#93.17.18.00.00
-unspsc7#94.00.00.00.00#Organizations and Clubs#94.00.00.00.00
-unspsc7#94.10.00.00.00#Work related organizations#94.00.00.00.00
-unspsc7#94.10.15.00.00#Business associations#94.10.00.00.00
-unspsc7#94.10.15.01.00#Agricultural industry associations#94.10.15.00.00
-unspsc7#94.10.15.02.00#Regulatory associations#94.10.15.00.00
-unspsc7#94.10.15.03.00#Sectoral business associations#94.10.15.00.00
-unspsc7#94.10.15.04.00#International business associations#94.10.15.00.00
-unspsc7#94.10.15.05.00#Employers associations#94.10.15.00.00
-unspsc7#94.10.16.00.00#Professional associations#94.10.00.00.00
-unspsc7#94.10.16.01.00#Dental associations#94.10.16.00.00
-unspsc7#94.10.16.02.00#Medical health associations#94.10.16.00.00
-unspsc7#94.10.16.03.00#Nursing associations#94.10.16.00.00
-unspsc7#94.10.16.04.00#Accounting associations#94.10.16.00.00
-unspsc7#94.10.16.05.00#Architect associations#94.10.16.00.00
-unspsc7#94.10.16.06.00#Bar associations#94.10.16.00.00
-unspsc7#94.10.16.07.00#Educational or teacher associations#94.10.16.00.00
-unspsc7#94.10.16.08.00#Engineering associations#94.10.16.00.00
-unspsc7#94.10.16.09.00#Scientific associations#94.10.16.00.00
-unspsc7#94.10.16.10.00#Professional standards review boards#94.10.16.00.00
-unspsc7#94.10.17.00.00#Staff associations#94.10.00.00.00
-unspsc7#94.10.17.01.00#Staff hobby clubs#94.10.17.00.00
-unspsc7#94.10.17.02.00#Staff sports associations#94.10.17.00.00
-unspsc7#94.10.17.03.00#Women staff associations#94.10.17.00.00
-unspsc7#94.10.17.04.00#Pensionnist staff associations#94.10.17.00.00
-unspsc7#94.10.17.05.00#Management staff associations#94.10.17.00.00
-unspsc7#94.10.18.00.00#Trade unions#94.10.00.00.00
-unspsc7#94.10.18.01.00#Labor or general workers trade unions#94.10.18.00.00
-unspsc7#94.10.18.02.00#Trade union activists services#94.10.18.00.00
-unspsc7#94.10.18.03.00#Trade union information services#94.10.18.00.00
-unspsc7#94.10.18.04.00#Transport unions#94.10.18.00.00
-unspsc7#94.10.18.05.00#Teachers unions#94.10.18.00.00
-unspsc7#94.10.18.06.00#Medical personnel unions#94.10.18.00.00
-unspsc7#94.10.18.07.00#Employers unions#94.10.18.00.00
-unspsc7#94.10.18.08.00#Civil servants unions#94.10.18.00.00
-unspsc7#94.10.18.09.00#Personal assistance services#94.10.18.00.00
-unspsc7#94.10.18.10.00#Aviation unions#94.10.18.00.00
-unspsc7#94.11.00.00.00#Religious organizations#94.00.00.00.00
-unspsc7#94.11.17.00.00#Religious residences#94.11.00.00.00
-unspsc7#94.11.17.01.00#Private religious home residences#94.11.17.00.00
-unspsc7#94.11.17.02.00#Community religious home residences#94.11.17.00.00
-unspsc7#94.11.17.03.00#Religious retreat residences#94.11.17.00.00
-unspsc7#94.11.17.04.00#Temporary religious home residences#94.11.17.00.00
-unspsc7#94.11.18.00.00#Pilgrimage organizations and services#94.11.00.00.00
-unspsc7#94.11.18.01.00#Mecca pilgrimage organizations or services#94.11.18.00.00
-unspsc7#94.11.18.02.00#Vatican pilgrimage organizations or services#94.11.18.00.00
-unspsc7#94.11.18.03.00#Pilgrimage travel assistance services#94.11.18.00.00
-unspsc7#94.11.18.04.00#Pilgrimage tour operators services#94.11.18.00.00
-unspsc7#94.11.19.00.00#Missionary services#94.11.00.00.00
-unspsc7#94.11.19.01.00#Religious orders services#94.11.19.00.00
-unspsc7#94.11.19.02.00#Evangelical missionary services#94.11.19.00.00
-unspsc7#94.11.19.03.00#Educational missionary services#94.11.19.00.00
-unspsc7#94.11.20.00.00#Denominational services#94.11.00.00.00
-unspsc7#94.11.20.01.00#Hinduism services#94.11.20.00.00
-unspsc7#94.11.20.02.00#Buddhism services#94.11.20.00.00
-unspsc7#94.11.20.03.00#Christian services#94.11.20.00.00
-unspsc7#94.11.20.04.00#Islam services#94.11.20.00.00
-unspsc7#94.11.20.05.00#Judaism services#94.11.20.00.00
-unspsc7#94.12.00.00.00#Clubs#94.00.00.00.00
-unspsc7#94.12.15.00.00#Sport clubs#94.12.00.00.00
-unspsc7#94.12.15.01.00#Ice sports clubs#94.12.15.00.00
-unspsc7#94.12.15.02.00#Boating or swimming sport clubs#94.12.15.00.00
-unspsc7#94.12.15.03.00#Gun or hunting sport clubs#94.12.15.00.00
-unspsc7#94.12.15.04.00#Outdoor field sport clubs#94.12.15.00.00
-unspsc7#94.12.15.05.00#Indoor or outdoor court sport clubs#94.12.15.00.00
-unspsc7#94.12.15.06.00#Winter sport clubs#94.12.15.00.00
-unspsc7#94.12.15.07.00#Beach or water sport clubs#94.12.15.00.00
-unspsc7#94.12.15.08.00#Cycling sport clubs#94.12.15.00.00
-unspsc7#94.12.15.09.00#Mountaineering sport clubs#94.12.15.00.00
-unspsc7#94.12.15.10.00#Racing sport clubs#94.12.15.00.00
-unspsc7#94.12.15.11.00#Flying sport clubs#94.12.15.00.00
-unspsc7#94.12.15.12.00#Professional or semiprofessional sports clubs#94.12.15.00.00
-unspsc7#94.12.15.13.00#Stadium event operator services#94.12.15.00.00
-unspsc7#94.12.15.14.00#Sport club managers or promoters services#94.12.15.00.00
-unspsc7#94.12.16.00.00#Hobby clubs#94.12.00.00.00
-unspsc7#94.12.16.01.00#Playing card hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.02.00#Handcrafts clubs#94.12.16.00.00
-unspsc7#94.12.16.03.00#Poetry or literature hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.04.00#Cooking hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.05.00#Gardening hobby clubs#94.12.16.00.00
-unspsc7#94.12.16.06.00#Collector hobby club#94.12.16.00.00
-unspsc7#94.12.16.07.00#Scouting club#94.12.16.00.00
-unspsc7#94.12.17.00.00#Amateurs clubs#94.12.00.00.00
-unspsc7#94.12.17.01.00#Amateur drama clubs or services#94.12.17.00.00
-unspsc7#94.12.17.02.00#Amateur music clubs or services#94.12.17.00.00
-unspsc7#94.12.17.03.00#Amateur dance clubs or services#94.12.17.00.00
-unspsc7#94.12.17.04.00#Amateur fine arts clubs or services#94.12.17.00.00
-unspsc7#94.12.18.00.00#Social clubs#94.12.00.00.00
-unspsc7#94.12.18.01.00#Youth clubs#94.12.18.00.00
-unspsc7#94.12.18.02.00#Senior citizens clubs#94.12.18.00.00
-unspsc7#94.12.18.03.00#Social gathering clubs#94.12.18.00.00
-unspsc7#94.12.18.04.00#Social clubs for people with disabilities#94.12.18.00.00
-unspsc7#94.12.18.05.00#War veterans social clubs#94.12.18.00.00
-unspsc7#94.13.00.00.00#Civic organizations and associations and movements#94.00.00.00.00
-unspsc7#94.13.15.00.00#Non governmental organizations#94.13.00.00.00
-unspsc7#94.13.15.01.00#Environmental non governmental services#94.13.15.00.00
-unspsc7#94.13.15.02.00#Emergency relief non governmental services#94.13.15.00.00
-unspsc7#94.13.15.03.00#Technical assistance non governmental services#94.13.15.00.00
-unspsc7#94.13.15.04.00#Development aid non governemntal services#94.13.15.00.00
-unspsc7#94.13.16.00.00#Charity organizations#94.13.00.00.00
-unspsc7#94.13.16.01.00#Charity organizations shelter services#94.13.16.00.00
-unspsc7#94.13.16.02.00#Food relief services#94.13.16.00.00
-unspsc7#94.13.16.03.00#Legal assistance services#94.13.16.00.00
-unspsc7#94.13.16.04.00#Resource mobilization services#94.13.16.00.00
-unspsc7#94.13.16.05.00#International aid assistance services#94.13.16.00.00
-unspsc7#94.13.16.06.00#Orphanage or adoption services#94.13.16.00.00
-unspsc7#94.13.16.07.00#Ederly assistance organizations#94.13.16.00.00
-unspsc7#94.13.16.08.00#Prisoner assistance organizations#94.13.16.00.00
-unspsc7#94.13.17.00.00#Green associations#94.13.00.00.00
-unspsc7#94.13.17.01.00#Radical green associations#94.13.17.00.00
-unspsc7#94.13.17.02.00#Ecofeminists associations#94.13.17.00.00
-unspsc7#94.13.17.03.00#Ecological political organizations#94.13.17.00.00
-unspsc7#94.13.17.04.00#Green activists movements or services#94.13.17.00.00
-unspsc7#94.13.18.00.00#Movements#94.13.00.00.00
-unspsc7#94.13.18.01.00#Gay or lesbian or bisexual or transgender movements#94.13.18.00.00
-unspsc7#94.13.18.02.00#Anti racism movements#94.13.18.00.00
-unspsc7#94.13.18.03.00#Women liberation movements#94.13.18.00.00
-unspsc7#94.13.18.04.00#Fraternal associations#94.13.18.00.00
-unspsc7#94.13.18.05.00#Ethnic minorities cultural preservation services#94.13.18.00.00
-unspsc7#94.13.19.00.00#Animal protection associations#94.13.00.00.00
-unspsc7#94.13.19.01.00#Animal liberation movements#94.13.19.00.00
-unspsc7#94.13.19.02.00#Endangered species protection associations#94.13.19.00.00
-unspsc7#94.13.19.03.00#Threatened animals protection associations#94.13.19.00.00
-unspsc7#94.13.20.00.00#Human rights advocacy and defense associations#94.13.00.00.00
-unspsc7#94.13.20.01.00#Children rights defense services#94.13.20.00.00
-unspsc7#94.13.20.02.00#Prisoners defense services#94.13.20.00.00
-unspsc7#94.13.20.03.00#Physical or mental torture defense associations#94.13.20.00.00
-unspsc7#94.13.20.04.00#Freedom of speech defense associations#94.13.20.00.00
-unspsc7#94.13.20.05.00#Voting rights defense associations#94.13.20.00.00
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp
deleted file mode 100644
index 80e9f9f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp
+++ /dev/null
@@ -1,114 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<script language="javascript">
- function processPublishServiceAdvancedForm(form)
- {
- if (handleSubmit(form))
- {
- processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
- processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processCategoryTable("publishServiceAdvancedCategories",form,false);
- return true;
- }
- return false;
- }
-</script>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceAdvanced" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/BusPublishServiceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processAdvancedForm(this)">
- <input type="hidden" name="subQueryGet">
- <input type="hidden" name="<%=UDDIActionInputs.NODEID_BUSINESS%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_business_publish_service_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_business_publish_service_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- </table>
-<%
- boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- String[] serviceInterfaceSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedServiceInterface");
- sectionHeaderInfo.setOtherProperties(serviceInterfaceSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp
deleted file mode 100644
index dfa8a17..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp
+++ /dev/null
@@ -1,260 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectSubQueryItemAction,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.*,
- org.uddi4j.datatype.tmodel.TModel,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode must be a business node.
- Node busNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(busNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
- // business parent node may be either the published items folder or a query node.
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- Node regNode = uddiMainNode.getRegistryNode(busNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_BUSINESS_PUBLISH_SERVICE")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
- var sectionIds = ["publishServiceSimple","publishServiceAdvanced"];
- var styleForm = "publishServiceStyle";
-
- function processAdvancedForm(form)
- {
- if (handleSubmit(form))
- {
- processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
- processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processCategoryTable("publishServiceAdvancedCategories",form,false);
- return true;
- }
- return false;
- }
-
- function setAuthenticationSectionDefaults(form)
- {
-<%
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- }
-
- function setDefaults()
- {
-<%
- String publishServiceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
- document.forms[styleForm].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=publishServiceStyleIndex%>].checked = true;
-
- var publishServiceSimpleSection = document.getElementById(sectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var publishServiceSimpleForm = publishServiceSimpleSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceSimpleForm);
- publishServiceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))%>";
- publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
- publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION))%>";
-
- // Advanced form details.
- var publishServiceAdvancedSection = document.getElementById(sectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var publishServiceAdvancedForm = publishServiceAdvancedSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceAdvancedForm);
- var publishServiceAdvancedNamesTable = getTable("publishServiceAdvancedNames");
- var publishServiceAdvancedDescriptionsTable = getTable("publishServiceAdvancedDescriptions");
- publishServiceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))%>";
-<%
- Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- if (serviceInterfaces != null)
- {
- if (serviceInterfacesCopy == null)
- serviceInterfacesCopy = new Vector();
- else
- serviceInterfacesCopy.removeAllElements();
- for (int i=0;i<serviceInterfaces.size();i++)
- {
- ListElement listElement = (ListElement)serviceInterfaces.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
- TModel tModel = (TModel)listElement.getObject();
- serviceInterfacesCopy.addElement(serviceInterfaces.elementAt(i));
-%>
- addResultRow("publishServiceAdvancedServiceInterface",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
- }
- else
- {
- serviceInterfaces = new Vector();
- serviceInterfacesCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceInterfaces);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
- }
-%>
-<%
- Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (serviceNameVector != null)
- {
- for (int i=0;i<serviceNameVector.size();i++)
- {
- Name name = (Name)serviceNameVector.elementAt(i);
-%>
- addLanguageInputRow("publishServiceAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishServiceAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i))
- {
-%>
- highlightErrantRow(publishServiceAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- Vector serviceDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- if (serviceDescriptionVector != null)
- {
- for (int i=0;i<serviceDescriptionVector.size();i++)
- {
- Description description = (Description)serviceDescriptionVector.elementAt(i);
-%>
- addLanguageInputRow("publishServiceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishServiceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i))
- {
-%>
- highlightErrantRow(publishServiceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- if (serviceCatBag != null)
- {
- Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("publishServiceAdvancedCategories");
- setCategoryRowSettings("publishServiceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- if (!regElement.isLoggedIn())
- {
-%>
- document.getElementById("publishServiceSimpleAuthentication").style.display = "";
- document.getElementById("publishServiceAdvancedAuthentication").style.display = "";
-<%
- }
-%>
- showPublishForm(<%=publishServiceStyleIndex%>);
- }
-
- function showPublishForm(style)
- {
- closeAllUddiChildWindows();
- for (var i=0;i<sectionIds.length;i++)
- {
- if (i == style)
- document.getElementById(sectionIds[i]).style.display = "";
- else
- document.getElementById(sectionIds[i]).style.display = "none";
- }
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td>
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "uddi/images/publish_service_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_PUBLISH_SERVICE");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <form name="publishServiceStyle" style="margin-top:0;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_business_publish_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_business_publish_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_business_publish_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_business_publish_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/BusPublishServiceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/BusPublishServiceAdvancedForm.jsp" flush="true"/>
- </div>
- </div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp
deleted file mode 100644
index 35a4d91..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp
+++ /dev/null
@@ -1,95 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/BusPublishServiceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <input type="hidden" name="<%=UDDIActionInputs.NODEID_BUSINESS%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_business_publish_service_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_business_publish_service_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_business_publish_service_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <tr>
- <td colspan=3> <input type="text" id="input_business_publish_service_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_business_publish_service_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
- </td>
- </tr>
- <tr>
- <td colspan=3> <input type="text" id="input_business_publish_service_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp
deleted file mode 100644
index 6a0a09d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp
+++ /dev/null
@@ -1,294 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_BUSINESS_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
- var businessDetailsDiscoveryURLsTable = getTable("businessDetailsDiscoveryURLs");
- var businessDetailsNamesTable = getTable("businessDetailsNames");
- var businessDetailsDescriptionsTable = getTable("businessDetailsDescriptions");
- var businessDetailsIdentifiersTable = getTable("businessDetailsIdentifiers");
-<%
- Vector discoveryURLVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- if (discoveryURLVector != null)
- {
- for (int i=0;i<discoveryURLVector.size();i++)
- {
- ListElement listElement = (ListElement)discoveryURLVector.elementAt(i);
- DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
- boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
- boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsDiscoveryURLRow("businessDetailsDiscoveryURLs",<%=isError||isNewItem%>);
- setDetailsDiscoveryURLRow("businessDetailsDiscoveryURLs",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(businessDetailsDiscoveryURLsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector nameIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- if (nameIndexVector != null)
- {
- for (int i=0;i<nameIndexVector.size();i++)
- {
- ListElement listElement = (ListElement)nameIndexVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsLanguageInputRow("businessDetailsNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
- setDetailsLanguageInputRow("businessDetailsNames",<%=i%>,<%=listElement.getViewId()%>,"<%=name.getLang()%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(businessDetailsNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- if (descriptionIndexVector != null)
- {
- for (int i=0;i<descriptionIndexVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsLanguageInputRow("businessDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
- setDetailsLanguageInputRow("businessDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(businessDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector idVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- if (idVector != null)
- {
- for (int i=0;i<idVector.size();i++)
- {
- ListElement listElement = (ListElement)idVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,i);
- boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsIdentifierRow("businessDetailsIdentifiers",<%=isError||isNewItem%>);
- setDetailsIdentifierRow("businessDetailsIdentifiers",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(businessDetailsIdentifiersTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- if (catVector != null)
- {
- for (int i=0;i<catVector.size();i++)
- {
- ListElement listElement = (ListElement)catVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- boolean isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,i);
- boolean isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsCategoryRow("businessDetailsCategories",<%=isError||isNewItem%>);
- setDetailsCategoryRow("businessDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(businessDetailsCategoriesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- // Authentication.
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- if (<%=!regElement.isLoggedIn()%>)
- document.getElementById("businessDetailsAuthentication").style.display = "";
-
- showMainForm();
- }
-
- function showMainForm()
- {
- closeAllUddiChildWindows();
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function processForm(form)
- {
- if (handleSubmit(form))
- {
- processDetailsDiscoveryURLTable("businessDetailsDiscoveryURLs","<%=UDDIActionInputs.DISCOVERYURL_MODIFIED%>","<%=UDDIActionInputs.DISCOVERYURL_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL%>",form);
- processDetailsLanguageInputTable("businessDetailsNames","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.NAME_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processDetailsLanguageInputTable("businessDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processDetailsIdentifierTable("businessDetailsIdentifiers",form);
- processDetailsCategoryTable("businessDetailsCategories",form);
- return true;
- }
- return false;
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateBusinessActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "images/details_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_BUSINESS_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>">
- <table>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
- </td>
- </tr>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES))};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsIdentifiers");
-%>
-<jsp:include page="/uddi/forms/detailsIdentifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsDiscoveryURLs");
- Boolean discoveryURLSpecificInfo = new Boolean(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS));
- sectionHeaderInfo.setOtherProperties(discoveryURLSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsDiscoveryURLs_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("businessDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </div>
- </form>
- </div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp
deleted file mode 100644
index bfdb7cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp
+++ /dev/null
@@ -1,218 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.service.*,
- org.uddi4j.datatype.tmodel.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request">
-<%
- subQueryTransferTargetHolder.removeAllElements();
-%>
-</jsp:useBean>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = nodeManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- TreeElement treeElement = selectedNode.getTreeElement();
- String parentQueryKey;
- int lastSeparatorPos = subQueryKey.lastIndexOf(':');
- if (lastSeparatorPos == -1)
- parentQueryKey = "";
- else
- parentQueryKey = subQueryKey.substring(0,lastSeparatorPos);
- FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(parentQueryKey);
- Object queryItemProperty = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
- Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
- Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
- Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
- Hashtable parentQueryData = new Hashtable();
- if (queryItemProperty != null)
- parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItemProperty);
- if (queryStyleBus != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
- if (queryStyleSer != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
- if (queryStyleSerInt != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
- SubQueryTransferTarget subQueryTransferTarget = new SubQueryTransferTarget(selectedNode,subQueryKey,parentQueryData);
- treeElement.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
- subQueryTransferTargetHolder.addElement(subQueryTransferTarget);
- boolean hasTarget = true;
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_GET_FORM")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
-<%
- int queryItem = Integer.parseInt((String)formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM));
- Hashtable allUniqueNodes = new Hashtable();
- Vector allNodes = new Vector();
- UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- regNode.getAllBusinessNodes(allNodes);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- regNode.getAllServiceNodes(allNodes);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- regNode.getAllServiceInterfaceNodes(allNodes);
- }
-
- for (int i=0;i<allNodes.size();i++)
- {
- Node node = (Node)allNodes.elementAt(i);
- allUniqueNodes.put(node.getTreeElement().getKey(),node);
- }
-
- if (!allUniqueNodes.isEmpty())
- {
- Object[] itemNodes = allUniqueNodes.values().toArray();
- QuickSort.sort(itemNodes,0,itemNodes.length-1);
- for (int i=0;i<itemNodes.length;i++)
- {
- Node itemNode = (Node)itemNodes[i];
- String url = SelectNavigatorNodeAction.getActionLink(itemNode.getNodeId(),false);
- String name = null;
- String description = null;
- if (itemNode instanceof BusinessNode)
- {
- BusinessElement busElement = (BusinessElement)itemNode.getTreeElement();
- BusinessEntity be = busElement.getBusinessEntity();
- name = be.getDefaultNameString();
- description = be.getDefaultDescriptionString();
- }
- else if (itemNode instanceof ServiceNode)
- {
- ServiceElement serviceElement = (ServiceElement)itemNode.getTreeElement();
- BusinessService bs = serviceElement.getBusinessService();
- name = bs.getDefaultNameString();
- description = bs.getDefaultDescriptionString();
- }
- else if (itemNode instanceof ServiceInterfaceNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)itemNode.getTreeElement();
- TModel tModel = siElement.getTModel();
- name = tModel.getNameString();
- description = tModel.getDefaultDescriptionString();
- }
-%>
- addResultRow("Get",<%=itemNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
- }
-%>
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
-<%
- }
- else
- {
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(TransferSubQueryResultsAction.getActionLinkForReturn()))%>";
-<%
- }
-%>
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
- <table id="loadScreen">
- <tr>
- <td>
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String title = uddiPerspective.getMessage("ALT_GET");
- String titleImagePath = "uddi/images/find_highlighted.gif";
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
- <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
- sectionHeaderInfo.clear();
- String tableTitle;
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
- }
- String[] otherProperties = {tableTitle,""};
- sectionHeaderInfo.setContainerId("Get");
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_TRANSFER")%>" onClick="transferSelections('Get',this.form)" class="button">
- </td>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Get',this.form)" class="button">
- </td>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Get',this.form)" class="button">
- </td>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Get',this.form)" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
- </form>
- </div>
-</div>
-</div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp
deleted file mode 100644
index 43fdace..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp
+++ /dev/null
@@ -1,211 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.service.*,
- org.uddi4j.datatype.tmodel.*,
- java.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- int queryItem = Integer.parseInt(request.getParameter(UDDIActionInputs.QUERY_ITEM));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager.getRootNode();
- Node selectedNode = nodeManager.getSelectedNode();
- Tool selectedTool = selectedNode.getCurrentToolManager().getSelectedTool();
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- TreeElement treeElement = selectedNode.getTreeElement();
- Vector summaryNodes = new Vector();
- if (treeElement instanceof QueryParentElement)
- regNode.getDiscoveredNodes(summaryNodes,queryItem);
- else if (treeElement instanceof PublishedItemsElement)
- {
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- regNode.getPublishedBusinessNodes(summaryNodes);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- regNode.getPublishedServiceNodes(summaryNodes);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- regNode.getPublishedServiceInterfaceNodes(summaryNodes);
- }
- }
- boolean hasTarget = false;
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_ITEMS_SUMMARY")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
-<%
- Hashtable allUniqueNodes = new Hashtable();
- for (int i=0;i<summaryNodes.size();i++)
- {
- Node summaryNode = (Node)summaryNodes.elementAt(i);
- allUniqueNodes.put(summaryNode.getTreeElement().getKey(),summaryNode);
- }
-
- if (!allUniqueNodes.isEmpty())
- {
- Object[] itemNodes = allUniqueNodes.values().toArray();
- QuickSort.sort(itemNodes,0,itemNodes.length-1);
- for (int i=0;i<itemNodes.length;i++)
- {
- Node itemNode = (Node)itemNodes[i];
- String url = SelectNavigatorNodeAction.getActionLink(itemNode.getNodeId(),false);
- String name = null;
- String description = null;
- if (itemNode instanceof QueryNode)
- {
- QueryElement queryElement = (QueryElement)itemNode.getTreeElement();
- name = queryElement.getName();
- String numberOfChildNodesString = String.valueOf(itemNode.getChildNodes().size());
- switch (queryElement.getQueryType())
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- description = uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",numberOfChildNodesString);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- description = uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",numberOfChildNodesString);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- description = uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",numberOfChildNodesString);
- }
- }
- else if (itemNode instanceof BusinessNode)
- {
- BusinessElement busElement = (BusinessElement)itemNode.getTreeElement();
- BusinessEntity be = busElement.getBusinessEntity();
- name = be.getDefaultNameString();
- description = be.getDefaultDescriptionString();
- }
- else if (itemNode instanceof ServiceNode)
- {
- ServiceElement serviceElement = (ServiceElement)itemNode.getTreeElement();
- BusinessService bs = serviceElement.getBusinessService();
- name = bs.getDefaultNameString();
- description = bs.getDefaultDescriptionString();
- }
- else if (itemNode instanceof ServiceInterfaceNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)itemNode.getTreeElement();
- TModel tModel = siElement.getTModel();
- name = tModel.getNameString();
- description = tModel.getDefaultDescriptionString();
- }
-%>
- addResultRow("Summary",<%=itemNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
- }
- }
-%>
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
- <table id="loadScreen">
- <tr>
- <td>
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String title = selectedTool.getAltText();
- String titleImagePath = selectedTool.getHighlightedImageLink();
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
- <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
- sectionHeaderInfo.clear();
- String tableTitle;
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_QUERIES:
- tableTitle = uddiPerspective.getMessage("FORM_LABEL_QUERIES");
- break;
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
- }
- String[] otherProperties = {tableTitle,""};
- sectionHeaderInfo.setContainerId("Summary");
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Summary',this.form)" class="button">
- </td>
-<%
- if (queryItem != UDDIActionInputs.QUERY_ITEM_QUERIES)
- {
-%>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Summary',this.form)" class="button">
- </td>
-<%
- }
-%>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Summary',this.form)" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
- </form>
- </div>
-</div>
-</div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/LoginUddiForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/LoginUddiForm.jsp
deleted file mode 100644
index 65d24b9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/LoginUddiForm.jsp
+++ /dev/null
@@ -1,88 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.tmodel.TModel,
- org.uddi4j.datatype.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode must be a registry node.
- Node regNode = navigatorManager.getSelectedNode();
- regNode.getToolManager().setSelectedToolId(1);
- List tools = regNode.getCurrentToolManager().getTools();
- Iterator iter = tools.iterator();
- Tool t = null;
- FormTool formTool = (FormTool)(regNode.getCurrentToolManager().getSelectedTool());
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>New Login Form</title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<script language="javascript">
- function showMainForm(publishValue)
- {
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
-</script>
-</head>
-<body class="contentbodymargin">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" >
-<%
- String titleImagePath = "uddi/images/publish_highlighted.gif";
- String title = "Login";
-%>
-<%@ include file="/forms/formheader.inc" %>
- </div>
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/LoginAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <jsp:include page="/uddi/forms/login_authentication_table.jsp" flush="true"/>
- <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
- </div>
-<script language="javascript">
- showMainForm(0);
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp
deleted file mode 100644
index 0b8f948..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp
+++ /dev/null
@@ -1,409 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.response.CompletionStatus,
- org.uddi4j.datatype.business.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- String pubAssertionForm = "showPublisherAssertionsForm";
- String publisherAssertionsBusiness = "publisherAssertionsBusiness";
-
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- String divPublisherAssertionTable = "divPublisherAssertionTable";
- String xdivPublisherAssertionTable = "xdivPublisherAssertionTable";
-%>
-
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
- closeAllUddiChildWindows();
-<%
- if (!regElement.isLoggedIn())
- {
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- document.getElementById("<%=pubAssertionForm%>").style.display = "";
-<%
- }
-
- Vector business = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
- if (business != null)
- {
- if (businessCopy == null)
- businessCopy = new ListManager();
- else
- businessCopy.clear();
- for (int i=0;i<business.size();i++)
- {
- ListElement listElement = (ListElement)business.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- businessCopy.add(listElement);
-%>
- addPublisherAssertionResultRow("<%=publisherAssertionsBusiness%>",<%=listElement.getViewId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY,businessCopy);
- }
- else
- {
- business = new Vector();
- businessCopy = new ListManager();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS,business);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY,businessCopy);
- }
-%>
- }
-
- function populateAssertionTable() {
-<%
- if (selectedElement instanceof BusinessElement)
- {
- ListManager pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
- if (pubAssertions == null)
- {
- ShowPublisherAssertionsAction action = new ShowPublisherAssertionsAction(controller);
- action.run();
-%>
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-<%
- pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
- }
-
- pubAssertions = ((BusinessElement)selectedElement).getPublisherAssertions();
- Enumeration e = ((pubAssertions != null) ? pubAssertions.getListElements() : null);
- while (e != null && e.hasMoreElements())
- {
- ListElement le = (ListElement)e.nextElement();
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)le.getObject();
- int viewId = le.getViewId();
- String direction;
- if (((BusinessElement)selectedElement).getBusinessEntity().getBusinessKey().equals(pubAssertionElement.getFromKey()))
- direction = uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_FROM");
- else
- direction = uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_TO");
- ListElement sp = (ListElement)pubAssertionElement.getServiceProvider();
- int targetNodeId = sp.getTargetNodeId();
- int targetToolId = sp.getTargetToolId();
- int targetViewId = sp.getTargetViewId();
- int subQueryItemId = pubAssertionElement.getSubQueryItemId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS,subQueryItemId,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
- String name = ((BusinessEntity)sp.getObject()).getDefaultNameString();
- String desc = ((BusinessEntity)sp.getObject()).getDefaultDescriptionString();
- String status = pubAssertionElement.getStatus();
- String type = pubAssertionElement.getKeyedRef().getKeyValue();
-%>
- addAssertion("<%=divPublisherAssertionTable%>",<%=viewId%>,"<%=direction%>","<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(desc)%>","<%=status%>","<%=HTMLUtils.JSMangle(type)%>");
-<%
- }
- }
-%>
- }
-
- function addAssertion(tableContainerId,viewId,direction,url,name,desc,status,type)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
- var column4 = document.createElement("td");
- var column5 = document.createElement("td");
- var column6 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- rowCheckbox.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID%>";
- rowCheckbox.value = viewId;
- column0.appendChild(rowCheckbox);
-
- column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_THIS_BUSINESS")%>"));
-
- column2.appendChild(document.createTextNode(direction));
-
- var nameDetailsLink = document.createElement("a");
- nameDetailsLink.href = url;
- nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
- nameDetailsLink.appendChild(document.createTextNode(name));
- column3.appendChild(nameDetailsLink);
-
- column4.appendChild(document.createTextNode(getDefaultDisplayString(desc)));
-
- column5.appendChild(document.createTextNode(status));
-
- column6.appendChild(document.createTextNode(type));
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column2.className = "tablecells";
- column3.className = "tablecells";
- column4.className = "tablecells";
- column5.className = "tablecells";
- column6.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- newRow.appendChild(column4);
- newRow.appendChild(column5);
- newRow.appendChild(column6);
- tableBody.appendChild(newRow);
-
- }
-
- function addPublisherAssertionResultRow(tableContainerId,nodeId,url,name,description)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
- var column4 = document.createElement("td");
- var column5 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
- column0.appendChild(createHiddenElement("",nodeId));
-
- column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_THIS_BUSINESS")%>"));
-
- var direction = document.createElement("select");
- direction.id = "label_publisher_assertion_direction";
- direction.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION%>";
- direction.className = "selectlist";
- direction.options[0] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_FROM")%>", "<%=String.valueOf(UDDIActionInputs.DIRECTION_FROM)%>");
- direction.options[1] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_DIRECTION_TO")%>", "<%=String.valueOf(UDDIActionInputs.DIRECTION_TO)%>");
- column2.appendChild(direction);
-
- var nameDetailsLink = document.createElement("a");
- nameDetailsLink.href = url;
- nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
- nameDetailsLink.appendChild(document.createTextNode(name));
- column3.appendChild(nameDetailsLink);
-
- column4.appendChild(document.createTextNode(getDefaultDisplayString(description)));
-
- var assertionType = document.createElement("select");
- assertionType.id = "label_publisher_assertion_type";
- assertionType.name = "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE%>";
- assertionType.className = "selectlist";
- assertionType.options[0] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD)%>");
- assertionType.options[1] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER)%>");
- assertionType.options[2] = new Option("<%=uddiPerspective.getMessage("FORM_OPTION_ASSERTION_TYPE_IDENTITY")%>", "<%=String.valueOf(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE_IDENTITY)%>");
- column5.appendChild(assertionType);
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column2.className = "tablecells";
- column3.className = "tablecells";
- column4.className = "tablecells";
- column5.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- newRow.appendChild(column4);
- newRow.appendChild(column5);
- tableBody.appendChild(newRow);
- }
-
- function setFormLocationAndSubmit(form,location)
- {
- form.action = location;
- if (handleSubmit(form))
- {
- processResultTable("<%=publisherAssertionsBusiness%>", "<%=UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID%>", form, false);
- form.submit();
- }
- }
-
- function checkTableEntriesAndSubmit(tableContainerId,form,location)
- {
- if (getNumberOfSelections(tableContainerId) > 0) {
- setFormLocationAndSubmit(form,location);
- return;
- }
- alert("<%=controller.getUDDIPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-
- function checkTableSizeAndSubmit(tableContainerId,form,location)
- {
- var table = getTable(tableContainerId);
- if (table.rows.length > numberOfHeaderRows) {
- setFormLocationAndSubmit(form,location);
- return;
- }
- alert("<%=controller.getUDDIPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <div id="publisherAssertions">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ShowPublisherAssertionsActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
-
-<%
- String titleImagePath = "uddi/images/publisher_assertions_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table width="90%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC")%>
- </td>
- </tr>
- </table>
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divPublisherAssertionTable%>','<%=xdivPublisherAssertionTable%>')"><img name="<%=xdivPublisherAssertionTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_ASSERTIONS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divPublisherAssertionTable%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=divPublisherAssertionTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=((BusinessElement)selectedElement).getBusinessEntity().getDefaultNameString()%></th>
- <th class="headercolor"><label for="label_publisher_assertion_direction"><%=uddiPerspective.getMessage("FORM_LABEL_DIRECTION")%></label></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_STATUS")%></th>
- <th class="headercolor"><label for="label_publisher_assertion_type"><%=uddiPerspective.getMessage("FORM_LABEL_ASSERTION_TYPE")%></label></th>
- </tr>
- </table>
- <table width="90%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" align="left" nowrap class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC")%>
- </td>
- </tr>
- </table>
- </div>
-
-<%
- boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- String[] busSpecificInfo = {"FORM_LABEL_BUSINESSES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publisherAssertions",UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId(publisherAssertionsBusiness);
- sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjectsPublisherAssertions_table.jsp" flush="true"/>
-
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId(pubAssertionForm);
-%>
-<jsp:include page="authentication_table.jsp" flush="true"/>
- <br>
- <table>
- <tr>
- <td>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS")%>" onClick="setFormLocationAndSubmit(this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ShowPublisherAssertionsActionJSP.jsp"))%>')" class="button">
- </td>
- <td>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS")%>" onClick="checkTableEntriesAndSubmit('<%=divPublisherAssertionTable%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/CompletePublisherAssertionsActionJSP.jsp"))%>')" class="button">
- </td>
- <td>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS")%>" onClick="checkTableSizeAndSubmit('<%=publisherAssertionsBusiness%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddPublisherAssertionsActionJSP.jsp"))%>')" class="button">
- </td>
- <td>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS")%>" onClick="checkTableEntriesAndSubmit('<%=divPublisherAssertionTable%>',this.form,'<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RemovePublisherAssertionsActionJSP.jsp"))%>')" class="button">
- </td>
- </tr>
- </table>
- </form>
-
- </div>
- </div>
-<script language="javascript">
- populateAssertionTable();
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp
deleted file mode 100644
index 13609ed..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp
+++ /dev/null
@@ -1,232 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.service.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- BusinessElement busElement = (BusinessElement)selectedNode.getTreeElement();
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
- String sk = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- subQueryKeyProperty.setSubQueryKey(sk);
-%>
-</jsp:useBean>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <title><%=uddiPerspective.getMessage("FORM_TITLE_MANAGE_REFERENCED_SERVICES")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
-<%
- if (!regElement.isLoggedIn())
- {
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- document.getElementById("manageReferencedServicesAuthentication").style.display = "";
-<%
- }
- String subQueryKey = subQueryKeyProperty.getSubQueryKey();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
- if (referencedServices == null)
- {
- referencedServices = new Vector();
- BusinessEntity businessEntity = busElement.getBusinessEntity();
- String businessKey = businessEntity.getBusinessKey();
- BusinessServices businessSvcs = businessEntity.getBusinessServices();
- if (businessSvcs != null)
- {
- Vector businessSvcVector = businessSvcs.getBusinessServiceVector();
- for (int i=0;i<businessSvcVector.size();i++)
- {
- BusinessService busService = (BusinessService)businessSvcVector.elementAt(i);
- if (!busService.getBusinessKey().equals(businessKey))
- {
- ListElement listElement = new ListElement(busService);
- referencedServices.addElement(listElement);
- }
- }
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES,referencedServices);
- }
-
- for (int i=0;i<referencedServices.size();i++)
- {
- ListElement listElement = (ListElement)referencedServices.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKey,UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
- BusinessService bs = (BusinessService)listElement.getObject();
- String name = bs.getDefaultNameString();
- String description = bs.getDefaultDescriptionString();
-%>
- addResultRow("manageReferencedServicesReferences",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
- }
-
- Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
- if (services != null)
- {
- for (int i=0;i<services.size();i++)
- {
- ListElement listElement = (ListElement)services.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKey,UDDIActionInputs.QUERY_INPUT_SERVICES,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
- BusinessService bs = (BusinessService)listElement.getObject();
- String name = bs.getDefaultNameString();
- String description = bs.getDefaultDescriptionString();
-%>
- addResultRow("manageReferencedServicesServices",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
- }
- }
-%>
- }
-
- function processReferenceTable(tableContainerId,inputName,form)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var inputs = table.rows[i].getElementsByTagName("input");
- form.appendChild(createHiddenElement(inputName,inputs.item(0).checked));
- }
- }
-
- function processForm(form)
- {
- if (handleSubmit(form))
- {
- processReferenceTable("manageReferencedServicesReferences","<%=UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE%>",form);
- processResultTable("manageReferencedServicesServices","<%=UDDIActionInputs.NODEID_SERVICE%>",form,false);
- form.submit();
- }
- }
-
- function processAddServices(form)
- {
- var table = getTable("manageReferencedServicesServices");
- if (table.rows.length == numberOfHeaderRows)
- alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES"))%>");
- else
- {
- form.<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>.value = "<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD%>";
- processForm(form);
- }
- }
-
- function processRemoveReferences(form)
- {
- var numberOfSelections = getNumberOfSelections("manageReferencedServicesReferences");
- if (getNumberOfSelections("manageReferencedServicesReferences") == 0)
- alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_REFERENCE_SELECTED"))%>");
- else
- {
- form.<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>.value = "<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE%>";
- processForm(form);
- }
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <div id="manageReferencedServices">
-<%
- String titleImagePath = "uddi/images/referenced_services_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ManageReferencedServicesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <input type="hidden" name="<%=UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION%>">
- <table width="90%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC")%>
- </td>
- </tr>
- </table>
-<%
- String[] projectionsSpecificInfo = {"FORM_LABEL_REFERENCED_SERVICES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"manageReferencedServices",UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("manageReferencedServicesReferences");
- sectionHeaderInfo.setOtherProperties(projectionsSpecificInfo);
- sectionHeaderInfo.enableDynamic(false);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- String[] servicesSpecificInfo = {"FORM_OPTION_SERVICES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"manageReferencedServices",UDDIActionInputs.QUERY_INPUT_SERVICES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("manageReferencedServicesServices");
- sectionHeaderInfo.setOtherProperties(servicesSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("manageReferencedServicesAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_SERVICES")%>" onClick="processAddServices(this.form)" class="button">
- </td>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_REMOVE_REFERENCES")%>" onClick="processRemoveReferences(this.form)" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
- </form>
- </div>
- </div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp
deleted file mode 100644
index 8bd4287..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp
+++ /dev/null
@@ -1,186 +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
- *
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 135307 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080513 231351 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
-OpenRegistryTool openRegistryTool = (OpenRegistryTool)(uddiMainNode.getCurrentToolManager().getSelectedTool());
-Enumeration favoriteRegistryElements = openRegistryTool.getFavoriteRegistryElements();
-Vector favoriteRegistryList = new Vector();
-while (favoriteRegistryElements.hasMoreElements())
- favoriteRegistryList.addElement(favoriteRegistryElements.nextElement());
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_OPEN_REGISTRY")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
- <jsp:include page="/scripts/formutils.jsp" flush="true"/>
- <script language="javascript">
- function fillFavoriteInfo(favoriteRegistrySelect)
- {
- var selectedFavoriteRegistryIndex = favoriteRegistrySelect.selectedIndex-1;
- if (selectedFavoriteRegistryIndex >= 0)
- {
- var form = document.getElementById("openRegistryForm");
- switch (selectedFavoriteRegistryIndex)
- {
- <%
- for (int i=0;i<favoriteRegistryList.size();i++)
- {
- FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)favoriteRegistryList.elementAt(i);
- %>
- case <%=i%>:
- form.<%=UDDIActionInputs.REGISTRY_NAME%>.value = "<%=HTMLUtils.JSMangle(favRegElement.getName())%>";
- form.<%=UDDIActionInputs.INQUIRY_URL%>.value = "<%=HTMLUtils.JSMangle(favRegElement.getInquiryURL())%>";
- break;
- <%
- }
- %>
- }
- }
- }
-
- function setDefaults()
- {
- var form = document.getElementById("openRegistryForm");
- form.<%=UDDIActionInputs.REGISTRY_NAME%>.value = "<%=HTMLUtils.JSMangle((String)openRegistryTool.getProperty(UDDIActionInputs.REGISTRY_NAME))%>";
- form.<%=UDDIActionInputs.INQUIRY_URL%>.value = "<%=HTMLUtils.JSMangle((String)openRegistryTool.getProperty(UDDIActionInputs.INQUIRY_URL))%>";
- showMainForm();
- }
-
- function showMainForm()
- {
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
-
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
- <%
- String titleImagePath = "uddi/images/open_registry_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_OPEN_REGISTRY");
- %>
- <%@ include file="/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_OPEN_REGISTRY_DESC")%>
- </td>
- </tr>
- </table>
-
- <form id="openRegistryForm" action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/OpenRegistryActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
-
- <tr>
- <td class="labels" valign="bottom" nowrap height=25>
- <label for="favoriteRegistry"><%=uddiPerspective.getMessage("FORM_LABEL_FAVORITE_REGISTRY")%></label>
- </td>
- </tr>
- <tr>
- <td height=25 valign="bottom" >
- <select id="favoriteRegistry" onChange="fillFavoriteInfo(this)" class="selectlist">
- <option value="" selected>
- <%
- for (int i=0;i<favoriteRegistryList.size();i++)
- {
- FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)favoriteRegistryList.elementAt(i);
- %>
- <option value="<%=favRegElement.getName()%>"><%=favRegElement.getName()%>
- <%
- }
- if(favoriteRegistryList.size() == 0){
- %>
- <option value="Empty"> </option>
- <%
- }
- %>
- </select>
- </td>
- </tr>
- <tr>
- <td class="labels" height=25 valign="bottom">
- <label for="input_registry_name"><%=uddiPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%></label>
- <%
- if (!openRegistryTool.isInputValid(UDDIActionInputs.REGISTRY_NAME))
- {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td>
- <input type="text" id="input_registry_name" name="<%=UDDIActionInputs.REGISTRY_NAME%>" class="textenter">
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="input_inquiry_url"><%=uddiPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%></label>
- <%
- if (!openRegistryTool.isInputValid(UDDIActionInputs.INQUIRY_URL))
- {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td>
- <input type="text" id="input_inquiry_url" name="<%=UDDIActionInputs.INQUIRY_URL%>" class="textenter">
- </td>
- </tr>
- </table>
- <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
- <script language="javascript">
- setDefaults();
- </script>
-
- </div>
- </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp
deleted file mode 100644
index 2b3ede0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
- <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
- <input name="<%=UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=uddiPerspective.getPerspectiveContentFramesetCols()%>">
- <input name="<%=UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=uddiPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp
deleted file mode 100644
index a9af45d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp
+++ /dev/null
@@ -1,268 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // The selected node must be a registry node.
- Node registryNode = navigatorManager.getSelectedNode();
- ToolManager currentToolManager = registryNode.getCurrentToolManager();
- FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
- RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
- regElement.refreshMeta();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<script language="javascript">
- function setDefaults()
- {
- var registryDetailsNameTable = getTable("registryDetailsName");
-<%
- String name = regElement.getName();
- boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-%>
- addDetailsSingleItemRow("registryDetailsName",false);
- setDetailsNameSingleItemRow("registryDetailsName","<%=HTMLUtils.JSMangle(name)%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(registryDetailsNameTable.rows[numberOfHeaderRows],"errantRow");
-<%
- }
-
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- boolean containsUserDefinedCategories;
- if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
- {
-%>
- var registryCategoriesTable = getTable("registryUserDefinedCategories");
-<%
- containsUserDefinedCategories = true;
- ArrayList userDefinedCategoriesList = new ArrayList();
- do
- {
- userDefinedCategoriesList.add(userDefinedCategories.nextElement());
- } while (userDefinedCategories.hasMoreElements());
- CategoryModel[] userDefinedCategoriesArray = new CategoryModel[userDefinedCategoriesList.size()];
- userDefinedCategoriesList.toArray(userDefinedCategoriesArray);
- QuickSort.sort(userDefinedCategoriesArray,0,userDefinedCategoriesArray.length-1);
- StringBuffer fileName = new StringBuffer();
- for (int i=0;i<userDefinedCategoriesArray.length;i++)
- {
- name = userDefinedCategoriesArray[i].getDisplayName();
- String tModelKey = userDefinedCategoriesArray[i].getTModelKey();
- boolean checked = userDefinedCategoriesArray[i].isChecked();
- fileName.setLength(0);
- if (userDefinedCategoriesArray[i].isDataLoaded())
- fileName.append(userDefinedCategoriesArray[i].getCategoryKey()).append(".txt");
- else
- fileName.append(controller.getMessage("TABLE_BLANK_PLACEHOLDER"));
- boolean hasError = !formTool.isRowInputValid(UDDIActionInputs.USER_DEFINED_CATEGORIES,tModelKey);
-%>
- addDetailsUserDefinedCategoryRow("registryUserDefinedCategories","<%=tModelKey%>","<%=HTMLUtils.JSMangle(name)%>",<%=checked%>,"<%=HTMLUtils.JSMangle(fileName.toString())%>",<%=hasError%>);
-<%
- if (hasError)
- {
-%>
- highlightErrantRow(registryCategoriesTable.rows[numberOfHeaderRows+<%=i%>],"errantRow");
-<%
- }
- }
- }
- else
- containsUserDefinedCategories = false;
-%>
- showMainForm();
- }
-
- function showMainForm()
- {
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function processForm(form)
- {
- if (handleSubmit(form))
- {
- processDetailsSingleItemTable("registryDetailsName","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME%>",form);
- return true;
- }
- return false;
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateRegistryActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "images/details_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_REGISTRY_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",registryNode.getNodeName())%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("registryDetailsName");
- sectionHeaderInfo.setOtherProperties(uddiPerspective.getMessage("FORM_LABEL_REGISTRY_NAME"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=regElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-<%
- String publishURL = regElement.getPublishURL();
- if (Validator.validateURL(publishURL))
- {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=regElement.getPublishURL()%>
- </td>
- </tr>
- </table>
-<%
- }
-
- if (containsUserDefinedCategories)
- {
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("registryUserDefinedCategories");
-%>
-<jsp:include page="/uddi/forms/ud_categories_table.jsp" flush="true"/>
-<%
- }
- if (regElement.isLoggedIn())
- {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_USERID")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=regElement.getUserId()%>
- </td>
- </tr>
- </table>
-<%
- }
-
- String registrationURL = regElement.getRegistrationURL();
- if (Validator.validateURL(registrationURL))
- {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table>
- <tr>
- <td align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_URL",registrationURL)%>
- </td>
- </tr>
- </table>
-<%
- }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </div>
- </form>
- </div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp
deleted file mode 100644
index a907d0f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findBusinessesAdvanced">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindBusinessesAdvancedForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="90%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=35 valign="bottom">
- <input type="checkbox" id="input_find_businesses_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,this.checked)">
- <label for="input_find_businesses_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",Boolean.FALSE.toString()};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
- String[] siSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"findBusinessesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedServiceInterfaces");
- sectionHeaderInfo.setOtherProperties(siSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedDiscoveryURLs");
- sectionHeaderInfo.setOtherProperties(new Boolean(false));
-%>
-<jsp:include page="/uddi/forms/discoveryURLs_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedFindQualifiers");
-%>
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findBusinessesAdvancedCommon");
-%>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp
deleted file mode 100644
index f914834..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findBusinesses" style="display:none;">
- <form name="findBusinessesStyle">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_find_business_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_business_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_find_business_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_business_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- <input type="radio" id="radio_find_business_uuid" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_business_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegFindBusinessesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindBusinessesAdvancedForm.jsp" flush="true"/>
-<%
- sectionHeaderInfo.setContainerId("findBusinessUUID");
- String[] otherProperties = {"uddi/actions/RegFindBusinessUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,"FORM_LABEL_FIND_BUSINESS_UUID_DESC"};
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp
deleted file mode 100644
index 2c7e34a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findBusinessesSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindBusinessesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC")%>
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="input_find_businesses_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="input_find_businesses_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
deleted file mode 100644
index 0d5cb5a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp
+++ /dev/null
@@ -1,713 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- * 20081106 254516 mahutch@ca.ibm.com - Mark Hutchinson, fix compilation error, remove duplicate variable declaration
- * 20081217 259140 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.service.*,
- org.uddi4j.datatype.tmodel.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- Node regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_FIND")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
- var sectionIds = ["findBusinesses","findServices","findServiceInterfaces"];
- var findBusinessesSectionIds = ["findBusinessesSimple","findBusinessesAdvanced","findBusinessUUID"];
- var findServicesSectionIds = ["findServicesSimple","findServicesAdvanced","findServiceUUID"];
- var findServiceInterfacesSectionIds = ["findServiceInterfacesSimple","findServiceInterfacesAdvanced","findServiceInterfaceUUID"];
- var styleForms = ["findBusinessesStyle","findServicesStyle","findServiceInterfacesStyle"];
- var authenticationSectionIds = ["findBusinessesAdvancedAuthentication","findServicesAdvancedAuthentication","findServiceInterfacesAdvancedAuthentication"];
-
- function validateQueryName()
- {
-<%
- String subQueryKeyValue = subQueryKeyProperty.getSubQueryKey();
- boolean isSubQuery = (subQueryKeyValue != null && subQueryKeyValue.length() > 0);
-%>
- if (<%=isSubQuery%>)
- {
- // Subqueries must have a name which is different from that of the current query or the closest query enclosing this object.
-<%
- String currentQueryName = "";
- if (selectedNode instanceof QueryNode)
- currentQueryName = selectedNode.getNodeName();
- else if (selectedNode instanceof BusinessNode)
- {
- Node parentNode = selectedNode.getParent();
- if (parentNode instanceof QueryNode)
- currentQueryName = parentNode.getNodeName();
- }
-%>
- var queryName = document.getElementById("queryName").value;
- if (queryName == "<%=HTMLUtils.JSMangle(currentQueryName)%>")
- {
- alert("<%=uddiPerspective.getMessage("MSG_ERROR_QUERY_NAME_CONFLICT")%>");
- return false;
- }
- }
- return true;
- }
-
- function processForm(form)
- {
- if (!handleSubmit(form))
- return false;
- if (!validateQueryName())
- return false;
- form.<%=UDDIActionInputs.SUBQUERY_KEY%>.value = "<%=subQueryKeyProperty.getSubQueryKey()%>";
- form.<%=UDDIActionInputs.QUERY_NAME%>.value = document.getElementById("queryName").value;
- return true;
- }
-
- function processFindBusinessesAdvancedForm(form)
- {
- if (processForm(form))
- {
- processLanguageInputTable("findBusinessesAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processNameFindQualifiers("findBusinessesAdvancedNames",form);
- processIdentifierTable("findBusinessesAdvancedIdentifiers",form);
- processCategoryTable("findBusinessesAdvancedCategories",form,true);
- processResultTable("findBusinessesAdvancedServiceInterfaces","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
- processDiscoveryURLTable("findBusinessesAdvancedDiscoveryURLs",form);
- processFindQualifierTable("findBusinessesAdvancedFindQualifiers",form);
- return true;
- }
- return false;
- }
-
- function processFindServicesAdvancedForm(form)
- {
- if (processForm(form))
- {
- processResultTable("findServicesAdvancedBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
- processLanguageInputTable("findServicesAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processNameFindQualifiers("findServicesAdvancedNames",form);
- processCategoryTable("findServicesAdvancedCategories",form,false);
- processResultTable("findServicesAdvancedServiceInterfaces","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
- processFindQualifierTable("findServicesAdvancedFindQualifiers",form);
- return true;
- }
- return false;
- }
-
- function processFindServiceInterfacesAdvancedForm(form)
- {
- if (processForm(form))
- {
- processResultTable("findServiceInterfacesAdvancedService","<%=UDDIActionInputs.NODEID_SERVICE%>",form,false);
- processNameFindQualifiers("findServiceInterfacesAdvancedName",form);
- processIdentifierTable("findServiceInterfacesAdvancedIdentifiers",form);
- processCategoryTable("findServiceInterfacesAdvancedCategories",form,false);
- processFindQualifierTable("findServiceInterfacesAdvancedFindQualifiers",form);
- return true;
- }
- return false;
- }
-
- function setDefaults()
- {
- // Set the query name
- document.getElementById("queryName").value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_NAME))%>";
- var searchFor = document.getElementById("searchFor");
- searchFor.selectedIndex = <%=formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM)%>;
- setDefaultsForFindBusinessesForms();
- setDefaultsForFindServicesForms();
- setDefaultsForFindServiceInterfacesForms();
- showMainForm(searchFor.value);
- }
-
- function setAuthenticationSectionDefaults(advancedForm,queryItemIndex,isOwnedChecked)
- {
-<%
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>.checked = isOwnedChecked;
- advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- advancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- toggleAdvancedAuthenticationSection(queryItemIndex,isOwnedChecked);
- }
-
- function setAdvancedCommonSectionDefaults(form,maxSearchSet,maxResults)
- {
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET%>.value = maxSearchSet;
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS%>.value = maxResults;
- }
-
- function setDefaultsForFindBusinessesForms()
- {
- // Initialize the findBusinesses form.
-<%
- String findBusinessesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>]].<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>[<%=findBusinessesStyleIndex%>].checked = true;
- var findBusinessesSimpleSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var findBusinessesSimpleForm = findBusinessesSimpleSection.getElementsByTagName("form").item(0);
- findBusinessesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))%>";
-
- // Advanced form details.
- var findBusinessesAdvancedSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var findBusinessesAdvancedForm = findBusinessesAdvancedSection.getElementsByTagName("form").item(0);
- var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null)%>;
- setAuthenticationSectionDefaults(findBusinessesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,isOwnedChecked);
-<%
- Vector busNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- if (busNameVector != null)
- {
- for (int i=0;i<busNameVector.size();i++)
- {
- Name name = (Name)busNameVector.elementAt(i);
-%>
- addLanguageInputRow("findBusinessesAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("findBusinessesAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- }
- }
-
- IdentifierBag busIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- if (busIdBag != null)
- {
- Vector keyedReferenceVector = busIdBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addIdentifierRow("findBusinessesAdvancedIdentifiers");
- setIdentifierRowSettings("findBusinessesAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- CategoryBag busCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- if (busCatBag != null)
- {
- Vector keyedReferenceVector = busCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("findBusinessesAdvancedCategories");
- setCategoryRowSettings("findBusinessesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
- Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
- if (busServiceInterfaces != null)
- {
- if (busServiceInterfacesCopy == null)
- busServiceInterfacesCopy = new Vector();
- else
- busServiceInterfacesCopy.removeAllElements();
- for (int i=0;i<busServiceInterfaces.size();i++)
- {
- ListElement listElement = (ListElement)busServiceInterfaces.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
- TModel tModel = (TModel)listElement.getObject();
- busServiceInterfacesCopy.addElement(busServiceInterfaces.elementAt(i));
-%>
- addResultRow("findBusinessesAdvancedServiceInterfaces",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY,busServiceInterfacesCopy);
- }
- else
- {
- busServiceInterfaces = new Vector();
- busServiceInterfacesCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY,busServiceInterfacesCopy);
- }
-
- DiscoveryURLs busDiscoveryURLs = (DiscoveryURLs)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- if (busDiscoveryURLs != null)
- {
- Vector discoveryURLVector = busDiscoveryURLs.getDiscoveryURLVector();
- for (int i=0;i<discoveryURLVector.size();i++)
- {
- DiscoveryURL discoveryURL = (DiscoveryURL)discoveryURLVector.elementAt(i);
-%>
- addDiscoveryURLRow("findBusinessesAdvancedDiscoveryURLs");
- setDiscoveryURLRowSettings("findBusinessesAdvancedDiscoveryURLs",<%=i%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
- }
- }
-
- FindQualifiers busFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
- if (busFindQualifiers != null)
- {
- Vector findQualifierVector = busFindQualifiers.getFindQualifierVector();
- for (int i=0;i<findQualifierVector.size();i++)
- {
- FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
- setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findBusinessesAdvancedNames","findBusinessesAdvancedCategories","findBusinessesAdvancedFindQualifiers");
-<%
- }
- }
-%>
- setAdvancedCommonSectionDefaults(findBusinessesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS))%>");
-
- // UUID form details.
- var findBusinessesUUIDSection = document.getElementById(findBusinessesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
- var findBusinessesUUIDForm = findBusinessesUUIDSection.getElementsByTagName("form").item(0);
- findBusinessesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY))%>";
-
- showFindForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=findBusinessesStyleIndex%>);
- }
-
- function setDefaultsForFindServicesForms()
- {
- // Initialize the findServices form.
-<%
- String findServicesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=findServicesStyleIndex%>].checked = true;
- var findServicesSimpleSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var findServicesSimpleForm = findServicesSimpleSection.getElementsByTagName("form").item(0);
- findServicesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
-
- // Advanced form details.
- var findServicesAdvancedSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var findServicesAdvancedForm = findServicesAdvancedSection.getElementsByTagName("form").item(0);
- var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null)%>;
- setAuthenticationSectionDefaults(findServicesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,isOwnedChecked);
-<%
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- if (serviceBusiness != null)
- {
- if (serviceBusinessCopy == null)
- serviceBusinessCopy = new Vector();
- else
- serviceBusinessCopy.removeAllElements();
- for (int i=0;i<serviceBusiness.size();i++)
- {
- ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
- addResultRow("findServicesAdvancedBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
- else
- {
- serviceBusiness = new Vector();
- serviceBusinessCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
-
- Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (serviceNameVector != null)
- {
- for (int i=0;i<serviceNameVector.size();i++)
- {
- Name name = (Name)serviceNameVector.elementAt(i);
-%>
- addLanguageInputRow("findServicesAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("findServicesAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- }
- }
-
- CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- if (serviceCatBag != null)
- {
- Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("findServicesAdvancedCategories");
- setCategoryRowSettings("findServicesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- if (serviceServiceInterfaces != null)
- {
- if (serviceServiceInterfacesCopy == null)
- serviceServiceInterfacesCopy = new Vector();
- else
- serviceServiceInterfacesCopy.removeAllElements();
- for (int i=0;i<serviceServiceInterfaces.size();i++)
- {
- ListElement listElement = (ListElement)serviceServiceInterfaces.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
- TModel tModel = (TModel)listElement.getObject();
- serviceServiceInterfacesCopy.addElement(serviceServiceInterfaces.elementAt(i));
-%>
- addResultRow("findServicesAdvancedServiceInterfaces",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceServiceInterfacesCopy);
- }
- else
- {
- serviceServiceInterfaces = new Vector();
- serviceServiceInterfacesCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceServiceInterfacesCopy);
- }
-
- FindQualifiers serviceFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
- if (serviceFindQualifiers != null)
- {
- Vector findQualifierVector = serviceFindQualifiers.getFindQualifierVector();
- for (int i=0;i<findQualifierVector.size();i++)
- {
- FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
- setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findServicesAdvancedNames","findServicesAdvancedCategories","findServicesAdvancedFindQualifiers");
-<%
- }
- }
-%>
- setAdvancedCommonSectionDefaults(findServicesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS))%>");
-
- // UUID form details.
- var findServicesUUIDSection = document.getElementById(findServicesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
- var findServicesUUIDForm = findServicesUUIDSection.getElementsByTagName("form").item(0);
- findServicesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY))%>";
-
- showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=findServicesStyleIndex%>);
- }
-
- function setDefaultsForFindServiceInterfacesForms()
- {
- // Initialize the findServiceInterfaces form.
-<%
- String findServiceInterfacesStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>[<%=findServiceInterfacesStyleIndex%>].checked = true;
- var findServiceInterfacesSimpleSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var findServiceInterfacesSimpleForm = findServiceInterfacesSimpleSection.getElementsByTagName("form").item(0);
- findServiceInterfacesSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))%>";
-
- // Advanced form details.
- var findServiceInterfacesAdvancedSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var findServiceInterfacesAdvancedForm = findServiceInterfacesAdvancedSection.getElementsByTagName("form").item(0);
-
- var isOwnedChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null)%>;
- setAuthenticationSectionDefaults(findServiceInterfacesAdvancedForm,<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,isOwnedChecked);
- var isUseServiceChecked = <%=(formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null)%>;
- findServiceInterfacesAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>.checked = isUseServiceChecked;
- toggleFindServiceInterfacesAdvancedServiceParameters(findServiceInterfacesAdvancedForm);
- findServiceInterfacesAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))%>";
-
-<%
- Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
- if (siService != null)
- {
- if (siServiceCopy == null)
- siServiceCopy = new Vector();
- else
- siServiceCopy.removeAllElements();
- for (int i=0;i<siService.size();i++)
- {
- ListElement listElement = (ListElement)siService.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,i,UDDIActionInputs.QUERY_ITEM_SERVICES,false);
- BusinessService bs = (BusinessService)listElement.getObject();
- siServiceCopy.addElement(siService.elementAt(i));
-%>
- addResultRow("findServiceInterfacesAdvancedService",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(bs.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(bs.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY,siServiceCopy);
- }
- else
- {
- siService = new Vector();
- siServiceCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY,siServiceCopy);
- }
-
- IdentifierBag siIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- if (siIdBag != null)
- {
- Vector keyedReferenceVector = siIdBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addIdentifierRow("findServiceInterfacesAdvancedIdentifiers");
- setIdentifierRowSettings("findServiceInterfacesAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- CategoryBag siCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- if (siCatBag != null)
- {
- Vector keyedReferenceVector = siCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("findServiceInterfacesAdvancedCategories");
- setCategoryRowSettings("findServiceInterfacesAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- FindQualifiers siFindQualifiers = (FindQualifiers)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
- if (siFindQualifiers != null)
- {
- Vector findQualifierVector = siFindQualifiers.getFindQualifierVector();
- for (int i=0;i<findQualifierVector.size();i++)
- {
- FindQualifier findQualifier = (FindQualifier)findQualifierVector.elementAt(i);
-%>
- setFindQualifier("<%=HTMLUtils.JSMangle(findQualifier.getText())%>","findServiceInterfacesAdvancedName","findServiceInterfacesAdvancedCategories","findServiceInterfacesAdvancedFindQualifiers");
-<%
- }
- }
-%>
- setAdvancedCommonSectionDefaults(findServiceInterfacesAdvancedForm,"<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET))%>","<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS))%>");
-
- // UUID form details.
- var findServiceInterfacesUUIDSection = document.getElementById(findServiceInterfacesSectionIds[<%=UDDIActionInputs.QUERY_STYLE_UUID%>]);
- var findServiceInterfacesUUIDForm = findServiceInterfacesUUIDSection.getElementsByTagName("form").item(0);
- findServiceInterfacesUUIDForm.<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY))%>";
-
- showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=findServiceInterfacesStyleIndex%>);
- }
-
- function showMainForm(searchForValueString)
- {
- closeAllUddiChildWindows();
- var queryInfoItemList = document.getElementById("queryInfoItemList");
- var searchForIndex = parseInt(searchForValueString);
- for (var i=0;i<sectionIds.length;i++)
- {
- if (i == searchForIndex)
- document.getElementById(sectionIds[i]).style.display = "";
- else
- document.getElementById(sectionIds[i]).style.display = "none";
- }
-<%
- if (subQueryKeyProperty.getSubQueryKey().length() < 1)
- {
-%>
- document.getElementById("queryInfoItemList").style.display = "";
-<%
- }
-%>
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function showFindForm(queryItemIndex,style)
- {
- closeAllUddiChildWindows();
- var findSectionIds;
- switch (queryItemIndex)
- {
- case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
- findSectionIds = findBusinessesSectionIds;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
- findSectionIds = findServicesSectionIds;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
- default:
- findSectionIds = findServiceInterfacesSectionIds;
- }
- for (var i=0;i<findSectionIds.length;i++)
- {
- if (i == style)
- document.getElementById(findSectionIds[i]).style.display = "";
- else
- document.getElementById(findSectionIds[i]).style.display = "none";
- }
- }
-
- function toggleAdvancedAuthenticationSection(queryItemIndex,isChecked)
- {
- if (isChecked && <%=!regElement.isLoggedIn()%>)
- document.getElementById(authenticationSectionIds[queryItemIndex]).style.display = "";
- else
- document.getElementById(authenticationSectionIds[queryItemIndex]).style.display = "none";
- }
-
- function toggleFindServiceInterfacesAdvancedServiceParameters(form)
- {
- var isUseServiceChecked = form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>.checked;
- var isOwnedChecked = form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>.checked;
- if (isUseServiceChecked)
- {
- document.getElementById("findServiceInterfacesAdvancedServiceSection").style.display = "";
- document.getElementById("findServiceInterfacesAdvancedOwned").style.display = "none";
- toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,false);
- document.getElementById("findServiceInterfacesAdvancedNameFindQualifiersSection").style.display = "none";
- document.getElementById("findServiceInterfacesAdvancedFindQualifiersSection").style.display = "none";
- }
- else
- {
- document.getElementById("findServiceInterfacesAdvancedServiceSection").style.display = "none";
- document.getElementById("findServiceInterfacesAdvancedOwned").style.display = "";
- toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,isOwnedChecked);
- document.getElementById("findServiceInterfacesAdvancedNameFindQualifiersSection").style.display = "";
- document.getElementById("findServiceInterfacesAdvancedFindQualifiersSection").style.display = "";
- }
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "uddi/images/find_highlighted.gif";
- String title;
- //The JSP validator claims this subQueryKey variable declaration is
- //invalid, but removing it causes the JSP not to compile on Jetty.
- String subQueryKey = subQueryKeyProperty.getSubQueryKey();
- if (subQueryKey != null && subQueryKey.length() > 0)
- {
- int queryItem = Integer.parseInt((String)formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM));
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_BUSINESSES"));
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_SERVICES"));
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- title = uddiPerspective.getMessage("ALT_SUBQUERY",uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES"));
- }
- }
- else
- title = uddiPerspective.getMessage("ALT_FIND");
-%>
-<%@ include file="/uddi/forms/findformheader.inc" %>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <label for="queryName"><%=uddiPerspective.getMessage("FORM_LABEL_QUERY_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input id="queryName" type="text" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(uddiPerspective.getMessage("DEFAULT_QUERY_NAME"))%>" class="textenter"> </td>
- </tr>
- </table>
- <div id="queryInfoItemList" style="display:none;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" valign="middle" nowrap height=40>
- <label for="searchFor"><%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_FOR")%></label>
- </td>
- <td valign="middle" nowrap height=40>
- <select id="searchFor" onChange="showMainForm(this.value)" class="selectlist">
- <option value="<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>"><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESSES")%>
- <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICES")%>
- <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES")%>
- </select>
- </td>
- <td width="90%" height=40> </td>
- </tr>
- </table>
- </div>
- </div>
-<jsp:include page="/uddi/forms/RegFindBusinessesForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServicesForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesForm.jsp" flush="true"/>
- </div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp
deleted file mode 100644
index 11bad2b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp
+++ /dev/null
@@ -1,114 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServiceInterfacesAdvanced" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindServiceInterfacesAdvancedForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=20 valign="bottom"> <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%> </td>
- </tr>
- <tr>
- <td height=40 valign="bottom">
- <input type="checkbox" id="input_find_service_interface_advance_use_service" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE%>" onClick="toggleFindServiceInterfacesAdvancedServiceParameters(this.form)"><label for="input_find_service_interface_advance_use_service"><%=uddiPerspective.getMessage("FORM_LABEL_USE_SERVICE")%></label>
- </td>
- </tr>
- </table>
-<%
- String[] serviceSpecificInfo = {"FORM_LABEL_SERVICE",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES),"findServiceInterfacesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedService");
- sectionHeaderInfo.setOtherProperties(serviceSpecificInfo);
-%>
-<div id="findServiceInterfacesAdvancedServiceSection" style="display:none;">
- <jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-</div>
- <div id="findServiceInterfacesAdvancedOwned">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=35 valign="bottom">
- <input type="checkbox" id="input_find_service_interface_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,this.checked)">
- <label for="input_find_service_interface_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
- </td>
- </tr>
- </table>
- </div>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <div id="findServiceInterfacesAdvancedName">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=40 valign="bottom">
- <label for="input_find_service_interface_advanced_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td><input type="text" id="input_find_service_interface_advanced_name" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>" class="textenter"></td>
- </tr>
- </table>
-<div id="findServiceInterfacesAdvancedNameFindQualifiersSection">
-<jsp:include page="/uddi/forms/names_findQualifiers_table.jsp" flush="true"/>
-</div>
- </div>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServiceInterfacesAdvancedFindQualifiers");
-%>
-<div id="findServiceInterfacesAdvancedFindQualifiersSection">
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-</div>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp
deleted file mode 100644
index 59ed9c4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServiceInterfaces" style="display:none;">
- <form name="findServiceInterfacesStyle">
- <table>
- <tr>
- <td> <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%> </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_find_service_interface_simple" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_service_interface_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_find_service_interface_advance" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_service_interface_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- <input type="radio" id="radio_find_service_interface_uuid" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_service_interface_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp" flush="true"/>
-<%
- sectionHeaderInfo.setContainerId("findServiceInterfaceUUID");
- String[] otherProperties = {"uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,"FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC"};
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp
deleted file mode 100644
index 635934b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServiceInterfacesSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC")%>
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="input_find_service_interfaces_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="input_find_service_interfaces_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp
deleted file mode 100644
index b6976a9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServicesAdvanced">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServicesAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processFindServicesAdvancedForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="90%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_FIND_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=35 valign="bottom">
- <input type="checkbox" id="input_find_services_advance_owned" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" onClick="toggleAdvancedAuthenticationSection(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,this.checked)">
- <label for="input_find_services_advance_owned"><%=uddiPerspective.getMessage("FORM_LABEL_OWNED")%></label>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
- String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"findServicesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedBusiness");
- sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",Boolean.FALSE.toString()};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
- String[] siSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",Boolean.FALSE.toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"findServicesAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedServiceInterfaces");
- sectionHeaderInfo.setOtherProperties(siSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("findServicesAdvancedFindQualifiers");
-%>
-<jsp:include page="/uddi/forms/findQualifiers_table.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/advancedCommon_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp
deleted file mode 100644
index f94f393..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="findServices" style="display:none;">
- <form name="findServicesStyle">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_SEARCH_TYPE")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_find_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_find_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_find_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_find_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- <input type="radio" id="radio_find_service_uuid" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showFindForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_UUID%>)"><label for="radio_find_service_uuid"><%=uddiPerspective.getMessage("FORM_RADIO_UUID")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegFindServicesSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegFindServicesAdvancedForm.jsp" flush="true"/>
-<%
- sectionHeaderInfo.setContainerId("findServiceUUID");
- String[] otherProperties = {"uddi/actions/RegFindServiceUUIDActionJSP.jsp",UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,"FORM_LABEL_FIND_SERVICE_UUID_DESC"};
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/RegFindUUIDForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp
deleted file mode 100644
index 40b7281..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="findServicesSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegFindServicesSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_FIND_SERVICES_SIMPLE_DESC")%>
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="input_find_services_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="input_find_services_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp
deleted file mode 100644
index ae39db2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode could be the registry or query nodes.
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-
- String formContainerId = sectionHeaderInfo.getContainerId();
- String[] otherProperties = (String[])(sectionHeaderInfo.getOtherProperties());
- String actionLink = (String)otherProperties[0];
- String uuidEntryKey = (String)otherProperties[1];
- String descriptionKey = (String)otherProperties[2];
-%>
-<div id="<%=formContainerId%>" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext(actionLink))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_KEY%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage(descriptionKey)%>
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="<%=(formContainerId+"_input_uuid_key")%>"><%=uddiPerspective.getMessage("FORM_LABEL_UUID_KEY")%></label>
-<%
- if (!formToolPI.isInputValid(uuidEntryKey))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="<%=(formContainerId+"_input_uuid_key")%>" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_KEY%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp
deleted file mode 100644
index 0de1a93..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishBusinessAdvanced" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishBusinessAdvancedForm(this)">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES))};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessAdvancedDiscoveryURLs");
- sectionHeaderInfo.setOtherProperties(new Boolean(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS)));
-%>
-<jsp:include page="/uddi/forms/discoveryURLs_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp
deleted file mode 100644
index b7b30c1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishBusiness" style="display:none;">
- <form name="publishBusinessStyle">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_publish_business_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_business_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_publish_business_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_business_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegPublishBusinessSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishBusinessAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp
deleted file mode 100644
index 9c193d5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishBusinessSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishBusinessSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishBusinessSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <label for="input_publish_business_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="input_publish_business_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>" class="textenter"> </td>
- </tr>
- <tr>
- <td class="labels">
- <label for="input_publish_business_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
- </td>
- </tr>
- <tr>
- <td> <input type="text" id="input_publish_business_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp
deleted file mode 100644
index 7c43d67..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp
+++ /dev/null
@@ -1,584 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.tmodel.TModel,
- org.uddi4j.datatype.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- // selectedNode must be a registry node.
- Node regNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(regNode.getCurrentToolManager().getSelectedTool());
-%>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request">
-<%
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- subQueryKeyProperty.setSubQueryKey(subQueryKey);
-%>
-</jsp:useBean>
-<%
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_REGISTRY_PUBLISH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
- var sectionIds = ["publishBusiness","publishService","publishServiceInterface"];
- var publishBusinessSectionIds = ["publishBusinessSimple","publishBusinessAdvanced"];
- var publishServiceSectionIds = ["publishServiceSimple","publishServiceAdvanced"];
- var publishServiceInterfaceSectionIds = ["publishServiceInterfaceSimple","publishServiceInterfaceAdvanced"];
- var styleForms = ["publishBusinessStyle","publishServiceStyle","publishServiceInterfaceStyle"];
-
- function processPublishBusinessAdvancedForm(form)
- {
- if (handleSubmit(form))
- {
- processLanguageInputTable("publishBusinessAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processLanguageInputTable("publishBusinessAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processIdentifierTable("publishBusinessAdvancedIdentifiers",form);
- processCategoryTable("publishBusinessAdvancedCategories",form,false);
- processDiscoveryURLTable("publishBusinessAdvancedDiscoveryURLs",form);
- return true;
- }
- return false;
- }
-
- function processPublishServiceSimpleForm(form)
- {
- if (handleSubmit(form))
- {
- processResultTable("publishServiceSimpleBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
- return true;
- }
- return false;
- }
-
- function processPublishServiceAdvancedForm(form)
- {
- if (handleSubmit(form))
- {
- processResultTable("publishServiceAdvancedBusiness","<%=UDDIActionInputs.NODEID_BUSINESS%>",form,false);
- processResultTable("publishServiceAdvancedServiceInterface","<%=UDDIActionInputs.NODEID_SERVICE_INTERFACE%>",form,false);
- processLanguageInputTable("publishServiceAdvancedNames","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processLanguageInputTable("publishServiceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processCategoryTable("publishServiceAdvancedCategories",form,false);
- return true;
- }
- return false;
- }
-
- function processPublishServiceInterfaceAdvancedForm(form)
- {
- if (handleSubmit(form))
- {
- processLanguageInputTable("publishServiceInterfaceAdvancedDescriptions","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processIdentifierTable("publishServiceInterfaceAdvancedIdentifiers",form);
- processCategoryTable("publishServiceInterfaceAdvancedCategories",form,false);
- return true;
- }
- return false;
- }
-
- function setDefaults()
- {
- var publish = document.getElementById("publish");
- publish.selectedIndex = <%=formToolPI.getProperty(UDDIActionInputs.QUERY_ITEM)%>;
- setDefaultsForPublishBusinessForms();
- setDefaultsForPublishServiceForms();
- setDefaultsForPublishServiceInterfaceForms();
-<%
- if (!regElement.isLoggedIn())
- {
-%>
- document.getElementById("publishBusinessSimpleAuthentication").style.display = "";
- document.getElementById("publishBusinessAdvancedAuthentication").style.display = "";
- document.getElementById("publishServiceSimpleAuthentication").style.display = "";
- document.getElementById("publishServiceAdvancedAuthentication").style.display = "";
- document.getElementById("publishServiceInterfaceSimpleAuthentication").style.display = "";
- document.getElementById("publishServiceInterfaceAdvancedAuthentication").style.display = "";
-<%
- }
-%>
- showMainForm(publish.value);
- }
-
- function setAuthenticationSectionDefaults(form)
- {
-<%
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- }
-
- function setDefaultsForPublishBusinessForms()
- {
- // Initialize the publishBusiness form.
-<%
- String publishBusinessStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>]].<%=UDDIActionInputs.QUERY_STYLE_BUSINESSES%>[<%=publishBusinessStyleIndex%>].checked = true;
- var publishBusinessSimpleSection = document.getElementById(publishBusinessSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var publishBusinessSimpleForm = publishBusinessSimpleSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishBusinessSimpleForm);
- publishBusinessSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME))%>";
- publishBusinessSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION))%>";
-
- // Advanced form details.
- var publishBusinessAdvancedSection = document.getElementById(publishBusinessSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var publishBusinessAdvancedForm = publishBusinessAdvancedSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishBusinessAdvancedForm);
- var publishBusinessAdvancedNamesTable = getTable("publishBusinessAdvancedNames");
- var publishBusinessAdvancedDescriptionsTable = getTable("publishBusinessAdvancedDescriptions");
- var publishBusinessAdvancedDiscoveryURLsTable = getTable("publishBusinessAdvancedDiscoveryURLs");
-<%
- Vector busNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- if (busNameVector != null)
- {
- for (int i=0;i<busNameVector.size();i++)
- {
- Name name = (Name)busNameVector.elementAt(i);
-%>
- addLanguageInputRow("publishBusinessAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishBusinessAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i))
- {
-%>
- highlightErrantRow(publishBusinessAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- Vector busDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- if (busDescriptionVector != null)
- {
- for (int i=0;i<busDescriptionVector.size();i++)
- {
- Description description = (Description)busDescriptionVector.elementAt(i);
-%>
- addLanguageInputRow("publishBusinessAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishBusinessAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i))
- {
-%>
- highlightErrantRow(publishBusinessAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- IdentifierBag busIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- if (busIdBag != null)
- {
- Vector keyedReferenceVector = busIdBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addIdentifierRow("publishBusinessAdvancedIdentifiers");
- setIdentifierRowSettings("publishBusinessAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- CategoryBag busCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- if (busCatBag != null)
- {
- Vector keyedReferenceVector = busCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("publishBusinessAdvancedCategories");
- setCategoryRowSettings("publishBusinessAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- DiscoveryURLs discoveryURLs = (DiscoveryURLs)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- if (discoveryURLs != null)
- {
- Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
- for (int i=0;i<discoveryURLVector.size();i++)
- {
- DiscoveryURL discoveryURL = (DiscoveryURL)discoveryURLVector.elementAt(i);
-%>
- addDiscoveryURLRow("publishBusinessAdvancedDiscoveryURLs");
- setDiscoveryURLRowSettings("publishBusinessAdvancedDiscoveryURLs",<%=i%>,"<%=HTMLUtils.JSMangle(discoveryURL.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i))
- {
-%>
- highlightErrantRow(publishBusinessAdvancedDiscoveryURLsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-%>
- showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>,<%=publishBusinessStyleIndex%>);
- }
-
- function setDefaultsForPublishServiceForms()
- {
-<%
- String publishServiceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>[<%=publishServiceStyleIndex%>].checked = true;
- var publishServiceSimpleSection = document.getElementById(publishServiceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var publishServiceSimpleForm = publishServiceSimpleSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceSimpleForm);
-<%
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
- if (serviceBusiness != null)
- {
- if (serviceBusinessCopy == null)
- serviceBusinessCopy = new Vector();
- else
- serviceBusinessCopy.removeAllElements();
- for (int i=0;i<serviceBusiness.size();i++)
- {
- ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
- addResultRow("publishServiceSimpleBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
- else
- {
- serviceBusiness = new Vector();
- serviceBusinessCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
-%>
-<%
- Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- if (serviceInterfaces != null)
- {
- if (serviceInterfacesCopy == null)
- serviceInterfacesCopy = new Vector();
- else
- serviceInterfacesCopy.removeAllElements();
- for (int i=0;i<serviceInterfaces.size();i++)
- {
- ListElement listElement = (ListElement)serviceInterfaces.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,i,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,false);
- TModel tModel = (TModel)listElement.getObject();
- serviceInterfacesCopy.addElement(serviceInterfaces.elementAt(i));
-%>
- addResultRow("publishServiceAdvancedServiceInterface",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(tModel.getNameString())%>","<%=HTMLUtils.JSMangle(tModel.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
- }
- else
- {
- serviceInterfaces = new Vector();
- serviceInterfacesCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceInterfaces);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY,serviceInterfacesCopy);
- }
-%>
- publishServiceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))%>";
- publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))%>";
- publishServiceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION))%>";
-
- // Advanced form details.
- var publishServiceAdvancedSection = document.getElementById(publishServiceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var publishServiceAdvancedForm = publishServiceAdvancedSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceAdvancedForm);
- var publishServiceAdvancedNamesTable = getTable("publishServiceAdvancedNames");
- var publishServiceAdvancedDescriptionsTable = getTable("publishServiceAdvancedDescriptions");
-<%
- serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- if (serviceBusiness != null)
- {
- if (serviceBusinessCopy == null)
- serviceBusinessCopy = new Vector();
- else
- serviceBusinessCopy.removeAllElements();
- for (int i=0;i<serviceBusiness.size();i++)
- {
- ListElement listElement = (ListElement)serviceBusiness.elementAt(i);
- int targetNodeId = listElement.getTargetNodeId();
- int targetToolId = listElement.getTargetToolId();
- int targetViewId = listElement.getTargetViewId();
- String url = SelectSubQueryItemAction.getActionLink(targetNodeId,targetToolId,targetViewId,subQueryKeyProperty.getSubQueryKey(),UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,i,UDDIActionInputs.QUERY_ITEM_BUSINESSES,false);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- serviceBusinessCopy.addElement(serviceBusiness.elementAt(i));
-%>
- addResultRow("publishServiceAdvancedBusiness",<%=targetNodeId%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(be.getDefaultNameString())%>","<%=HTMLUtils.JSMangle(be.getDefaultDescriptionString())%>");
-<%
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
- else
- {
- serviceBusiness = new Vector();
- serviceBusinessCopy = new Vector();
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- }
-%>
- publishServiceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))%>";
-<%
- Vector serviceNameVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (serviceNameVector != null)
- {
- for (int i=0;i<serviceNameVector.size();i++)
- {
- Name name = (Name)serviceNameVector.elementAt(i);
-%>
- addLanguageInputRow("publishServiceAdvancedNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishServiceAdvancedNames",<%=i%>,"<%=HTMLUtils.JSMangle(name.getLang())%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i))
- {
-%>
- highlightErrantRow(publishServiceAdvancedNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- Vector serviceDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- if (serviceDescriptionVector != null)
- {
- for (int i=0;i<serviceDescriptionVector.size();i++)
- {
- Description description = (Description)serviceDescriptionVector.elementAt(i);
-%>
- addLanguageInputRow("publishServiceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishServiceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i))
- {
-%>
- highlightErrantRow(publishServiceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- CategoryBag serviceCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- if (serviceCatBag != null)
- {
- Vector keyedReferenceVector = serviceCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("publishServiceAdvancedCategories");
- setCategoryRowSettings("publishServiceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-%>
- showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=publishServiceStyleIndex%>);
- }
-
- function setDefaultsForPublishServiceInterfaceForms()
- {
-<%
- String publishServiceInterfaceStyleIndex = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-%>
- document.forms[styleForms[<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>]].<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>[<%=publishServiceInterfaceStyleIndex%>].checked = true;
- var publishServiceInterfaceSimpleSection = document.getElementById(publishServiceInterfaceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>]);
- var publishServiceInterfaceSimpleForm = publishServiceInterfaceSimpleSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceInterfaceSimpleForm);
- publishServiceInterfaceSimpleForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL))%>";
- publishServiceInterfaceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))%>";
- publishServiceInterfaceSimpleForm.<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION))%>";
-
- // Advanced form details.
- var publishServiceInterfaceAdvancedSection = document.getElementById(publishServiceInterfaceSectionIds[<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>]);
- var publishServiceInterfaceAdvancedForm = publishServiceInterfaceAdvancedSection.getElementsByTagName("form").item(0);
- setAuthenticationSectionDefaults(publishServiceInterfaceAdvancedForm);
- publishServiceInterfaceAdvancedForm.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL))%>";
- publishServiceInterfaceAdvancedForm.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>.value = "<%=HTMLUtils.JSMangle((String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))%>";
- var publishServiceInterfaceAdvancedDescriptionsTable = getTable("publishServiceInterfaceAdvancedDescriptions");
-<%
- Vector siDescriptionVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- if (siDescriptionVector != null)
- {
- for (int i=0;i<siDescriptionVector.size();i++)
- {
- Description description = (Description)siDescriptionVector.elementAt(i);
-%>
- addLanguageInputRow("publishServiceInterfaceAdvancedDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>");
- setLanguageInputRowSettings("publishServiceInterfaceAdvancedDescriptions",<%=i%>,"<%=HTMLUtils.JSMangle(description.getLang())%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (!formToolPI.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i))
- {
-%>
- highlightErrantRow(publishServiceInterfaceAdvancedDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantrow");
-<%
- }
- }
- }
-
- IdentifierBag siIdBag = (IdentifierBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- if (siIdBag != null)
- {
- Vector keyedReferenceVector = siIdBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addIdentifierRow("publishServiceInterfaceAdvancedIdentifiers");
- setIdentifierRowSettings("publishServiceInterfaceAdvancedIdentifiers",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- CategoryBag siCatBag = (CategoryBag)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- if (siCatBag != null)
- {
- Vector keyedReferenceVector = siCatBag.getKeyedReferenceVector();
- for (int i=0;i<keyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)keyedReferenceVector.elementAt(i);
-%>
- addCategoryRow("publishServiceInterfaceAdvancedCategories");
- setCategoryRowSettings("publishServiceInterfaceAdvancedCategories",<%=i%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-%>
- showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=publishServiceInterfaceStyleIndex%>);
- }
-
- function showMainForm(publishValue)
- {
- closeAllUddiChildWindows();
- var publish = parseInt(publishValue);
- for (var i=0;i<sectionIds.length;i++)
- {
- if (i == publish)
- document.getElementById(sectionIds[i]).style.display = "";
- else
- document.getElementById(sectionIds[i]).style.display = "none";
- }
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function showPublishForm(queryItemIndex,style)
- {
- closeAllUddiChildWindows();
- var publishSectionIds;
- switch (queryItemIndex)
- {
- case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
- publishSectionIds = publishBusinessSectionIds;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
- publishSectionIds = publishServiceSectionIds;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
- default:
- publishSectionIds = publishServiceInterfaceSectionIds;
- break;
- }
- for (var i=0;i<publishSectionIds.length;i++)
- {
- if (i == style)
- document.getElementById(publishSectionIds[i]).style.display = "";
- else
- document.getElementById(publishSectionIds[i]).style.display = "none";
- }
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "uddi/images/publish_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_PUBLISH");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" valign="middle" nowrap>
- <label for="publish"><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH")%></label>
- </td>
- <td valign="middle" nowrap>
- <select id="publish" onChange="showMainForm(this.value)" class="selectlist">
- <option value="<%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>"><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESS")%>
- <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE")%>
- <option value="<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACE")%>
- </select>
- </td>
- <td width="90%"> </td>
- </tr>
- </table>
- </div>
-<jsp:include page="/uddi/forms/RegPublishBusinessForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceForm.jsp" flush="true"/>
- </div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp
deleted file mode 100644
index bef6c0b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp
+++ /dev/null
@@ -1,107 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceAdvanced" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceAdvancedForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
- boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedBusiness");
- sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_publish_service_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_publish_service_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- </table>
-<%
- tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- String[] serviceInterfaceSpecificInfo = {"FORM_LABEL_SERVICE_INTERFACES",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES),"publishServiceAdvanced",UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedServiceInterface");
- sectionHeaderInfo.setOtherProperties(serviceInterfaceSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp
deleted file mode 100644
index 82a3ff5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishService" style="display:none;">
- <form name="publishServiceStyle">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_publish_service_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_service_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_publish_service_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_service_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegPublishServiceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp
deleted file mode 100644
index 24eca78..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceInterfaceAdvanced" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceInterfaceAdvancedForm(this)">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_publish_service_interface_advance_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceInterfaceAdvanced',<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_publish_service_interface_advance_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_publish_service_interface_advance_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <tr>
- <td colspan=3> <input type="text" id="input_publish_service_interface_advance_name" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/languageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedIdentifiers");
-%>
-<jsp:include page="/uddi/forms/identifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceInterfaceAdvancedCategories");
-%>
-<jsp:include page="/uddi/forms/categories_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp
deleted file mode 100644
index 9fa82cd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<div id="publishServiceInterface" style="display:none;">
- <form name="publishServiceInterfaceStyle">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_FORM")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_publish_service_interface_simple" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_SIMPLE%>)"><label for="radio_publish_service_interface_simple"><%=uddiPerspective.getMessage("FORM_RADIO_SIMPLE")%></label>
- <input type="radio" id="radio_publish_service_interface_advance" class="radio" name="<%=UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES%>" onClick="showPublishForm(<%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>,<%=UDDIActionInputs.QUERY_STYLE_ADVANCED%>)"><label for="radio_publish_service_interface_advance"><%=uddiPerspective.getMessage("FORM_RADIO_ADVANCED")%></label>
- </td>
- </tr>
- </table>
- </form>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp" flush="true"/>
-<jsp:include page="/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp" flush="true"/>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp
deleted file mode 100644
index 85b06eb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceInterfaceSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceInterfaceSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_publish_service_interface_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceInterfaceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_publish_service_interface_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_publish_service_interface_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <tr>
- <td colspan=3> <input type="text" id="input_publish_service_interface_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME%>" class="textenter"> </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_publish_service_interface_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
- </td>
- </tr>
- <tr>
- <td colspan=3> <input type="text" id="input_publish_service_interface_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp
deleted file mode 100644
index aacaf1e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp
+++ /dev/null
@@ -1,103 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKeyProperty.getSubQueryKey());
-%>
-<div id="publishServiceSimple" style="display:none;">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RegPublishServiceSimpleActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processPublishServiceSimpleForm(this)">
- <input type="hidden" name="<%=UDDIActionInputs.SUBQUERY_GET%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>">
- <input type="hidden" name="<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceSimpleAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<%
- boolean tableHasErrors = !formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- String[] busSpecificInfo = {"FORM_LABEL_BUSINESS",(new Boolean(tableHasErrors)).toString(),String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES),"publishServiceSimple",UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS};
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("publishServiceSimpleBusiness");
- sectionHeaderInfo.setOtherProperties(busSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/uddiObjects_table.jsp" flush="true"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td nowrap class="labels" height=30 valign="bottom">
- <label for="input_publish_service_simple_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap height=30 valign="bottom">
- <a href="javascript:openWSDLBrowser('publishServiceSimple',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_publish_service_simple_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" class="textenter">
- </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_publish_service_simple_name"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></label>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <tr>
- <td colspan=3> <input type="text" id="input_publish_service_simple_name" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME%>" class="textenter"> </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <label for="input_publish_service_simple_desc"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></label>
- </td>
- </tr>
- <tr>
- <td colspan=3> <input type="text" id="input_publish_service_simple_desc" name="<%=UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION%>" class="textenter"> </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp
deleted file mode 100644
index c446fde..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp
+++ /dev/null
@@ -1,177 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.business.*,
- org.uddi4j.datatype.service.*,
- org.uddi4j.datatype.tmodel.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request">
-<%
- subQueryTransferTargetHolder.removeAllElements();
-%>
-</jsp:useBean>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement treeElement = selectedNode.getTreeElement();
- SubQueryTransferTarget subQueryTransferTarget = null;
- boolean hasTarget = false;
- if (treeElement instanceof QueryElement)
- {
- subQueryTransferTarget = (SubQueryTransferTarget)treeElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
- if (subQueryTransferTarget != null && subQueryTransferTarget.getTargetFormTool() != null)
- {
- subQueryTransferTargetHolder.removeAllElements();
- subQueryTransferTargetHolder.addElement(subQueryTransferTarget);
- hasTarget = true;
- }
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_RESULTS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/results.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
-<%
- Vector childNodes = selectedNode.getChildNodes();
- for (int i=0;i<childNodes.size();i++)
- {
- Node childNode = (Node)childNodes.elementAt(i);
- String url = SelectNavigatorNodeAction.getActionLink(childNode.getNodeId(),false);
- String name = null;
- String description = null;
- if (childNode instanceof BusinessNode)
- {
- BusinessElement busElement = (BusinessElement)childNode.getTreeElement();
- BusinessEntity be = busElement.getBusinessEntity();
- name = be.getDefaultNameString();
- description = be.getDefaultDescriptionString();
- }
- else if (childNode instanceof ServiceNode)
- {
- ServiceElement serviceElement = (ServiceElement)childNode.getTreeElement();
- BusinessService bs = serviceElement.getBusinessService();
- name = bs.getDefaultNameString();
- description = bs.getDefaultDescriptionString();
- }
- else if (childNode instanceof ServiceInterfaceNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)childNode.getTreeElement();
- TModel tModel = siElement.getTModel();
- name = tModel.getNameString();
- description = tModel.getDefaultDescriptionString();
- }
-%>
- addResultRow("Results",<%=childNode.getNodeId()%>,"<%=response.encodeURL(controller.getPathWithContext(url))%>","<%=HTMLUtils.JSMangle(name)%>","<%=HTMLUtils.JSMangle(description)%>");
-<%
- }
-%>
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<div id="content">
- <table id="loadScreen">
- <tr>
- <td>
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String title = uddiPerspective.getMessage("ALT_QUERY_RESULTS");
- String titleImagePath = "images/details_highlighted.gif";
-%>
-<%@ include file="/uddi/forms/resultsformheader.inc" %>
- <form target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data" style="margin-top:10px;">
-<%
- sectionHeaderInfo.clear();
- String tableTitle;
- int itemType = Integer.parseInt(treeElement.getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
- switch (itemType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- tableTitle = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
- }
- String[] otherProperties = {tableTitle,""};
- sectionHeaderInfo.setContainerId("Results");
- sectionHeaderInfo.setOtherProperties(otherProperties);
-%>
-<jsp:include page="/uddi/forms/results_table.jsp" flush="true"/>
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
-<%
- if (hasTarget)
- {
-%>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_TRANSFER")%>" onClick="transferSelections('Results',this.form)" class="button">
- </td>
-<%
- }
-%>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="refreshSelections('Results',this.form)" class="button">
- </td>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_ADD_TO_FAVORITES")%>" onClick="addSelectionsToFavorites('Results',this.form)" class="button">
- </td>
- <td height=40 align="bottom" nowrap>
- <input type="button" value="<%=uddiPerspective.getMessage("FORM_BUTTON_CLEAR")%>" onClick="clearSelections('Results',this.form)" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
- </form>
- </div>
-</div>
-</div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp
deleted file mode 100644
index c91602a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp
+++ /dev/null
@@ -1,279 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
- ServiceElement serviceElement = (ServiceElement)selectedNode.getTreeElement();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
- var serviceDetailsWSDLURLTable = getTable("serviceDetailsWSDLURL");
- var serviceDetailsNamesTable = getTable("serviceDetailsNames");
- var serviceDetailsDescriptionsTable = getTable("serviceDetailsDescriptions");
-<%
- ListElement wsdlURLListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- String wsdlURL = null;
- if (wsdlURLListElement == null)
- {
- try
- {
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- wsdlURL = uddi4jHelper.getWSDL(serviceElement.getBusinessService(), serviceElement.getRegistryElement().getProxy());
- uddi4jHelper.getWSDLDefinition(wsdlURL);
- if (wsdlURL == null)
- wsdlURL = "temp.wsdl";
- }
- catch (Throwable t)
- {
- wsdlURL = "";
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- }
- wsdlURLListElement = new ListElement(wsdlURL);
- wsdlURLListElement.setTargetViewToolInfo(-1,-1,0);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
- }
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- boolean isNewItem = (wsdlURLListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsSingleItemRow("serviceDetailsWSDLURL",<%=isError||isNewItem%>);
- setDetailsWSDLURLSingleItemRow("serviceDetailsWSDLURL",<%=UDDIActionInputs.WSDL_TYPE_SERVICE%>,"<%=HTMLUtils.JSMangle(wsdlURL)%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceDetailsWSDLURLTable.rows[numberOfHeaderRows],"errantRow");
-<%
- }
-
- Vector nameIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (nameIndexVector != null)
- {
- for (int i=0;i<nameIndexVector.size();i++)
- {
- ListElement listElement = (ListElement)nameIndexVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsLanguageInputRow("serviceDetailsNames","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_NAME_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
- setDetailsLanguageInputRow("serviceDetailsNames",<%=i%>,<%=listElement.getViewId()%>,"<%=name.getLang()%>","<%=HTMLUtils.JSMangle(name.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceDetailsNamesTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- if (descriptionIndexVector != null)
- {
- for (int i=0;i<descriptionIndexVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsLanguageInputRow("serviceDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
- setDetailsLanguageInputRow("serviceDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- if (catVector != null)
- {
- for (int i=0;i<catVector.size();i++)
- {
- ListElement listElement = (ListElement)catVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsCategoryRow("serviceDetailsCategories",<%=isError||isNewItem%>);
- setDetailsCategoryRow("serviceDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- // Authentication.
- if (!regElement.isLoggedIn())
- {
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- document.getElementById("serviceDetailsAuthentication").style.display = "";
-<%
- }
-%>
-
- showMainForm();
- }
-
- function showMainForm()
- {
- closeAllUddiChildWindows();
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function processForm(form)
- {
- if (handleSubmit(form))
- {
- processDetailsSingleItemTable("serviceDetailsWSDLURL","<%=UDDIActionInputs.WSDL_URL_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL%>",form);
- processDetailsLanguageInputTable("serviceDetailsNames","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.NAME_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME%>",form);
- processDetailsLanguageInputTable("serviceDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processDetailsCategoryTable("serviceDetailsCategories",form);
- return true;
- }
- return false;
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "images/details_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_SERVICE_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY)%>">
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY)%>">
- <table>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
- </td>
- </tr>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=uddiPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY)%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceDetailsWSDLURL");
- sectionHeaderInfo.setOtherProperties(controller.getMessage("FORM_LABEL_WSDL_URL"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceDetailsNames");
- String[] nameSpecificInfo = {"FORM_LABEL_NAMES","FORM_LABEL_NAME",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES))};
- sectionHeaderInfo.setOtherProperties(nameSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceDetailsDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </div>
- </form>
- </div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp
deleted file mode 100644
index e55a6b5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp
+++ /dev/null
@@ -1,293 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- FormTool formTool = (FormTool)(currentToolManager.getSelectedTool());
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)selectedNode.getTreeElement();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(selectedNode);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_SERVICE_INTERFACE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/detailstables.jsp" flush="true"/>
-<script language="javascript">
- function setDefaults()
- {
- var serviceInterfaceDetailsWSDLURLTable = getTable("serviceInterfaceDetailsWSDLURL");
- var serviceInterfaceDetailsNameTable = getTable("serviceInterfaceDetailsName");
- var serviceInterfaceDetailsDescriptionsTable = getTable("serviceInterfaceDetailsDescriptions");
- var serviceInterfaceDetailsIdentifiersTable = getTable("serviceInterfaceDetailsIdentifiers");
- var serviceInterfaceDetailsCategoriesTable = getTable("serviceInterfaceDetailsCategories");
-<%
- ListElement wsdlURLListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- String wsdlURL = null;
- if (wsdlURLListElement == null)
- {
- try
- {
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- wsdlURL = uddi4jHelper.getWSDL(siElement.getTModel());
- uddi4jHelper.getWSDLDefinition(wsdlURL);
- if (wsdlURL == null)
- wsdlURL = "temp.wsdl";
- }
- catch (Throwable t)
- {
- wsdlURL = "";
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- }
- wsdlURLListElement = new ListElement(wsdlURL);
- wsdlURLListElement.setTargetViewToolInfo(-1,-1,0);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
- }
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- boolean isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- boolean isNewItem = (wsdlURLListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsSingleItemRow("serviceInterfaceDetailsWSDLURL",<%=isError||isNewItem%>);
- setDetailsWSDLURLSingleItemRow("serviceInterfaceDetailsWSDLURL",<%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>,"<%=HTMLUtils.JSMangle(wsdlURL)%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceInterfaceDetailsWSDLURLTable.rows[numberOfHeaderRows],"errantRow");
-<%
- }
-
- ListElement nameListElement = (ListElement)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String name = (String)nameListElement.getObject();
- isError = !formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- isNewItem = (nameListElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsSingleItemRow("serviceInterfaceDetailsName",<%=isError||isNewItem%>);
- setDetailsNameSingleItemRow("serviceInterfaceDetailsName","<%=HTMLUtils.JSMangle(name)%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceInterfaceDetailsNameTable.rows[numberOfHeaderRows],"errantRow");
-<%
- }
-
- Vector descriptionIndexVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- if (descriptionIndexVector != null)
- {
- for (int i=0;i<descriptionIndexVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionIndexVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsLanguageInputRow("serviceInterfaceDetailsDescriptions","<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE"))%>",<%=isError||isNewItem%>);
- setDetailsLanguageInputRow("serviceInterfaceDetailsDescriptions",<%=i%>,<%=listElement.getViewId()%>,"<%=description.getLang()%>","<%=HTMLUtils.JSMangle(description.getText())%>");
-<%
- if (isError)
- {
-%>
- highlightErrantRow(serviceInterfaceDetailsDescriptionsTable.rows[<%=i%>+numberOfHeaderRows],"errantRow");
-<%
- }
- }
- }
-
- Vector idVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- if (idVector != null)
- {
- for (int i=0;i<idVector.size();i++)
- {
- ListElement listElement = (ListElement)idVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsIdentifierRow("serviceInterfaceDetailsIdentifiers",<%=isError||isNewItem%>);
- setDetailsIdentifierRow("serviceInterfaceDetailsIdentifiers",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- Vector catVector = (Vector)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- if (catVector != null)
- {
- for (int i=0;i<catVector.size();i++)
- {
- ListElement listElement = (ListElement)catVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- isError = !formTool.isRowInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,i);
- isNewItem = (listElement.getTargetViewId() == ActionInputs.VIEWID_DEFAULT);
-%>
- addDetailsCategoryRow("serviceInterfaceDetailsCategories",<%=isError||isNewItem%>);
- setDetailsCategoryRow("serviceInterfaceDetailsCategories",<%=i%>,<%=listElement.getViewId()%>,"<%=HTMLUtils.JSMangle(kr.getTModelKey())%>","<%=HTMLUtils.JSMangle(kr.getKeyName())%>","<%=HTMLUtils.JSMangle(kr.getKeyValue())%>");
-<%
- }
- }
-
- // Authentication.
- if (!regElement.isLoggedIn())
- {
- String publishURL = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)formTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-%>
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle(publishURL)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle(userId)%>";
- document.forms[0].<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle(password)%>";
- document.getElementById("serviceInterfaceDetailsAuthentication").style.display = "";
-<%
- }
-%>
- showMainForm();
- }
-
- function showMainForm()
- {
- closeAllUddiChildWindows();
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-
- function processForm(form)
- {
- if (handleSubmit(form))
- {
- processDetailsSingleItemTable("serviceInterfaceDetailsWSDLURL","<%=UDDIActionInputs.WSDL_URL_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL%>",form);
- processDetailsSingleItemTable("serviceInterfaceDetailsName","<%=UDDIActionInputs.NAME_MODIFIED%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME%>",form);
- processDetailsLanguageInputTable("serviceInterfaceDetailsDescriptions","<%=UDDIActionInputs.DESCRIPTION_MODIFIED%>","<%=UDDIActionInputs.DESCRIPTION_VIEWID%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE%>","<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION%>",form);
- processDetailsIdentifierTable("serviceInterfaceDetailsIdentifiers",form);
- processDetailsCategoryTable("serviceInterfaceDetailsCategories",form);
- return true;
- }
- return false;
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UpdateServiceInterfaceActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return processForm(this)">
- <table id="loadScreen">
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
-<%
- String titleImagePath = "images/details_highlighted.gif";
- String title = uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY%>" value="<%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY)%>">
- <table>
- <tr>
- <td class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_DETAILS_EDITABLE",selectedNode.getNodeName())%>
- </td>
- </tr>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=uddiPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=formTool.getProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY)%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsWSDLURL");
- sectionHeaderInfo.setOtherProperties(controller.getMessage("FORM_LABEL_WSDL_URL"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsName");
- sectionHeaderInfo.setOtherProperties(uddiPerspective.getMessage("FORM_LABEL_NAME"));
-%>
-<jsp:include page="/uddi/forms/detailsSingleItem_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsDescriptions");
- String[] descSpecificInfo = {"FORM_LABEL_DESCRIPTIONS","FORM_LABEL_DESCRIPTION",String.valueOf(!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS))};
- sectionHeaderInfo.setOtherProperties(descSpecificInfo);
-%>
-<jsp:include page="/uddi/forms/detailsLanguageInput_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsIdentifiers");
-%>
-<jsp:include page="/uddi/forms/detailsIdentifiers_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsCategories");
-%>
-<jsp:include page="/uddi/forms/detailsCategories_table.jsp" flush="true"/>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("serviceInterfaceDetailsAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </div>
- </form>
- </div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index 84228b2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- String wsdlURL;
- // selectedNode should be either a service or a service interface node.
- if (selectedNode instanceof ServiceNode)
- {
- ServiceNode serviceNode = (ServiceNode)selectedNode;
- wsdlURL = serviceNode.getWSDLURLFromDetailsTool();
- }
- else
- {
- ServiceInterfaceNode siNode = (ServiceInterfaceNode)selectedNode;
- wsdlURL = siNode.getWSDLURLFromDetailsTool();
- }
- formProperties.put("formActionLink","uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp");
- formProperties.put("wsdlURL",wsdlURL);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 5ffa252..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
- formActionLink.append("uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp
deleted file mode 100644
index 25a3372..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-
- FormTool unpublishTool = (FormTool)(navigatorManager.getSelectedNode().getCurrentToolManager().getSelectedTool());
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FORM_TITLE_UNPUBLISH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-
-<script language="javascript">
- function setDefaults()
- {
-<%
- if (!regElement.isLoggedIn())
- {
-%>
- var authenticationSection = document.getElementById("unpublishAuthentication");
- authenticationSection.style.display = "";
- var form = document.forms[0];
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL))%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID))%>";
- form.<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>.value = "<%=HTMLUtils.JSMangle((String)unpublishTool.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD))%>";
-<%
- }
-%>
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeAllUddiChildWindows()">
- <div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/UnpublishActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-<%
- String titleImagePath = unpublishTool.getHighlightedImageLink();
- String title = unpublishTool.getAltText();
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=uddiPerspective.getMessage("FORM_LABEL_UNPUBLISH_DESC")%>
- </td>
- </tr>
- </table>
-<%
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("unpublishAuthentication");
-%>
-<jsp:include page="/uddi/forms/authentication_table.jsp" flush="true"/>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </div>
-<script language="javascript">
- setDefaults();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp
deleted file mode 100644
index cbe853e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- FormToolPropertiesInterface formToolPI = (FormToolPropertiesInterface)(selectedNode.getCurrentToolManager().getSelectedTool());
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td colspan=3 height=40 valign="bottom" align="left" class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_MAX_SEARCH_SET")%>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET%>" class="smtextenter">
- </td>
- </tr>
- <tr>
- <td colspan=3 class="labels">
- <%=uddiPerspective.getMessage("FORM_LABEL_MAX_RESULTS")%>
-<%
- if (!formToolPI.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS%>" class="smtextenter">
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp
deleted file mode 100644
index 7e779c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp
+++ /dev/null
@@ -1,88 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.AbstractUDDIElement,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryKeyProperty" class="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryKeyProperty" scope="request"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-Node selectedNode = navigatorManager.getSelectedNode();
-TreeElement selectedElement = selectedNode.getTreeElement();
-FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-String tableContainerId = sectionHeaderInfo.getContainerId();
-String username = null;
-String password = null;
-if (selectedElement instanceof AbstractUDDIElement)
-{
- RegistryElement regElement = ((AbstractUDDIElement)selectedElement).getRegistryElement();
- username = regElement.getUserId();
- password = regElement.getCred();
-}
-if (username == null)
- username = "";
-if (password == null)
- password = "";
-%>
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="<%=tableContainerId+"_input_publish_url"%>"><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%></label>
- <%
- if (!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL))
- {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td><input type="text" id="<%=tableContainerId+"_input_publish_url"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>" class="textenter"></td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="<%=tableContainerId+"_input_user_id"%>"><%=uddiPerspective.getMessage("FORM_LABEL_USERID")%></label>
- <%
- if (!formTool.isInputValid(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID))
- {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td><input type="text" id="<%=tableContainerId+"_input_user_id"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(username)%>" class="textenter"></td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom"><label for="<%=tableContainerId+"_input_password"%>"><%=uddiPerspective.getMessage("FORM_LABEL_PASSWORD")%></label></td>
- </tr>
- <tr>
- <td><input type="password" id="<%=tableContainerId+"_input_password"%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(password)%>" class="textenter"></td>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp
deleted file mode 100644
index d549a65..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp
+++ /dev/null
@@ -1,77 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORIES")%></strong>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addCategoryRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORY_TYPE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-<%
- if (tableContainerId.startsWith("findBusinesses"))
- {// condition to turn off for everything other than find by business searches.
-%>
- <table>
- <tr>
- <td height=30 valign="center">
- <label for="business_categories"><%=uddiPerspective.getMessage("FORM_LABEL_BUSINESS_CATEGORIES")%></label>
- </td>
- <td height=30 valign="center">
- <select id="business_categories" class="selectlist">
- <option><%=uddiPerspective.getMessage("FORM_OPTION_BUSINESSES_ONLY")%>
- <option value="<%=FindQualifier.serviceSubset%>"><%=uddiPerspective.getMessage("FORM_OPTION_SERVICES_ONLY")%>
- <option value="<%=FindQualifier.combineCategoryBags%>"><%=uddiPerspective.getMessage("FORM_OPTION_BOTH")%>
- </select>
- </td>
- </tr>
- </table>
-<%
- }
-%>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp
deleted file mode 100644
index adcfe4d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORIES")%></strong>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addDetailsCategoryRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:editSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:cancelSelectedDetailsCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_CATEGORY_TYPE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp
deleted file mode 100644
index 8d3d711..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- boolean hasErrors = ((Boolean)sectionHeaderInfo.getOtherProperties()).booleanValue();
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURLS")%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addDetailsDiscoveryURLRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:editSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:cancelSelectedDetailsDiscoveryURLRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
- </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL")%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp
deleted file mode 100644
index 8d7bc54..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIERS")%></strong>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addDetailsIdentifierRow('<%=tableContainerId%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:editSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:cancelSelectedDetailsIdentifierRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIER_TYPE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp
deleted file mode 100644
index 1d8d5e7..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String[] otherProperties = (String[])sectionHeaderInfo.getOtherProperties();
- String[] titleKeys = {otherProperties[0],otherProperties[1]};
- boolean hasErrors = otherProperties[2].equals(Boolean.TRUE.toString());
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage(titleKeys[0])%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
-<%
- String textControlTitleKey;
- if (titleKeys[0].equals("FORM_LABEL_NAMES"))
- textControlTitleKey = "FORM_CONTROL_TITLE_NAME_TEXT_VALUE";
- else
- textControlTitleKey = "FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE";
-%>
- <a href="javascript:addDetailsLanguageInputRow('<%=tableContainerId%>','<%=HTMLUtils.JSMangle(uddiPerspective.getMessage(textControlTitleKey))%>',true)"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:editSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:cancelSelectedDetailsLanguageInputRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage(titleKeys[1])%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp
deleted file mode 100644
index 41c7cff..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String itemHeader = (String)sectionHeaderInfo.getOtherProperties();
-%>
-<table>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-<div id="<%=tableContainerId%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=itemHeader%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp
deleted file mode 100644
index ab3f535..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- boolean hasErrors = ((Boolean)sectionHeaderInfo.getOtherProperties()).booleanValue();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURLS")%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addDiscoveryURLRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp
deleted file mode 100644
index 9137216..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels"><strong><%=uddiPerspective.getMessage("FORM_LABEL_FINDQUALIFIERS")%></strong></td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table>
- <tr>
- <td><label for="combine_keys"><%=uddiPerspective.getMessage("FORM_LABEL_COMBINE_KEYS")%></label></td>
- <td>
- <select id="combine_keys" class="selectlist">
- <option value="<%=FindQualifier.andAllKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ANDALLKEYS")%>
- <option value="<%=FindQualifier.orAllKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ORALLKEYS")%>
- <option value="<%=FindQualifier.orLikeKeys%>"><%=uddiPerspective.getMessage("FORM_OPTION_ORLIKEKEYS")%>
- </select>
- </td>
- </tr>
- <tr>
- <td><%=uddiPerspective.getMessage("FORM_LABEL_SORT_BY_NAME")%></td>
- <td>
- <input type="radio" id="advance_sort_by_name_asc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_NAME%>" value="<%=FindQualifier.sortByNameAsc%>" checked><label for="advance_sort_by_name_asc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_ASC")%></label>
- <input type="radio" id="advance_sort_by_name_desc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_NAME%>" value="<%=FindQualifier.sortByNameDesc%>"><label for="advance_sort_by_name_desc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_DESC")%></label>
- </td>
- </tr>
- <tr>
- <td><%=uddiPerspective.getMessage("FORM_LABEL_SORT_BY_DATE")%></td>
- <td>
- <input type="radio" id="advance_sort_by_date_asc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_DATE%>" value="<%=FindQualifier.sortByDateAsc%>" checked><label for="advance_sort_by_date_asc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_ASC")%></label>
- <input type="radio" id="advance_sort_by_date_desc" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_SORT_BY_DATE%>" value="<%=FindQualifier.sortByDateDesc%>"><label for="advance_sort_by_date_desc"><%=uddiPerspective.getMessage("FORM_RADIO_SORT_DESC")%></label>
- </td>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc
deleted file mode 100644
index 7e82e21..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
- <td width="*"> </td>
-<%
- int colspan = 2;
- if (subQueryKey != null && subQueryKey.length() > 0)
- {
- int nodeId = selectedNode.getNodeId();
- int toolId = formTool.getToolId();
- int viewId = selectedNode.getViewId();
- int viewToolId = selectedNode.getViewToolId();
- int count = 1;
-%>
- <td align="right">
- <a href="<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,"",false)))%>"><%=count%></a>
- </td>
-<%
- String currentSubQueryKey = subQueryKey;
- int separatorPos = -1;
- while ((separatorPos = currentSubQueryKey.indexOf(':')) != -1)
- {
- count++;
-%>
- <td align="right">
- <a href="<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,currentSubQueryKey.substring(0,separatorPos),false)))%>"><%=count%></a>
- </td>
-<%
- currentSubQueryKey = currentSubQueryKey.substring(separatorPos+1,currentSubQueryKey.length());
- }
- colspan += count;
- }
-%>
- </tr>
- <tr>
- <td height=20 colspan=<%=colspan%>> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp
deleted file mode 100644
index 71ac46c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIERS")%></strong>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:addIdentifierRow('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_IDENTIFIER_TYPE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_KEY_VALUE")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp
deleted file mode 100644
index bd58d13..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp
+++ /dev/null
@@ -1,86 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String[] otherProperties = (String[])sectionHeaderInfo.getOtherProperties();
- String[] titleKeys = {otherProperties[0],otherProperties[1]};
- boolean hasErrors = otherProperties[2].equals(Boolean.TRUE.toString());
- boolean isFind = tableContainerId.startsWith("find");
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage(titleKeys[0])%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
-<%
- String textControlTitleKey;
- if (titleKeys[0].equals("FORM_LABEL_NAMES"))
- textControlTitleKey = "FORM_CONTROL_TITLE_NAME_TEXT_VALUE";
- else
- textControlTitleKey = "FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE";
-%>
- <a href="javascript:addLanguageInputRow('<%=tableContainerId%>','<%=HTMLUtils.JSMangle(uddiPerspective.getMessage(textControlTitleKey))%>')">
- <%=uddiPerspective.getMessage("FORM_LINK_ADD")%>
- </a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage(titleKeys[1])%></th>
- </tr>
- </table>
-<%
- if (isFind)
- {// condition to turn off when publishing to come.
-%>
-<jsp:include page="/uddi/forms/names_findQualifiers_table.jsp" flush="true"/>
-<%
- }
-%>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/login_authentication_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/login_authentication_table.jsp
deleted file mode 100644
index 12a8c5a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/login_authentication_table.jsp
+++ /dev/null
@@ -1,79 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.AbstractUDDIElement,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
-UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-Node selectedNode = navigatorManager.getSelectedNode();
-TreeElement selectedElement = selectedNode.getTreeElement();
-
-RegistryElement regElement = ((AbstractUDDIElement)selectedElement).getRegistryElement();
-String username = regElement.getUserId();
-String password = regElement.getCred();
-String publishURL = regElement.getPublishURL();
-
-if (username == null) {
- username = "";
-}
-
-if (password == null) {
- password = "";
-}
-
-if (publishURL == null) {
- publishURL = "";
-}
-
-%>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED%>" value="true"/>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_NAME%>" value="Query Results"/>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET%>" value="100"/>
- <input type="hidden" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS%>" value="10"/>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label><%=uddiPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%></label>
- </td>
- </tr>
- <tr>
- <td>
- <input type="text" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL%>" value="<%=publishURL%>" class="textenter"/>
- </td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label><%=uddiPerspective.getMessage("FORM_LABEL_USERID")%></label>
- </td>
- </tr>
- <tr>
- <td><input type="text" value="<%=username%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID%>" class="textenter"/></td>
- </tr>
- <tr>
- <td class="labels" height=30 valign="bottom"><label><%=uddiPerspective.getMessage("FORM_LABEL_PASSWORD")%></label></td>
- </tr>
- <tr>
- <td><input type="password" value ="<%=password%>" name="<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD%>" class="textenter"/></td>
- </tr>
- </table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp
deleted file mode 100644
index 43ee68b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.uddi4j.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<table>
- <tr>
- <td>
- <input type="checkbox" id="find_qualifier_exact_name_match" value="<%=FindQualifier.exactNameMatch%>"><label for="find_qualifier_exact_name_match"><%=uddiPerspective.getMessage("FORM_LABEL_EXACT_NAME_MATCH")%></label>
- </td>
- </tr>
- <tr>
- <td>
- <input type="checkbox" id="find_qualifier_case_sensitive_match" value="<%=FindQualifier.caseSensitiveMatch%>"><label for="find_qualifier_case_sensitive_match"><%=uddiPerspective.getMessage("FORM_LABEL_CASE_SENSITIVE_MATCH")%></label>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp
deleted file mode 100644
index 0631855..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
- String title = specificInfo[0];
- String parentContainerId = specificInfo[1];
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=title%></strong>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc
deleted file mode 100644
index 903c272..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc
+++ /dev/null
@@ -1,50 +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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td align="left" nowrap>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
-<%
- int colspan = 1;
- if (hasTarget)
- {
- String returnLink = TransferSubQueryResultsAction.getActionLinkForReturn();
-%>
- <td nowrap width="*"> </td>
- <td align="right" nowrap>
- <a href="<%=response.encodeURL(controller.getPathWithContext(returnLink))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=uddiPerspective.getMessage("FORM_LINK_TARGET")%></a>
- </td>
-<%
- colspan += 2;
- }
-%>
- </tr>
- <tr>
- <td height=20 colspan=<%=colspan%>> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
- <tr>
- <td colspan=<%=colspan%>>
-<%
- if (hasTarget)
- {
-%>
-<%=uddiPerspective.getMessage("FORM_LABEL_SUBQUERY")%>
-<%
- }
-%>
-<%=uddiPerspective.getMessage("FORM_LABEL_QUERY")%>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp
deleted file mode 100644
index 7b1ff00..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.uddi4j.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage("FORM_LABEL_USER_DEFINED_CATEGORIES")%></strong>
- </td>
- <!--
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:editSelectedDetailsUserDefinedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_EDIT")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:cancelSelectedDetailsUserDefinedCategoryRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_CANCEL")%></a>
- </td>
- -->
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:'';">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <!--
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- -->
- <th class="headercolor" width="15%"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <!--
- <th class="headercolor" width="10%"><%=uddiPerspective.getMessage("FORM_LABEL_CHECKED")%></th>
- <th class="headercolor" width="70%"><%=uddiPerspective.getMessage("FORM_LABEL_FILE")%></th>
- <th class="headercolor" width="*"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- -->
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp
deleted file mode 100644
index d028228..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
- String tableTitleKey = specificInfo[0];
- boolean hasErrors = specificInfo[1].equals(Boolean.TRUE.toString());
- String queryItemString = specificInfo[2];
- String parentContainerId = specificInfo[3];
- String transferTargetKey = specificInfo[4];
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage(tableTitleKey)%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
-<%
- if (sectionHeaderInfo.isDynamic())
- {
-%>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,true)"><%=uddiPerspective.getMessage("FORM_LINK_GET")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,false)"><%=uddiPerspective.getMessage("FORM_LINK_FIND")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
-<%
- }
-%>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=((BusinessElement)uddiPerspective.getNavigatorManager().getSelectedNode().getTreeElement()).getBusinessEntity().getDefaultNameString()%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DIRECTION")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_ASSERTION_TYPE")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp
deleted file mode 100644
index b5b3da6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp
+++ /dev/null
@@ -1,80 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- String[] specificInfo = (String[])sectionHeaderInfo.getOtherProperties();
- String tableTitleKey = specificInfo[0];
- boolean hasErrors = specificInfo[1].equals(Boolean.TRUE.toString());
- String queryItemString = specificInfo[2];
- String parentContainerId = specificInfo[3];
- String transferTargetKey = specificInfo[4];
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=uddiPerspective.getMessage(tableTitleKey)%></strong>
-<%
- if (hasErrors)
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
-<%
- if (sectionHeaderInfo.isDynamic())
- {
-%>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,true)"><%=uddiPerspective.getMessage("FORM_LINK_GET")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:initiateSubQuery('<%=parentContainerId%>','<%=transferTargetKey%>',<%=queryItemString%>,false)"><%=uddiPerspective.getMessage("FORM_LINK_FIND")%></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <a href="javascript:removeSelectedRows('<%=tableContainerId%>')"><%=uddiPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
-<%
- }
-%>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerId%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor"><%=uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION")%></th>
- </tr>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif
deleted file mode 100644
index 3afd94a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif
deleted file mode 100644
index d3d6a77..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif
deleted file mode 100644
index a85c097..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif
deleted file mode 100644
index df3043f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif
deleted file mode 100644
index 6ad7cea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif
deleted file mode 100644
index 4514d7d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif
deleted file mode 100644
index 5c18d74..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif
deleted file mode 100644
index d540a01..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif
deleted file mode 100644
index 875066b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif
deleted file mode 100644
index 8d5699c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif
deleted file mode 100644
index 3c4263c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif
deleted file mode 100644
index 62cef1f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif
deleted file mode 100644
index 45894fd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif
deleted file mode 100644
index d45ea5c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif
deleted file mode 100644
index 1eff855..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif
deleted file mode 100644
index 54e992f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif
deleted file mode 100644
index 7737d7b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif
deleted file mode 100644
index 9d5500c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif
deleted file mode 100644
index b6ca154..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif
deleted file mode 100644
index 0607660..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif
deleted file mode 100644
index 89d796f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif
deleted file mode 100644
index 401506f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif
deleted file mode 100644
index d37d59e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif
deleted file mode 100644
index 3a6714b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif
deleted file mode 100644
index 21325ca..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif
deleted file mode 100644
index fbe4a74..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif
deleted file mode 100644
index 9bd9820..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif
deleted file mode 100644
index 9afcc01..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif
deleted file mode 100644
index c398f6f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif
deleted file mode 100644
index 5e6544f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif
deleted file mode 100644
index 282b4c0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif
deleted file mode 100644
index 8f86052..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif
deleted file mode 100644
index b6922ac..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif
deleted file mode 100644
index a254164..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif
deleted file mode 100644
index d730b0f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif
deleted file mode 100644
index 4e4dd3c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif
deleted file mode 100644
index 48bd83f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif
deleted file mode 100644
index 60eb199..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif
deleted file mode 100644
index 59713e2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp
deleted file mode 100644
index b0dc9a2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=UDDIFrameNames.NAVIGATOR_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp
deleted file mode 100644
index 3ec9ca0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-</head>
-<%
- String selectedAnchorName = "";
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- int focusedNodeId = navigatorManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = navigatorManager.getSelectedNode();
- if (selectedNode != null)
- {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-<div id="treecontentborder">
-<%=navigatorManager.renderTreeView(response)%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp
deleted file mode 100644
index 7e264e3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(UDDIFrameNames.NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (uddiPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- else
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
- String altRefresh = controller.getMessage("ALT_REFRESH");
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RefreshUDDINodeActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodeActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp
deleted file mode 100644
index 991d1c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=UDDIFrameNames.PROPERTIES_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=UDDIFrameNames.PROPERTIES_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp
deleted file mode 100644
index 4491057..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp
+++ /dev/null
@@ -1,77 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNavigatorNode = navigatorManager.getSelectedNode();
- if (selectedNavigatorNode != null)
- {
- ToolManager toolManager;
- if (selectedNavigatorNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNavigatorNode.getToolManager();
- else
- toolManager = selectedNavigatorNode.getViewToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION)
- {
-%>
-<script language="javascript">
- location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
-</script>
-<%
- }
- else
- {
-%>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
- </td>
- </tr>
-</table>
-<%
- }
- }
- else
- {
-%>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
- </td>
- </tr>
-</table>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp
deleted file mode 100644
index 59292a6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(UDDIFrameNames.PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (uddiPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (uddiPerspective.getActionsContainerFramesetRows().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNavigatorNode = navigatorManager.getSelectedNode();
- if (selectedNavigatorNode != null)
- {
- ToolManager toolManager;
- if (selectedNavigatorNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNavigatorNode.getToolManager();
- else
- toolManager = selectedNavigatorNode.getViewToolManager();
- for (int i=0;i<toolManager.getNumberOfTools();i++)
- {
- Tool tool = (Tool)toolManager.getTool(i);
-%>
- <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
-<%
- }
- }
-%>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp
deleted file mode 100644
index 8c27198..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<script language="javascript">
- var categoryBrowserWindow = top;
- var categoryBrowserWindowWorkArea = top.frames["<%=UDDIFrameNames.CATEGORIES_WORKAREA%>"];
- var categoryBrowserWindowToolbar = categoryBrowserWindow.frames["<%=UDDIFrameNames.CATEGORIES_TOOLBAR%>"];
- var categoryBrowserWindowContent = categoryBrowserWindow.frames["<%=UDDIFrameNames.CATEGORIES_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp
deleted file mode 100644
index 1fde370..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp
+++ /dev/null
@@ -1,1550 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- function addDetailsLanguageInputRow(tableContainerId,textControlTitle,hasError)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column2.className = "tablecells";
- column2.width = "70%";
- column3.className = "tablecells";
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
- column1.appendChild(createHiddenElement("","")); <%// original language%>
- column1.appendChild(createHiddenElement("","")); <%// original text%>
- column1.appendChild(createHiddenElement("",textControlTitle)); <%// control title%>
- column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
- if (hasError)
- {
- var languageSelect = document.createElement("select");
- languageSelect.className = "selectlist";
- populateLanguageSelect(languageSelect);
- column1.appendChild(languageSelect);
-
- var textInput = document.createElement("input");
- textInput.className = "tabletextenter";
- textInput.title = textControlTitle;
- column2.appendChild(textInput);
-
- addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column3,table.rows.length);
- }
- else
- {
- column1.appendChild(document.createTextNode(""));
- column2.appendChild(document.createTextNode(""));
- addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,table.rows.length);
- }
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
-
- tableBody.appendChild(newRow);
- }
-
- function removeColumnChildren(column)
- {
- for (var i=0;i<column.childNodes.length;i++)
- {
- column.removeChild(column.childNodes[i]);
- i--;
- }
- }
-
- function addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column,rowIndex)
- {
- var removeLink = document.createElement("a");
- setJSLinkRowTarget(removeLink,"removeDetailsLanguageInputRow",tableContainerId,rowIndex);
- removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
- column.appendChild(removeLink);
- }
-
- function addDetailsLanguageInputRowEditActionLink(tableContainerId,column,rowIndex)
- {
- var editLink = document.createElement("a");
- setJSLinkRowTarget(editLink,"editDetailsLanguageInputRow",tableContainerId,rowIndex);
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function addDetailsLanguageInputRowCancelActionLink(tableContainerId,column,rowIndex)
- {
- var cancelLink = document.createElement("a");
- setJSLinkRowTarget(cancelLink,"cancelDetailsLanguageInputRowEdit",tableContainerId,rowIndex);
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function editDetailsLanguageInputRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
-
- var langId = column1.childNodes[1].value;
- var inputValue = column1.childNodes[2].value;
- var textControlTitle = column1.childNodes[3].value;
- var editable = (column1.childNodes[4].value == "true")
- if (editable)
- return;
- column1.childNodes[4].value = true;
- var column1Control = column1.childNodes[5];
-
- var languageSelect = document.createElement("select");
- populateLanguageSelect(languageSelect);
- column1.replaceChild(languageSelect,column1Control);
- languageSelect.className = "selectlist";
- setLanguageSelect(languageSelect,langId);
-
- var column2Control = column2.childNodes[0];
- var textInput = document.createElement("input");
- column2.replaceChild(textInput,column2Control);
- textInput.className = "tabletextenter";
- textInput.title = textControlTitle;
- textInput.value = inputValue;
-
- removeColumnChildren(column3);
- addDetailsLanguageInputRowCancelActionLink(tableContainerId,column3,rowIndex);
- }
-
- function setDetailsLanguageInputRow(tableContainerId,index,viewId,langId,inputValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+index];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- column1.childNodes[0].value = viewId;
- column1.childNodes[1].value = langId;
- column1.childNodes[2].value = inputValue;
- var editable = (column1.childNodes[4].value == "true");
- var column1Control = column1.childNodes[5];
- if (editable)
- setLanguageSelect(column1Control,langId);
- else
- {
- var tempSelect = document.createElement("select");
- populateLanguageSelect(tempSelect);
- var language = setLanguageSelect(tempSelect,langId);
- column1.replaceChild(document.createTextNode(getDefaultDisplayString(language)),column1Control);
- }
-
- var column2Control = column2.childNodes[0];
- if (editable)
- column2Control.value = inputValue;
- else
- column2.replaceChild(document.createTextNode(getDefaultDisplayString(inputValue)),column2Control)
- }
-
- function removeDetailsLanguageInputRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- table.deleteRow(rowIndex);
- fixDetailsLanguageInputRowLinks(tableContainerId);
- }
-
- function cancelDetailsLanguageInputRowEdit(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
-
- var viewId = column1.childNodes[0].value;
- var langId = column1.childNodes[1].value;
- var inputValue = column1.childNodes[2].value;
- var rowActionLinkHref = column3.childNodes[column3.childNodes.length-1].href;
- if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
- return;
-
- column1.childNodes[4].value = false;
-
- var column1Control = column1.childNodes[5];
- var tempSelect = document.createElement("select");
- populateLanguageSelect(tempSelect);
- var language = setLanguageSelect(tempSelect,langId);
- column1.replaceChild(document.createTextNode(getDefaultDisplayString(language)),column1Control);
-
- var column2Control = column2.childNodes[0];
- column2.replaceChild(document.createTextNode(getDefaultDisplayString(inputValue)),column2Control);
-
- removeColumnChildren(column3);
- addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,rowIndex);
- }
-
- function removeSelectedDetailsLanguageInputRows(tableContainerId)
- {
- removeSelectedRows(tableContainerId);
- fixDetailsLanguageInputRowLinks(tableContainerId);
- }
-
- function fixDetailsLanguageInputRowLinks(tableContainerId)
- {
- <%// Fix the links%>
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var row = table.rows[i];
- var columns = row.getElementsByTagName("td");
- var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-
- for (var j=1;j<columns.length;j++)
- {
- if (rowCheckbox.checked)
- columns.item(j).className = "rowcolor";
- else
- columns.item(j).className = "tablecells";
- }
-
- var column1 = columns.item(1);
- var column3 = columns.item(3);
- var link = column3.childNodes[column3.childNodes.length-1];
- var removeLink;
- if (link.href.indexOf("javascript:remove") == 0)
- removeLink = true;
- else
- removeLink = false;
-
- removeColumnChildren(column3);
- var editable = (column1.childNodes[4].value == "true");
- if (link.href.indexOf("javascript:remove") == 0)
- addDetailsLanguageInputRowRemoveActionLink(tableContainerId,column3,i);
- else if (link.href.indexOf("javascript:cancel") == 0)
- addDetailsLanguageInputRowCancelActionLink(tableContainerId,column3,i);
- else if (link.href.indexOf("javascript:edit") == 0)
- addDetailsLanguageInputRowEditActionLink(tableContainerId,column3,i);
- }
- }
-
- function editSelectedDetailsLanguageInputRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- editDetailsLanguageInputRow(tableContainerId,i);
- }
- }
-
- function cancelSelectedDetailsLanguageInputRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- cancelDetailsLanguageInputRowEdit(tableContainerId,i);
- }
- }
-
- function addDetailsIdentifierRow(tableContainerId,hasError)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
- var column4 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column1.width = "10%";
- column2.className = "tablecells";
- column2.width = "40%";
- column3.className = "tablecells";
- column3.width = "40%";
- column4.className = "tablecells";
-
- column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
- column1.appendChild(createHiddenElement("","")); <%// original key type%>
- column1.appendChild(createHiddenElement("","")); <%// original key name%>
- column1.appendChild(createHiddenElement("","")); <%// original key value%>
- column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-
- var identifierTypeSelect;
- var keyNameTextInput;
- if (hasError)
- {
- identifierTypeSelect = document.createElement("select");
- identifierTypeSelect.onchange = handleIdentifierChange;
- populateIdentifierTypeSelect(identifierTypeSelect);
- identifierTypeSelect.className = "selectlist";
- column1.appendChild(identifierTypeSelect);
-
- keyNameTextInput = document.createElement("input");
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME")%>";
- column2.appendChild(keyNameTextInput);
-
- var keyValueTextInput = document.createElement("input");
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE")%>";
- column3.appendChild(keyValueTextInput);
- addDetailsIdentifierRowRemoveActionLink(tableContainerId,column4,table.rows.length);
- }
- else
- {
- column1.appendChild(document.createTextNode(""));
- column2.appendChild(document.createTextNode(""));
- column3.appendChild(document.createTextNode(""));
- addDetailsIdentifierRowEditActionLink(tableContainerId,column4,table.rows.length);
- }
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- newRow.appendChild(column4);
- tableBody.appendChild(newRow);
- if (hasError)
- keyNameTextInput.value = identifierTypeSelect.options[0].text;
- }
-
- function addDetailsIdentifierRowRemoveActionLink(tableContainerId,column,rowIndex)
- {
- var removeLink = document.createElement("a");
- setJSLinkRowTarget(removeLink,"removeDetailsIdentifierRow",tableContainerId,rowIndex);
- removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
- column.appendChild(removeLink);
- }
-
- function addDetailsIdentifierRowEditActionLink(tableContainerId,column,rowIndex)
- {
- var editLink = document.createElement("a");
- setJSLinkRowTarget(editLink,"editDetailsIdentifierRow",tableContainerId,rowIndex);
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function addDetailsIdentifierRowCancelActionLink(tableContainerId,column,rowIndex)
- {
- var cancelLink = document.createElement("a");
- setJSLinkRowTarget(cancelLink,"cancelDetailsIdentifierRowEdit",tableContainerId,rowIndex);
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function editDetailsIdentifierRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var tModelKey = column1.childNodes[1].value
- var keyName = column1.childNodes[2].value;
- var keyValue = column1.childNodes[3].value;
- var editable = (column1.childNodes[4].value == "true")
- if (editable)
- return;
- column1.childNodes[4].value = true;
-
- var column1Control = column1.childNodes[5];
- var identifierTypeSelect = document.createElement("select");
- identifierTypeSelect.onchange = handleIdentifierChange;
- populateIdentifierTypeSelect(identifierTypeSelect);
- column1.replaceChild(identifierTypeSelect,column1Control);
- identifierTypeSelect.className = "selectlist";
- setTModelKeySelect(identifierTypeSelect,tModelKey);
-
- var column2Control = column2.childNodes[0];
- var keyNameTextInput = document.createElement("input");
- column2.replaceChild(keyNameTextInput,column2Control);
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME")%>";
- keyNameTextInput.value = keyName;
-
- var column3Control = column3.childNodes[0];
- var keyValueTextInput = document.createElement("input");
- column3.replaceChild(keyValueTextInput,column3Control);
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE")%>";
- keyValueTextInput.value = keyValue;
-
- removeColumnChildren(column4);
-
- addDetailsIdentifierRowCancelActionLink(tableContainerId,column4,rowIndex);
- }
-
- function setDetailsIdentifierRow(tableContainerId,index,viewId,tModelKey,keyName,keyValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+index];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- column1.childNodes[0].value = viewId;
- column1.childNodes[1].value = tModelKey;
- column1.childNodes[2].value = keyName;
- column1.childNodes[3].value = keyValue;
- var editable = (column1.childNodes[4].value == "true");
- var column1Control = column1.childNodes[5];
- if (editable)
- setTModelKeySelect(column1Control,tModelKey);
- else
- {
- var tempSelect = document.createElement("select");
- populateIdentifierTypeSelect(tempSelect);
- var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
- column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
- }
-
- var column2Control = column2.childNodes[0];
- if (editable)
- column2Control.value = keyName;
- else
- column2.replaceChild(document.createTextNode(keyName),column2Control);
-
- var column3Control = column3.childNodes[0];
- if (editable)
- column3Control.value = keyValue;
- else
- column3.replaceChild(document.createTextNode(keyValue),column3Control);
- }
-
- function removeDetailsIdentifierRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- table.deleteRow(rowIndex);
- fixDetailsIdentifierRowLinks(tableContainerId);
- }
-
- function cancelDetailsIdentifierRowEdit(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var viewId = column1.childNodes[0].value;
- var tModelKey = column1.childNodes[1].value;
- var keyName = column1.childNodes[2].value;
- var keyValue = column1.childNodes[3].value;
- var rowActionLinkHref = column4.childNodes[column4.childNodes.length-1].href;
- if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
- return;
- column1.childNodes[4].value = false;
-
- var column1Control = column1.childNodes[5];
- var tempSelect = document.createElement("select");
- populateIdentifierTypeSelect(tempSelect);
- var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
- column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-
- var column2Control = column2.childNodes[0];
- column2.replaceChild(document.createTextNode(keyName),column2Control);
-
- var column3Control = column3.childNodes[0];
- column3.replaceChild(document.createTextNode(keyValue),column3Control);
-
- removeColumnChildren(column4);
- addDetailsIdentifierRowEditActionLink(tableContainerId,column4,rowIndex);
- }
-
- function removeSelectedDetailsIdentifierRows(tableContainerId)
- {
- removeSelectedRows(tableContainerId);
- <%// Fix the links%>
- fixDetailsIdentifierRowLinks(tableContainerId);
- }
-
- function fixDetailsIdentifierRowLinks(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var row = table.rows[i];
- var columns = row.getElementsByTagName("td");
- var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
- for (var j=1;j<columns.length;j++)
- {
- if (rowCheckbox.checked)
- columns.item(j).className = "rowcolor";
- else
- columns.item(j).className = "tablecells";
- }
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var column4 = columns.item(4);
- var link = column4.childNodes[column4.childNodes.length-1];
- var removeLink;
- if (link.href.indexOf("javascript:remove") == 0)
- removeLink = true;
- else
- removeLink = false;
- removeColumnChildren(column4);
-
- if (link.href.indexOf("javascript:remove") == 0)
- addDetailsIdentifierRowRemoveActionLink(tableContainerId,column4,i);
- else if (link.href.indexOf("javascript:edit") == 0)
- addDetailsIdentifierRowEditActionLink(tableContainerId,column4,i);
- else if (link.href.indexOf("javascript:cancel") == 0)
- addDetailsIdentifierRowCancelActionLink(tableContainerId,column4,i);
- }
- }
-
- function editSelectedDetailsIdentifierRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- editDetailsIdentifierRow(tableContainerId,i);
- }
- }
-
- function cancelSelectedDetailsIdentifierRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- cancelDetailsIdentifierRowEdit(tableContainerId,i);
- }
- }
-
- function addDetailsCategoryRow(tableContainerId,hasError)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
- var column4 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column1.width = "5%";
- column2.className = "tablecells";
- column2.width = "55%";
- column3.className = "tablecells";
- column3.width = "25%";
- column4.className = "tablecells";
-
- column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
- column1.appendChild(createHiddenElement("","")); <%// original key type%>
- column1.appendChild(createHiddenElement("","")); <%// original key name%>
- column1.appendChild(createHiddenElement("","")); <%// original key value%>
- column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
-
- if (hasError)
- {
- var categoryTypeSelect = document.createElement("select");
- populateCategoryTypeSelect(categoryTypeSelect);
- categoryTypeSelect.className = "selectlist";
- column1.appendChild(categoryTypeSelect);
-
- var keyNameTextInput = document.createElement("input");
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME")%>";
- column2.appendChild(keyNameTextInput);
-
- var keyValueTextInput = document.createElement("input");
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE")%>";
- column3.appendChild(keyValueTextInput);
- addCategoryRowBrowseLink(tableContainerId,column4,table.rows.length);
- }
- else
- {
- column1.appendChild(document.createTextNode(""));
- column2.appendChild(document.createTextNode(""));
- column3.appendChild(document.createTextNode(""));
- addDetailsCategoryRowEditActionLink(tableContainerId,column4,table.rows.length);
- }
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- newRow.appendChild(column4);
- tableBody.appendChild(newRow);
- }
-
- function addDetailsCategoryRowCancelActionLink(tableContainerId,column,rowIndex)
- {
- var cancelLink = document.createElement("a");
- setJSLinkRowTarget(cancelLink,"cancelDetailsCategoryRowEdit",tableContainerId,rowIndex);
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column,rowIndex)
- {
- addCategoryRowBrowseLink(tableContainerId,column,rowIndex);
- column.appendChild(document.createTextNode(" "));
- addDetailsCategoryRowCancelActionLink(tableContainerId,column,rowIndex);
- }
-
- function addDetailsCategoryRowEditActionLink(tableContainerId,column,rowIndex)
- {
- var editLink = document.createElement("a");
- setJSLinkRowTarget(editLink,"editDetailsCategoryRow",tableContainerId,rowIndex);
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function addDetailsCategoryRowRemoveActionLink(tableContainerId,column,rowIndex)
- {
- var removeLink = document.createElement("a");
- setJSLinkRowTarget(removeLink,"removeDetailsCategoryRow",tableContainerId,rowIndex);
- removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
- column.appendChild(removeLink);
- }
-
- function addDetailsCategoryRowBrowseRemoveActionLinks(tableContainerId,column,rowIndex)
- {
- addCategoryRowBrowseLink(tableContainerId,column,rowIndex);
- column.appendChild(document.createTextNode(" "));
- addDetailsCategoryRowRemoveActionLink(tableContainerId,column,rowIndex);
- }
-
- function editDetailsCategoryRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var tModelKey = column1.childNodes[1].value
- var keyName = column1.childNodes[2].value;
- var keyValue = column1.childNodes[3].value;
- var editable = (column1.childNodes[4].value == "true")
- if (editable)
- return;
- column1.childNodes[4].value = true;
-
- var column1Control = column1.childNodes[5];
- var categoryTypeSelect = document.createElement("select");
- populateCategoryTypeSelect(categoryTypeSelect);
- column1.replaceChild(categoryTypeSelect,column1Control);
- categoryTypeSelect.className = "selectlist";
- setTModelKeySelect(categoryTypeSelect,tModelKey);
-
- var column2Control = column2.childNodes[0];
- var keyNameTextInput = document.createElement("input");
- column2.replaceChild(keyNameTextInput,column2Control);
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME")%>";
- keyNameTextInput.value = keyName;
-
- var column3Control = column3.childNodes[0];
- var keyValueTextInput = document.createElement("input");
- column3.replaceChild(keyValueTextInput,column3Control);
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE")%>";
- keyValueTextInput.value = keyValue;
-
- removeColumnChildren(column4);
-
- addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column4,rowIndex);
- }
-
- function setDetailsCategoryRow(tableContainerId,index,viewId,tModelKey,keyName,keyValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+index];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- column1.childNodes[0].value = viewId;
- column1.childNodes[1].value = tModelKey;
- column1.childNodes[2].value = keyName;
- column1.childNodes[3].value = keyValue;
- var editable = (column1.childNodes[4].value == "true");
-
- var column1Control = column1.childNodes[5];
- if (editable)
- setTModelKeySelect(column1Control,tModelKey);
- else
- {
- var tempSelect = document.createElement("select");
- populateCategoryTypeSelect(tempSelect);
- var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
- column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
- }
-
- var column2Control = column2.childNodes[0];
- if (editable)
- column2Control.value = keyName;
- else
- column2.replaceChild(document.createTextNode(keyName),column2Control);
-
- var column3Control = column3.childNodes[0];
- if (editable)
- column3Control.value = keyValue;
- else
- column3.replaceChild(document.createTextNode(keyValue),column3Control);
- }
-
- function removeDetailsCategoryRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- table.deleteRow(rowIndex);
- fixDetailsCategoryRowLinks(tableContainerId);
- }
-
- function cancelDetailsCategoryRowEdit(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var viewId = column1.childNodes[0].value;
- var tModelKey = column1.childNodes[1].value;
- var keyName = column1.childNodes[2].value;
- var keyValue = column1.childNodes[3].value;
- var rowActionLinkHref = column4.childNodes[column4.childNodes.length-1].href;
- if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
- return;
- column1.childNodes[4].value = false;
-
- var column1Control = column1.childNodes[5];
- var tempSelect = document.createElement("select");
- populateCategoryTypeSelect(tempSelect);
- var tModelKeyValue = setTModelKeySelect(tempSelect,tModelKey);
- column1.replaceChild(document.createTextNode(tModelKeyValue),column1Control);
-
- var column2Control = column2.childNodes[0];
- column2.replaceChild(document.createTextNode(keyName),column2Control);
-
- var column3Control = column3.childNodes[0];
- column3.replaceChild(document.createTextNode(keyValue),column3Control);
-
- removeColumnChildren(column4);
- addDetailsCategoryRowEditActionLink(tableContainerId,column4,rowIndex);
- if (rowIndex == targetCategoryRow)
- closeCategoryBrowser();
- }
-
- function removeSelectedDetailsCategoryRows(tableContainerId)
- {
- removeSelectedRows(tableContainerId);
- <%// Fix the links%>
- fixDetailsCategoryRowLinks(tableContainerId);
- }
-
- function fixDetailsCategoryRowLinks(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var row = table.rows[i];
- var columns = row.getElementsByTagName("td");
- var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
- for (var j=1;j<columns.length;j++)
- {
- if (rowCheckbox.checked)
- columns.item(j).className = "rowcolor";
- else
- columns.item(j).className = "tablecells";
- }
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var column4 = columns.item(4);
-<%
- // Browse, Remove
- // Browse, Cancel
- // Edit
- // Browse
-%>
- var lastLink = column4.childNodes[column4.childNodes.length-1];
- removeColumnChildren(column4);
- if (lastLink.href.indexOf("javascript:remove") == 0)
- addDetailsCategoryRowBrowseRemoveActionLinks(tableContainerId,column4,i);
- else if (lastLink.href.indexOf("javascript:cancel") == 0)
- addDetailsCategoryRowBrowseCancelActionLinks(tableContainerId,column4,i);
- else if (lastLink.href.indexOf("javascript:edit") == 0)
- addDetailsCategoryRowEditActionLink(tableContainerId,column4,i);
- else if (lastLink.href.indexOf("javascript:open") == 0)
- addCategoryRowBrowseLink(tableContainerId,column4,i);
- }
- }
-
- function editSelectedDetailsCategoryRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- editDetailsCategoryRow(tableContainerId,i);
- }
- }
-
- function cancelSelectedDetailsCategoryRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- cancelDetailsCategoryRowEdit(tableContainerId,i);
- }
- }
-
- function addDetailsUserDefinedCategoryRow(tableContainerId,tModelKey,categoryName,isChecked,fileName,hasError)
- {
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- //var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- //var column2 = document.createElement("td");
- //var column3 = document.createElement("td");
- //var column4 = document.createElement("td");
-
- //column0.className = "checkboxcells";
- column1.className = "tablecells";
- column1.width = "15%";
- //column2.className = "tablecells";
- //column2.width = "10%";
- //column3.className = "tablecells";
- //column3.width = "70%";
- //column4.className = "tablecells";
-
- //var rowCheckbox = createRowCheckbox();
- //column0.appendChild(rowCheckbox);
-
- //column1.appendChild(createHiddenElement("",fileName)); <%// original file name%>
- //column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
- //column1.appendChild(createHiddenElement("",tModelKey)); <%// tModelKey%>
- column1.appendChild(document.createTextNode(categoryName));
-
- //column2.appendChild(document.createTextNode(isChecked));
-
- //if (hasError)
- //{
- // column3.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_TMODEL_KEY%>",tModelKey));
- // var fileInput = document.createElement("input");
- // fileInput.setAttribute("name","<%=UDDIActionInputs.CATEGORY_FILENAME%>");
- // fileInput.setAttribute("type","file");
- // fileInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_FILE"))%>";
- // fileInput.className = "tablefilebrowse";
- // column3.appendChild(fileInput);
- // addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column4,table.rows.length);
- //}
- //else
- //{
- // column3.appendChild(document.createTextNode(fileName));
- // addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column4,table.rows.length);
- //}
-
- //newRow.appendChild(column0);
- newRow.appendChild(column1);
- //newRow.appendChild(column2);
- //newRow.appendChild(column3);
- //newRow.appendChild(column4);
-
- tableBody.appendChild(newRow);
- }
-
- function addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column,rowIndex)
- {
- var editLink = document.createElement("a");
- setJSLinkRowTarget(editLink,"editDetailsUserDefinedCategoryRow",tableContainerId,rowIndex);
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function editDetailsUserDefinedCategoryRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var editable = (column1.childNodes[1].value == "true");
- if (editable)
- return;
- var tModelKey = column1.childNodes[2].value;
- column1.childNodes[1].value = true;
-
- removeColumnChildren(column3);
- column3.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_TMODEL_KEY%>",tModelKey));
- var fileInput = document.createElement("input");
- fileInput.setAttribute("name","<%=UDDIActionInputs.CATEGORY_FILENAME%>");
- fileInput.setAttribute("type","file");
- fileInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_FILE"))%>";
- fileInput.className = "tablefilebrowse";
- column3.appendChild(fileInput);
-
- removeColumnChildren(column4);
-
- addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column4,rowIndex);
- }
-
- function addDetailsUserDefinedCategoryRowCancelLink(tableContainerId,column,rowIndex)
- {
- var cancelLink = document.createElement("a");
- setJSLinkRowTarget(cancelLink,"cancelDetailsUserDefinedCategoryRowEdit",tableContainerId,rowIndex);
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function cancelDetailsUserDefinedCategoryRowEdit(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column3 = columns.item(3);
- var column4 = columns.item(4);
-
- var editable = (column1.childNodes[1].value == "true");
- if (!editable)
- return;
- column1.childNodes[1].value = false;
-
- removeColumnChildren(column3);
- column3.appendChild(document.createTextNode(column1.childNodes[0].value));
-
- removeColumnChildren(column4);
-
- addDetailsUserDefinedCategoryRowEditLink(tableContainerId,column4,rowIndex);
- }
-
- function editSelectedDetailsUserDefinedCategoryRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- editDetailsUserDefinedCategoryRow(tableContainerId,i);
- }
- }
-
- function cancelSelectedDetailsUserDefinedCategoryRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- cancelDetailsUserDefinedCategoryRowEdit(tableContainerId,i);
- }
- }
-
- function addDetailsDiscoveryURLRow(tableContainerId,hasError)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column1.width = "85%";
- column2.className = "tablecells";
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- column1.appendChild(createHiddenElement("","<%=ActionInputs.VIEWID_DEFAULT%>")); <%// viewId%>
- column1.appendChild(createHiddenElement("","")); <%// original Discovery URL%>
- column1.appendChild(createHiddenElement("",hasError)); <%// mode%>
- if (hasError)
- {
- var textInput = document.createElement("input");
- textInput.className = "tabletextenter";
- textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL")%>";
- column1.appendChild(textInput);
- addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column2,table.rows.length);
- }
- else
- {
- column1.appendChild(document.createTextNode(""));
- addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,table.rows.length);
- }
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
-
- tableBody.appendChild(newRow);
- }
-
- function addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column,rowIndex)
- {
- var removeLink = document.createElement("a");
- setJSLinkRowTarget(removeLink,"removeDetailsDiscoveryURLRow",tableContainerId,rowIndex);
- removeLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_REMOVE"))%>"));
- column.appendChild(removeLink);
- }
-
- function addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column,rowIndex)
- {
- var editLink = document.createElement("a");
- setJSLinkRowTarget(editLink,"editDetailsDiscoveryURLRow",tableContainerId,rowIndex);
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column,rowIndex)
- {
- var cancelLink = document.createElement("a");
- setJSLinkRowTarget(cancelLink,"cancelDetailsDiscoveryURLRowEdit",tableContainerId,rowIndex);
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function editDetailsDiscoveryURLRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
-
- var column1 = columns.item(1);
- var column2 = columns.item(2);
-
- var discoveryURL = column1.childNodes[1].value;
- var editable = (column1.childNodes[2].value == "true")
- if (editable)
- return;
- column1.childNodes[2].value = true;
-
- var column1Control = column1.childNodes[3];
- var textInput = document.createElement("input");
- column1.replaceChild(textInput,column1Control);
- textInput.className = "tabletextenter";
- textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL")%>";
- textInput.value = discoveryURL;
-
- removeColumnChildren(column2);
- addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column2,rowIndex);
- }
-
- function setDetailsDiscoveryURLRow(tableContainerId,index,viewId,discoveryURL)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+index];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- column1.childNodes[0].value = viewId;
- column1.childNodes[1].value = discoveryURL;
- var editable = (column1.childNodes[2].value == "true");
- var column1Control = column1.childNodes[3];
- if (editable)
- column1Control.value = discoveryURL;
- else
- column1.replaceChild(document.createTextNode(getDefaultDisplayString(discoveryURL)),column1Control);
- }
-
- function removeDetailsDiscoveryURLRow(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- table.deleteRow(rowIndex);
- fixDetailsDiscoveryURLRowLinks(tableContainerId);
- }
-
- function cancelDetailsDiscoveryURLRowEdit(tableContainerId,rowIndex)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[rowIndex];
- var columns = row.getElementsByTagName("td");
- var column1 = columns.item(1);
- var column2 = columns.item(2);
-
- var viewId = column1.childNodes[0].value;
- var discoveryURL = column1.childNodes[1].value;
- var rowActionLinkHref = column2.childNodes[column2.childNodes.length-1].href;
- if (rowActionLinkHref.indexOf("javascript:cancel") != 0)
- return;
-
- column1.childNodes[2].value = false;
-
- var column1Control = column1.childNodes[3];
- column1.replaceChild(document.createTextNode(getDefaultDisplayString(discoveryURL)),column1Control);
-
- removeColumnChildren(column2);
- addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,rowIndex);
- }
-
- function removeSelectedDetailsDiscoveryURLRows(tableContainerId)
- {
- removeSelectedRows(tableContainerId);
- fixDetailsDiscoveryURLRowLinks(tableContainerId);
- }
-
- function fixDetailsDiscoveryURLRowLinks(tableContainerId)
- {
- <%// Fix the links%>
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var row = table.rows[i];
- var columns = row.getElementsByTagName("td");
- var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
-
- for (var j=1;j<columns.length;j++)
- {
- if (rowCheckbox.checked)
- columns.item(j).className = "rowcolor";
- else
- columns.item(j).className = "tablecells";
- }
-
- var column1 = columns.item(1);
- var column2 = columns.item(2);
- var link = column2.childNodes[column2.childNodes.length-1];
- removeColumnChildren(column2);
- var editable = (column1.childNodes[2].value == "true");
- if (link.href.indexOf("javascript:remove") == 0)
- addDetailsDiscoveryURLRowRemoveActionLink(tableContainerId,column2,i);
- else if (link.href.indexOf("javascript:cancel") == 0)
- addDetailsDiscoveryURLRowCancelActionLink(tableContainerId,column2,i);
- else if (link.href.indexOf("javascript:edit") == 0)
- addDetailsDiscoveryURLRowEditActionLink(tableContainerId,column2,i);
- }
- }
-
- function editSelectedDetailsDiscoveryURLRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- editDetailsDiscoveryURLRow(tableContainerId,i);
- }
- }
-
- function cancelSelectedDetailsDiscoveryURLRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- cancelDetailsDiscoveryURLRowEdit(tableContainerId,i);
- }
- }
-
- function addDetailsSingleItemRow(tableContainerId,hasError)
- {
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
-
- column0.className = "tablecells";
- column0.width = "90%";
- column1.className = "tablecells";
-
- column0.appendChild(createHiddenElement("","")); <%// item value%>
- column0.appendChild(createHiddenElement("",hasError)); <%// mode%>
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
-
- newRow.appendChild(column1);
- tableBody.appendChild(newRow);
- }
-
- function addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column)
- {
- var browseLink = document.createElement("a");
- browseLink.href = "javascript:openWSDLBrowser('contentborder',"+wsdlType+")";
- browseLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
- column.appendChild(browseLink);
- }
-
- function addDetailsWSDLURLSingleItemRowBrowseCancelActionLinks(tableContainerId,wsdlType,column)
- {
- addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column);
- column.appendChild(document.createTextNode(" "));
- var cancelLink = document.createElement("a");
- cancelLink.href = "javascript:cancelDetailsWSDLURLSingleItemRowEdit('"+tableContainerId+"')";
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column)
- {
- var editLink = document.createElement("a");
- editLink.href = "javascript:editDetailsWSDLURLSingleItemRow('"+tableContainerId+"')";
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function cancelDetailsWSDLURLSingleItemRowEdit(tableContainerId)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- column0.childNodes[2].value = false;
-
- var column0Control = column0.childNodes[column0.childNodes.length-1];
- column0.replaceChild(document.createTextNode(getWSDLURLDisplay(column0.childNodes[0].value)),column0Control);
-
- removeColumnChildren(column1);
-
- addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column1);
- }
-
- function editDetailsWSDLURLSingleItemRow(tableContainerId)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- var wsdlType = column0.childNodes[1].value;
- column0.childNodes[2].value = true;
-
- var column0Control = column0.childNodes[column0.childNodes.length-1];
- var wsdlURLEditControl = createWSDLURLEditControl();
- column0.replaceChild(wsdlURLEditControl,column0Control);
- wsdlURLEditControl.className = "tabletextenter";
- wsdlURLEditControl.value = getWSDLURLDisplay(column0.childNodes[0].value);
-
- removeColumnChildren(column1);
-
- addDetailsWSDLURLSingleItemRowBrowseCancelActionLinks(tableContainerId,wsdlType,column1);
- }
-
- function createWSDLURLEditControl()
- {
- var control;
- if (isMicrosoftInternetExplorer())
- control = document.createElement("<input name='<%=ActionInputs.QUERY_INPUT_WSDL_URL%>'>");
- else
- {
- control = document.createElement("input");
- control.setAttribute("name","<%=ActionInputs.QUERY_INPUT_WSDL_URL%>");
- }
- return control;
- }
-
- function getWSDLURLDisplay(wsdlURL)
- {
- if (wsdlURL.length < 1)
- wsdlURLDisplay = "<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_WSDL_URL_IS_UNREACHABLE"))%>";
- else
- wsdlURLDisplay = wsdlURL;
- return wsdlURLDisplay;
- }
-
- function setDetailsWSDLURLSingleItemRow(tableContainerId,wsdlType,wsdlURL)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- column0.insertBefore(createHiddenElement("",wsdlType),column0.childNodes[1]);
- var editable = (column0.childNodes[2].value == "true");
- var wsdlURLDisplay = getWSDLURLDisplay(wsdlURL);
- column0.childNodes[0].value = wsdlURL;
-
- var column0Control;
- if (editable)
- {
- column0Control = createWSDLURLEditControl();
- column0Control.className = "tabletextenter";
- addDetailsWSDLURLSingleItemRowBrowseActionLink(tableContainerId,wsdlType,column1);
- }
- else
- {
- column0Control = document.createTextNode(wsdlURLDisplay);
- addDetailsWSDLURLSingleItemRowEditActionLink(tableContainerId,column1);
- }
- column0.appendChild(column0Control);
- if (editable)
- column0Control.value = wsdlURLDisplay;
- }
-
- function addDetailsNameSingleItemRowCancelActionLink(tableContainerId,column)
- {
- var cancelLink = document.createElement("a");
- cancelLink.href = "javascript:cancelDetailsNameSingleItemRowEdit('"+tableContainerId+"')";
- cancelLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_CANCEL"))%>"));
- column.appendChild(cancelLink);
- }
-
- function addDetailsNameSingleItemRowEditActionLink(tableContainerId,column)
- {
- var editLink = document.createElement("a");
- editLink.href = "javascript:editDetailsNameSingleItemRow('"+tableContainerId+"')";
- editLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_LINK_EDIT"))%>"));
- column.appendChild(editLink);
- }
-
- function editDetailsNameSingleItemRow(tableContainerId)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- column0.childNodes[1].value = true;
-
- var column0Control = column0.childNodes[column0.childNodes.length-1];
- var textInput = document.createElement("input");
- column0.replaceChild(textInput,column0Control);
- textInput.className = "tabletextenter";
- textInput.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_INPUT_TEXT_VALUE")%>";
- textInput.value = column0.childNodes[0].value;
-
- removeColumnChildren(column1);
-
- addDetailsNameSingleItemRowCancelActionLink(tableContainerId,column1);
- }
-
- function cancelDetailsNameSingleItemRowEdit(tableContainerId)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- column0.childNodes[1].value = false;
-
- var column0Control = column0.childNodes[column0.childNodes.length-1];
- column0.replaceChild(document.createTextNode(column0.childNodes[0].value),column0Control);
-
- for (var i=0;i<column1.childNodes.length;i++)
- {
- column1.removeChild(column1.childNodes[i]);
- i--;
- }
- addDetailsNameSingleItemRowEditActionLink(tableContainerId,column1);
- }
-
- function setDetailsNameSingleItemRow(tableContainerId,name)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
-
- var editable = (column0.childNodes[1].value == "true");
- column0.childNodes[0].value = name;
-
- var column0Control;
- if (editable)
- {
- column0Control = document.createElement("input");
- column0Control.className = "tabletextenter";
- column0Control.title = "<%=uddiPerspective.getMessage("FORM_CONTROL_TITLE_INPUT_TEXT_VALUE")%>";
- column0Control.value = name;
- column1.appendChild(document.createTextNode("<%=uddiPerspective.getMessage("FORM_LABEL_ACTIONS_NONE")%>"));
- }
- else
- {
- column0Control = document.createTextNode(name);
- addDetailsNameSingleItemRowEditActionLink(tableContainerId,column1);
- }
- column0.appendChild(column0Control);
- }
-
- function processDetailsDiscoveryURLTable(tableContainerId,modifiedName,viewIdName,discoveryURLName,form)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var editable = (column1.childNodes[2].value == "true");
- var discoveryURL;
- if (editable)
- discoveryURL = column1.childNodes[3].value;
- else
- discoveryURL = column1.childNodes[1].value;
- form.appendChild(createHiddenElement(viewIdName,viewId));
- form.appendChild(createHiddenElement(discoveryURLName,discoveryURL));
- form.appendChild(createHiddenElement(modifiedName,editable));
- }
- }
-
- function processDetailsLanguageInputTable(tableContainerId,modifiedName,viewIdName,langIdName,inputName,form)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var editable = (column1.childNodes[4].value == "true");
- var langId,inputText;
- if (editable)
- {
- langId = column1.childNodes[5].value;
- var column2 = columns.item(2);
- inputText = column2.childNodes[0].value;
- }
- else
- {
- langId = column1.childNodes[1].value;
- inputText = column1.childNodes[2].value;
- }
- form.appendChild(createHiddenElement(viewIdName,viewId));
- form.appendChild(createHiddenElement(langIdName,langId));
- form.appendChild(createHiddenElement(inputName,inputText));
- form.appendChild(createHiddenElement(modifiedName,editable));
- }
- }
-
- function processDetailsIdentifierTable(tableContainerId,form)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var editable = (column1.childNodes[4].value == "true");
- var tModelKey,idKeyName,idKeyValue;
- if (editable)
- {
- tModelKey = column1.childNodes[5].value;
- var column2 = columns.item(2);
- idKeyName = column2.childNodes[0].value;
- var column3 = columns.item(3);
- idKeyValue = column3.childNodes[0].value;
- }
- else
- {
- tModelKey = column1.childNodes[1].value;
- idKeyName = column1.childNodes[2].value;
- idKeyValue = column1.childNodes[3].value;
- }
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.IDENTIFIER_VIEWID%>",viewId));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE%>",tModelKey));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME%>",idKeyName));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE%>",idKeyValue));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.IDENTIFIER_MODIFIED%>",editable));
- }
- }
-
- function processDetailsCategoryTable(tableContainerId,form)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var column1 = columns.item(1);
- var viewId = column1.childNodes[0].value;
- var editable = (column1.childNodes[4].value == "true");
- var tModelKey,catKeyName,catKeyValue;
- if (editable)
- {
- tModelKey = column1.childNodes[5].value;
- var column2 = columns.item(2);
- catKeyName = column2.childNodes[0].value;
- var column3 = columns.item(3);
- catKeyValue = column3.childNodes[0].value;
- }
- else
- {
- tModelKey = column1.childNodes[1].value;
- catKeyName = column1.childNodes[2].value;
- catKeyValue = column1.childNodes[3].value;
- }
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_VIEWID%>",viewId));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE%>",tModelKey));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME%>",catKeyName));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE%>",catKeyValue));
- form.appendChild(createHiddenElement("<%=UDDIActionInputs.CATEGORY_MODIFIED%>",editable));
- }
- }
-
- function processDetailsSingleItemTable(tableContainerId,modifiedName,inputName,form)
- {
- var table = getTable(tableContainerId);
- var columns = table.rows[numberOfHeaderRows].getElementsByTagName("td");
- var column0 = columns.item(0);
- var column1 = columns.item(1);
- var editable = (column0.childNodes[column0.childNodes.length-2].value == "true");
- var inputValue;
- if (editable)
- inputValue = column0.childNodes[column0.childNodes.length-1].value;
- else
- inputValue = column0.childNodes[0].value;
- form.appendChild(createHiddenElement(inputName,inputValue));
- form.appendChild(createHiddenElement(modifiedName,editable));
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp
deleted file mode 100644
index 31b6672..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp
+++ /dev/null
@@ -1,135 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="subQueryTransferTargetHolder" class="java.util.Vector" scope="request"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/uddi/scripts/udditables.jsp" flush="true"/>
-<script language="javascript">
- function getNumberOfSelections(tableContainerId)
- {
- var numberSelected = 0;
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- numberSelected++;
- }
- return numberSelected;
- }
-
- function processResultForm(tableContainerId,form)
- {
- if (handleSubmit(form))
- {
- processResultTable(tableContainerId,"<%=ActionInputs.NODEID%>",form,true);
- form.submit();
- }
- }
-
- function clearSelections(tableContainerId,form)
- {
- form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>";
- // Ensure that at least one item is selected.
- var numberSelected = getNumberOfSelections(tableContainerId);
- if (numberSelected > 0)
- processResultForm(tableContainerId,form);
- else
- alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-
- function refreshSelections(tableContainerId,form)
- {
- form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/RefreshUDDINodesActionJSP.jsp"))%>";
- // Ensure that at least one item is selected.
- var numberSelected = getNumberOfSelections(tableContainerId);
- if (numberSelected > 0)
- processResultForm(tableContainerId,form);
- else
- alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-
- function addSelectionsToFavorites(tableContainerId,form)
- {
- form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddItemsToFavoritesActionJSP.jsp"))%>";
- // Ensure that at least one item is selected.
- var numberSelected = getNumberOfSelections(tableContainerId);
- if (numberSelected > 0)
- processResultForm(tableContainerId,form);
- else
- alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-
-<%
- if (subQueryTransferTargetHolder.size() > 0)
- {
- SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)subQueryTransferTargetHolder.elementAt(0);
- String subQueryKey = subQueryTransferTarget.getSubQueryKey();
- int lastSeparatorPos = subQueryKey.lastIndexOf(':');
- String targetQueryKey;
- if (lastSeparatorPos == -1)
- targetQueryKey = "";
- else
- targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
- String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
-%>
- function transferSelections(tableContainerId,form)
- {
- form.action = "<%=response.encodeURL(controller.getPathWithContext("uddi/actions/TransferSubQueryResultsActionJSP.jsp"))%>";
- // Ensure that at least one item is selected.
- var numberSelected = getNumberOfSelections(tableContainerId);
- if (numberSelected > 0)
- {
-<%
- if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
- {
-%>
- if (numberSelected != 1)
- {
- alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_SINGLE_ITEM"))%>");
- return;
- }
-
-<%
- FormTool targetFormTool = subQueryTransferTarget.getTargetFormTool();
- FormToolPropertiesInterface targetFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
- Vector serviceBusiness = (Vector)targetFormToolPI.getProperty(targetProperty);
- if (serviceBusiness != null && serviceBusiness.size() > 0)
- {
-%>
- if (!confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_ITEM_REPLACEMENT"))%>"))
- return;
-<%
- }
- }
-%>
- processResultForm(tableContainerId,form);
- }
- else
- alert("<%=uddiPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- }
-<%
- }
-%>
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp
deleted file mode 100644
index da24ad5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- function getActionsContainerFrameset()
- {
- return perspectiveContent.frames["<%=UDDIFrameNames.ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
- }
-
- function processFramesetSizes(framesetSizesForm)
- {
- toggleDoubleClickColumnTitle();
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- framesetSizesForm.<%=UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
- framesetSizesForm.<%=UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
- framesetSizesForm.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp
deleted file mode 100644
index 3d864cc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- var navigatorContainer = perspectiveContent.frames["<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>"];
- var navigatorToolbar = navigatorContainer.frames["<%=UDDIFrameNames.NAVIGATOR_TOOLBAR%>"];
- var navigatorContent = navigatorContainer.frames["<%=UDDIFrameNames.NAVIGATOR_CONTENT%>"];
- var actionsContainer = perspectiveContent.frames["<%=UDDIFrameNames.ACTIONS_CONTAINER%>"];
- var propertiesContainer = actionsContainer.frames["<%=UDDIFrameNames.PROPERTIES_CONTAINER%>"];
- var propertiesToolbar = propertiesContainer.frames["<%=UDDIFrameNames.PROPERTIES_TOOLBAR%>"];
- var propertiesContent = propertiesContainer.frames["<%=UDDIFrameNames.PROPERTIES_CONTENT%>"];
- var statusContainer = actionsContainer.frames["<%=UDDIFrameNames.STATUS_CONTAINER%>"];
- var statusToolbar = statusContainer.frames["<%=UDDIFrameNames.STATUS_TOOLBAR%>"];
- var statusContent = statusContainer.frames["<%=UDDIFrameNames.STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp
deleted file mode 100644
index 9fb2785..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp
+++ /dev/null
@@ -1,894 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.uddi4j.datatype.tmodel.*,
- org.uddi4j.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/wsdlbrowser.jsp" flush="true"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- String sessionId = session.getId();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager.getRootNode();
- RegistryNode regNode = uddiMainNode.getRegistryNode(navigatorManager.getSelectedNode());
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-%>
-<jsp:useBean id="commonCategoryModels" class="java.util.Hashtable" scope="application"/>
-<script language="javascript">
- // Requires browserdetect.js, tables.jsp (explorer)
- var rowCheckboxName = "rowCheckboxName";
- var categoryWindow;
- var categoryWindowClosed = true;
- var targetCategoryRow = -1;
- var targetCategoryKeyNameElement;
- var targetCategoryKeyValueElement;
- var languageArray = new Array();
- var categoryArray = new Array();
- var wildcardCategoryBrowserURLRe = /(%)/;
-
- function closeAllUddiChildWindows()
- {
- closeCategoryBrowser();
- closeWSDLBrowser();
- }
-
- function Language(displayName,langId)
- {
- this.displayName = displayName;
- this.langId = langId;
- }
-
- function compareLanguageDisplayNames(a,b)
- {
- var result = a.displayName.localeCompare(b.displayName);
- if (result < 0)
- return -1;
- else if (result > 0)
- return 1;
- else
- return 0;
- }
-
- function setTModelKeySelect(itemSelect,tModelKey)
- {
- for (var i=0;i<itemSelect.options.length;i++)
- {
- if (itemSelect.options[i].value.toLowerCase() == tModelKey.toLowerCase())
- {
- itemSelect.options[i].selected = true;
- return itemSelect.options[i].text;
- }
- }
- }
-
- function setLanguageSelect(languageSelect,languageValue)
- {
- var start;
-<%
- // Compare with the empty string only if the languageValue is the empty string.
-%>
- if (languageValue.length < 1)
- start = 0;
- else
- start = 1;
- for (var i=start;i<languageSelect.options.length;i++)
- {
-<%
- // Use a regular expression to check if languageValue begins with a key whose item is in the pick list. This enables "English" to be selected
- // for en-xxx (dialects).
-%>
- var regExp = new RegExp("^"+languageSelect.options[i].value,"i");
- if (regExp.test(languageValue))
- {
- languageSelect.options[i].selected = true;
- return languageSelect.options[i].text;
- }
- }
- }
-
- function populateLanguageSelect(languageSelect)
- {
- if (languageArray.length == 0)
- {
- languageArray[languageArray.length] = new Language("","");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EN"))%>","en");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AA"))%>","aa");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AB"))%>","ab");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AF"))%>","af");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AM"))%>","am");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AR"))%>","ar");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AS"))%>","as");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AY"))%>","ay");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_AZ"))%>","az");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BA"))%>","ba");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BE"))%>","be");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BG"))%>","bg");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BH"))%>","bh");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BI"))%>","bi");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BN"))%>","bn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BO"))%>","bo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_BR"))%>","br");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CA"))%>","ca");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CO"))%>","co");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CZ"))%>","cz");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_CY"))%>","cy");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DA"))%>","da");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DE"))%>","de");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_DZ"))%>","dz");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EL"))%>","el");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EO"))%>","eo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ES"))%>","es");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ET"))%>","et");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_EU"))%>","eu");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FA"))%>","fa");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FI"))%>","fi");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FJ"))%>","fj");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FO"))%>","fo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FR"))%>","fr");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_FY"))%>","fy");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GA"))%>","ga");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GD"))%>","gd");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GL"))%>","gl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GN"))%>","gn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_GU"))%>","gu");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HA"))%>","ha");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HI"))%>","hi");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HR"))%>","hr");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HU"))%>","hu");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_HY"))%>","hy");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IA"))%>","ia");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IE"))%>","ie");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IK"))%>","ik");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IN"))%>","in");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IS"))%>","is");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IT"))%>","it");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_IW"))%>","iw");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JA"))%>","ja");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JI"))%>","ji");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_JW"))%>","jw");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KA"))%>","ka");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KK"))%>","kk");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KL"))%>","kl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KM"))%>","km");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KN"))%>","kn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KO"))%>","ko");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KS"))%>","ks");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KU"))%>","ku");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_KY"))%>","ky");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LA"))%>","la");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LN"))%>","ln");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LO"))%>","lo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LT"))%>","lt");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_LV"))%>","lv");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MG"))%>","mg");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MI"))%>","mi");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MK"))%>","mk");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ML"))%>","ml");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MN"))%>","mn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MO"))%>","mo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MR"))%>","mr");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MS"))%>","ms");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MT"))%>","mt");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_MY"))%>","my");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NA"))%>","na");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NE"))%>","ne");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NL"))%>","nl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_NO"))%>","no");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OC"))%>","oc");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OM"))%>","om");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_OR"))%>","or");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PA"))%>","pa");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PL"))%>","pl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PS"))%>","ps");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_PT"))%>","pt");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_QU"))%>","qu");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RM"))%>","rm");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RN"))%>","rn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RO"))%>","ro");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RU"))%>","ru");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_RW"))%>","rw");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SA"))%>","sa");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SD"))%>","sd");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SG"))%>","sg");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SH"))%>","sh");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SI"))%>","si");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SK"))%>","sk");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SL"))%>","sl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SM"))%>","sm");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SN"))%>","sn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SO"))%>","so");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SQ"))%>","sq");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SR"))%>","sr");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SS"))%>","ss");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ST"))%>","st")
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SU"))%>","su");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SV"))%>","sv");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_SW"))%>","sw");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TA"))%>","ta");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TE"))%>","te");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TG"))%>","tg");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TH"))%>","th");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TI"))%>","ti");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TK"))%>","tk");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TL"))%>","tl");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TN"))%>","tn");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TO"))%>","to");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TR"))%>","tr");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TS"))%>","ts");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TT"))%>","tt");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_TW"))%>","tw");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UK"))%>","uk");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UR"))%>","ur");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_UZ"))%>","uz");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_VI"))%>","vi");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_VO"))%>","vo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_WO"))%>","wo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_XH"))%>","xh");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_YO"))%>","yo");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ZH"))%>","zh");
- languageArray[languageArray.length] = new Language("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_LANGUAGE_ZU"))%>","zu");
- languageArray.sort(compareLanguageDisplayNames);
- }
-
- for (var i=0;i<languageArray.length;i++)
- languageSelect.options[i] = new Option(languageArray[i].displayName,languageArray[i].langId);
- }
-
- function setLanguageInputRowSettings(tableContainerId,nameIndex,languageValue,nameTextValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+nameIndex];
- var languageSelect = row.getElementsByTagName("select").item(0);
- var nameText = row.getElementsByTagName("input").item(1);
- setLanguageSelect(languageSelect,languageValue);
- nameText.value = nameTextValue;
- }
-
- function removeSelectedCategoryRows(tableContainerId)
- {
- // Check if any rows above and including the targetCategoryRow are selected.
- var table = getTable(tableContainerId);
- var newTargetCategoryRow = targetCategoryRow;
- for (var i=numberOfHeaderRows;i<=targetCategoryRow;i++)
- {
- var tableRow = table.rows[i];
- var rowCheckbox = tableRow.getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- {
- if (i == targetCategoryRow)
- newTargetCategoryRow = -1;
- else
- newTargetCategoryRow--;
- }
- }
- if (newTargetCategoryRow == -1)
- closeCategoryBrowser();
- targetCategoryRow = newTargetCategoryRow;
- removeSelectedRows(tableContainerId);
- // Fix the browse... links.
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var tableRow = table.rows[i];
- var browseLink = tableRow.getElementsByTagName("a").item(0);
- setJSLinkRowTarget(browseLink,"openCategoryBrowser",tableContainerId,i);
- }
- }
-
- function addLanguageInputRow(tableContainerId,textControlTitle)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var languageSelect = document.createElement("select");
- populateLanguageSelect(languageSelect);
- column1.appendChild(languageSelect);
-
- var textInput = document.createElement("input");
- column2.appendChild(textInput);
-
- column0.className = "checkboxcells";
- languageSelect.className = "selectlist";
- column1.className = "tablecells";
- textInput.className = "tabletextenter";
- textInput.title = textControlTitle;
- column2.className = "tablecells";
- column2.width = "90%";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- tableBody.appendChild(newRow);
- }
-
- function setIdentifierRowSettings(tableContainerId,identifierIndex,tModelKey,keyName,keyValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+identifierIndex];
- var identifierTypeSelect = row.getElementsByTagName("select").item(0);
- var rowElementCollection = row.getElementsByTagName("input");
- var keyNameText = rowElementCollection.item(1);
- var keyValueText = rowElementCollection.item(2);
- setTModelKeySelect(identifierTypeSelect,tModelKey);
- keyNameText.value = keyName;
- keyValueText.value = keyValue;
- }
-
- function populateIdentifierTypeSelect(identifierTypeSelect)
- {
- var counter = 0;
- identifierTypeSelect.options[counter++] = new Option("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_IDENTIFIER_DUNS"))%>","<%=TModel.D_U_N_S_TMODEL_KEY%>");
- identifierTypeSelect.options[counter++] = new Option("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY"))%>","<%=TModel.THOMAS_REGISTER_TMODEL_KEY%>");
- }
-
- function handleIdentifierChange(e)
- {
- var identifierSelect;
- if (isMicrosoftInternetExplorer())
- identifierSelect = event.srcElement;
- else
- identifierSelect = e.target;
- var cell = identifierSelect.parentNode;
- var row = cell.parentNode;
- var inputElements = row.getElementsByTagName("input");
- for (var i=0;i<inputElements.length;i++)
- {
- if (inputElements.item(i).type == "text")
- {
- inputElements.item(i).value = identifierSelect.options[identifierSelect.selectedIndex].text;
- break;
- }
- }
- }
-
- function addIdentifierRow(tableContainerId)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var keyTypeSelect = document.createElement("select");
- keyTypeSelect.onchange = handleIdentifierChange;
- populateIdentifierTypeSelect(keyTypeSelect);
- column1.appendChild(keyTypeSelect);
-
- var keyNameTextInput = document.createElement("input");
- column2.appendChild(keyNameTextInput);
-
- var keyValueTextInput = document.createElement("input");
- column3.appendChild(keyValueTextInput);
-
- column0.className = "checkboxcells";
- keyTypeSelect.className = "selectlist"
- column1.className = "tablecells";
- column1.width = "5%";
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME"))%>";
- column2.className = "tablecells";
- column2.width = "40%";
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE"))%>";
- column3.className = "tablecells";
- column3.width = "55%";
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- tableBody.appendChild(newRow);
- keyNameTextInput.value = keyTypeSelect.options[0].text;
- }
-
- function Category(displayName,tModelKey)
- {
- this.displayName = displayName;
- this.tModelKey = tModelKey;
- }
-
- function compareCategoryDisplayNames(a,b)
- {
- var result = a.displayName.localeCompare(b.displayName);
- if (result < 0)
- return -1;
- else if (result > 0)
- return 1;
- else
- return 0;
- }
-
- function populateCategoryTypeSelect(categoryTypeSelect)
- {
- if (categoryArray.length == 0)
- {
-<%
- Enumeration commonCategories = commonCategoryModels.elements();
- while (commonCategories.hasMoreElements())
- {
- CategoryModel commonCategoryModel = (CategoryModel)commonCategories.nextElement();
-%>
- categoryArray[categoryArray.length] = new Category("<%=HTMLUtils.JSMangle(commonCategoryModel.getDisplayName())%>","<%=commonCategoryModel.getTModelKey()%>");
-<%
- }
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- if (userDefinedCategories != null)
- {
- while (userDefinedCategories.hasMoreElements())
- {
- CategoryModel userDefinedCategory = (CategoryModel)userDefinedCategories.nextElement();
-%>
- categoryArray[categoryArray.length] = new Category("<%=HTMLUtils.JSMangle(userDefinedCategory.getDisplayName())%>","<%=userDefinedCategory.getTModelKey()%>");
-<%
- }
- }
-%>
- categoryArray.sort(compareCategoryDisplayNames);
- }
-
- for (var i=0;i<categoryArray.length;i++)
- categoryTypeSelect.options[i] = new Option(categoryArray[i].displayName,categoryArray[i].tModelKey);
- }
-
- function setJSLinkRowTarget(link,jsFunction,tableContainerId,row)
- {
- link.href = "javascript:"+jsFunction+"('"+tableContainerId+"',"+row+")";
- }
-
- function openCategoryBrowser(tableContainerId,row)
- {
- var table = getTable(tableContainerId);
- var categorySelect = table.rows[row].getElementsByTagName("select").item(0);
- var selectedCategoryOption = categorySelect.options[categorySelect.options.selectedIndex];
- var categoryType = table.rows[row].getElementsByTagName("select").item(0).options.selectedIndex;
- var columns = table.rows[row].getElementsByTagName("td");
- targetCategoryRow = row;
- targetCategoryKeyNameElement = columns.item(2).childNodes[0];
- targetCategoryKeyValueElement = columns.item(3).childNodes[0];
- var link = "<%=response.encodeURL(controller.getPathWithContext(OpenCategoryBrowserAction.getWildCardActionLink(sessionId)))%>";
- categoryWindow = window.open(link.replace(wildcardCategoryBrowserURLRe,selectedCategoryOption.value),"categoryWindow","height=300,width=300,status=yes,scrollbars=yes,resizable=yes");
- if (categoryWindow.focus)
- categoryWindow.focus();
- }
-
- function closeCategoryBrowser()
- {
- if (!categoryWindowClosed)
- categoryWindow.close();
- }
-
- function setCategoryRowSettings(tableContainerId,categoryIndex,tModelKey,keyName,keyValue)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+categoryIndex];
- var categoryTypeSelect = row.getElementsByTagName("select").item(0);
- var rowElementCollection = row.getElementsByTagName("input");
- var keyNameText = rowElementCollection.item(1);
- var keyValueText = rowElementCollection.item(2);
- setTModelKeySelect(categoryTypeSelect,tModelKey);
- keyNameText.value = keyName;
- keyValueText.value = keyValue;
- }
-
- function addCategoryRowBrowseLink(tableContainerId,column,rowIndex)
- {
- var browseLink = document.createElement("a");
- setJSLinkRowTarget(browseLink,"openCategoryBrowser",tableContainerId,rowIndex);
- browseLink.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
- column.appendChild(browseLink);
- }
-
- function addCategoryRow(tableContainerId)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
- var column3 = document.createElement("td");
- var column4 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var categoryTypeSelect = document.createElement("select");
- populateCategoryTypeSelect(categoryTypeSelect);
- column1.appendChild(categoryTypeSelect);
-
- var keyNameTextInput = document.createElement("input");
- column2.appendChild(keyNameTextInput);
-
- var keyValueTextInput = document.createElement("input");
- column3.appendChild(keyValueTextInput);
-
- addCategoryRowBrowseLink(tableContainerId,column4,table.rows.length);
-
- column0.className = "checkboxcells";
- categoryTypeSelect.className = "selectlist";
- column1.className = "tablecells";
- column1.width = "5%";
- keyNameTextInput.className = "tabletextenter";
- keyNameTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_NAME"))%>";
- column2.className = "tablecells";
- column2.width = "55%";
- keyValueTextInput.className = "tabletextenter";
- keyValueTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE"))%>";
- column3.className = "tablecells";
- column3.width = "25%";
- column4.className = "tablecells";
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- newRow.appendChild(column3);
- newRow.appendChild(column4);
- tableBody.appendChild(newRow);
- }
-
- function setDiscoveryURLRowSettings(tableContainerId,discoveryURLIndex,discoveryURL)
- {
- var table = getTable(tableContainerId);
- var row = table.rows[numberOfHeaderRows+discoveryURLIndex];
- var rowElementCollection = row.getElementsByTagName("input");
- var discoveryURLTextInput = rowElementCollection.item(1);
- discoveryURLTextInput.value = discoveryURL;
- }
-
- function addDiscoveryURLRow(tableContainerId)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var discoveryURLTextInput = document.createElement("input");
- column1.appendChild(discoveryURLTextInput);
-
- column0.className = "checkboxcells";
- discoveryURLTextInput.className = "tabletextenter";
- discoveryURLTextInput.title = "<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("FORM_CONTROL_TITLE_DISCOVERY_URL"))%>";
- column1.className = "tablecells";
- column1.width = "95%";
-
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- tableBody.appendChild(newRow);
- }
-
- function addResultRow(tableContainerId,nodeId,url,name,description)
- {
- twistOpen(tableContainerId);
- var table = getTable(tableContainerId);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
- column0.appendChild(createHiddenElement("",nodeId));
-
- var nameDetailsLink = document.createElement("a");
- nameDetailsLink.href = url;
- nameDetailsLink.target = "<%=FrameNames.PERSPECTIVE_WORKAREA%>";
- nameDetailsLink.appendChild(document.createTextNode(name));
- column1.appendChild(nameDetailsLink);
-
- column2.appendChild(document.createTextNode(getDefaultDisplayString(description)));
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column2.className = "tablecells";
- column1.width = "48%";
- column2.width = "48%";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- tableBody.appendChild(newRow);
- }
-
- function getFindQualifierTable(containerId)
- {
- var container = document.getElementById(containerId);
- return container.getElementsByTagName("table").item(1);
- }
-
- function setFindQualifier(findQualifier,nameTableContainerId,categoryTableContainerId,findQualifiersTableContainerId)
- {
- var twistOpenNames = false;
- var twistOpenCategories = false;
- var twistOpenFindQualifiers = false;
-
- if (findQualifier == "<%=FindQualifier.exactNameMatch%>")
- {
- var fqTable = getFindQualifierTable(nameTableContainerId);
- var exactNameMatchCheckbox = fqTable.getElementsByTagName("input").item(0);
- exactNameMatchCheckbox.checked = true;
- twistOpenNames = true;
- }
- else if (findQualifier == "<%=FindQualifier.caseSensitiveMatch%>")
- {
- var fqTable = getFindQualifierTable(nameTableContainerId);
- var caseSensitiveMatchCheckbox = fqTable.getElementsByTagName("input").item(1);
- caseSensitiveMatchCheckbox.checked = true;
- twistOpenNames = true;
- }
- else if (findQualifier == "<%=FindQualifier.serviceSubset%>" || findQualifier == "<%=FindQualifier.combineCategoryBags%>")
- {
- var fqTable = getFindQualifierTable(categoryTableContainerId);
- var categorySelect = fqTable.getElementsByTagName("select").item(0);
- setSelect(categorySelect,findQualifier);
- twistOpenCategories = true;
- }
- else if (findQualifier == "<%=FindQualifier.andAllKeys%>" || findQualifier == "<%=FindQualifier.orAllKeys%>" || findQualifier == "<%=FindQualifier.orLikeKeys%>")
- {
- var fqTable = getTable(findQualifiersTableContainerId);
- var keySelect = fqTable.getElementsByTagName("select").item(0);
- setSelect(keySelect,findQualifier);
- if (findQualifier != "<%=FindQualifier.andAllKeys%>")
- twistOpenFindQualifiers = true;
- }
- else if (findQualifier == "<%=FindQualifier.sortByNameAsc%>" || findQualifier == "<%=FindQualifier.sortByNameDesc%>" || findQualifier == "<%=FindQualifier.sortByDateAsc%>" || findQualifier == "<%=FindQualifier.sortByDateDesc%>")
- {
- var fqTable = getTable(findQualifiersTableContainerId);
- var sortCollection = fqTable.getElementsByTagName("input");
- for (var i=0;i<sortCollection.length;i++)
- {
- if (sortCollection.item(i).value == findQualifier)
- sortCollection.item(i).checked = true;
- }
- if (findQualifier != "<%=FindQualifier.sortByNameAsc%>" && findQualifier != "<%=FindQualifier.sortByDateAsc%>")
- twistOpenFindQualifiers = true;
- }
-
- if (twistOpenNames)
- twistOpen(nameTableContainerId);
- if (twistOpenCategories)
- twistOpen(categoryTableContainerId);
- if (twistOpenFindQualifiers)
- twistOpen(findQualifiersTableContainerId);
- }
-
- function processLanguageInputTable(tableContainerId,langVar,textVar,form)
- {
- var table = getTable(tableContainerId);
- var languageSelects = table.getElementsByTagName("select");
- var textInputs = table.getElementsByTagName("input");
- for (var i=0;i<languageSelects.length;i++)
- {
- var hiddenLanguageSelect = createHiddenElement(langVar,languageSelects[i].value);
- form.appendChild(hiddenLanguageSelect);
- }
-
- for (var i=0;i<textInputs.length;i++)
- {
- if (textInputs[i].type == "text")
- {
- var hiddenTextInput = createHiddenElement(textVar,textInputs[i].value);
- form.appendChild(hiddenTextInput);
- }
- }
- }
-
- function processNameFindQualifiers(tableContainerId,form)
- {
- var table = getFindQualifierTable(tableContainerId);
- var nameFindQualifierCheckboxes = table.getElementsByTagName("input");
- for (var i=0;i<nameFindQualifierCheckboxes.length;i++)
- {
- var item = nameFindQualifierCheckboxes.item(i);
- if (item.checked)
- {
- var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",item.value);
- form.appendChild(hiddenFindQualifier);
- }
- }
- }
-
- function processIdentifierTable(tableContainerId,form)
- {
- var table = getTable(tableContainerId);
- var identifierTypeSelects = table.getElementsByTagName("select");
- var textInputs = table.getElementsByTagName("input");
- for (var i=0;i<identifierTypeSelects.length;i++)
- {
- var hiddenIdentifierTypeSelect = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE%>",identifierTypeSelects[i].value);
- form.appendChild(hiddenIdentifierTypeSelect);
- }
-
- var isKeyName = true;
- for (var i=0;i<textInputs.length;i++)
- {
- if (textInputs[i].type == "text")
- {
- var name;
- if (isKeyName)
- name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME%>";
- else
- name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE%>";
- var hiddenTextInput = createHiddenElement(name,textInputs[i].value);
- form.appendChild(hiddenTextInput);
- isKeyName = !isKeyName;
- }
- }
- }
-
- function processCategoryTable(tableContainerId,form,isFindBusiness)
- {
- var table = getTable(tableContainerId);
- var categoryTypeSelects = table.getElementsByTagName("select");
- var textInputs = table.getElementsByTagName("input");
- for (var i=0;i<categoryTypeSelects.length;i++)
- {
- var hiddenCategoryTypeSelect = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE%>",categoryTypeSelects[i].value);
- form.appendChild(hiddenCategoryTypeSelect);
- }
-
- var isKeyName = true;
- for (var i=0;i<textInputs.length;i++)
- {
- if (textInputs[i].type == "text")
- {
- var name;
- if (isKeyName)
- name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME%>";
- else
- name = "<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE%>";
- var hiddenTextInput = createHiddenElement(name,textInputs[i].value);
- form.appendChild(hiddenTextInput);
- isKeyName = !isKeyName;
- }
- }
-
- if (isFindBusiness)
- {
- table = getFindQualifierTable(tableContainerId);
- var categoryFindQualifier = table.getElementsByTagName("select").item(0);
- if (categoryFindQualifier.selectedIndex != 0)
- {
- var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",categoryFindQualifier.value);
- form.appendChild(hiddenFindQualifier);
- }
- }
- }
-
- function processDiscoveryURLTable(tableContainerId,form)
- {
- var table = getTable(tableContainerId);
- var textInputs = table.getElementsByTagName("input");
- for (var i=0;i<textInputs.length;i++)
- {
- if (textInputs[i].type == "text")
- {
- var hiddenTextInput = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL%>",textInputs[i].value);
- form.appendChild(hiddenTextInput);
- }
- }
- }
-
- function processFindQualifierTable(tableContainerId,form)
- {
- var table = getTable(tableContainerId);
- var findQualifierSelects = table.getElementsByTagName("select");
- for (var i=0;i<findQualifierSelects.length;i++)
- {
- var findQualifierSelect = findQualifierSelects.item(i);
- var hiddenFindQualifier = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",findQualifierSelect.value);
- form.appendChild(hiddenFindQualifier);
- }
-
- var findQualifierSortRadios = table.getElementsByTagName("input");
- for (var i=0;i<findQualifierSortRadios.length;i++)
- {
- if (findQualifierSortRadios.item(i).checked)
- {
- var hiddenSortElement = createHiddenElement("<%=UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER%>",findQualifierSortRadios.item(i).value);
- form.appendChild(hiddenSortElement);
- }
- }
- }
-
- function processResultTable(tableContainerId,inputName,form,selectedOnly)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var inputs = table.rows[i].getElementsByTagName("input");
- if (selectedOnly)
- {
- if (inputs.item(0).checked)
- form.appendChild(createHiddenElement(inputName,inputs.item(1).value));
- }
- else
- form.appendChild(createHiddenElement(inputName,inputs.item(1).value));
- }
- }
-
- function initiateSubQuery(formContainerId,newSubQueryKey,queryItem,isGet)
- {
- if (isGet)
- {
- var hasGetItems = false;
- switch (queryItem)
- {
- case <%=UDDIActionInputs.QUERY_ITEM_BUSINESSES%>:
- hasGetItems = <%=regNode.hasBusiness()%>;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICES%>:
- hasGetItems = <%=regNode.hasService()%>;
- break;
- case <%=UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES%>:
- default:
- hasGetItems = <%=regNode.hasServiceInterface()%>;
- }
- if (!hasGetItems)
- {
- alert("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_ERROR_NO_ITEMS_TO_GET"))%>");
- return;
- }
- }
- var formContainer = document.getElementById(formContainerId);
- var form = formContainer.getElementsByTagName("form").item(0);
- form.<%=UDDIActionInputs.SUBQUERY_GET%>.value = isGet;
- form.<%=UDDIActionInputs.NEW_SUBQUERY_INITIATED%>.value = newSubQueryKey;
- form.<%=UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM%>.value = queryItem;
- var okToSubmit = false;
- if (formContainerId == "findBusinessesAdvanced")
- okToSubmit = processFindBusinessesAdvancedForm(form);
- else if (formContainerId == "findServicesAdvanced")
- okToSubmit = processFindServicesAdvancedForm(form);
- else if (formContainerId == "findServiceInterfacesAdvanced")
- okToSubmit = processFindServiceInterfacesAdvancedForm(form);
- else if (formContainerId == "publishServiceSimple")
- okToSubmit = processPublishServiceSimpleForm(form);
- else if (formContainerId == "publishServiceAdvanced")
- okToSubmit = processPublishServiceAdvancedForm(form);
- else if (formContainerId == "publisherAssertions")
- okToSubmit = handleSubmit(form);
- else if (formContainerId == "manageReferencedServices")
- okToSubmit = processForm(form);
- if (okToSubmit)
- form.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp
deleted file mode 100644
index 85d3757..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=UDDIFrameNames.STATUS_TOOLBAR%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=UDDIFrameNames.STATUS_CONTENT%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp
deleted file mode 100644
index 4954b51..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp
+++ /dev/null
@@ -1,43 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <pre>
-<%=HTMLUtils.charactersToHTMLEntitiesStrict(uddiPerspective.getMessageQueue().getMessagesFromList())%>
- </pre>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp
deleted file mode 100644
index 78b4ed5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("uddi/actions/ResizeUDDIFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(UDDIFrameNames.STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/uddi/forms/ProcessUDDIFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (uddiPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (uddiPerspective.getActionsContainerFramesetRows().endsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>" target="<%=UDDIFrameNames.STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp
deleted file mode 100644
index 1f6fb32..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=uddiPerspective.getMessage("FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT")%></title>
-</head>
-<frameset cols="<%=uddiPerspective.getPerspectiveContentFramesetCols()%>" bgcolor=#ECE9D8>
- <%
- if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
- {
- %>
- <frame name="<%=UDDIFrameNames.ACTIONS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- else
- {
- %>
- <frame name="<%=UDDIFrameNames.NAVIGATOR_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=UDDIFrameNames.ACTIONS_CONTAINER%>" title="<%=uddiPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("uddi/actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- %>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp
deleted file mode 100644
index 8bc35cd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ClearWSDLAction"%>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-if (controller.getSessionId() == null) {
-%>
-
- <script language="javascript">
- var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
- perspectiveContent.location = "http://<%=request.getServerName()%>:<%=request.getServerPort()%><%=request.getContextPath()%>/actions/SessionTimedOut.jsp";
- </script>
-<%
-}
-else {
-%>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<%
-// Prepare the action.
-ClearWSDLAction action = new ClearWSDLAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp
deleted file mode 100644
index ca40384..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.CreateInstanceAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <%
- CreateInstanceAction action = new CreateInstanceAction(controller);
- action.populatePropertyTable(request);
- action.execute();
- %>
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp
deleted file mode 100644
index cbbf470..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <%
- // Prepare the action.
- InvokeWSDLHttpGetOperationFormAction action = new InvokeWSDLHttpGetOperationFormAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- boolean actionResult = action.execute();
- }
- %>
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp
deleted file mode 100644
index f0c2d42..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <%
- // Prepare the action.
- InvokeWSDLHttpPostOperationFormAction action = new InvokeWSDLHttpPostOperationFormAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- boolean actionResult = action.execute();
- }
- %>
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp
deleted file mode 100644
index 51239fc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport,
- org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException,
- sun.misc.BASE64Decoder,
- javax.servlet.http.HttpServletResponse"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-InvokeWSDLSOAPOperationFormAction action = new InvokeWSDLSOAPOperationFormAction(controller);
-String httpBasicAuthData = request.getHeader(HTTPTransport.HTTP_HEADER_AUTH);
-if (httpBasicAuthData != null && httpBasicAuthData.length() > 0)
-{
- int basicIndex = httpBasicAuthData.indexOf(HTTPTransport.BASIC);
- if (basicIndex != -1)
- {
- BASE64Decoder decoder = new BASE64Decoder();
- httpBasicAuthData = new String(decoder.decodeBuffer(httpBasicAuthData.substring(basicIndex + HTTPTransport.BASIC.length() + 1)));
- int colonIndex = httpBasicAuthData.indexOf(HTTPTransport.COLON);
- if (colonIndex != -1)
- {
- action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME, httpBasicAuthData.substring(0, colonIndex));
- action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD, httpBasicAuthData.substring(colonIndex + 1, httpBasicAuthData.length()));
- }
- }
-}
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid)
-{
-%>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
- </body>
- </html>
-<%
-}
-else
-{
- try
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- <%
- if (actionResult)
- {
- %>
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
- <%
- }
- else
- {
- %>
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- <%
- }
- %>
- </script>
- </body>
- </html>
-<%
- }
- catch (HTTPTransportException httpe)
- {
- int code = httpe.getStatusCode();
- if (code == HttpServletResponse.SC_UNAUTHORIZED)
- {
- response.setStatus(code);
- response.setHeader(HTTPTransport.HTTP_HEADER_CONTENT_LENGTH, String.valueOf(0));
- String wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH.toLowerCase());
- if (wwwAuthData == null)
- wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH);
- if (wwwAuthData == null)
- wwwAuthData = HTTPTransport.BASIC;
- response.setHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH, wwwAuthData);
- }
- else
- {
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- messageQueue.addMessage(controller.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage(String.valueOf(code));
- messageQueue.addMessage(httpe.getMessage());
- %>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
- </body>
- </html>
- <%
- }
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp
deleted file mode 100644
index 41cc9e9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp
+++ /dev/null
@@ -1,179 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException,
- sun.misc.BASE64Decoder,
- javax.servlet.http.HttpServletResponse,
- javax.wsdl.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-InvokeWSDLSOAPOperationSourceAction action = new InvokeWSDLSOAPOperationSourceAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-
-if (action.wasSaveAsSelected())
-{
- // write to file system
- response.setContentType("application/octet-stream");
- response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultSaveAsFileName());
- action.writeSourceContent(response.getOutputStream());
-}
-else
-{
- if (!inputsValid)
- {
- %>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
- </body>
- </html>
- <%
- }
- else
- {
- if (action.wasNewFileSelected())
- {
- %>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
- </body>
- </html>
- <%
- }
- else
- {
- String httpBasicAuthData = request.getHeader(HTTPTransport.HTTP_HEADER_AUTH);
- if (httpBasicAuthData != null && httpBasicAuthData.length() > 0)
- {
- int basicIndex = httpBasicAuthData.indexOf(HTTPTransport.BASIC);
- if (basicIndex != -1)
- {
- BASE64Decoder decoder = new BASE64Decoder();
- httpBasicAuthData = new String(decoder.decodeBuffer(httpBasicAuthData.substring(basicIndex + HTTPTransport.BASIC.length() + 1)));
- int colonIndex = httpBasicAuthData.indexOf(HTTPTransport.COLON);
- if (colonIndex != -1)
- {
- action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME, httpBasicAuthData.substring(0, colonIndex));
- action.addProperty(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD, httpBasicAuthData.substring(colonIndex + 1, httpBasicAuthData.length()));
- }
- }
- }
- try
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- %>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- <%
- if (actionResult)
- {
- %>
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
- <%
- }
- else
- {
- %>
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- <%
- }
- %>
- </script>
- </body>
- </html>
-<%
- }
- catch (HTTPTransportException httpe)
- {
- int code = httpe.getStatusCode();
- if (code == HttpServletResponse.SC_UNAUTHORIZED)
- {
- response.setStatus(code);
- response.setHeader(HTTPTransport.HTTP_HEADER_CONTENT_LENGTH, String.valueOf(0));
- String wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH.toLowerCase());
- if (wwwAuthData == null)
- wwwAuthData = httpe.getHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH);
- if (wwwAuthData == null)
- wwwAuthData = HTTPTransport.BASIC;
- response.setHeader(HTTPTransport.HTTP_HEADER_WWW_AUTH, wwwAuthData);
- }
- else
- {
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- messageQueue.addMessage(controller.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage(String.valueOf(code));
- messageQueue.addMessage(httpe.getMessage());
- %>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script>
- </head>
- <body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
- </body>
- </html>
- <%
- }
- }
- }
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp
deleted file mode 100644
index 92fe255..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- OpenWSDLAction action = new OpenWSDLAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
- if (!inputsValid) {
-%>
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
-<%
- }
- else {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
- <script language="javascript">
- if (isMicrosoftInternetExplorer()) {
- wsdlNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_navigator_content.jsp"))%>";
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- }
- else {
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
- }
- </script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp
deleted file mode 100644
index 98bea55..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp
+++ /dev/null
@@ -1,90 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.RefreshWSDLAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ClearWSDLAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-if (controller.getSessionId() == null) {
-%>
-
- <script language="javascript">
- var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
- perspectiveContent.location = "http://<%=request.getServerName()%>:<%=request.getServerPort()%><%=request.getContextPath()%>/actions/SessionTimedOut.jsp";
- </script>
-<%
-}
-else {
-%>
-
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
- <%
- // Prepare the action.
- RefreshWSDLAction action = new RefreshWSDLAction(controller);
-
- // The action may be executed via program link.
- boolean paramsValid = action.populatePropertyTable(request);
- if (paramsValid) {
- int nodeID = Integer.parseInt((String)action.getPropertyTable().get(ActionInputs.NODEID));
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node wsdlNode = nodeManager.getNode(nodeID);
-
- // Run the action.
- boolean actionResult = action.execute();
-
- if (actionResult) {
- %>
- <script language="javascript">
- if (isMicrosoftInternetExplorer()) {
- wsdlNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_navigator_content.jsp"))%>";
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- }
- else {
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
- }
- </script>
- <%
- }
- else {
- %>
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_QUESTION_REMOVE_WSDL_NODE", wsdlNode.getNodeName()))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearWSDLAction.getActionLink(nodeID)))%>";
- else {
- wsdlPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_container.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- }
- </script>
- <%
- }
- }
-%>
-<%
-}
-%>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp
deleted file mode 100644
index 1a76472..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeWSDLFramesAction action = new ResizeWSDLFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
-
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=wsdlPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp
deleted file mode 100644
index 9cd44a4..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-if (controller.getSessionId() == null) {
-%>
-
- <script language="javascript">
- var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
- perspectiveContent.location = "http://<%=request.getServerName()%>:<%=request.getServerPort()%><%=request.getContextPath()%>/actions/SessionTimedOut.jsp";
- </script>
-<%
-}
-else {
-%>
-<%
-// Prepare the action.
-SelectWSDLNavigatorNodeAction action = new SelectWSDLNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp
deleted file mode 100644
index 1476414..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectWSDLPropertiesToolAction action = new SelectWSDLPropertiesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp
deleted file mode 100644
index 901c766..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromWSDLAction action = new SwitchPerspectiveFromWSDLAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp
deleted file mode 100644
index 6fd7692..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-if (wsdlPerspective.getStatusContentType() == WSDLPerspective.STATUS_CONTENT_RESULT_FORM)
- wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE);
-else
- wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_FORM);
-%>
-<script language="javascript">
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_result_content.jsp"))%>";
-</script>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp
deleted file mode 100644
index e17adf9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLDetailsTool"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
-WSDLDetailsTool wsdlDetailsTool = (WSDLDetailsTool)wsdlNode.getToolManager().getSelectedTool();
-wsdlDetailsTool.toggleViewId();
-%>
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp
deleted file mode 100644
index d5e2d89..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp
+++ /dev/null
@@ -1,39 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-if (invokeWSDLOperationTool.getFragmentViewID().equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM))
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
-else
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-%>
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp
deleted file mode 100644
index 545ac1c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SynchronizeFragmentViewsAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-
-<%
-SynchronizeFragmentViewsAction action = new SynchronizeFragmentViewsAction(controller);
-boolean paramValid = action.populatePropertyTable(request);
-String viewID = (String)action.getPropertyTable().get(FragmentConstants.FRAGMENT_VIEW_ID);
-boolean sourceToForm = viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-if (sourceToForm) {
- if (paramValid) {
-%>
- <script language="javascript">
- if (!confirm("<%=controller.getWSDLPerspective().getMessage("MSG_QUESTION_SYNC_VIEWS")%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp"))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- if (!confirm("<%=controller.getWSDLPerspective().getMessage("MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT")%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp"))%>";
- </script>
-<%
- }
-}
-action.execute();
-%>
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
-</script>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp
deleted file mode 100644
index 1e586d0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-ToggleWSDLNavigatorNodeAction action = new ToggleWSDLNavigatorNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp
deleted file mode 100644
index 1616c23..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-if (controller.getSessionId() == null) {
-%>
-
- <script language="javascript">
- var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"];
- perspectiveContent.location = "http://<%=request.getServerName()%>:<%=request.getServerPort()%><%=request.getContextPath()%>/actions/SessionTimedOut.jsp";
- </script>
-<%
-}
-else {
-%>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller);
- action.populatePropertyTable(request);
- action.execute();
-%>
- <script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
- </script>
-</body>
-</html>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp
deleted file mode 100644
index db0652c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction"%>
-
-
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WSDLAddToFavoritesAction action = new WSDLAddToFavoritesAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- wsdlPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_properties_content.jsp"))%>";
- wsdlStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 00f4800..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/WSDLAddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-Enumeration paramNames = request.getParameterNames();
-while (paramNames.hasMoreElements()) {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- for (int i = 0; i < paramValues.length; i++) {
-%>
- <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
- }
-}
-%>
-</form>
-</body>
-</html>
-
-<%
-// Prepare the action.
-WSDLAddToFavoritesAction action = new WSDLAddToFavoritesAction(controller);
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-if (action.favoriteExists()) {
-%>
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(controller.getWSDLPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
- document.forms[0].submit();
- </script>
-<%
-}
-else {
-%>
- <script language="javascript">
- document.forms[0].submit();
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index 0df02da..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index d02382e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToWorkbenchAction,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLImportWSDLToWorkbenchAction action = new WSDLImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index 8f8760f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLLaunchWebServiceWizardAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLLaunchWebServiceWizardAction action = new WSDLLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp
deleted file mode 100644
index 5faf420..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp
+++ /dev/null
@@ -1,108 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.wsdl.binding.soap.SOAPHeader,
- javax.wsdl.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getSelectedNode();
-nodeID.delete(0, nodeID.length());
-nodeID.append(selectedNode.getNodeId());
-InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-
-Iterator it = operElement.getSOAPHeaders().iterator();
-
-if (it.hasNext()) {
- String headerDivId = "Header";
- String headerImgId = "xHeader";
- %>
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=headerDivId%>','<%=headerImgId%>')"><img name="<%=headerImgId%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_HEADER")%></strong></td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=headerDivId%>">
- <%
- while (it.hasNext()) {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IXSDFragment frag = operElement.getHeaderFragment(soapHeader);
- fragID.delete(0, fragID.length());
- fragID.append(frag.getID());
- %>
- <jsp:include page="<%=frag.getWriteFragment()%>" flush="true"/>
- <%
- }
- %>
- </div>
- <%
-}
-
-boolean hasInput = Boolean.parseBoolean(request.getParameter("hasInput"));
-String bodyDivId = "Body";
-
-if (hasInput) {
- String bodyImgId = "xBody";
- %>
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=bodyDivId%>','<%=bodyImgId%>')"><img name="<%=bodyImgId%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_BODY")%></strong></td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
- <%
-}
-%>
-
-<div id="<%=bodyDivId%>" class="fragarea">
-<%
-it = operElement.getOrderedBodyParts().iterator();
-while (it.hasNext()) {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- fragID.delete(0, fragID.length());
- fragID.append(frag.getID());
- %>
- <jsp:include page="<%=frag.getWriteFragment()%>" flush="true"/>
- <%
-}
-%>
-</div>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp
deleted file mode 100644
index 75eee86..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp
+++ /dev/null
@@ -1,376 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- * 20060726 144824 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.wst.ws.internal.explorer.transport.*,
- org.eclipse.wst.wsdl.binding.soap.SOAPHeader,
- org.w3c.dom.*,
- javax.wsdl.*,
- javax.wsdl.extensions.ExtensibilityElement,
- javax.wsdl.extensions.soap.SOAPBody,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- WSDLOperationElement operElement = (WSDLOperationElement)(wsdlPerspective.getNodeManager().getSelectedNode().getTreeElement());
- ISOAPTransport soapTransport = operElement.getSOAPTransportProvider().newTransport();
- ISOAPMessage soapMessage = soapTransport.newMessage(operElement.getMessageContext());
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP, soapMessage);
-
- Hashtable soapEnvelopeNamespaceTable = new Hashtable(soapMessage.getNamespaceTable());
-
- String cachedHeaderContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER);
- String cachedBodyContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT);
-
- // if either header or body has been cached, need to ensure namespace table is updated
- // from the cached copy
- if (cachedHeaderContent != null || cachedBodyContent != null) {
- if (SOAPMessageUtils.decodeNamespaceTable(soapEnvelopeNamespaceTable, operElement))
- soapMessage.setNamespaceTable(soapEnvelopeNamespaceTable);
- }
-
- String headerContent;
- String bodyContent;
-
- if (cachedHeaderContent != null)
- headerContent = cachedHeaderContent;
- else {
- try {
- SOAPMessageUtils.setHeaderContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
-
- // ensure namespace table updated in message before serialize operation
- soapMessage.setNamespaceTable(soapEnvelopeNamespaceTable);
- headerContent = soapTransport.newSerializer().serialize(ISOAPMessage.HEADER_CONTENT, soapMessage);
- }
- catch (Exception e) {
- headerContent = "";
- }
- }
-
- if (cachedBodyContent != null)
- bodyContent = cachedBodyContent;
- else {
- try {
- SOAPMessageUtils.setBodyContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
-
- // ensure namespace table updated in message before serialize operation
- soapMessage.setNamespaceTable(soapEnvelopeNamespaceTable);
- bodyContent = soapTransport.newSerializer().serialize(ISOAPMessage.BODY_CONTENT, soapMessage);
- }
- catch (Exception e) {
- bodyContent = "";
- }
- }
-
- // cache the namespace table
- Enumeration enm = soapEnvelopeNamespaceTable.keys();
- while (enm.hasMoreElements())
- {
- String uri = (String)enm.nextElement();
- String prefix = (String)soapEnvelopeNamespaceTable.get(uri);
- String value = SoapHelper.encodeNamespaceDeclaration(prefix, uri);
- %>
- <input type="hidden" name="<%=FragmentConstants.SOURCE_CONTENT_NAMESPACE%>" value="<%=value%>">
- <%
- }
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" class="labels">
-<%
- Element soapEnvelopeElement = soapMessage.getEnvelope(false);
- StringBuffer header = new StringBuffer("<");
- header.append(soapEnvelopeElement.getTagName());
- NamedNodeMap attributes = soapEnvelopeElement.getAttributes();
- int numberOfAttributes = attributes.getLength();
- if (numberOfAttributes == 0)
- header.append('>');
-%>
- <%=HTMLUtils.charactersToHTMLEntitiesStrict(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- for (int i=0;i<numberOfAttributes;i++)
- {
- header.setLength(0);
- Node attrNode = attributes.item(i);
- header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
- if (i == numberOfAttributes-1)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=8>
- <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- }
-
- Element soapHeaderElement = soapMessage.getHeader(false);
- header.setLength(0);
- header.append('<').append(soapHeaderElement.getTagName());
- attributes = soapHeaderElement.getAttributes();
- numberOfAttributes = attributes.getLength();
- if (numberOfAttributes == 0)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=8>
- <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- for (int i=0;i<numberOfAttributes;i++)
- {
- header.setLength(0);
- Node attrNode = attributes.item(i);
- header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
- if (i == numberOfAttributes-1)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=16>
- <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- }
-%>
-<table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td width="16">
- <img width="16" height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="center" align="left" nowrap>
- <input type="file" name="<%=WSDLActionInputs.SELECTED_FILE_HEADER%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SOAP_FILE")%>">
- </td>
- <td valign="center" align="left" class="labels" nowrap>
- <a href="javascript:doAction('<%=WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE_HEADER%>')"><%=wsdlPerspective.getMessage("BUTTON_LABEL_LOAD")%></a>
- </td>
- <td valign="center" align="left" class="labels" nowrap>
- <a href="javascript:doAction('<%=WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS_HEADER%>')"><%=wsdlPerspective.getMessage("BUTTON_LABEL_SAVE_AS")%></a>
- </td>
- </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td width="16">
- <img width="16" height="16" src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td width="100%">
- <textarea id="soap_header_content" name="<%=FragmentConstants.SOURCE_CONTENT_HEADER%>" class="textareaenter"><%=HTMLUtils.charactersToHTMLEntitiesStrict(headerContent)%></textarea>
- </td>
- </tr>
-</table>
-<%
- header.setLength(0);
- header.append("</").append(soapHeaderElement.getTagName()).append('>');
-%>
-<table width="95%" cellpadding=1 cellspacing=0>
- <tr>
- <td width=8>
- <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- Element soapBodyElement = soapMessage.getBody(false);
- header.setLength(0);
- header.append('<').append(soapBodyElement.getTagName());
- attributes = soapBodyElement.getAttributes();
- numberOfAttributes = attributes.getLength();
- if (numberOfAttributes == 0)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=8>
- <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- for (int i=0;i<numberOfAttributes;i++)
- {
- header.setLength(0);
- Node attrNode = attributes.item(i);
- header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
- if (i == numberOfAttributes-1)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=16>
- <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- }
-
- Element wrapperElement = null;
- if (!operElement.isDocumentStyle())
- {
- // Generate an RPC style wrapper element.
- wrapperElement = (Element) soapBodyElement.getFirstChild();
- header.setLength(0);
- header.append('<').append(wrapperElement.getTagName());
- attributes = wrapperElement.getAttributes();
- numberOfAttributes = attributes.getLength();
- if (numberOfAttributes == 0)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=16>
- <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- for (int i=0;i<numberOfAttributes;i++)
- {
- header.setLength(0);
- Node attrNode = attributes.item(i);
- header.append(attrNode.getNodeName()).append("=\"").append(attrNode.getNodeValue()).append('\"');
- if (i == numberOfAttributes-1)
- header.append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=24>
- <img width=24 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- }
- }
-
- int sourceContentIndentationImageWidth = 16;
- if (wrapperElement != null)
- sourceContentIndentationImageWidth += 8;
-%>
-<table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td width=<%=sourceContentIndentationImageWidth%>>
- <img width=<%=sourceContentIndentationImageWidth%> height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="center" align="left" nowrap>
- <input type="file" name="<%=WSDLActionInputs.SELECTED_FILE%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SOAP_FILE")%>">
- </td>
- <td valign="center" align="left" class="labels" nowrap>
- <a href="javascript:doAction('<%=WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE%>')"><%=wsdlPerspective.getMessage("BUTTON_LABEL_LOAD")%></a>
- </td>
- <td valign="center" align="left" class="labels" nowrap>
- <a href="javascript:doAction('<%=WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS%>')"><%=wsdlPerspective.getMessage("BUTTON_LABEL_SAVE_AS")%></a>
- </td>
- </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td width=<%=sourceContentIndentationImageWidth%>>
- <img width=<%=sourceContentIndentationImageWidth%> height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td width="100%">
- <textarea id="soap_body_content" name="<%=FragmentConstants.SOURCE_CONTENT%>" class="bigtextareaenter"><%=HTMLUtils.charactersToHTMLEntitiesStrict(bodyContent)%></textarea>
- </td>
- </tr>
-</table>
-<%
- if (wrapperElement != null)
- {
- header.setLength(0);
- header.append("</").append(wrapperElement.getTagName()).append('>');
-%>
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td width=16>
- <img width=16 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- }
-
- header.setLength(0);
- header.append("</").append(soapBodyElement.getTagName()).append('>');
-%>
-<table width="95%" cellpadding=1 cellspacing=0>
- <tr>
- <td width=8>
- <img width=8 height=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
-<%
- header.setLength(0);
- header.append("</").append(soapEnvelopeElement.getTagName()).append('>');
-%>
-<table width="95%" cellpadding=1 cellspacing=0>
- <tr>
- <td valign="bottom" class="labels">
- <%=HTMLUtils.charactersToHTMLEntities(header.toString())%>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp
deleted file mode 100644
index c6d2d4d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp
+++ /dev/null
@@ -1,209 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20060512 121210 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- javax.wsdl.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node selectedNode = wsdlPerspective.getNodeManager().getSelectedNode();
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- String fragmentViewID = invokeWSDLOperationTool.getFragmentViewID();
- int operationType = operElement.getOperationType();
- String invokeWSDLOperationURL = response.encodeURL(controller.getPathWithContext(invokeWSDLOperationTool.getFormActionLink(operationType,fragmentViewID)));
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FORM_TITLE_INVOKE_WSDL_OPERATION")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/wsdl/scripts/fragmenttables.jsp" flush="true"/>
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<script language="javascript">
- function doAction(action)
- {
- var form = document.forms[0];
- if (handleSubmit(form))
- {
- form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = action;
- form.submit();
- form.<%=WSDLActionInputs.SUBMISSION_ACTION%>.value = "<%=invokeWSDLOperationURL%>";
- resetSubmission();
- }
- }
-
- function closeChildWindows()
- {
- closeXSDInfoDialog();
- closeCalendarBrowser();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeChildWindows()">
-<div id="contentborder">
- <form action="<%=invokeWSDLOperationURL%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <input type="hidden" name="<%=WSDLActionInputs.SUBMISSION_ACTION%>" value="<%=WSDLActionInputs.SUBMISSION_ACTION_FORM%>">
- <%
- String titleImagePath = "wsdl/images/invoke_wsdl_operation_highlighted.gif";
- String title = wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION");
- if (operationType == WSDLOperationElement.OPERATION_TYPE_SOAP)
- {
- %>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
- <td width="*"> </td>
- <td align="right" class="labels">
-<%
- if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- {
-%>
- <a href="javascript:synchronizeFragmentViews('<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM%>')" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
- }
- else
- {
-%>
- <a href="javascript:synchronizeFragmentViews('<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>')" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td height=20 colspan=3><img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""></td>
- </tr>
-</table>
- <%
- }
- else
- {
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- }
- %>
- <table>
- <tr>
- <td class="labels">
-
- <%
- //here we determine if there are any input parameters for this operation
- boolean hasInput = true;
- selectedNode = wsdlPerspective.getNodeManager().getSelectedNode();
- Iterator iter = operElement.getOrderedBodyParts().iterator();
- String operationName = operElement.getName();
-
- while (iter.hasNext())
- {
- Part part = (Part)iter.next();
- IXSDFragment frag = operElement.getFragment(part);
- org.eclipse.xsd.XSDTypeDefinition def = frag.getXSDTypeDefinition();
- //we check the type of the operation's input message
- if (def == null)
- {
- //this is the pattern <element name="foo"></element>
- hasInput = false;
- }
- else
- {
- org.w3c.dom.Element element = def.getElement();
- if (element.getLocalName().equals("complexType") && !element.hasChildNodes())
- { //this is the pattern <element name="foo"><complexType/></element>
- //there could be other patterns with no input but they are uncommon
- hasInput = false;
- }
- }
- }
- if (hasInput || !operElement.getSOAPHeaders().isEmpty())
- {
- out.print(wsdlPerspective.getMessage("FORM_LABEL_INVOKE_WSDL_OPERATION_DESC"));
- }
- else
- {
- out.print(wsdlPerspective.getMessage("FORM_LABEL_INVOKE_WSDL_OPERATION_DESC_NO_INPUT", operationName ));
- }
- %>
-
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <fieldset class="keylinefieldset">
- <legend class="labels">
- <label for="<%=WSDLActionInputs.END_POINT%>"><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></label>
- </legend>
- <table border=0 cellpadding=10 cellspacing=0>
- <tr>
- <td>
- <select id="<%=WSDLActionInputs.END_POINT%>" name="<%=WSDLActionInputs.END_POINT%>" class="selectlist">
- <%
- WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
- String[] endPoints = bindingElement.getEndPoints();
- String currEndPoint = invokeWSDLOperationTool.getEndPoint();
- for (int i = 0; i < endPoints.length; i++)
- {
- %>
- <option value="<%=endPoints[i]%>" <%if (endPoints[i].equals(currEndPoint)) {%>selected<%}%>><%=endPoints[i]%>
- <%
- }
- %>
- </select>
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
- </table>
- <%
- if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- {
- %>
-<jsp:include page="/wsdl/forms/FragmentsSoapView.jsp" flush="true"/>
- <%
- }
- else
- {
- %>
-<jsp:include page="/wsdl/forms/FragmentsFormView.jsp" flush="true">
- <jsp:param name="hasInput" value="<%=hasInput%>"/>
-</jsp:include>
- <%
- }
- %>
- <jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp
deleted file mode 100644
index f3e36fd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp
+++ /dev/null
@@ -1,85 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- FormTool formTool = (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FORM_TITLE_OPEN_WSDL")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<jsp:include page="/scripts/wsdlbrowser.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin" onUnload="closeWSDLBrowser()">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/OpenWSDLActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <%
- String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
- String title = wsdlPerspective.getMessage("ALT_OPEN_WSDL");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_OPEN_WSDL_DESC")%>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" nowrap>
- <label for="input_wsdl_url"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label>
- <%
- if (!formTool.isInputValid(ActionInputs.QUERY_INPUT_WSDL_URL)) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- String wsdlUrl = (String)formTool.getProperty(ActionInputs.QUERY_INPUT_WSDL_URL);
- if (wsdlUrl == null)
- wsdlUrl = "";
- %>
- </td>
- <td height=25 valign="bottom" nowrap>
- <a href="javascript:openWSDLBrowser('contentborder',<%=ActionInputs.WSDL_TYPE_SERVICE%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td width="90%"> </td>
- </tr>
- <tr>
- <td colspan=3>
- <input type="text" id="input_wsdl_url" name="<%=ActionInputs.QUERY_INPUT_WSDL_URL%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlUrl)%>" size="50" class="textenter">
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-<script language="javascript">
- closeWSDLBrowser();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp
deleted file mode 100644
index 3e52f4d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
- <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
- <input name="<%=WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>">
- <input name="<%=WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=wsdlPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp
deleted file mode 100644
index 21b3882..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp
+++ /dev/null
@@ -1,229 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20070507 185600 makandre@ca.ibm.com - Andrew Mak, WSE status pane's "header" twistie should not appear for responses without headers
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.wst.ws.internal.explorer.transport.*,
- org.eclipse.wst.wsdl.binding.soap.SOAPHeader,
- org.w3c.dom.*,
- javax.wsdl.*,
- javax.xml.parsers.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_FORM);
-Node operNode = wsdlPerspective.getOperationNode();
-nodeID.delete(0, nodeID.length());
-nodeID.append(operNode.getNodeId());
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-Operation oper = operElement.getOperation();
-if (oper.getOutput() == null)
-{
-%>
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW")%>
- </td>
- </tr>
- </table>
-<%
-}
-else
-{
- ISOAPMessage soapMessage = (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_RESPONSE);
- Element[] headerContent = soapMessage.getHeaderContent();;
- Element[] bodyContent = soapMessage.getBodyContent();
-
- boolean cached = ((Boolean)operElement.getPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED)).booleanValue();
-
- if (soapMessage.getBody(false) == null) // body is mandatory
- {
- %>
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW")%>
- </td>
- </tr>
- </table>
- <%
- }
- else
- {
- if (headerContent != null && headerContent.length > 0) {
-
- String headerDivId = "Header";
- String headerImgId = "xHeader";
- %>
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=headerDivId%>','<%=headerImgId%>')"><img name="<%=headerImgId%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_HEADER")%></strong></td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=headerDivId%>" class="fragarea">
- <%
- boolean hasSOAPHeaders = false;
- Iterator it = operElement.getSOAPHeaders(false).iterator();
- int start = 0;
- while (it.hasNext() && start < headerContent.length) {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IXSDFragment fragment = operElement.getHeaderFragment(soapHeader, false);
-
- if (!cached) {
- int pos = SOAPMessageUtils.findFirstMatchingElement(
- soapHeader.getEPart(),
- headerContent,
- soapMessage.getNamespaceTable(),
- fragment.getName(),
- start);
-
- if (pos == -1)
- continue;
-
- Element element = headerContent[pos];
- start = pos + 1;
-
- if (!fragment.setParameterValuesFromInstanceDocuments(new Element[] { element }))
- continue;
- }
- else if (!fragment.validateAllParameterValues())
- continue;
-
- hasSOAPHeaders = true;
- fragID.delete(0, fragID.length());
- fragID.append(fragment.getID());
- %>
- <jsp:include page="<%=fragment.getReadFragment()%>" flush="true"/>
- <%
- }
- if (!hasSOAPHeaders) {
- %>
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_CANNOT_DISPLAY_HEADER_IN_FORM_VIEW")%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
- </div>
- <%
- }
-
- String bodyDivId = "Body";
- String bodyImgId = "xBody";
- %>
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=bodyDivId%>','<%=bodyImgId%>')"><img name="<%=bodyImgId%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_BODY")%></strong></td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=bodyDivId%>" class="fragarea">
- <%
- boolean hasSOAPBody = false;
- if (bodyContent != null && bodyContent.length > 0) {
-
- Map partsMap = oper.getOutput().getMessage().getParts();
- Iterator it = partsMap.values().iterator();
- Hashtable uriReferences = null;
- while (it.hasNext())
- {
- IXSDFragment fragment = operElement.getFragment((Part)it.next(), false);
- if (!cached)
- {
- if (!operElement.isUseLiteral() && (fragment instanceof ISOAPEncodingWrapperFragment))
- {
- if (uriReferences == null)
- uriReferences = SOAPEncodingWrapperFragment.parseURIReferences(soapMessage.getEnvelope(true), true);
- ((ISOAPEncodingWrapperFragment)fragment).setURIReferences(uriReferences);
- }
- if (!fragment.setParameterValuesFromInstanceDocuments(bodyContent))
- continue;
- }
- else if (!fragment.validateAllParameterValues())
- continue;
-
- hasSOAPBody = true;
- fragID.delete(0, fragID.length());
- fragID.append(fragment.getID());
- %>
- <jsp:include page="<%=fragment.getReadFragment()%>" flush="true"/>
- <%
- }
- operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(true));
- }
-
- if (soapMessage.getFault() == null && (bodyContent == null || bodyContent.length == 0)) {
- %>
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_BODY_IS_EMPTY")%>
- </td>
- </tr>
- </table>
- <%
- }
- else if (!hasSOAPBody) {
- %>
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" class="labels">
- <%=wsdlPerspective.getMessage("FORM_LABEL_CANNOT_DISPLAY_BODY_IN_FORM_VIEW")%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
- </div>
- <%
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp
deleted file mode 100644
index 4931ebf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp
+++ /dev/null
@@ -1,119 +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
- * -------- -------- -----------------------------------------------------------
- * 20060509 103072 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060515 140607 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE);
-Node operNode = wsdlPerspective.getOperationNode();
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-String soapRequestTableContainerId = "SOAPRequest";
-StringBuffer soapRequestTwistImageName = new StringBuffer("x");
-soapRequestTwistImageName.append(soapRequestTableContainerId);
-String soapResponseTableContainerId = "SOAPResponse";
-StringBuffer soapResponseTwistImageName = new StringBuffer("x");
-soapResponseTwistImageName.append(soapResponseTableContainerId);
-%>
-
-<script language="javascript">
- var sectionIds = ["<%=soapRequestTableContainerId%>","<%=soapResponseTableContainerId%>"];
- function toggleSOAPEnvelope(soapEnvelopeType,twistImageName)
- {
-<%
- // If both envelopes are expanded, each should have 50% height. Otherwise, the remaining displayed envelope should be reset to 100% height.
-%>
- var soapSectionId = sectionIds[soapEnvelopeType];
- var soapSection = document.getElementById(soapSectionId);
- var soapSectionTable = getTable(soapSectionId);
- var otherSoapSectionId = sectionIds[1-soapEnvelopeType];
- var otherSoapSection = document.getElementById(otherSoapSectionId);
- var otherSoapSectionTable = getTable(otherSoapSectionId);
- if (soapSection.style.display == "none")
- {
- if (otherSoapSection.style.display == "")
- {
- soapSectionTable.height = "50%";
- otherSoapSectionTable.height = "50%";
- }
- else
- soapSectionTable.height = "100%";
- }
- else
- {
- if (otherSoapSection.style.display == "")
- otherSoapSectionTable.height = "100%";
- }
- twist(soapSectionId,twistImageName);
- }
-</script>
-
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:toggleSOAPEnvelope(<%=WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST%>,'<%=soapRequestTwistImageName.toString()%>')"><img name="<%=soapRequestTwistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_REQUEST_ENVELOPE")%></strong>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<div id="<%=soapRequestTableContainerId%>" style="display:none">
- <table width="95%" height="50%" border=0 cellpadding=0 cellpadding=0>
- <tr>
- <td>
- <iframe name="requestEnvelopeFrame" frameborder=0 src="<%=response.encodeURL(controller.getPathWithContext(wsdlPerspective.getSOAPEnvelopeXMLLink(WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST)))%>" width="95%" height="100%"></iframe>
- </td>
- </tr>
- </table>
-</div>
-<script language="javascript">
- twist("<%=soapRequestTableContainerId%>","<%=soapRequestTwistImageName.toString()%>");
-</script>
-
-<%
-if (operElement.getOperation().getOutput() != null)
-{
-%>
-<table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:toggleSOAPEnvelope(<%=WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE%>,'<%=soapResponseTwistImageName.toString()%>')"><img name="<%=soapResponseTwistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_RESPONSE_ENVELOPE")%></strong>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<div id="<%=soapResponseTableContainerId%>" style="display:none">
- <table width="95%" height="50%" border=0 cellpadding=0 cellpadding=0>
- <tr>
- <td>
- <!-- the onload call is to fix bug 140607 in bugzilla -->
- <iframe onload="javascript:requestEnvelopeFrame.document.location.reload()" frameborder=0 src="<%=response.encodeURL(controller.getPathWithContext(wsdlPerspective.getSOAPEnvelopeXMLLink(WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE)))%>" width="95%" height="100%"></iframe>
- </td>
- </tr>
- </table>
-</div>
-<script language="javascript">
- twist("<%=soapResponseTableContainerId%>","<%=soapResponseTwistImageName.toString()%>");
-</script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp
deleted file mode 100644
index f0be3a3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node bindingNode = wsdlPerspective.getNodeManager().getSelectedNode();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_BINDING_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
- var rowCheckboxName = "rowCheckboxName";
-</script>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<form action="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/UpdateWSDLBindingActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
-<%
- String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
- String title = wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS");
- WSDLBindingElement wsdlBindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- Vector operationNodes = bindingNode.getChildNodes();
-%>
-<%@ include file = "/forms/formheader.inc" %>
-<input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=bindingNode.getNodeId()%>">
-<table>
- <tr>
- <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_BINDING_DETAILS_DESC",wsdlPerspective.getBindingTypeString(wsdlBindingElement.getBindingType()))%></td>
- </tr>
-</table>
-<%
- String documentation = wsdlBindingElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
- if (documentation.length() > 0)
- {
-%>
-<table>
- <tr>
- <td height=20 valign="bottom" class="labels"><%=documentation%></td>
- </tr>
- <tr>
- <td height=10> </td>
- </tr>
-</table>
-<%
- }
-
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("Operations");
- sectionHeaderInfo.setOtherProperties(operationNodes);
-%>
-<jsp:include page="/wsdl/forms/operations_table.jsp" flush="true"/>
-<%
- if (operationNodes.size() > 0)
- {
-%>
-<script language="javascript">
- twist("Operations","xOperations");
-</script>
-<%
- }
-
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("Endpoints");
- sectionHeaderInfo.setOtherProperties(wsdlBindingElement);
-%>
-<table>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-<jsp:include page="/wsdl/forms/endpoint_table.jsp" flush="true"/>
-<%
- if (wsdlBindingElement.getEndPoints().length > 0)
- {
-%>
-<script language="javascript">
- twistOpen("Endpoints");
-</script>
-<%
- }
-%>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
-</form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp
deleted file mode 100644
index 497c97b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp
+++ /dev/null
@@ -1,105 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
- ToolManager currentToolManager = wsdlNode.getCurrentToolManager();
- WSDLDetailsTool wsdlDetailsTool = (WSDLDetailsTool)currentToolManager.getSelectedTool();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function switchWSDLDetailsView() {
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp"))%>";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
- String title = wsdlPerspective.getMessage("ALT_WSDL_DETAILS");
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
- <td width="*"> </td>
- <td align="right" class="labels">
-<%
- if (wsdlDetailsTool.getViewId() == WSDLDetailsTool.SOURCE_VIEW_ID)
- {
-%>
- <a href="javascript:switchWSDLDetailsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
- }
- else
- {
-%>
- <a href="javascript:switchWSDLDetailsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
- }
-%>
- </td>
- </tr>
- <tr>
- <td height=20 colspan=3><img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""></td>
- </tr>
-</table>
-<%
- if (wsdlDetailsTool.getViewId() == WSDLDetailsTool.FORM_VIEW_ID)
- {
-%>
- <jsp:include page="/wsdl/forms/WSDLDetailsFormView.jsp" flush="true"/>
-<%
- }
- else
- {
-%>
- <table width="95%" height="100%" border=0 cellpadding=0 cellpadding=0>
- <tr>
- <td>
- <iframe src="<%=response.encodeURL(controller.getPathWithContext("wsdl/forms/WSDLDetailsSourceView.jsp"))%>" width="95%" height="100%"></iframe>
- </td>
- </tr>
- </table>
-<%
- }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp
deleted file mode 100644
index 5525c53..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp
+++ /dev/null
@@ -1,106 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<table>
- <tr>
- <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_WSDL_DETAILS_DESC")%></td>
- </tr>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-<%
-Node wsdlNode = wsdlPerspective.getNodeManager().getSelectedNode();
-WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
-String documentation = wsdlElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
-if (documentation != null && documentation.length() > 0)
-{
-%>
-<table>
- <tr>
- <td height=20 valign="bottom" class="labels"><%=documentation%></td>
- </tr>
-</table>
-<%
-}
-%>
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></th>
- </tr>
- <tr>
- <td class="tablecells"><%=wsdlElement.getWsdlUrl()%></td>
- </tr>
-</table>
-<table>
- <tr>
- <td height=10> </td>
- </tr>
-</table>
-<%
-sectionHeaderInfo.clear();
-sectionHeaderInfo.setContainerId("Services");
-Vector serviceNodes = wsdlNode.getChildNodes();
-sectionHeaderInfo.setOtherProperties(serviceNodes);
-%>
-<jsp:include page="/wsdl/forms/services_table.jsp" flush="true"/>
-<table>
- <tr>
- <td height=10> </td>
- </tr>
-</table>
-<%
-Vector bindingNodes = new Vector();
-for (int i=0;i<serviceNodes.size();i++)
-{
- Node serviceNode = (Node)serviceNodes.elementAt(i);
- Vector serviceBindingNodes = serviceNode.getChildNodes();
- for (int j=0;j<serviceBindingNodes.size();j++)
- {
- Node serviceBindingNode = (Node)serviceBindingNodes.elementAt(j);
- bindingNodes.addElement(serviceBindingNode);
- }
-}
-sectionHeaderInfo.clear();
-sectionHeaderInfo.setContainerId("Bindings");
-sectionHeaderInfo.setOtherProperties(bindingNodes);
-%>
-<jsp:include page="/wsdl/forms/bindings_table.jsp" flush="true"/>
-<script language="javascript">
-<%
-if (serviceNodes.size() > 0)
-{
-%>
- twist("Services","xServices");
-<%
-}
-if (bindingNodes.size() > 0)
-{
-%>
- twist("Bindings","xBindings");
-<%
-}
-%>
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp
deleted file mode 100644
index 470a4b5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl,
- java.io.*,
- javax.wsdl.*,
- javax.wsdl.xml.*,
- javax.wsdl.factory.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-NodeManager nodeManager = wsdlPerspective.getNodeManager();
-Node selectedNode = nodeManager.getSelectedNode();
-WSDLElement wsdlElement = (WSDLElement)selectedNode.getTreeElement();
-Definition definition = wsdlElement.getDefinition();
-WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-StringWriter stringWriter = new StringWriter();
-try
-{
- wsdlWriter.writeWSDL(definition, stringWriter);
- %>
- <%=stringWriter.toString()%>
- <%
-}
-catch (WSDLException wsdle)
-{
- %>
- <?xml version="1.0"?>
- <%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index 1ad9d5c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- String wsdlUrl = ((WSDLElement)selectedNode.getTreeElement()).getWsdlUrl();
- formProperties.put("formActionLink","wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp");
- formProperties.put("wsdlURL",wsdlUrl);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 893d80c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
-formActionLink.append("wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp
deleted file mode 100644
index cbf4bd6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp
+++ /dev/null
@@ -1,79 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node serviceNode = wsdlPerspective.getNodeManager().getSelectedNode();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FORM_TITLE_WSDL_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- String titleImagePath = "wsdl/images/open_wsdl_highlighted.gif";
- String title = wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS");
-%>
-<%@ include file = "/forms/formheader.inc" %>
-<table>
- <tr>
- <td class="labels"><%=wsdlPerspective.getMessage("FORM_LABEL_SERVICE_DETAILS_DESC")%></td>
- </tr>
-</table>
-<%
- WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)serviceNode.getTreeElement();
- String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
- if (documentation.length() > 0)
- {
-%>
-<table>
- <tr>
- <td height=20 valign="bottom" class="labels"><%=documentation%></td>
- </tr>
- <tr>
- <td height=10> </td>
- </tr>
-</table>
-<%
- }
- Vector bindingNodes = serviceNode.getChildNodes();
- sectionHeaderInfo.clear();
- sectionHeaderInfo.setContainerId("Bindings");
- sectionHeaderInfo.setOtherProperties(bindingNodes);
-%>
-<jsp:include page="/wsdl/forms/bindings_table.jsp" flush="true"/>
-</div>
-<%
- if (bindingNodes.size() > 0)
- {
-%>
-<script language="javascript">
- twist("Bindings","xBindings");
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp
deleted file mode 100644
index f86ee60..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp
+++ /dev/null
@@ -1,72 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- javax.wsdl.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_BINDINGS")%></strong></td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_BINDING_TYPE")%></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
- </tr>
-<%
- Vector bindingNodes = (Vector)sectionHeaderInfo.getOtherProperties();
- for (int i=0;i<bindingNodes.size();i++)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(i);
- WSDLBindingElement wsdlBindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- Binding binding = wsdlBindingElement.getBinding();
-%>
- <tr>
- <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(bindingNode.getNodeId(),false)))%>"><%=binding.getQName().getLocalPart()%></td>
- <td class="tablecells"><%=wsdlPerspective.getBindingTypeString(wsdlBindingElement.getBindingType())%></td>
-<%
- WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)wsdlBindingElement.getParentElement();
- String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
- if (documentation.length() < 1)
- documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-%>
- <td class="tablecells"><%=documentation%></td>
- </tr>
-<%
- }
-%>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp
deleted file mode 100644
index 03dd2e1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp
+++ /dev/null
@@ -1,139 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<script language="javascript">
- function addEndpoint(tableContainerID, id, name, value, isRemovable)
- {
- twistOpen(tableContainerID);
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("tbody").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- if (!isRemovable)
- {
- rowCheckbox.disabled = true;
- }
- column0.appendChild(rowCheckbox);
-
- var endPoint;
- if (isRemovable)
- {
- endPoint = document.createElement("input");
- endPoint.type = "text";
- endPoint.id = id;
- endPoint.name = name;
- if (value != null)
- endPoint.value = value;
- endPoint.className = "tabletextenter";
- }
- else
- endPoint = document.createTextNode(value);
- column1.appendChild(endPoint);
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- tableBody.appendChild(newRow);
- }
-
- function handleEndpointCheckAllClick(tableContainerId,checkAllCheckbox)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- if (!rowCheckbox.disabled)
- {
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked)
- highlightRow(table.rows[i],"rowcolor");
- else
- highlightRow(table.rows[i],"tablecells");
- }
- }
- }
-</script>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String tableContainerID = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerID);
- WSDLBindingElement bindingElement = (WSDLBindingElement)sectionHeaderInfo.getOtherProperties();
- String[] endpoints = bindingElement.getEndPoints();
- String addressLocation = ((WSDLServiceElement)bindingElement.getParentElement()).getAddressLocation(bindingElement.getBinding());
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></strong>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', '<%=WSDLActionInputs.END_POINT%>', '<%=addressLocation%>', true)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:removeSelectedRows('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerID%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleEndpointCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_END_POINTS")%></th>
- </tr>
- </table>
-</div>
-<script language="javascript">
-<%
- boolean isDefaultAdded = false;
- for (int i = 0; i < endpoints.length; i++)
- {
- if (endpoints[i].equals(addressLocation) && !isDefaultAdded)
- {
-%>
- addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', "", '<%=endpoints[i]%>', false);
-
-<%
- isDefaultAdded = true;
- }
- else
- {
-%>
- addEndpoint('<%=tableContainerID%>', '<%=WSDLActionInputs.END_POINT%>', '<%=WSDLActionInputs.END_POINT%>', '<%=endpoints[i]%>', true);
-<%
- }
- }
-%>
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp
deleted file mode 100644
index 11e8268..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_OPERATIONS")%></strong></td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
- </tr>
-<%
- Vector operationNodes = (Vector)sectionHeaderInfo.getOtherProperties();
- for (int i=0;i<operationNodes.size();i++)
- {
- Node operationNode = (Node)operationNodes.elementAt(i);
- WSDLOperationElement wsdlOperationElement = (WSDLOperationElement)operationNode.getTreeElement();
-%>
- <tr>
- <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(operationNode.getNodeId(),false)))%>"><%=wsdlOperationElement.getOperation().getName()%></a></td>
-<%
- String documentation = wsdlOperationElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
- if (documentation.length() < 1)
- documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-%>
- <td class="tablecells"><%=documentation%></td>
- </tr>
-<%
- }
-%>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp
deleted file mode 100644
index 5f359c8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="sectionHeaderInfo" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.SectionHeaderInfo" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String tableContainerId = sectionHeaderInfo.getContainerId();
- StringBuffer twistImageName = new StringBuffer("x");
- twistImageName.append(tableContainerId);
-%>
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11><a href="javascript:twist('<%=tableContainerId%>','<%=twistImageName.toString()%>')"><img name="<%=twistImageName.toString()%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a></td>
- <td height=20 valign="bottom" align="left" nowrap class="labels"><strong><%=wsdlPerspective.getMessage("FORM_LABEL_SERVICES")%></strong></td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=tableContainerId%>" style="display:none;">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor" width="20%"><%=wsdlPerspective.getMessage("FORM_LABEL_NAME")%></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_DOCUMENTATION")%></th>
- </tr>
-<%
- Vector serviceNodes = (Vector)sectionHeaderInfo.getOtherProperties();
- for (int i=0;i<serviceNodes.size();i++)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(i);
- WSDLServiceElement wsdlServiceElement = (WSDLServiceElement)serviceNode.getTreeElement();
-%>
- <tr>
- <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSDLNavigatorNodeAction.getActionLink(serviceNode.getNodeId(),false)))%>"><%=wsdlServiceElement.getService().getQName().getLocalPart()%></a></td>
-<%
- String documentation = wsdlServiceElement.getPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION);
- if (documentation.length() < 1)
- documentation = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
-%>
- <td class="tablecells"><%=documentation%></td>
- </tr>
-<%
- }
-%>
- </table>
-</div>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp
deleted file mode 100644
index 0cc2355..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-ISOAPEncArrayFragment frag = (ISOAPEncArrayFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp" flush="true"/>
- </td>
- </tr>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp
deleted file mode 100644
index c8f2e6a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp
+++ /dev/null
@@ -1,67 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-ISOAPEncArrayFragment frag = (ISOAPEncArrayFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-for (int i = 0; i < groupIDs.length; i++) {
-%>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=frag.getName()%>
- </td>
- </tr>
- </table>
- <span id="<%=i + tableContainerIDBase%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
- IXSDFragment[] childFragments = frag.getGroupMemberFragments(groupIDs[i]);
- for (int j = 0; j < childFragments.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(childFragments[j].getID());
-%>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="<%=childFragments[j].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
- }
-%>
- </table>
- </span>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp
deleted file mode 100644
index 502a699..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,89 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_SOAP_ENC_ARRAYS")%></th>
- </tr>
- <%
- String[] groupIDs = frag.getGroupIDs();
- for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
- String groupID;
- if (i < groupIDs.length)
- groupID = groupIDs[i];
- else
- groupID = frag.createGroupSeqInstance();
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
- %>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <%
- for (int j = 0; j < groupMemberFragments.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[j].getID());
- %>
- <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
- <%
- }
- %>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp
deleted file mode 100644
index 14918c2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp
+++ /dev/null
@@ -1,86 +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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPHeaderWrapperFragment,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-SOAPHeaderWrapperFragment wrapperFragment = (SOAPHeaderWrapperFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = wrapperFragment.getXSDDelegationFragment();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-
-String mustUnderstandID = wrapperFragment.getMustUnderstandID();
-String actorID = wrapperFragment.getActorID();
-
-String fieldsetClass = BrowserDetect.isMicrosoftInternetExplorer(request) ? "" : "headerfieldset";
-%>
-<table cellpadding="0" cellspacing="0" class="fixfragtable">
- <tr>
- <td>
- <fieldset class="<%=fieldsetClass%>">
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- <table cellpadding="3" cellspacing="0" class="fixfragtable">
- <tr>
- <td height="3"><!-- spacer --></td>
- </tr>
- <tr>
- <td>
- <% if (wrapperFragment.isMustUnderstand()) { %>
- <input type="checkbox" id="<%=mustUnderstandID%>" name="<%=mustUnderstandID%>" checked/>
- <% } else { %>
- <input type="checkbox" id="<%=mustUnderstandID%>" name="<%=mustUnderstandID%>"/>
- <% } %>
- </td>
- <td class="label">
- <label for="<%=mustUnderstandID%>"><%=wsdlPerspective.getMessage("FORM_LABEL_MUSTUNDERSTAND")%></label>
- </td>
- <td>|</td>
- <td class="label">
- <label for="<%=actorID%>"><%=wsdlPerspective.getMessage("FORM_LABEL_ACTOR")%></label>
- </td>
- <td>
- <div style="width: 5px">
- <% if (!wrapperFragment.validateActor()) { %>
- <%=HTMLUtils.redAsterisk()%>
- <% } %>
- </div>
- </td>
- <td width="100%">
- <input type="text" id="<%=actorID%>" name="<%=actorID%>" value="<%=wrapperFragment.getActor()%>" class="tabletextenter"/>
- </td>
- </tr>
- <tr>
- <td height="3"><!-- spacer --></td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td height="5"><!-- spacer --></td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp
deleted file mode 100644
index 887d4ba..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,123 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070516 185596 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer misinterprets response message
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
-
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <%
- IXSDFragment[] childFrags = frag.getAllFragments();
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createComplexInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
- attribute.delete(0, attribute.length());
- attribute.append("false");
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
-
- if(attributeFragment.getID().startsWith(childFragID)){
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
- }
- }
-}
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp
deleted file mode 100644
index deb540f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp
+++ /dev/null
@@ -1,91 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070516 185596 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer misinterprets response message
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-IXSDFragment[] childFrags = frag.getAllFragments();
-for (int i = 0; i < childFrags.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(childFrags[i].getID());
-%>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=frag.getName()%>
- </td>
- </tr>
- </table>
- <span id="<%=i + tableContainerIDBase%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
-
- if (attributeFragment.getID().startsWith(childFrags[i].getID())) {
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
- }
- }
-}
- %>
-
- </table>
- </span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp
deleted file mode 100644
index 05598d1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,135 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080201 197865 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_CONTENT")%></th>
- </tr>
- <%
- IXSDFragment[] childFrags = frag.getAllFragments();
- for (int i = 0; i < childFrags.length || i < xsdConfig.getMinOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createComplexInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
- %>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
-
- if(attributeFragment.getID().startsWith(childFragID)){
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
- %>
-
- <tr>
- <td class="tablecells" width=10>
-
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
-
- }
- }
-}
-%>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp
deleted file mode 100644
index d15620c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,129 +0,0 @@
-<%
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp, wsa.etools.ws.explorer, lunar-5.1.2 2
-* Version 1.2 05/05/26 16:18:23
-*/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
-
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <%
-
-
-
-
- IXSDFragment[] childFrags = frag.getAllFragments();
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createComplexInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
- attribute.delete(0, attribute.length());
- attribute.append("false");
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
-
-
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
- if(attributeFragment.getID().startsWith(childFragID)){
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-
- <%
- }
- }
-}
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp
deleted file mode 100644
index 77c6021..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp
+++ /dev/null
@@ -1,95 +0,0 @@
-<%
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp, wsa.etools.ws.explorer, lunar-5.1.2 1
-* Version 1.1 03/02/28 15:33:57
-*/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-IXSDFragment[] childFrags = frag.getAllFragments();
-for (int i = 0; i < childFrags.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(childFrags[i].getID());
-%>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=frag.getName()%>
- </td>
- </tr>
- </table>
- <span id="<%=i + tableContainerIDBase%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
-
- if(attributeFragment.getID().startsWith(childFrags[i].getID())){
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
-
-
- %>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
-
- }
- }
-}
- %>
-
- </table>
- </span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp
deleted file mode 100644
index 1942f14..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,137 +0,0 @@
-<%
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp, wsa.etools.ws.explorer, lunar-5.1.2 2
-* Version 1.2 05/05/26 16:18:24
-*/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDComplexFragment frag = (IXSDComplexFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRowsAttribute('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_CONTENT")%></th>
- </tr>
- <%
-
- IXSDFragment[] childFrags = frag.getAllFragments();
- for (int i = 0; i < childFrags.length || i < xsdConfig.getMinOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createComplexInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
- %>
-
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-
- <%
- IXSDAttributeFragment[] attributeFragments = frag.getAllAttributeFragments();
- IXSDAttributeFragment attributeFragment;
- for(int j = 0; j < attributeFragments.length; j++){
- attributeFragment = attributeFragments[j];
-
- if(attributeFragment.getID().startsWith(childFragID)){
- IXSDFragment delegationFragment = attributeFragment.getXSDDelegationFragment();
- fragID.delete(0, fragID.length());
- fragID.append(delegationFragment.getID());
- attribute.delete(0, attribute.length());
- attribute.append("true");
- %>
-
- <tr>
- <td class="tablecells" width=10>
-
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=attributeFragment.getID()%>">
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
-
-
- }
- }
-}
-%>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp
deleted file mode 100644
index 3a8ad82..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp
+++ /dev/null
@@ -1,201 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.emf.common.util.EList,
- org.eclipse.xsd.*,
- org.w3c.dom.Element,
- org.w3c.dom.NodeList" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%!
-private static final String XMLNS_LANG = "xml:lang";
-private static final String DEFAULT_XMLNS_LANG = "en-US";
-%>
-
-<%
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDComponent xsdComponent = frag.getXSDToFragmentConfiguration().getXSDComponent();
-XSDAnnotation annotation = null;
-EList appInfoList = null;
-EList docList = null;
-if (xsdComponent instanceof XSDTypeDefinition)
- annotation = ((XSDTypeDefinition)xsdComponent).getAnnotation();
-else if (xsdComponent instanceof XSDElementDeclaration)
- annotation = ((XSDElementDeclaration)xsdComponent).getAnnotation();
-if (annotation != null) {
- appInfoList = annotation.getApplicationInformation();
- docList = annotation.getUserInformation();
-}
-String appInfoContainerID = "::appInfo";
-String xappInfoContainerID = "x::appInfo";
-String documentationContainerID = "::documentation";
-String xdocumentationContainerID = "x::documentation";
-%>
-
-<script language="javascript">
- function twist(tableContainerId,twistImageName)
- {
- var tableContainer = document.getElementById(tableContainerId);
- var twistImage = document.images[twistImageName];
- if (tableContainer.style.display == "none")
- {
- tableContainer.style.display = "";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_OPENED"))%>";
- }
- else
- {
- tableContainer.style.display = "none";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_CLOSED"))%>";
- }
- }
-
- function twistClose(tableContainerId)
- {
- if (document.getElementById(tableContainerId).style.display == "")
- twist(tableContainerId,"x"+tableContainerId);
- }
-</script>
-
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=appInfoContainerID%>','<%=xappInfoContainerID%>')"><img name="<%=xappInfoContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_APPLICATION_INFORMATION")%></strong>
- </td>
- </tr>
-</table>
-<span id="<%=appInfoContainerID%>">
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor" width="100%"><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_APPLICATION_INFORMATION")%></th>
- </tr>
- <%
- boolean openAppInfoTable = false;
- if (appInfoList != null) {
- for (int i = 0; i < appInfoList.size(); i++) {
- Element e = (Element)appInfoList.get(i);
- String appInfoLang = e.getAttribute(XMLNS_LANG);
- String appInfoText = null;
- NodeList nl = e.getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- if (nl.item(j).getNodeType() == org.w3c.dom.Node.TEXT_NODE) {
- appInfoText = nl.item(j).getNodeValue();
- break;
- }
- }
- if (appInfoText != null)
- {
- openAppInfoTable = true;
- if (appInfoText.trim().length() < 1)
- appInfoText = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
- %>
- <tr>
- <td class="tablecells"><%=((appInfoLang != null && appInfoLang.length() > 0) ? appInfoLang : DEFAULT_XMLNS_LANG)%></td>
- <td class="tablecells"><%=appInfoText%></td>
- </tr>
- <%
- }
- }
- }
- %>
-</table>
-</span>
-<%
-if (!openAppInfoTable) {
-%>
-<script language="javascript">
- twistClose('<%=appInfoContainerID%>');
-</script>
-<%
-}
-%>
-
-<table>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=documentationContainerID%>','<%=xdocumentationContainerID%>')"><img name="<%=xdocumentationContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_DOCUMENTATION")%></strong>
- </td>
- </tr>
-</table>
-<span id="<%=documentationContainerID%>">
-<table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor" width="100%"><%=wsdlPerspective.getMessage("FORM_LABEL_XSD_DOCUMENTATION")%></th>
- </tr>
- <%
- boolean openDocTable = false;
- if (docList != null) {
- for (int i = 0; i < docList.size(); i++) {
- Element e = (Element)docList.get(i);
- String docLang = e.getAttribute(XMLNS_LANG);
- String docText = null;
- NodeList nl = e.getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- if (nl.item(j).getNodeType() == org.w3c.dom.Node.TEXT_NODE) {
- docText = nl.item(j).getNodeValue();
- break;
- }
- }
- if (docText != null)
- {
- openDocTable = true;
- if (docText.trim().length() < 1)
- docText = controller.getMessage("TABLE_BLANK_PLACEHOLDER");
- %>
- <tr>
- <td class="tablecells"><%=((docLang != null && docLang.length() > 0) ? docLang : DEFAULT_XMLNS_LANG)%></td>
- <td class="tablecells"><%=docText%></td>
- </tr>
- <%
- }
- }
- }
- %>
-</table>
-</span>
-<%
-if (!openDocTable) {
-%>
-<script language="javascript">
- twistClose('<%=documentationContainerID%>');
-</script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp
deleted file mode 100644
index cc9c9f0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp
+++ /dev/null
@@ -1,76 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.Node,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.w3c.dom.Element,
- javax.xml.rpc.NamespaceConstants,
- java.util.Hashtable" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-// TODO: Replace "SOAP-ENV" by NamespaceConstants.NSPREFIX_SOAP_ENVELOPE (="soapenv")
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SOAP_ENVELOPE,"SOAP-ENV");
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSI,NamespaceConstants.NSPREFIX_SCHEMA_XSI);
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSD,NamespaceConstants.NSPREFIX_SCHEMA_XSD);
-Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-StringBuffer sb = new StringBuffer();
-for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- sb.append(XMLUtils.serialize(instanceDocuments[i], true));
- sb.append(HTMLUtils.LINE_SEPARATOR);
-}
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><%=frag.getName()%></label>
- </td>
- </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <textarea id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="textareaenter" readonly><%=HTMLUtils.charactersToHTMLEntitiesStrict(sb.toString())%></textarea>
-<%
- /*
- StringBuffer url = new StringBuffer();
- url.append(response.encodeURL(controller.getPathWithContext("/wsdl/fragment/XSDDefaultRFragmentXML.jsp?")));
- url.append(WSDLActionInputs.FRAGMENT_ID).append("=").append(fragID).append("&");
- url.append(ActionInputs.NODEID).append("=").append(nodeID).append("&");
- url.append(ActionInputs.SESSIONID).append("=").append(session.getId());
- */
-%>
- <!--
- <iframe src="" width="100%" height="150px"></iframe>
- -->
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp
deleted file mode 100644
index 25089f1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp
+++ /dev/null
@@ -1,114 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*,
- org.w3c.dom.Element,
- org.xml.sax.*,
- org.xml.sax.helpers.*,
- javax.xml.rpc.NamespaceConstants,
- javax.xml.parsers.*,
- java.io.*,
- java.util.*" %>
-<%
-String fragID = request.getParameter(WSDLActionInputs.FRAGMENT_ID);
-String nodeID = request.getParameter(ActionInputs.NODEID);
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID);
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-// TODO: Replace "SOAP-ENV" by NamespaceConstants.NSPREFIX_SOAP_ENVELOPE (="soapenv")
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SOAP_ENVELOPE,"SOAP-ENV");
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSI,NamespaceConstants.NSPREFIX_SCHEMA_XSI);
-soapEnvelopeNamespaceTable.put(NamespaceConstants.NSURI_SCHEMA_XSD,NamespaceConstants.NSPREFIX_SCHEMA_XSD);
-Element[] instanceDocuments = new Element[0];
-StringBuffer sb = null;
-try
-{
- instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
- if (instanceDocuments.length == 1)
- {
- byte[] b = XMLUtils.serialize(instanceDocuments[0], true).getBytes(HTMLUtils.UTF8_ENCODING);
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
- SAXParserFactory saxFactory = SAXParserFactory.newInstance();
- saxFactory.setValidating(true);
- SAXParser saxParser = saxFactory.newSAXParser();
- saxParser.parse(bais,
- new DefaultHandler()
- {
- public void error(SAXParseException e) throws SAXException
- {
- throw e;
- }
-
- public void fatalError(SAXParseException e) throws SAXException
- {
- throw e;
- }
-
- public void warning(SAXParseException e) throws SAXException
- {
- throw e;
- }
- });
- bais.close();
- sb = new StringBuffer(new String(b));
- }
-}
-catch (Throwable t)
-{
-}
-if (sb == null)
-{
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=frag.getName()%></title>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- sb = new StringBuffer();
- response.setContentType("text/html; charset=UTF-8");
- for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- sb.append(HTMLUtils.charactersToHTMLEntitiesStrict(XMLUtils.serialize(instanceDocuments[i], true)));
- }
-%>
-<%=sb.toString()%>
-</body>
-</html>
-<%
-}
-else
-{
-%>
-<%=sb.toString()%>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp
deleted file mode 100644
index 2e8520d..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp
+++ /dev/null
@@ -1,74 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String param = frag.getParameterValue(frag.getID(), 0);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td>
- <%
- if (!frag.validateAllParameterValues()) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <textarea id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="textareaenter"><%=((param != null) ? HTMLUtils.charactersToHTMLEntitiesStrict(param) : "")%></textarea>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp
deleted file mode 100644
index d0931f2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDDelegationFragment wrapperFragment = (IXSDDelegationFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = wrapperFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = wrapperFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <jsp:include page="<%=delegationFragment.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp
deleted file mode 100644
index c34607a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDDelegationFragment wrapperFragment = (IXSDDelegationFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = wrapperFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = wrapperFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementRFragmentJSP.jsp
deleted file mode 100644
index 12c2629..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementRFragmentJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp, wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 1
-* Version 1.1 03/02/28 15:34:04
-*/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = elementFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = elementFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-elementID.delete(0, elementID.length());
-elementID.append(elementFragment.getID());
-%>
-
-
-
-<table cellpadding=0 cellspacing=0 class="<%=("innerfixfragtable")%>">
- <tr>
- <td>
- <jsp:include page="<%=delegationFragment.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-</table>
-
-
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementWFragmentJSP.jsp
deleted file mode 100644
index d15644a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementWFragmentJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
- %>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(fragID.toString());
-IXSDFragment delegationFragment = elementFragment.getXSDDelegationFragment();
-XSDToFragmentConfiguration xsdConfig = elementFragment.getXSDToFragmentConfiguration();
-fragID.delete(0, fragID.length());
-fragID.append(delegationFragment.getID());
-elementID.delete(0, elementID.length());
-elementID.append(elementFragment.getID());
-%>
-
-
-
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <jsp:include page="<%=delegationFragment.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-</table>
-
-
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp
deleted file mode 100644
index ba3ceee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp
+++ /dev/null
@@ -1,17 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp
deleted file mode 100644
index 89a4943..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp
+++ /dev/null
@@ -1,77 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-int minOccurs = xsdConfig.getMinOccurs();
-int maxOccurs = xsdConfig.getMaxOccurs();
-if (minOccurs == maxOccurs) {
-%>
-<input type="hidden" name="<%=frag.getID()%>" value="<%=maxOccurs%>"/>
-<%
-} else {
- String[] params = frag.getParameterValues(frag.getID());
-%>
- <table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <label for="<%=frag.getID()%>"><%=wsdlPerspective.getMessage("FORM_LABEL_OCCURANCE")%> <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- </tr>
- <tr>
- <td>
- <%
- if (maxOccurs != FragmentConstants.UNBOUNDED) {
- %>
- <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="selectlist">
- <%
- for (int i = minOccurs; i <= maxOccurs; i++) {
- %>
- <option value="<%=i%>" <% if (params != null && i == params.length) { %>selected<% } %>><%=i%>
- <%
- }
- %>
- </select>
- <%
- } else {
- %>
- <input type="text" id="<%=frag.getID()%>" name="<%=frag.getID()%>" value="<%=((params != null) ? String.valueOf(params.length) : "")%>" class="tabletextenter">
- <%
- if (!frag.validateParameterValues(frag.getID())) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- }
- %>
- </td>
- </tr>
- </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp
deleted file mode 100644
index 1590292..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp
+++ /dev/null
@@ -1,190 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupAllFragment frag = (IXSDGroupAllFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-boolean enableGroup = (xsdConfig.getMinOccurs() > 0 || frag.getGroupIDs().length > 0);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String groupID = frag.getGroupAllInstance();
-String groupCheckboxID = (new StringBuffer(FragmentConstants.XSD_ALL_GROUP_ID)).append(frag.getID()).toString();
-String groupMemberRadioID = (new StringBuffer(groupCheckboxID)).append(frag.getID()).toString();
-%>
-<script language="javascript">
- function initGroupAll(tableContainerID, twistImageName, fragID, groupID, groupCheckboxID, enable) {
- var checkbox = document.getElementById(groupCheckboxID);
- checkbox.checked = enable;
- enableGroupAll(tableContainerID, twistImageName, fragID, groupID, checkbox);
- }
-
- function enableGroupAll(tableContainerID, twistImageName, fragID, groupID, checkbox) {
- var tableContainer = document.getElementById(tableContainerID);
- var checkboxTable = checkbox.parentNode.parentNode.parentNode;
- if (checkbox.checked) {
- if (tableContainer.style.display == "none")
- twist(tableContainerID, twistImageName);
- checkbox.name = fragID;
- checkbox.value = groupID;
- }
- else {
- if (tableContainer.style.display == "")
- twist(tableContainerID, twistImageName);
- checkbox.name = "";
- checkbox.value = "";
- }
- var tds = checkboxTable.getElementsByTagName("td");
- var checkboxCellIndex = checkbox.parentNode.cellIndex;
- for (var i = 0; i < tds.length; i++) {
- if (i == checkboxCellIndex || checkbox.checked)
- tds.item(i).style.display = "";
- else
- tds.item(i).style.display = "none";
- }
- }
-
- function groupAllOrderingMoveUp(tableContainerID) {
- var table = getTable(tableContainerID);
- if (table.rows[numberOfHeaderRows].cells[0].getElementsByTagName("input").item(0).checked) {
- alert('<%=wsdlPerspective.getMessage("MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP")%>');
- return;
- }
- for (var i = numberOfHeaderRows + 1; i < table.rows.length; i++) {
- if (table.rows[i].cells[0].getElementsByTagName("input").item(0).checked) {
- swapRows(table, i-1, i);
- table.rows[i-1].cells[0].getElementsByTagName("input").item(0).checked = true;
- return;
- }
- }
- alert('<%=controller.getWSDLPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>');
- }
-
- function groupAllOrderingMoveDown(tableContainerID) {
- var table = getTable(tableContainerID);
- if (table.rows[table.rows.length - 1].cells[0].getElementsByTagName("input").item(0).checked) {
- alert('<%=wsdlPerspective.getMessage("MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN")%>');
- return;
- }
- for (var i = numberOfHeaderRows; i < table.rows.length - 1; i++) {
- if (table.rows[i].cells[0].getElementsByTagName("input").item(0).checked) {
- swapRows(table, i, i+1);
- table.rows[i+1].cells[0].getElementsByTagName("input").item(0).checked = true;
- return;
- }
- }
- alert('<%=controller.getWSDLPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>');
- }
-
- <%
- // rowIndex1 must be smaller than rowIndex2 in order to work
- %>
- function swapRows(table, rowIndex1, rowIndex2) {
- var row1ChildNodes = cloneArray(table.rows[rowIndex1].childNodes);
- var row2ChildNodes = cloneArray(table.rows[rowIndex2].childNodes);
- table.deleteRow(rowIndex2);
- table.deleteRow(rowIndex1);
- var row1 = table.insertRow(rowIndex1);
- var row2 = table.insertRow(rowIndex2);
- appendToRow(row1, row2ChildNodes);
- appendToRow(row2, row1ChildNodes);
- }
-
- function cloneArray(oldArray) {
- var arrayClone = new Array();
- for (var i = 0; i < oldArray.length; i++) {
- arrayClone[i] = oldArray[i].cloneNode(true);
- }
- return arrayClone;
- }
-
- function appendToRow(row, nodesArray) {
- for (var i = 0; i < nodesArray.length; i++) {
- row.appendChild(nodesArray[i]);
- }
- }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <%
- if (xsdConfig.getMinOccurs() > 0) {
- %>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <%
- }
- else {
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <input type="checkbox" id="<%=groupCheckboxID%>" name="<%=frag.getID()%>" value="<%=groupID%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP")%>" onClick="javascript:enableGroupAll('<%=tableContainerID%>', '<%=twistImageName%>', '<%=frag.getID()%>', '<%=groupID%>', this)" checked><label for="<%=groupCheckboxID%>"><%=wsdlPerspective.getMessage("FORM_LABEL_ENABLE_DISABLE_GROUP")%></label>
- </td>
- <%
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:groupAllOrderingMoveUp('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:groupAllOrderingMoveDown('<%=tableContainerID%>')"><%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="headercolor" width=10></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
- </tr>
- <%
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
- for (int i = 0; i < groupMemberFragments.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[i].getID());
- %>
- <tr>
- <td class="tablecells">
- <input type="radio" class="radio" name="<%=groupMemberRadioID%>" value="<%=fragID.toString()%>" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP")%>">
- </td>
- <td class="tablecells" width="100%">
- <input type="hidden" name="<%=groupID%>" value="<%=fragID.toString()%>">
- <jsp:include page="<%=groupMemberFragments[i].getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
-<%
-if (!enableGroup) {
-%>
- <script language="javascript">
- initGroupAll('<%=tableContainerID%>', '<%=twistImageName%>', '<%=frag.getID()%>', '<%=groupID%>', '<%=groupCheckboxID%>', <%=enableGroup%>);
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp
deleted file mode 100644
index ec23dc1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,119 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<script language="javascript">
- function choose(select) {
- for (var i = 0; i < select.options.length; i++) {
- var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
- tableContainerID += select.options(i).value;
- showTable(tableContainerID, select.options(i).selected);
- }
- }
-
- function showTable(tableContainerID, show) {
- var tableContainer = document.getElementById(tableContainerID);
- if (show)
- tableContainer.style.display = "";
- else
- tableContainer.style.display = "none";
- }
-</script>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-%>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_CHOICES")%></th>
- <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
- </tr>
-<%
- XSDParticle[] choices = frag.getChoices();
- String[] groupIDs = frag.getGroupIDs();
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- String groupID;
- int choiceIndex;
- if (i < groupIDs.length) {
- groupID = groupIDs[i];
- choiceIndex = frag.getChoiceIndex(groupID);
- }
- else {
- groupID = frag.createGroupChoiceInstance(0);
- choiceIndex = 0;
- }
- IXSDFragment[] choiceFrags = frag.getGroupMemberFragments(groupID);
-%>
- <tr>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <select id="<%=groupID%>" name="<%=groupID%>" onChange="javascript:choose(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_CHOICES")%>">
-<%
- for (int j = 0; j < choiceFrags.length; j++) {
- XSDComponent xsdComponent = choiceFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
- String name = "";
- if(xsdComponent instanceof XSDElementDeclaration)
- name = ((XSDElementDeclaration)xsdComponent).getQName();
- else
- name = xsdComponent.getElement().getTagName();
-
- if (j == choiceIndex) {
-%>
- <option value="<%=choiceFrags[j].getID()%>" selected><%=name%>
-<%
- }
- else {
-%>
- <option value="<%=choiceFrags[j].getID()%>"><%=name%>
-<%
- }
- }
-%>
- </select>
- </td>
- <td class="tablecells">
-<%
- for (int j = 0; j < choiceFrags.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(choiceFrags[j].getID());
- String choiceFragTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(choiceFrags[j].getID()).toString();
-%>
- <span id="<%=choiceFragTableContainerID%>">
- <jsp:include page="<%=choiceFrags[j].getWriteFragment()%>" flush="true"/>
- </span>
- <script language="javascript">
- showTable('<%=choiceFragTableContainerID%>', <%=(j == choiceIndex)%>);
- </script>
-<%
- }
-%>
- </td>
- </tr>
-<%
- }
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp
deleted file mode 100644
index 276b857..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp
+++ /dev/null
@@ -1,79 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-if (groupIDs.length == 1) {
- int choiceIndex = frag.getChoiceIndex(groupIDs[0]);
- IXSDFragment choiceFrag = frag.getGroupMemberFragments(groupIDs[0])[choiceIndex];
- fragID.delete(0, fragID.length());
- fragID.append(choiceFrag.getID());
-%>
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td>
- <jsp:include page="<%=choiceFrag.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- </table>
-<%
-}
-else {
- for (int i = 0; i < groupIDs.length; i++) {
- int choiceIndex = frag.getChoiceIndex(groupIDs[i]);
- IXSDFragment choiceFrag = frag.getGroupMemberFragments(groupIDs[i])[choiceIndex];
- fragID.delete(0, fragID.length());
- fragID.append(choiceFrag.getID());
-%>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_NUMBER", String.valueOf(i + 1))%>
- </td>
- </tr>
- </table>
- <span id="<%=i + tableContainerIDBase%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="<%=choiceFrag.getReadFragment()%>" flush="true"/>
- </td>
- </tr>
- </table>
- </span>
-<%
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp
deleted file mode 100644
index 0d91b7f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,152 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<script language="javascript">
- function choose(select) {
- for (var i = 0; i < select.options.length; i++) {
- var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
- tableContainerID += select.options(i).value;
- showTable(tableContainerID, select.options(i).selected);
- }
- }
-
- function showTable(tableContainerID, show) {
- var tableContainer = document.getElementById(tableContainerID);
- if (show)
- tableContainer.style.display = "";
- else
- tableContainer.style.display = "none";
- }
-</script>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupChoiceFragment frag = (IXSDGroupChoiceFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_CHOICES")%></th>
- <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
- </tr>
-<%
- XSDParticle[] choices = frag.getChoices();
- String[] groupIDs = frag.getGroupIDs();
- for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
- String groupID;
- int choiceIndex;
- if (i < groupIDs.length) {
- groupID = groupIDs[i];
- choiceIndex = frag.getChoiceIndex(groupID);
- }
- else {
- groupID = frag.createGroupChoiceInstance(0);
- choiceIndex = 0;
- }
- IXSDFragment[] choiceFrags = frag.getGroupMemberFragments(groupID);
-%>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <select id="<%=groupID%>" name="<%=groupID%>" onChange="javascript:choose(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_CHOICES")%>">
-<%
- for (int j = 0; j < choiceFrags.length; j++) {
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)choiceFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
- if (j == choiceIndex) {
-%>
- <option value="<%=choiceFrags[j].getID()%>" selected><%=xsdElement.getQName()%>
-<%
- }
- else {
-%>
- <option value="<%=choiceFrags[j].getID()%>"><%=xsdElement.getQName()%>
-<%
- }
- }
-%>
- </select>
- </td>
- <td class="tablecells">
-<%
- for (int j = 0; j < choiceFrags.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(choiceFrags[j].getID());
- String choiceFragTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(choiceFrags[j].getID()).toString();
-%>
- <span id="<%=choiceFragTableContainerID%>">
- <jsp:include page="<%=choiceFrags[j].getWriteFragment()%>" flush="true"/>
- </span>
- <script language="javascript">
- showTable('<%=choiceFragTableContainerID%>', <%=(j == choiceIndex)%>);
- </script>
-<%
- }
-%>
- </td>
- </tr>
-<%
- }
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp
deleted file mode 100644
index 8fdfda3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp
+++ /dev/null
@@ -1,89 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDGroupFragment frag = (IXSDGroupFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerIDBase = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageNameBase = (new StringBuffer("x")).append(tableContainerIDBase).toString();
-String[] groupIDs = frag.getGroupIDs();
-if (groupIDs.length == 1) {
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupIDs[0]);
-%>
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
- for (int i = 0; i < groupMemberFragments.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[i].getID());
-%>
- <tr>
- <td>
- <jsp:include page="<%=groupMemberFragments[i].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
- }
-%>
- </table>
-<%
-}
-else {
- for (int i = 0; i < groupIDs.length; i++) {
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupIDs[i]);
-%>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=i + tableContainerIDBase%>','<%=i + twistImageNameBase%>')"><img name="<%=i + twistImageNameBase%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=wsdlPerspective.getMessage("FORM_LABEL_GROUP_NUMBER", String.valueOf(i + 1))%>
- </td>
- </tr>
- </table>
- <span id="<%=i + tableContainerIDBase%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
- for (int j = 0; j < groupMemberFragments.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[j].getID());
-%>
- <tr>
- <td width=16>
- <img width=16 src="<%=response.encodeURL(controller.getPathWithContext("images/space.gif"))%>" alt="">
- </td>
- <td>
- <jsp:include page="<%=groupMemberFragments[j].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
- }
-%>
- </table>
- </span>
-<%
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp
deleted file mode 100644
index 55d81c0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String[] groupIDs = frag.getGroupIDs();
-for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- String groupID;
- if (i < groupIDs.length)
- groupID = groupIDs[i];
- else
- groupID = frag.createGroupSeqInstance();
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
-%>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
- for (int j = 0; j < groupMemberFragments.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[j].getID());
-%>
- <tr>
- <td>
- <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
- }
-%>
- </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp
deleted file mode 100644
index 7fc41ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,101 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDGroupSeqFragment frag = (IXSDGroupSeqFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_ELEMENTS")%></th>
- </tr>
- <%
- String[] groupIDs = frag.getGroupIDs();
- for (int i = 0; i < groupIDs.length || i < xsdConfig.getMinOccurs(); i++) {
- String groupID;
- if (i < groupIDs.length)
- groupID = groupIDs[i];
- else
- groupID = frag.createGroupSeqInstance();
- IXSDFragment[] groupMemberFragments = frag.getGroupMemberFragments(groupID);
- %>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=groupID%>">
- <%
- for (int j = 0; j < groupMemberFragments.length; j++) {
- fragID.delete(0, fragID.length());
- fragID.append(groupMemberFragments[j].getID());
- %>
- <jsp:include page="<%=groupMemberFragments[j].getWriteFragment()%>" flush="true"/>
- <%
- }
- %>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp
deleted file mode 100644
index 0213c41..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String nodeId = request.getParameter(ActionInputs.NODEID);
- String fragmentId = request.getParameter(WSDLActionInputs.FRAGMENT_ID);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>
- <%=wsdlPerspective.getMessage("TITLE_XSD_INFORMATION_DIALOG")%>
- </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
- StringBuffer link = new StringBuffer("wsdl/fragment/XSDInfo_toolbar.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- link.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- link.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragmentId);
-%>
- <frame name="<%=WSDLFrameNames.XSD_INFO_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_XSD_INFORMATION_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%
- link.setLength(0);
- link.append("wsdl/fragment/XSDInfo_content.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- link.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- link.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragmentId);
-%>
- <frame name="<%=WSDLFrameNames.XSD_INFO_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_XSD_INFORMATION_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp
deleted file mode 100644
index 71b964f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp
+++ /dev/null
@@ -1,48 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
- sessionID.append(request.getParameter(ActionInputs.SESSIONID));
- fragID.append(request.getParameter(WSDLActionInputs.FRAGMENT_ID));
-
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
- Controller controller = (Controller)currentSession.getAttribute("controller");
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- nodeID.append(request.getParameter(ActionInputs.NODEID));
- Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_XSD_INFORMATION_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<jsp:include page="<%=frag.getInformationFragment()%>" flush="true"/>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp
deleted file mode 100644
index bb186b9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(request.getParameter(ActionInputs.SESSIONID));
- Controller controller = (Controller)currentSession.getAttribute("controller");
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(request.getParameter(ActionInputs.NODEID)));
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- IXSDFragment frag = operElement.getFragmentByID(request.getParameter(WSDLActionInputs.FRAGMENT_ID));
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_XSD_INFORMATION_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.xsdInfoDialogClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar">
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl.gif"))%>" alt="" width=16 height=16></td>
- <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=frag.getName()%></td>
- </tr>
- </table>
- </div>
-</div>
-<script language="javascript">
- top.opener.xsdInfoDialogClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp
deleted file mode 100644
index aec4d3a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,97 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-String fragIDString = fragID.toString();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=fragIDString%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td>
- <%
- if (!frag.validateParameterValues(fragIDString)) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <%
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- %>
- <tr>
- <td width="60%">
- <%
- String value = frag.getParameterValue(frag.getID(), i);
- %>
- <input type="text" id="<%=frag.getID()%>" name="<%=fragIDString%>" value="<%=((value != null) ? HTMLUtils.charactersToHTMLEntitiesStrict(value) : "")%>" size="50" class="tabletextenter">
- </td>
- <td valign="center" align="left" nowrap>
- <a href="javascript:openCalendarBrowser(<%=request.getParameter(ActionInputs.CALENDAR_TYPE)%>,'contentborder','<%=fragIDString%>',<%=i%>)"><%=controller.getMessage("FORM_LINK_BROWSE")%></a>
- </td>
- <td nowrap width="30%"> </td>
- </tr>
- <%
- }
- %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp
deleted file mode 100644
index 96523ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,113 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
-
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:addSimpleAtomicDateTimeRows(<%=calendarType%>,'<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedDateTimeRows(<%=calendarType%>,'<%=tableContainerID%>',<%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td>
- <%
- if (!frag.validateParameterValues(frag.getID())) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th width="90%" class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
- <th class="headercolor"><%=controller.getMessage("FORM_LABEL_ACTIONS")%></th>
- </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
- for ( ; i < values.length; i++) {
-%>
- <script language="javascript">
- addSimpleAtomicDateTimeRows(<%=calendarType%>,"<%=tableContainerID%>","<%=frag.getID()%>","<%=frag.getID()%>","<%=values[i]%>",<%=xsdConfig.getMaxOccurs()%>);
- </script>
-<%
- }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
- <script language="javascript">
- addSimpleAtomicDateTimeRows(<%=calendarType%>,"<%=tableContainerID%>","<%=frag.getID()%>","<%=frag.getID()%>",null,<%=xsdConfig.getMaxOccurs()%>);
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp
deleted file mode 100644
index b99731a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,109 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- XSDSimpleAtomicEnumFragment frag = (XSDSimpleAtomicEnumFragment)operElement.getFragmentByID(fragID.toString());
- IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
- XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
- XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td>
-<%
- if (!frag.validateParameterValues(frag.getID()))
- {
-%>
- <%=HTMLUtils.redAsterisk()%>
-<%
- }
-%>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
- OptionVector optionVector = frag.getOptionVector();
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++)
- {
-%>
- <tr>
- <td>
-<%
- String selectedValue = frag.getParameterValue(frag.getID(), i);
-%>
- <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" class="selectlist">
-<%
- for (int j = 0; j < optionVector.size(); j++)
- {
- String displayValue = optionVector.getDisplayValue(j);
- String value = optionVector.getValue(j);
- if (value.equals(selectedValue))
- {
-%>
- <option value="<%=value%>" selected><%=displayValue%>
-<%
- }
- else
- {
-%>
- <option value="<%=value%>"><%=displayValue%>
-<%
- }
- }
-%>
- </select>
- </td>
- </tr>
-<%
- }
- %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp
deleted file mode 100644
index 017a9ee..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,165 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.emf.common.util.EList,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- XSDSimpleAtomicEnumFragment frag = (XSDSimpleAtomicEnumFragment)operElement.getFragmentByID(fragID.toString());
- IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
- OptionVector optionVector = frag.getOptionVector();
- XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
- XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
- String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
- String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
- String optionsContainerID = (new StringBuffer(FragmentConstants.XSD_ATOMIC_ENUM_ID)).append(frag.getID()).toString();
-%>
-<span id="<%=optionsContainerID%>">
-<%
- for (int j = 0; j < optionVector.size(); j++) {
-%>
- <input type="hidden" name="<%=optionsContainerID%>" value="<%=optionVector.getDisplayValue(j)%>">
- <input type="hidden" name="<%=optionsContainerID%>" value="<%=optionVector.getValue(j)%>">
-<%
- }
-%>
-</span>
-<script language="javascript">
- function addSimpleAtomicEnumRows(tableContainerID, optionsContainerID, id, name, value, maxOccurs) {
- if (checkMaxOccursReached(tableContainerID, maxOccurs))
- return;
- twistOpen(tableContainerID);
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("tbody").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var select = document.createElement("select");
- column1.appendChild(select);
- select.id = id;
- select.name = name;
- select.className = "selectlist";
- var options = getOptions(optionsContainerID);
- var index = 0;
- for (var k = 0; k < options.length; k += 2) {
- select.options[index] = new Option(options[k].value,options[k+1].value);
- if (value != null && value == options[k+1].value)
- select.options[index].selected = true;
- index++;
- }
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- tableBody.appendChild(newRow);
- }
-
- function getOptions(optionsContainerID) {
- var optionsContainer = document.getElementById(optionsContainerID);
- var options = optionsContainer.getElementsByTagName("input");
- return options;
- }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td>
- <%
- if (!frag.validateParameterValues(frag.getID())) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
- </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
- for ( ; i < values.length; i++) {
-%>
- <script language="javascript">
- addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', '<%=values[i]%>', '<%=xsdConfig.getMaxOccurs()%>');
- </script>
-<%
- }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
- <script language="javascript">
- addSimpleAtomicEnumRows('<%=tableContainerID%>', '<%=optionsContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, '<%=xsdConfig.getMaxOccurs()%>');
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp
deleted file mode 100644
index cb6ad81..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,95 +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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="attribute" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-boolean attributeBool = Boolean.valueOf(attribute.toString()).booleanValue() ;
-
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable() && !(attributeBool) ){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
-
- <td>
- <%
- if (!frag.validateParameterValues(frag.getID())) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <%
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- %>
- <tr>
- <td>
- <%
- String value = frag.getParameterValue(frag.getID(), i);
- %>
- <input type="text" id="<%=frag.getID()%>" name="<%=frag.getID()%>" value="<%=((value != null) ? HTMLUtils.charactersToHTMLEntitiesStrict(value) : "")%>" size="50" class="tabletextenter">
- </td>
- </tr>
- <%
- }
- %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp
deleted file mode 100644
index e2ceffa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp
+++ /dev/null
@@ -1,323 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.emf.common.util.EList,
- org.eclipse.xsd.*,
- java.util.*" %>
-
-<jsp:useBean id="sessionID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<%
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionID.toString());
-Controller controller = (Controller)currentSession.getAttribute("controller");
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDToFragmentConfiguration().getXSDComponent();
-
-int minLength = -1;
-int maxLength = -1;
-Vector patternVector = new Vector();
-String whiteSpace = null;
-boolean minExclusive = true;
-Object min = null;
-boolean maxExclusive = true;
-Object max = null;
-int totalDigits = -1;
-int fractionDigits = -1;
-
-XSDSimpleTypeDefinition currType = simpleType;
-while (!XSDTypeDefinitionUtil.isRootTypeDefinition(currType)) {
- // minLength
- if (minLength < 0) {
- XSDLengthFacet xsdLengthFacet = currType.getLengthFacet();
- XSDMinLengthFacet xsdMinLengthFacet = currType.getMinLengthFacet();
- // port to org.eclipse.xsd
- if (xsdLengthFacet != null)
- minLength = xsdLengthFacet.getValue();
- else if (xsdMinLengthFacet != null)
- minLength = xsdMinLengthFacet.getValue();
- }
- // maxLength
- if (maxLength < 0) {
- XSDLengthFacet xsdLengthFacet = currType.getLengthFacet();
- XSDMaxLengthFacet xsdMaxLengthFacet = currType.getMaxLengthFacet();
- // port to org.eclipse.xsd
- if (xsdLengthFacet != null)
- maxLength = xsdLengthFacet.getValue();
- else if (xsdMaxLengthFacet != null)
- maxLength = xsdMaxLengthFacet.getValue();
- }
- // patternVector
- EList xsdPatternFacets = currType.getPatternFacets();
- if (xsdPatternFacets != null) {
- for (int i = 0; i < xsdPatternFacets.size(); i++) {
- XSDPatternFacet xsdPatternFacet = (XSDPatternFacet)xsdPatternFacets.get(i);
- EList patterns = xsdPatternFacet.getValue();
- for (int j = 0; j < patterns.size(); j++) {
- patternVector.add(patterns.get(j));
- }
- }
- }
- // whiteSpace
- if (whiteSpace == null) {
- XSDWhiteSpaceFacet xsdWhiteSpaceFacet = currType.getWhiteSpaceFacet();
- // port to org.eclipse.xsd
- if (xsdWhiteSpaceFacet != null)
- whiteSpace = xsdWhiteSpaceFacet.getValue().getName();
- }
- // min in/exclusive
- if (min == null ) {
- XSDMinExclusiveFacet xsdMinExclusiveFacet = currType.getMinExclusiveFacet();
- XSDMinInclusiveFacet xsdMinInclusiveFacet = currType.getMinInclusiveFacet();
- if (xsdMinExclusiveFacet != null) {
- min = xsdMinExclusiveFacet.getValue();
- minExclusive = true;
- }
- else if (xsdMinInclusiveFacet != null) {
- min = xsdMinInclusiveFacet.getValue();
- minExclusive = false;
- }
- }
- // max in/exclusive
- if (max == null) {
- XSDMaxExclusiveFacet xsdMaxExclusiveFacet = currType.getMaxExclusiveFacet();
- XSDMaxInclusiveFacet xsdMaxInclusiveFacet = currType.getMaxInclusiveFacet();
- if (xsdMaxExclusiveFacet != null) {
- max = xsdMaxExclusiveFacet.getValue();
- maxExclusive = true;
- }
- else if (xsdMaxInclusiveFacet != null) {
- max = xsdMaxInclusiveFacet.getValue();
- maxExclusive = false;
- }
- }
- // totalDigits
- if (totalDigits < 0) {
- XSDTotalDigitsFacet xsdTotalDigitsFacet = currType.getTotalDigitsFacet();
- if (xsdTotalDigitsFacet != null)
- totalDigits = xsdTotalDigitsFacet.getValue();
- }
- // fractionDigits
- if (fractionDigits < 0) {
- XSDFractionDigitsFacet xsdFractionDigitsFacet = currType.getFractionDigitsFacet();
- if (xsdFractionDigitsFacet != null)
- fractionDigits = xsdFractionDigitsFacet.getValue();
- }
- // walk to base type
- currType = currType.getBaseTypeDefinition();
-}
-%>
-
-<jsp:include page="/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp" flush="true"/>
-
-<table>
- <tr>
- <td height=20> </td>
- </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_BASE_TYPE")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType).getName()%>
- </td>
- </tr>
-</table>
-
-<%
-String minLengthString = (minLength < 0) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : String.valueOf(minLength);
-String maxLengthString = (maxLength < 0) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : String.valueOf(maxLength);
-String[] lengthValues = {minLengthString, maxLengthString};
-if (minLength >= 0 || maxLength >= 0) {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_LENGTH")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsdlPerspective.getMessage("FORM_LABEL_LENGTH_VALUE", lengthValues)%>
- </td>
- </tr>
- </table>
-<%
-}
-%>
-
-<%
-if (patternVector.size() > 0) {
- String patternContainerID = "::pattern";
- String xpatternContainerID = "x::pattern";
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=patternContainerID%>','<%=xpatternContainerID%>')"><img name="<%=xpatternContainerID%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <strong><%=wsdlPerspective.getMessage("FORM_LABEL_PATTERN")%></strong>
- </td>
- </tr>
- </table>
- <span id="<%=patternContainerID%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_PATTERN")%>
- </th>
- </tr>
- <%
- for (int k = 0; k < patternVector.size(); k++) {
- %>
- <tr>
- <td class="tablecells">
- <%=(String)patternVector.get(k)%>
- </td>
- </tr>
- <%
- }
- %>
- </table>
- </span>
-<%
-}
-%>
-
-<%
-if (whiteSpace != null) {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_WHITESPACE")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=whiteSpace%>
- </td>
- </tr>
- </table>
-<%
-}
-%>
-
-<%
-String lowerBound;
-if (minExclusive)
- lowerBound = wsdlPerspective.getMessage("FORM_LABEL_MIN_EXCLUSIVE", (min == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : min.toString());
-else
- lowerBound = wsdlPerspective.getMessage("FORM_LABEL_MIN_INCLUSIVE", (min == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : min.toString());
-String upperBound;
-if (maxExclusive)
- upperBound = wsdlPerspective.getMessage("FORM_LABEL_MAX_EXCLUSIVE", (max == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : max.toString());
-else
- upperBound = wsdlPerspective.getMessage("FORM_LABEL_MAX_INCLUSIVE", (max == null) ? wsdlPerspective.getMessage("FORM_LABEL_UNBOUNDED") : max.toString());
-if (min != null || max != null) {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_RANGE_OF_VALUES")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=lowerBound + upperBound%>
- </td>
- </tr>
- </table>
-<%
-}
-%>
-
-<%
-if (totalDigits >= 0) {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_TOTAL_DIGITS")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=totalDigits%>
- </td>
- </tr>
- </table>
-<%
-}
-%>
-
-<%
-if (fractionDigits >= 0) {
-%>
- <table>
- <tr>
- <td height=20> </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsdlPerspective.getMessage("FORM_LABEL_FRACTION_DIGITS")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=fractionDigits%>
- </td>
- </tr>
- </table>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp
deleted file mode 100644
index 4fdd4b6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp
+++ /dev/null
@@ -1,60 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String[] labelArgs = {frag.getName(), (xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())};
-String[] params = frag.getParameterValues(frag.getID());
-%>
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
- <tr>
- <th id="<%=frag.getID()%>" class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=wsdlPerspective.getMessage("FORM_LABEL_ATOMIC_NAME_TYPE", labelArgs)%>
- </th>
- <td headers="<%=frag.getID()%>" class="labels" height=25 width="100%" valign="bottom" align="left" nowrap>
- <%=((params != null && params.length > 0) ? HTMLUtils.charactersToHTMLEntities(params[0]) : wsdlPerspective.getMessage("FORM_LABEL_NULL"))%>
- </td>
- </tr>
- <%
- if (params != null) {
- for (int i = 1; i < params.length; i++) {
- %>
- <tr>
- <td class="labels" height=25 valign="bottom" align="left" nowrap></td>
- <td headers="<%=frag.getID()%>" class="labels" height=25 width="100%" valign="bottom" align="left" nowrap>
- <%=HTMLUtils.charactersToHTMLEntities(params[i])%>
- </td>
- </tr>
- <%
- }
- }
- %>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp
deleted file mode 100644
index 7b68d77..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,140 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDFragment frag = operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)frag.getXSDTypeDefinition();
-XSDTypeDefinition xsdBuiltInType = XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(simpleType);
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<script language="javascript">
- function addSimpleAtomicRows(tableContainerID, id, name, value, maxOccurs) {
- if (checkMaxOccursReached(tableContainerID, maxOccurs))
- return;
- twistOpen(tableContainerID);
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("tbody").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var input = document.createElement("input");
- column1.appendChild(input);
- input.type = "text";
- input.id = id;
- input.name = name;
- if (value != null && value.length > 0)
- input.value = value;
- input.className = "tabletextenter";
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- tableBody.appendChild(newRow);
- }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <label for="<%=frag.getID()%>"><a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a></label>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <%=(xsdBuiltInType != null ? xsdBuiltInType.getName() : simpleType.getName())%>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, <%=xsdConfig.getMaxOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td>
- <%
- if (!frag.validateParameterValues(frag.getID())) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- %>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_VALUES")%></th>
- </tr>
-</table>
-</span>
-<%
-String[] values = frag.getParameterValues(frag.getID());
-int i = 0;
-if (values != null) {
- for ( ; i < values.length; i++) {
-%>
- <script language="javascript">
- addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', '<%=values[i]%>', '<%=xsdConfig.getMaxOccurs()%>');
- </script>
-<%
- }
-}
-for ( ; i < xsdConfig.getMinOccurs(); i++) {
-%>
- <script language="javascript">
- addSimpleAtomicRows('<%=tableContainerID%>', '<%=frag.getID()%>', '<%=frag.getID()%>', null, '<%=xsdConfig.getMaxOccurs()%>');
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp
deleted file mode 100644
index 09c2300..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,57 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createListInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
-%>
- <tr>
- <td>
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp
deleted file mode 100644
index 0328618..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < childFrags.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(childFrags[i].getID());
-%>
- <tr>
- <td>
- <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp
deleted file mode 100644
index 27ebba3..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,103 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleListFragment frag = (IXSDSimpleListFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsdlPerspective.getMessage("FORM_LABEL_LIST_ITEMS")%></th>
- </tr>
- <%
- IXSDFragment[] childFrags = frag.getAllFragments();
- for (int i = 0; i < childFrags.length || i < xsdConfig.getMinOccurs(); i++) {
- IXSDFragment childFrag;
- String childFragID;
- if (i < childFrags.length) {
- childFrag = childFrags[i];
- childFragID = childFrag.getID();
- }
- else {
- childFragID = frag.createListInstance();
- childFrag = frag.getFragment(childFragID);
- }
- fragID.delete(0, fragID.length());
- fragID.append(childFragID);
- %>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <input type="hidden" name="<%=frag.getID()%>" value="<%=childFragID%>">
- <jsp:include page="<%=childFrag.getWriteFragment()%>" flush="true"/>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp
deleted file mode 100644
index aad8346..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp
+++ /dev/null
@@ -1,144 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-%>
-<script language="javascript">
- function changeUnionMemberType(select) {
- for (var i = 0; i < select.options.length; i++) {
- var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
- tableContainerID += select.options(i).value;
- showTable(tableContainerID, select.options(i).selected);
- }
- }
-
- function showTable(tableContainerID, show) {
- var tableContainer = document.getElementById(tableContainerID);
- if (show)
- tableContainer.style.display = "";
- else
- tableContainer.style.display = "none";
- }
-</script>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_TYPE")%></th>
- <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_MEMBERS")%></th>
- </tr>
- <%
- XSDSimpleTypeDefinition[] memberTypes = frag.getMemberTypeDefinitions();
- IXSDFragment[] memberFrags = frag.getAllFragments();
- for (int i = 0; i < xsdConfig.getMaxOccurs(); i++) {
- int typeSelectionIndex = 0;
- String[] newMemberFragIDs = new String[memberTypes.length];
- IXSDFragment[] newMemberFrags = new IXSDFragment[memberTypes.length];
- for (int j = 0; j < memberTypes.length; j++) {
- if (i < memberFrags.length && memberFrags[i].getXSDTypeDefinition().getQName().equals(memberTypes[j].getQName())) {
- newMemberFragIDs[j] = memberFrags[i].getID();
- newMemberFrags[j] = memberFrags[i];
- typeSelectionIndex = j;
- }
- else {
- newMemberFragIDs[j] = frag.createUnionInstance(j);
- newMemberFrags[j] = frag.getFragment(newMemberFragIDs[j]);
- }
- }
- %>
- <tr>
- <td class="tablecells">
- <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" onChange="javascript:changeUnionMemberType(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_UNION_TYPE")%>">
- <%
- for (int k = 0; k < memberTypes.length; k++) {
- if (k == typeSelectionIndex) {
- %>
- <option value="<%=newMemberFragIDs[k]%>" selected><%=memberTypes[k].getQName()%>
- <%
- }
- else {
- %>
- <option value="<%=newMemberFragIDs[k]%>"><%=memberTypes[k].getQName()%>
- <%
- }
- }
- %>
- </select>
- </td>
- <td class="tablecells">
- <%
- for (int l = 0; l < memberTypes.length; l++) {
- fragID.delete(0, fragID.length());
- fragID.append(newMemberFragIDs[l]);
- String memberTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(newMemberFrags[l].getID()).toString();
- %>
- <span id="<%=memberTableContainerID%>">
- <jsp:include page="<%=newMemberFrags[l].getWriteFragment()%>" flush="true"/>
- </span>
- <script language="javascript">
- showTable('<%=memberTableContainerID%>', <%=(l == typeSelectionIndex)%>);
- </script>
- <%
- }
- %>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp
deleted file mode 100644
index ae61fe5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp
+++ /dev/null
@@ -1,44 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node operNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)operNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDFragment[] childFrags = frag.getAllFragments();
-%>
-<table cellpadding=0 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "fixfragtable" : "innerfixfragtable")%>">
-<%
-for (int i = 0; i < childFrags.length; i++) {
- fragID.delete(0, fragID.length());
- fragID.append(childFrags[i].getID());
-%>
- <tr>
- <td>
- <jsp:include page="<%=childFrags[i].getReadFragment()%>" flush="true"/>
- </td>
- </tr>
-<%
-}
-%>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp
deleted file mode 100644
index 1561103..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp
+++ /dev/null
@@ -1,157 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.xsd.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="fragID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="nodeID" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="elementID" class="java.lang.StringBuffer" scope="request"/>
-
-<%
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-Node selectedNode = wsdlPerspective.getNodeManager().getNode(Integer.parseInt(nodeID.toString()));
-WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-IXSDSimpleUnionFragment frag = (IXSDSimpleUnionFragment)operElement.getFragmentByID(fragID.toString());
-XSDToFragmentConfiguration xsdConfig = frag.getXSDToFragmentConfiguration();
-IXSDElementFragment elementFragment = (IXSDElementFragment)operElement.getFragmentByID(elementID.toString());
-String tableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(frag.getID()).toString();
-String twistImageName = (new StringBuffer("x")).append(tableContainerID).toString();
-String nameAnchorID = (new StringBuffer(FragmentConstants.NAME_ANCHOR_ID)).append(frag.getID()).toString();
-%>
-<script language="javascript">
- function changeUnionMemberType(select) {
- for (var i = 0; i < select.options.length; i++) {
- var tableContainerID = '<%=FragmentConstants.TABLE_ID%>';
- tableContainerID += select.options(i).value;
- showTable(tableContainerID, select.options(i).selected);
- }
- }
-
- function showTable(tableContainerID, show) {
- var tableContainer = document.getElementById(tableContainerID);
- if (show)
- tableContainer.style.display = "";
- else
- tableContainer.style.display = "none";
- }
-</script>
-<a name="<%=nameAnchorID%>"/>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=tableContainerID%>','<%=twistImageName%>')"><img name="<%=twistImageName%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_OPENED")%>" class="twist"></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:openXSDInfoDialog('<%=response.encodeURL(controller.getPathWithContext(OpenXSDInfoDialogAction.getActionLink(session.getId(),selectedNode.getNodeId(),fragID.toString())))%>')"><%=frag.getName()%></a>
- </td>
- <%
- if(elementFragment != null && elementFragment.isNillable()){
- if(elementFragment.isNil()){
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" checked><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- else{
- %>
- <td width=10><input type="checkbox" name="<%=((IXSDElementFragment)elementFragment).getNilID()%>" value="<%=IXSDElementFragment.NIL_VALUE%>" ><%=wsdlPerspective.getMessage("ALT_NIL")%></td>
- <%
- }
- }
- %>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:createInstance('<%=tableContainerID%>', <%=xsdConfig.getMaxOccurs()%>, '<%=fragID%>', '<%=nameAnchorID%>')"><%=wsdlPerspective.getMessage("FORM_LINK_ADD")%></a>
- </td>
- <td class="labels" height=25 valign="bottom" align="left" nowrap>
- <a href="javascript:checkMinOccursAndRemoveSelectedRows('<%=tableContainerID%>', <%=xsdConfig.getMinOccurs()%>)"><%=wsdlPerspective.getMessage("FORM_LINK_REMOVE")%></a>
- </td>
- <td nowrap width="90%"> </td>
- </tr>
-</table>
-<span id="<%=tableContainerID%>">
-<table cellpadding=3 cellspacing=0 class="<%=(xsdConfig.getIsWSDLPart() ? "rangefragtable" : "innerrangefragtable")%>">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="handleCheckAllClick('<%=tableContainerID%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_TYPE")%></th>
- <th class="headercolor" width="100%" nowrap><%=wsdlPerspective.getMessage("FORM_LABEL_UNION_MEMBERS")%></th>
- </tr>
- <%
- XSDSimpleTypeDefinition[] memberTypes = frag.getMemberTypeDefinitions();
- IXSDFragment[] memberFrags = frag.getAllFragments();
- for (int i = 0; i < memberFrags.length || i < xsdConfig.getMinOccurs(); i++) {
- int typeSelectionIndex = 0;
- String[] newMemberFragIDs = new String[memberTypes.length];
- IXSDFragment[] newMemberFrags = new IXSDFragment[memberTypes.length];
- for (int j = 0; j < memberTypes.length; j++) {
- if (i < memberFrags.length && memberFrags[i].getXSDTypeDefinition().getQName().equals(memberTypes[j].getQName())) {
- newMemberFragIDs[j] = memberFrags[i].getID();
- newMemberFrags[j] = memberFrags[i];
- typeSelectionIndex = j;
- }
- else {
- newMemberFragIDs[j] = frag.createUnionInstance(j);
- newMemberFrags[j] = frag.getFragment(newMemberFragIDs[j]);
- }
- }
- %>
- <tr>
- <td class="checkboxcells" width=10>
- <input type="checkbox" onClick="handleRowCheckboxClick()" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>">
- </td>
- <td class="tablecells">
- <select id="<%=frag.getID()%>" name="<%=frag.getID()%>" onChange="javascript:changeUnionMemberType(this)" title="<%=wsdlPerspective.getMessage("FORM_CONTROL_TITLE_SELECT_UNION_TYPE")%>">
- <%
- for (int k = 0; k < memberTypes.length; k++) {
- if (k == typeSelectionIndex) {
- %>
- <option value="<%=newMemberFragIDs[k]%>" selected><%=memberTypes[k].getQName()%>
- <%
- }
- else {
- %>
- <option value="<%=newMemberFragIDs[k]%>"><%=memberTypes[k].getQName()%>
- <%
- }
- }
- %>
- </select>
- </td>
- <td class="tablecells">
- <%
- for (int l = 0; l < memberTypes.length; l++) {
- fragID.delete(0, fragID.length());
- fragID.append(newMemberFragIDs[l]);
- String memberTableContainerID = (new StringBuffer(FragmentConstants.TABLE_ID)).append(newMemberFrags[l].getID()).toString();
- %>
- <span id="<%=memberTableContainerID%>">
- <jsp:include page="<%=newMemberFrags[l].getWriteFragment()%>" flush="true"/>
- </span>
- <script language="javascript">
- showTable('<%=memberTableContainerID%>', <%=(l == typeSelectionIndex)%>);
- </script>
- <%
- }
- %>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-</span>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif
deleted file mode 100644
index 0f05592..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif
deleted file mode 100644
index bcfc403..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif
deleted file mode 100644
index 9ffa818..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif
deleted file mode 100644
index 5455bae..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif
deleted file mode 100644
index ae386c6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif
deleted file mode 100644
index c211ba2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif
deleted file mode 100644
index 15d08be..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp
deleted file mode 100644
index 2c0cdce..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp
+++ /dev/null
@@ -1,202 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<jsp:include page="/scripts/calendarbrowser.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-
-<script language="javascript">
- var xsdInfoDialog;
- var xsdInfoDialogClosed = true;
- var rowCheckboxName = "rowCheckboxName";
- var unbounded = <%=FragmentConstants.UNBOUNDED%>;
-
- function checkMaxOccursReached(tableContainerID, maxOccurs) {
- var table = getTable(tableContainerID);
- if (maxOccurs != unbounded && (table.rows.length - numberOfHeaderRows) >= maxOccurs) {
- alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_MAX_OCCURS_VIOLATION"))%>");
- return true;
- }
- else
- return false;
- }
-
- function checkMinOccursAndRemoveSelectedRows(tableContainerID, minOccurs) {
- var table = getTable(tableContainerID);
- var rowsLength = table.rows.length - numberOfHeaderRows;
- var checkedRows = 0;
- for (var i = numberOfHeaderRows; i < table.rows.length; i++) {
- var tableRow = table.rows[i];
- var rowCheckbox = tableRow.getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- checkedRows++;
- }
- if (checkedRows == 0)
- alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED"))%>");
- else if ((rowsLength - checkedRows) < minOccurs)
- alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_MIN_OCCURS_VIOLATION"))%>");
- else
- removeSelectedRows(tableContainerID);
- }
-
- function checkMinOccursAndRemoveSelectedRowsAttribute(tableContainerID, minOccurs) {
- var table = getTable(tableContainerID);
- var rowsLength = table.rows.length - numberOfHeaderRows;
- var checkedRows = 0;
- for (var i = numberOfHeaderRows; i < table.rows.length; i++) {
- var tableRow = table.rows[i];
- var rowCheckbox = tableRow.getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- checkedRows++;
- }
- if (checkedRows == 0)
- alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_NOTHING_SELECTED"))%>");
- else if ((rowsLength - checkedRows) < minOccurs)
- alert("<%=HTMLUtils.JSMangle(wsdlPerspective.getMessage("MSG_ERROR_MIN_OCCURS_VIOLATION"))%>");
- else
- removeSelectedRowsAttribute(tableContainerID);
- }
-
-
- function checkMinOccursAndRemoveSelectedDateTimeRows(calendarType,tableContainerID,minOccurs)
- {
- var table = getTable(tableContainerID);
- var newCalendarTargetRow = calendarTargetRow;
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var rowCheckbox = columns.item(0).getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- {
- if (i-numberOfHeaderRows == calendarTargetRow)
- newCalendarTargetRow = -1;
- else
- newCalendarTargetRow--;
- }
- }
- if (newCalendarTargetRow == -1)
- closeCalendarBrowser();
- calendarTargetRow = newCalendarTargetRow;
-
- checkMinOccursAndRemoveSelectedRows(tableContainerID,minOccurs);
-<%
- // Fix the browse... links.
-%>
- var table = getTable(tableContainerID);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var columns = table.rows[i].getElementsByTagName("td");
- var dateTimeTextField = columns.item(1).getElementsByTagName("input").item(0);
- setDateTimeBrowseLinkHref(columns.item(2).getElementsByTagName("a").item(0),calendarType,dateTimeTextField.name,i-numberOfHeaderRows);
- }
- }
-
- function createInstance(tableContainerID, maxOccurs, fragmentID, nameAnchorID) {
- if (checkMaxOccursReached(tableContainerID, maxOccurs))
- return;
- twistOpen(tableContainerID);
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("tbody").item(0);
- var newRow = document.createElement("tr");
- var newColumn = document.createElement("td");
- newColumn.appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_ID%>", fragmentID));
- newColumn.appendChild(createHiddenElement("<%=FragmentConstants.NAME_ANCHOR_ID%>", nameAnchorID));
- newRow.appendChild(newColumn);
- tableBody.appendChild(newRow);
- var form = document.getElementsByTagName("form");
- form[0].action = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/CreateInstanceActionJSP.jsp"))%>";
- form[0].submit();
- }
-
- function openXSDInfoDialog(link) {
- xsdInfoDialog = window.open(link, "XSDInformationDialog", "height=500,width=500,scrollbars=no,resizable=yes");
- if (xsdInfoDialog.focus)
- xsdInfoDialog.focus();
- }
-
- function closeXSDInfoDialog()
- {
- if (!xsdInfoDialogClosed)
- xsdInfoDialog.close();
- }
-
- function synchronizeFragmentViews(viewID) {
- var form = document.getElementsByTagName("form");
- if (viewID == "<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>")
- form[0].appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_VIEW_ID%>","<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE%>"));
- else
- form[0].appendChild(createHiddenElement("<%=FragmentConstants.FRAGMENT_VIEW_ID%>","<%=FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM%>"));
- form[0].action = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp"))%>";
- form[0].submit();
- }
-
- function addSimpleAtomicDateTimeRows(calendarType,tableContainerID,id,name,value,maxOccurs) {
- if (checkMaxOccursReached(tableContainerID, maxOccurs))
- return;
- twistOpen(tableContainerID);
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("tbody").item(0);
- var newRow = document.createElement("tr");
- var column0 = document.createElement("td");
- var column1 = document.createElement("td");
- var column2 = document.createElement("td");
-
- var rowCheckbox = createRowCheckbox();
- column0.appendChild(rowCheckbox);
-
- var input = document.createElement("input");
- input.type = "text";
- input.id = id;
- input.name = name;
- if (value != null && value.length > 0)
- input.value = value;
- input.className = "tabletextenter";
- column1.appendChild(input);
-
- column2.appendChild(createDateTimeBrowseLink(calendarType,name,table.rows.length-1));
- column2.width = "90%";
-
- column0.className = "checkboxcells";
- column1.className = "tablecells";
- column2.className = "tablecells";
- newRow.appendChild(column0);
- newRow.appendChild(column1);
- newRow.appendChild(column2);
- tableBody.appendChild(newRow);
- }
-
- function createDateTimeBrowseLink(calendarType,name,position)
- {
- var link = document.createElement("a");
- setDateTimeBrowseLinkHref(link,calendarType,name,position);
- link.appendChild(document.createTextNode("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LINK_BROWSE"))%>"));
- return link;
- }
-
- function setDateTimeBrowseLinkHref(link,calendarType,name,position)
- {
- link.href = "javascript:openCalendarBrowser("+calendarType+",'contentborder','"+name+"',"+position+")";
- return link;
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp
deleted file mode 100644
index d0c3849..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function getActionsContainerFrameset()
- {
- return perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
- }
-
- function processFramesetSizes(framesetSizesForm)
- {
- toggleDoubleClickColumnTitle();
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- framesetSizesForm.<%=WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
- framesetSizesForm.<%=WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
- framesetSizesForm.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp
deleted file mode 100644
index 5b509c0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- var wsdlNavigatorContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>"];
- var wsdlNavigatorToolbar = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>"];
- var wsdlNavigatorContent = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>"];
- var wsdlActionsContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"];
- var wsdlPropertiesContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>"];
- var wsdlPropertiesToolbar = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>"];
- var wsdlPropertiesContent = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>"];
- var wsdlStatusContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>"];
- var wsdlStatusToolbar = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>"];
- var wsdlStatusContent = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp
deleted file mode 100644
index 3beec90..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-%><%@ page contentType="text/xml; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement,
- org.eclipse.wst.ws.internal.explorer.transport.*" %><jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/><%
-int soapEnvelopeType = Integer.parseInt(request.getParameter(WSDLActionInputs.SOAP_ENVELOPE_TYPE));
-WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-WSDLOperationElement operElement = (WSDLOperationElement) wsdlPerspective.getOperationNode().getTreeElement();
-ISOAPMessage soapMessage;
-switch (soapEnvelopeType)
-{
- case WSDLActionInputs.SOAP_ENVELOPE_TYPE_REQUEST:
- soapMessage = (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST);
- break;
- case WSDLActionInputs.SOAP_ENVELOPE_TYPE_RESPONSE:
- default:
- soapMessage = (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_RESPONSE);
- break;
-}
-String messages = soapMessage.toXML();
-%><%=messages%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp
deleted file mode 100644
index 19d93a9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=wsdlPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
- <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL("wsdl_properties_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
- <frame name="<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_status_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp
deleted file mode 100644
index 6e2370f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_navigator_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL("wsdl_navigator_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp
deleted file mode 100644
index 7d5a292..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-</head>
-<%
- String selectedAnchorName = "";
- NodeManager nodeManager = controller.getWSDLPerspective().getNodeManager();
- int focusedNodeId = nodeManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
- <div id="treecontentborder">
- <%=nodeManager.renderTreeView(response)%>
- </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp
deleted file mode 100644
index c69a672..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsdlPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- else
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
- String altRefresh = controller.getMessage("ALT_REFRESH");
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/RefreshWSDLActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/ClearWSDLActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp
deleted file mode 100644
index 5a2151e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset cols="<%=wsdlPerspective.getPerspectiveContentFramesetCols()%>" bgcolor="#ECE9D8">
- <%
- if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
- {
- %>
- <frame name="<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsdl_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- else
- {
- %>
- <frame name="<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsdl_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsdl_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- %>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp
deleted file mode 100644
index ae69201..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_properties_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL("wsdl_properties_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp
deleted file mode 100644
index ebe4827..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null)
- {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
- %>
- <script language="javascript">
- location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
- </script>
- <%
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp
deleted file mode 100644
index d0a2741..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsdlPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (wsdlPerspective.getActionsContainerFramesetRows().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- for(int i=0; i<toolManager.getNumberOfTools(); i++) {
- Tool tool = (Tool)toolManager.getTool(i);
- %>
- <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
- <%
- }
- }
-%>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp
deleted file mode 100644
index a727123..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- int viewID = wsdlPerspective.getStatusContentType();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function switchReadOnlyFragmentsView() {
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp"))%>";
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td align="right" class="labels">
-<%
- if (viewID == wsdlPerspective.STATUS_CONTENT_RESULT_SOURCE)
- {
-%>
- <a href="javascript:switchReadOnlyFragmentsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_FORM_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_FORM")%></a>
-<%
- }
- else
- {
-%>
- <a href="javascript:switchReadOnlyFragmentsView()" title="<%=wsdlPerspective.getMessage("ALT_SWITCH_TO_SOURCE_VIEW")%>"><%=wsdlPerspective.getMessage("FORM_LINK_SOURCE")%></a>
-<%
- }
-%>
- </td>
- </tr>
- </table>
-<%
- if (viewID == wsdlPerspective.STATUS_CONTENT_RESULT_SOURCE)
- {
-%>
- <jsp:include page="/wsdl/forms/ReadOnlyFragmentsSoapView.jsp" flush="true"/>
-<%
- }
- else
- {
-%>
- <jsp:include page="/wsdl/forms/ReadOnlyFragmentsFormView.jsp" flush="true"/>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp
deleted file mode 100644
index 7088424..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- String statusContentSrc = "wsdl_status_content.jsp";
- switch (wsdlPerspective.getStatusContentType())
- {
- case WSDLPerspective.STATUS_CONTENT_RESULT_FORM:
- statusContentSrc = "wsdl_result_content.jsp";
- break;
- case WSDLPerspective.STATUS_CONTENT_RESULT_SOURCE:
- statusContentSrc = "wsdl_result_content.jsp";
- break;
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL("wsdl_status_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>" title="<%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(statusContentSrc)%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp
deleted file mode 100644
index 9c791da..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp
+++ /dev/null
@@ -1,44 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- wsdlPerspective.setStatusContentType(WSDLPerspective.STATUS_CONTENT_DEFAULT);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <pre>
-<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlPerspective.getMessageQueue().getMessagesFromList())%>
- </pre>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp
deleted file mode 100644
index 1df27c1..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsdlPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsdl/scripts/wsdlframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsdl/actions/ResizeWSDLFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WSDLFrameNames.WSDL_STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsdl/forms/ProcessWSDLFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsdlPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (wsdlPerspective.getActionsContainerFramesetRows().endsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsdl/wsdl_status_content.jsp"))%>" target="<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp
deleted file mode 100644
index 49b6cdd..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- String wsdlTypeString = request.getParameter(ActionInputs.WSDL_TYPE);
- int wsdlType = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
- try
- {
- wsdlType = Integer.parseInt(wsdlTypeString);
- }
- catch (NumberFormatException e)
- {
- }
- controller.setWSDLType(wsdlType);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>
-<%
- String wsdlSource;
- if (wsdlType == ActionInputs.WSDL_TYPE_SERVICE_INTERFACE)
- wsdlSource = controller.getMessage("WSDL_TYPE_SERVICE_INTERFACES");
- else
- wsdlSource = controller.getMessage("WSDL_TYPE_SERVICES");
-
- StringBuffer sessionIdParam = new StringBuffer(ActionInputs.SESSIONID);
- sessionIdParam.append('=').append(sessionId);
-
- StringBuffer toolbarLink = new StringBuffer("wsdl_toolbar.jsp?");
- toolbarLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
- <%=controller.getMessage("TITLE_WSDL_BROWSER",wsdlSource)%>
- </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FrameNames.WSDL_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_WSDL_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(toolbarLink.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FrameNames.WSDL_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_WSDL_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(ProxyLoadPageAction.getActionLink(sessionId,"wsdl_content.jsp")))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp
deleted file mode 100644
index 0f23f26..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp
+++ /dev/null
@@ -1,406 +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
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- * 20060524 142499 jeffliu@ca.ibm.com - Jeffrey Liu
- * 20070109 169553 makandre@ca.ibm.com - Andrew Mak
- * 20080618 186456 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.wst.ws.internal.wsrt.WebServiceInfo,
- org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder,
- org.eclipse.wst.ws.internal.wsfinder.WebServiceCategory,
- javax.wsdl.extensions.soap.*,
- javax.wsdl.extensions.http.*,
- javax.wsdl.extensions.*,
- javax.wsdl.*,
- java.util.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- int wsdlType = controller.getWSDLType();
-
- Vector wsInfoCache = new Vector();
- int workspaceStart = -1;
- int workspaceEnd = -1;
-
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title><%=controller.getMessage("FRAME_TITLE_WSDL_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
-</script>
-<script language="javascript">
-
-
- function fillCategories()
- {
- var y = 0;
- var x = 0;
- document.forms[0].<%=ActionInputs.CATEGORY%>.options[x++] = new Option("<%=controller.getMessage("FORM_LABEL_WSDL_All")%>","<%=controller.getMessage("FORM_LABEL_WSDL_All")%>");
- document.forms[0].<%=ActionInputs.CATEGORY%>.options[x++] = new Option("<%=controller.getMessage("FORM_LABEL_WSDL_SOURCE_FAVORITES")%>","<%=controller.getMessage("FORM_LABEL_WSDL_SOURCE_FAVORITES")%>");
-<%
- {
- WebServiceCategory[] categories = WebServiceFinder.instance().getWebServiceCategories();
- for (int i=0;i<categories.length;i++)
- {
- String label = HTMLUtils.JSMangle(categories[i].getLabel());
- if(categories[i].getId().equals("org.eclipse.wst.ws.internal.wsfinder.category.workspace")){
-%>
- var y = x;
-<%
- }
-%>
- document.forms[0].<%=ActionInputs.CATEGORY%>.options[x++] = new Option("<%=label%>","<%=label%>");
-<%
- }
- }
-%>
- if (document.forms[0].<%=ActionInputs.CATEGORY%>.options.length > 0)
- {
- document.forms[0].<%=ActionInputs.CATEGORY%>.options[y].selected = true;
- fillWSDLFilesByCategory(document.forms[0].<%=ActionInputs.CATEGORY%>.options[y].value);
- }
-
- }
-
- function fillWebProjects()
- {
- var x = 0;
-<%
- {
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- for (int i=0;i<projects.length;i++)
- {
- if (!projects[i].isOpen())
- continue;
- String name = HTMLUtils.JSMangle(projects[i].getName());
-%>
- document.forms[0].<%=ActionInputs.PROJECT%>.options[x++] = new Option("<%=name%>","<%=name%>");
-<%
- }
- }
-%>
- if (document.forms[0].<%=ActionInputs.PROJECT%>.options.length > 0)
- {
- document.forms[0].<%=ActionInputs.PROJECT%>.options[0].selected = true;
- fillWSDLFiles(document.forms[0].<%=ActionInputs.PROJECT%>.options[0].value);
- }
- }
-
-<%! private Vector wsdlURLs_ = new Vector(); %>
-
- function fillWSDLFilesByCategory(webServiceFinderLabel)
- {
- var currentNumberOfOptions = document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options.length;
- for (var i=0;i<currentNumberOfOptions;i++)
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[0] = null;
- if (webServiceFinderLabel == "<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_WSDL_All"))%>"){
- document.getElementById("projects").style.display = "none";
- fillAllWSDLFiles();
- }
- if (webServiceFinderLabel == "<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_WSDL_SOURCE_FAVORITES"))%>"){
- document.getElementById("projects").style.display = "none";
- fillFavoriteWSDLFiles();
- }
-
-<%
- {
-
- WebServiceFinder finder = WebServiceFinder.instance();
- WebServiceCategory[] categories = finder.getWebServiceCategories();
- for (int i=0;i<categories.length;i++)
- {
- WebServiceCategory category = categories[i];
-%>
- if (webServiceFinderLabel == "<%=HTMLUtils.JSMangle(category.getLabel())%>")
- {
- var x = 0;
-
-<%
- Iterator it = finder.getWebServicesByCategory(category,null);
- if(category.getId().equals("org.eclipse.wst.ws.internal.wsfinder.category.workspace")){
-
- workspaceStart = wsInfoCache.size();
- workspaceEnd = workspaceStart;
-
- while (it.hasNext()) {
- wsInfoCache.add(it.next());
- workspaceEnd++;
- }
-%>
- document.getElementById("projects").style.display = "";
- fillWebProjects();
-<%
- }
- else{
-%>
- document.getElementById("projects").style.display = "none";
-
-<%
- while(it.hasNext())
- {
- WebServiceInfo wsi = (WebServiceInfo)it.next();
- String wsdl = HTMLUtils.JSMangle(wsi.getWsdlURL());
-%>
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[x++] = new Option("<%=wsdl%>", "<%=wsdl%>");
-<%
- wsInfoCache.add(wsi);
- }
- }
-%>
- }
-<%
- }
- }
-%>
- }
-
- function fillAllWSDLFiles()
- {
- var x = 0;
- var currentNumberOfOptions = document.forms[0].webProjectWSDLURL.options.length;
- for (var i=0;i<currentNumberOfOptions;i++)
- document.forms[0].webProjectWSDLURL.options[0] = null;
-<%
- TreeSet urls = new TreeSet();
- Iterator wsIterator = wsInfoCache.iterator();
- while (wsIterator.hasNext())
- {
- WebServiceInfo wsInfo = (WebServiceInfo)wsIterator.next();
- String wsdl = HTMLUtils.JSMangle(wsInfo.getWsdlURL());
- urls.add(wsdl);
- }
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager favoritesNodeManager = favoritesPerspective.getNodeManager();
- TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
- TreeElement favoriteWSDLServicesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE).nextElement());
- Enumeration favoriteWSDLServiceElements = favoriteWSDLServicesElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- while (favoriteWSDLServiceElements.hasMoreElements())
- {
- FavoritesWSDLServiceElement favoriteWSDLServiceElement = (FavoritesWSDLServiceElement)favoriteWSDLServiceElements.nextElement();
- String wsdl = HTMLUtils.JSMangle((favoriteWSDLServiceElement.getService().getDescriptions())[0].getLocation());
- urls.add(wsdl);
- }
- Iterator iterator = urls.iterator();
- while(iterator.hasNext()){
- String wsdl = HTMLUtils.JSMangle(iterator.next().toString());
-%>
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[x++] = new Option("<%=wsdl%>", "<%=wsdl%>");
-<%
-
- }
-
-%>
- }
-
- function fillWSDLFiles(selectedWebProjectName)
- {
- var currentNumberOfOptions = document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options.length;
- for (var i=0;i<currentNumberOfOptions;i++)
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[0] = null;
-<%
- {
-
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
-
- for (int i=0;i<projects.length;i++)
- {
- if (!projects[i].isOpen())
- continue;
- {
-%>
- if (selectedWebProjectName == "<%=HTMLUtils.JSMangle(projects[i].getName())%>")
- {
- var x=0;
-<%
- String platformProtocol = "platform:/resource";
- String httpProtocol = "http://";
- String httpsProtocol = "https://";
- wsdlURLs_.removeAllElements();
-
- Iterator ws = wsInfoCache.subList(workspaceStart, workspaceEnd).iterator();
-
- while (ws.hasNext())
- {
- WebServiceInfo wsInfo = (WebServiceInfo)ws.next();
- String url = wsInfo.getWsdlURL();
-
- // filter wsdl URLs with same project name as selected project
- // only look at workspace URLs returned from the web service finder
- if (url.startsWith(platformProtocol))
- {
- //strip off platformProtocol to look at the workspace path
- Path wsdlPath = new Path(url.substring(platformProtocol.length()+1));
- String pathProjName = wsdlPath.segment(0);
-
- if (pathProjName.equals(projects[i].getName()))
- {
- wsdlURLs_.add(url);
- }
- }
- // also add any http or https URLs returned
- else if (url.startsWith(httpProtocol) || url.startsWith(httpsProtocol))
- {
- wsdlURLs_.add(url);
- }
- }
- if (wsdlType == ActionInputs.WSDL_TYPE_SERVICE_INTERFACE)
- {
-
- }
-
- for (Iterator it = wsdlURLs_.iterator(); it.hasNext();)
- {
- String wsdl = HTMLUtils.JSMangle(it.next().toString());
- %>
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[x++] = new Option("<%=wsdl%>", "<%=wsdl%>");
- <%
- }
-%>
- }
-<%
- }
- }
- }
-%>
- }
-
- function fillFavoriteWSDLFiles()
- {
- var currentNumberOfOptions = document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options.length;
- for (var i=0;i<currentNumberOfOptions;i++)
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[0] = null;
- var x = 0;
-<%
- Enumeration favoriteWSDLServiceElements2 = favoriteWSDLServicesElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- while (favoriteWSDLServiceElements2.hasMoreElements())
- {
- FavoritesWSDLServiceElement favoriteWSDLServiceElement = (FavoritesWSDLServiceElement)favoriteWSDLServiceElements2.nextElement();
- String url = HTMLUtils.JSMangle((favoriteWSDLServiceElement.getService().getDescriptions())[0].getLocation());
-%>
- document.forms[0].<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.options[x++] = new Option("<%=url%>","<%=url%>");
-<%
- }
-%>
-
- }
-
-
-
- function setDefaults()
- {
- fillCategories();
- var loadScreenTable = document.getElementById("loadScreen");
- if (loadScreenTable.rows.length > 0)
- loadScreenTable.deleteRow(0);
- document.getElementById("mainScreen").style.display = "";
- }
-</script>
-</head>
-
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <table id="loadScreen">
- <tr>
- <td>
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- <div id="mainScreen" style="display:none;">
- <form style="margin-top:0">
-
- <table>
- <tr>
- <td> <%=controller.getMessage("FORM_LABEL_WSDL_SOURCE")%> </td>
- </tr>
- </table>
- <div id="workbench" >
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" class="labels"><label for="<%=ActionInputs.CATEGORY%>"><%=controller.getMessage("FORM_LABEL_WSDL_CATEGORY")%></label></td>
- </tr>
- <tr>
- <td nowrap>
- <select id="<%=ActionInputs.CATEGORY%>" name="<%=ActionInputs.CATEGORY%>" onChange="fillWSDLFilesByCategory(this.value)" class="selectlist">
- </select>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="document.location.reload()" class="button">
- </td>
- </tr>
- </table>
- <div id="projects" style="display:none;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" class="labels"><label for="project"><%=controller.getMessage("FORM_LABEL_WSDL_SOURCE_WEBPROJECTS")%></label></td>
- </tr>
- <tr>
- <td nowrap>
- <select id="project" name="project" onChange="fillWSDLFiles(this.value)" class="selectlist">
- </select>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_REFRESH")%>" onClick="document.location.reload()" class="button">
- </td>
- </tr>
- </table>
- </div>
- <table>
- <tr>
- <td height=10 valign="bottom" class="labels"><label for="<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>"><%=controller.getMessage("FORM_LABEL_WSDL_URL")%></label></td>
- </tr>
- <tr>
- <td>
- <select id="<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>" name="<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>" class="selectlist">
- </select>
- </td>
- </tr>
- </table>
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" nowrap align="left">
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" onClick="top.opener.targetWSDLURLElement.value=this.form.<%=ActionInputs.QUERY_INPUT_WEBPROJECT_WSDL_URL%>.value;top.close()" class="button">
- </td>
- <td height=30 valign="bottom" nowrap align="left">
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_CANCEL")%>" onClick="top.close()" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
- </div>
-
- </form>
- </div>
- </div>
-<script language="javascript">
- setDefaults();
- resumeProxyLoadPage();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp
deleted file mode 100644
index 7d63aab..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_WSDL_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.wsdlWindowClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar">
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl.gif"))%>" alt="" width=16 height=16></td>
- <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_WSDL_BROWSER")%></td>
- </tr>
- </table>
- </div>
-</div>
-<script language="javascript">
- top.opener.wsdlWindowClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp
deleted file mode 100644
index de00c13..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp
+++ /dev/null
@@ -1,98 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils,
- java.util.Enumeration,
- java.net.*,
- java.io.*"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript">
- function initWindowName(name)
- {
- window.name = name;
- }
- </script>
- <%
- String sessionId = session.getId();
- %>
- <jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session">
- <%!
- private void resetController(ServletContext application,String sessionId,HttpSession session,HttpServletRequest request,Controller controller){
- // Add the session to the application. This allows us to resurrect the session even if the browser chooses not to participate.
- application.setAttribute(sessionId,session);
-
- // Set Max inactivity time out value to 30mins.
- session.setMaxInactiveInterval(1800);
-
- // LaunchOptionManager (below) handles most options,
- // but need to get state and install locations earlier,
- // specifically before controller.init().
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements())
- {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- if (paramValues != null && paramValues.length > 0)
- {
- String decodedParamName = URLUtils.decode(paramName);
- if (decodedParamName.equals(LaunchOptions.DEFAULT_FAVORITES_LOCATION))
- {
- controller.setDefaultFavoritesLocation(paramValues[0]);
- }
- else if (decodedParamName.equals(LaunchOptions.STATE_LOCATION))
- {
- controller.setStateLocation(paramValues[0]);
- }
- }
- }
-
- // controller.init()
- controller.init(sessionId,application,request.getContextPath());
- }
- %>
- <%//resetController(application,sessionId,session,request,controller);%>
- </jsp:useBean>
- <%
- // Check if session Controller needs to be re-initialized
- if (controller.getSessionId()==null){
- resetController(application,sessionId,session,request,controller);
- }
-
- // preload from LaunchOptionManager
- String key = request.getParameter(URLUtils.encode(WSExplorerContext.ID));
- if (key != null && key.length() > 0)
- {
- LaunchOptionsManager manager = LaunchOptionsManager.getInstance();
- manager.manage(key, sessionId, application);
- }
-
- %>
- <jsp:include page="/actionengine.jsp" flush="true"/>
- <title><%=controller.getMessage("TITLE_WSEXPLORER")%></title>
-</head>
-<%
-// reset perspective content to blank
-controller.enablePerspectiveContentBlank(true);
-%>
-<frameset rows="0,35,*" border=0 onload="initWindowName('<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>')">
- <frame name="<%=FrameNames.PERSPECTIVE_WORKAREA%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_WORKAREA")%>" frameborder=0 noresize>
- <frame name="<%=FrameNames.PERSPECTIVE_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("perspective_toolbar.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
- <frame name="<%=FrameNames.PERSPECTIVE_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("perspective_content.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp
deleted file mode 100644
index 69c6815..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060906 155434 makandre@ca.ibm.com - Andrew Mak, Back Slash '\' not appearing in "WSIL no longer resolvable" error message
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction,
- org.eclipse.wst.ws.internal.explorer.platform.util.*"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(controller.getWSILPerspective().getMessage("MSG_CONFIRM_REMOVE_NODE", controller.getWSILPerspective().getNodeManager().getSelectedNode().getNodeName()))%>")) {
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearWSILAction.getActionLink(controller.getWSILPerspective().getNodeManager().getSelectedNode().getNodeId())))%>";
- }
- else {
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- }
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp
deleted file mode 100644
index 31bb13f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- ClearWSILAction action = new ClearWSILAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp
deleted file mode 100644
index b55b946..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp
deleted file mode 100644
index 0edcd8e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp
deleted file mode 100644
index 01b8377..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-OpenWSILAction action = new OpenWSILAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid) {
-%>
- <script language="javascript">
- wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-<%
-}
-else {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- if (actionResult) {
-%>
- <script language="javascript">
- if (isMicrosoftInternetExplorer()) {
- wsilNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_navigator_content.jsp"))%>";
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-<%
- }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp
deleted file mode 100644
index abdcbec..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-OpenWSILLinkAction action = new OpenWSILLinkAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-if (!inputsValid) {
-%>
- <script language="javascript">
- wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-<%
-}
-else {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- if (actionResult) {
-%>
- <script language="javascript">
- if (isMicrosoftInternetExplorer()) {
- wsilNavigatorContent.location="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_navigator_content.jsp"))%>";
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- wsilPropertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_content.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-<%
- }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp
deleted file mode 100644
index deecc75..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.Action,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- Action action = RefreshAction.newAction(request, controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <%
- if (!actionResult) {
- if (action instanceof RefreshWSILAction) {
- %>
- <jsp:include page="/wsil/actions/ClearNodeConfirmJSP.jsp" flush="true"/>
- <%
- }
- else {
- %>
- <script language="javascript">
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
- <%
- }
- %>
- <%
- }
- else {
- %>
- <script language="javascript">
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
- <%
- }
- %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp
deleted file mode 100644
index 76ac52a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeWSILFramesAction action = new ResizeWSILFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=wsilPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=wsilPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp
deleted file mode 100644
index 7f94c89..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- SelectWSILNodeAction action = new SelectWSILNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp
deleted file mode 100644
index 338dfd6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- SelectWSILToolAction action = new SelectWSILToolAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp
deleted file mode 100644
index 57d07b2..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action
- SwitchPerspectiveFromWSILAction action = new SwitchPerspectiveFromWSILAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp
deleted file mode 100644
index 8d53132..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILImportWSILToWorkbenchAction action = new WSILImportWSILToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp
deleted file mode 100644
index 1099cf8..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-AddToFavoritesAction action = AddToFavoritesAction.newAction(request, controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action
-action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp
deleted file mode 100644
index 0f355ed..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="/scripts/panes.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <%
- // Prepare the action.
- Action action = AddToUDDIPerspectiveAction.newAction(request, controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult)
- {
- controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
- %>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>";
- </script>
- <%
- }
- else
- {
- %>
- <script language="javascript">
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
- <%
- }
- %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index ded22fa..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction"%>
-
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-WsilAddToWSDLPerspectiveAction action = new WsilAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-if (actionResult) {
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
- </script>
-<%
-}
-else {
-%>
- <script language="javascript">
- wsilPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_properties_container.jsp"))%>";
- wsilStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>";
- </script>
-<%
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 66c9644..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
- java.util.Enumeration"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/WsilAddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- for (int i = 0; i < paramValues.length; i++) {
-%>
- <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
- }
- }
-%>
- </form>
-</body>
-</html>
-<%
-if (request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION) == null) {
- // Prepare the action.
- AddToFavoritesAction action = AddToFavoritesAction.newAction(request, controller);
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
- if (action.favoriteExists()) {
-%>
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(controller.getWSILPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
- document.forms[0].submit();
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- document.forms[0].submit();
- </script>
-<%
- }
-}
-else {
-%>
- <script language="javascript">
- document.forms[0].submit();
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 3daac68..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WsilImportWSDLToWorkbenchAction action = new WsilImportWSDLToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index 284c839..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WsilLaunchWebServiceWizardAction action = new WsilLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp
deleted file mode 100644
index b82cdb0..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-WsilToggleNodeAction action = new WsilToggleNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp
deleted file mode 100644
index c2b3567..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp
+++ /dev/null
@@ -1,102 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSILPerspective wsilPerspective = controller.getWSILPerspective();
-FormTool formTool = (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_OPEN_WSIL")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/wsil/scripts/wsilPanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/OpenWSILActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" onSubmit="return handleSubmit(this)">
- <%
- String titleImagePath = "wsil/images/open_wsil_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_OPEN_WSIL");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsilPerspective.getMessage("FORM_LABEL_OPEN_WSIL_DESC")%>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=25 valign="bottom">
- <label for="input_wsil_url"><%=wsilPerspective.getMessage("WSIL_URL")%></label>
- <%
- if (!formTool.isInputValid(WsilActionInputs.WSIL_URL)) {
- %>
- <%=HTMLUtils.redAsterisk()%>
- <%
- }
- String wsilURL = (String)formTool.getProperty(WsilActionInputs.WSIL_URL);
- if (wsilURL == null)
- wsilURL = "";
- %>
- </td>
- </tr>
- <tr>
- <td>
- <input type="text" id="input_wsil_url" name="<%=WsilActionInputs.WSIL_URL%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsilURL)%>" size="50" class="textenter">
- </td>
- </tr>
- </table>
- <%
- String inspectionTypeString = (String)formTool.getProperty(WsilActionInputs.WSIL_INSPECTION_TYPE);
- int inspectionType = WsilActionInputs.WSIL_DETAILS;
- if (inspectionTypeString != null)
- inspectionType = Integer.parseInt(inspectionTypeString);
- %>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=30 valign="bottom">
- <label for="inspection_type"><%=wsilPerspective.getMessage("FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE")%></label>
- </td>
- </tr>
- <tr>
- <td valign="bottom">
- <select id="inspection_type" name="<%=WsilActionInputs.WSIL_INSPECTION_TYPE%>" class="selectlist">
- <option value="<%=WsilActionInputs.WSIL_DETAILS%>" <% if (inspectionType == WsilActionInputs.WSIL_DETAILS) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSIL")%>
- <option value="<%=WsilActionInputs.WSDL_SERVICES%>" <% if (inspectionType == WsilActionInputs.WSDL_SERVICES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_SERVICE")%>
- <option value="<%=WsilActionInputs.UDDI_SERVICES%>" <% if (inspectionType == WsilActionInputs.UDDI_SERVICES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE")%>
- <option value="<%=WsilActionInputs.UDDI_BUSINESSES%>" <% if (inspectionType == WsilActionInputs.UDDI_BUSINESSES) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS")%>
- <option value="<%=WsilActionInputs.WSIL_LINKS%>" <% if (inspectionType == WsilActionInputs.WSIL_LINKS) { %>selected<% } %>><%=wsilPerspective.getMessage("FORM_LABEL_WSIL_LINKS")%>
- </select>
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp
deleted file mode 100644
index 532e6da..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
- <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
- <input name="<%=WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=wsilPerspective.getPerspectiveContentFramesetCols()%>">
- <input name="<%=WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=wsilPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp
deleted file mode 100644
index d6be9c5..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToUDDIPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- int viewID = selectedNode.getViewId();
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryAPI = null;
- String businessKey = null;
- String discoveryURL = null;
- WsilUddiBusinessElement link = null;
- if (selectedElement instanceof WsilElement) {
- ListElement le = ((WsilElement)selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
- link = (WsilUddiBusinessElement)le.getObject();
- if (link != null) {
- abstracts.addAll(link.getLinkAbstracts());
- abstractLangs.addAll(link.getLinkAbstractLangs());
- inquiryAPI = link.getUDDILinkInquiryAPI();
- businessKey = link.getUDDILinkBusinessKey();
- discoveryURL = link.getUDDILinkDiscoveryURL();
- }
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_UDDI_BUSINESS_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_UDDI_LINK_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof WsilElement && link != null) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsilPerspective.getMessage("FORM_LABEL_INQUIRY_API")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((inquiryAPI != null) ? inquiryAPI : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsilPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((businessKey != null) ? businessKey : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsilPerspective.getMessage("FORM_LABEL_DISCOVERY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((discoveryURL != null) ? discoveryURL : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp
deleted file mode 100644
index 0296c2a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp
+++ /dev/null
@@ -1,133 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToUDDIPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- int viewID = selectedNode.getViewId();
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryAPI = null;
- String serviceKey = null;
- String discoveryURL = null;
- WsilServiceElement service = null;
- if (selectedElement instanceof WsilElement) {
- ListElement le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
- service = (WsilServiceElement)le.getObject();
- if (service != null) {
- names.addAll(service.getServiceNames());
- nameLangs.addAll(service.getServiceNameLangs());
- abstracts.addAll(service.getServiceAbstracts());
- abstractLangs.addAll(service.getServiceAbstractLangs());
- inquiryAPI = ((WsilUddiServiceElement)service).getUDDIServiceInquiryAPI();
- serviceKey = ((WsilUddiServiceElement)service).getUDDIServiceKey();
- discoveryURL = ((WsilUddiServiceElement)service).getUDDIServiceDiscoveryURL();
- }
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof WsilElement && service != null) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_INQUIRY_API")%></strong>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((inquiryAPI != null) ? inquiryAPI : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%></strong>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((serviceKey != null) ? serviceKey : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_DISCOVERY_URL")%></strong>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=((discoveryURL != null) ? discoveryURL : wsilPerspective.getMessage("FORM_LABEL_NA"))%>
- </td>
- </tr>
- </table>
-
- <jsp:include page="/wsil/scripts/wsilNameTable.jsp" flush="true"/>
-
- <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp
deleted file mode 100644
index 0e08fb6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp
+++ /dev/null
@@ -1,114 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-WSILPerspective wsilPerspective = controller.getWSILPerspective();
-NodeManager nodeManager = wsilPerspective.getNodeManager();
-Node selectedNode = nodeManager.getSelectedNode();
-WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
- <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <input type="hidden" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>">
- <%
- String titleImagePath = "images/import_to_workbench_highlighted.gif";
- String title = wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=wsilPerspective.getMessage("FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC")%>
- </td>
- </tr>
- </table>
- <table>
- <tr>
- <td class="labels" height=40 valign="center">
- <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
- </td>
- <td class="labels" height=40 valign="center" nowrap>
- <%
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- %>
- <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
- <%
- for (int i = 0; i < projects.length; i++)
- {
- try
- {
- if (!projects[i].isOpen())
- continue;
- String projectName = projects[i].getName();
- %>
- <option value="<%=projectName%>"><%=projectName%>
- <%
- }
- catch (Exception e) {}
- }
- %>
- </select>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <label for="input_imported_wsil_file_name"><%=controller.getMessage("WSIL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsilFileName = "temp.wsil";
- String wsilURL = wsilElement.getWsilUrl();
- if (wsilURL.endsWith(".wsil"))
- {
- int lastSeparatorPos = Math.max(wsilURL.lastIndexOf("/"), wsilURL.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- wsilFileName = wsilURL.substring(lastSeparatorPos+1, wsilURL.length());
- }
-%>
- <input type="text" id="input_imported_wsil_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsilFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp
deleted file mode 100644
index c422434..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp
+++ /dev/null
@@ -1,149 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.apache.wsil.QName,
- java.util.Vector,
- java.util.Enumeration" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
- String bindingTable = "bindingTable";
- String xbindingTable = "xbindingTable";
-
- WSILPerspective wsilPerspective =controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- int viewID = selectedNode.getViewId();
- TreeElement selectedElement = selectedNode.getTreeElement();
- WsilServiceElement service = null;
- String wsdlURL = null;
- Vector wsdlBindings = new Vector();
- if (selectedElement instanceof WsilElement) {
- ListElement le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
- service = (WsilServiceElement)le.getObject();
- if (service != null) {
- names.addAll(service.getServiceNames());
- nameLangs.addAll(service.getServiceNameLangs());
- abstracts.addAll(service.getServiceAbstracts());
- abstractLangs.addAll(service.getServiceAbstractLangs());
- wsdlURL = ((WsilWsdlServiceElement)service).getWSDLServiceURL();
- wsdlBindings = ((WsilWsdlServiceElement)service).getWSDLBinding();
- }
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_WSDL_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof WsilElement && service != null) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=viewID%>">
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></strong>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsdlURL%>
- </td>
- </tr>
- </table>
-
- <jsp:include page="/wsil/scripts/wsilNameTable.jsp" flush="true"/>
-
- <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=bindingTable%>','<%=xbindingTable%>')"><img name="<%=xbindingTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_BINDINGS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=bindingTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_NAMESPACE_URI")%></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LOCAL_NAME")%></th>
- </tr>
- <%
- Enumeration e = wsdlBindings.elements();
- while (e.hasMoreElements()) {
- QName qname = (QName)e.nextElement();
- %>
- <tr>
- <td class="tablecells" nowrap><%=qname.getNamespaceURI()%></td>
- <td class="tablecells" nowrap><%=qname.getLocalName()%></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=bindingTable%>','<%=xbindingTable%>');
- </script>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp
deleted file mode 100644
index 6e89771..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
- java.util.Enumeration" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
- WSILPerspective wsilPerspective =controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
- WsilElement wsilElement = null;
- if (selectedElement instanceof WsilElement) {
- wsilElement = (WsilElement)selectedElement;
- abstracts.addAll(wsilElement.getWSILAbstracts());
- abstractLangs.addAll(wsilElement.getWSILAbstractLangs());
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_WSIL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_WSIL_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof WsilElement) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=ActionInputs.VIEWID%>" value="<%=ActionInputs.VIEWID_DEFAULT%>">
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></strong>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsilElement.getWsilUrl()%>
- </td>
- </tr>
- </table>
-
- <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp
deleted file mode 100644
index ceaff7f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-%>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
- if (selectedTool instanceof ListWSDLServicesTool)
- {
- int viewId = selectedNode.getViewId();
- WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
- ListElement le = wsilElement.getAllWSDLServices().getElementWithViewId(viewId);
- WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement)le.getObject();
- formProperties.put("wsdlURL",wsilWsdlServiceElement.getWSDLServiceURL());
- }
- formProperties.put("formActionLink","wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp");
-%>
-</jsp:useBean>
-<%
- if (selectedTool instanceof ListWSDLServicesTool)
- {
-%>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
-<%
- }
- else if (selectedTool instanceof ListUDDIServicesTool)
- {
-%>
-<jsp:include page="/forms/ImportToWorkbenchForm.jsp" flush="true"/>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 799195e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
- formActionLink.append("wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp
deleted file mode 100644
index 3264a3b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-<%
- WSILPerspective wsilPerspective =controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- int viewID = selectedNode.getViewId();
- TreeElement selectedElement = selectedNode.getTreeElement();
- WsilWsilLinkElement link = null;
- if (selectedElement instanceof WsilElement) {
- ListElement le = ((WsilElement)selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
- link = (WsilWsilLinkElement)le.getObject();
- if (link != null) {
- abstractLangs.addAll(link.getLinkAbstractLangs());
- abstracts.addAll(link.getLinkAbstracts());
- }
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FORM_TITLE_WSIL_LINK_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_WSIL_LINK_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof WsilElement && link != null) {
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=wsilPerspective.getMessage("FORM_LABEL_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=link.getWSILLinkLocation()%>
- </td>
- </tr>
- </table>
-
- <jsp:include page="/wsil/scripts/wsilAbstractTable.jsp" flush="true"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif
deleted file mode 100644
index e65d19a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif
deleted file mode 100644
index 4aa3ddc..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif
deleted file mode 100644
index c351daf..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif
deleted file mode 100644
index 53e1335..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif
deleted file mode 100644
index 6dc0285..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif
deleted file mode 100644
index 428c8ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif
deleted file mode 100644
index 0fa0984..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif
deleted file mode 100644
index c34bbe6..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif
deleted file mode 100644
index bd1e37a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif
deleted file mode 100644
index d51b975..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif
deleted file mode 100644
index 459cc6e..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif
deleted file mode 100644
index 261775f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp
deleted file mode 100644
index 1c4d088..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="abstractLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="abstracts" class="java.util.Vector" scope="request"/>
-
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-
-<%
-String abstractTable = "abstractTable";
-String xabstractTable = "xabstractTable";
-String showAllAbstractID = "showAllAbstractID";
-WSILPerspective wsilPerspective =controller.getWSILPerspective();
-%>
-
-<script language="javascript">
- function showAbstract(tableContainerID) {
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var hiddenInput = document.getElementById('<%=showAllAbstractID%>');
- <%
- for (int i = 0; i < abstracts.size(); i++) {
- %>
- addRowToAbstractTable(tableBody,
- "<%=HTMLUtils.JSMangle((String)abstractLangs.elementAt(i))%>",
- "<%=HTMLUtils.JSMangle((String)abstracts.elementAt(i))%>");
- <%
- }
- %>
- }
-
- function addRowToAbstractTable(tableBody, lang, abst) {
- var newRow = document.createElement("tr");
- addKeyValueToRow(newRow, lang, abst);
- tableBody.appendChild(newRow);
- }
-</script>
-
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=abstractTable%>','<%=xabstractTable%>')"><img name="<%=xabstractTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_ABSTRACT")%></strong>
- </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=abstractTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor" width="100%"><%=wsilPerspective.getMessage("FORM_LABEL_ABSTRACT")%></th>
- </tr>
- </table>
-</div>
-
-<script language="javascript">
- showAbstract('<%=abstractTable%>');
- twistInit('<%=abstractTable%>','<%=xabstractTable%>');
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp
deleted file mode 100644
index eb25f00..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-<script language="javascript">
- function isSomethingSelected(tableContainerId) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- if (rowCheckbox.checked)
- return true;
- }
- alert("<%=controller.getWSILPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- return false;
- }
-
- function setFormLocationAndSubmit(tableContainerId, form, location) {
- if (isSomethingSelected(tableContainerId))
- setLocationAndSubmit(form, location);
- }
-
- function setLocationAndSubmit(form, location) {
- if (handleSubmit(form))
- {
- form.action = location;
- form.submit();
- }
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp
deleted file mode 100644
index 8060c9c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="nameLangs" class="java.util.Vector" scope="request"/>
-<jsp:useBean id="names" class="java.util.Vector" scope="request"/>
-
-<jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
-
-<%
-String nameTable = "nameTable";
-String xnameTable = "xnameTable";
-String showAllNameID = "showAllNameID";
-WSILPerspective wsilPerspective =controller.getWSILPerspective();
-%>
-
-<script language="javascript">
- function showName(tableContainerID) {
- var table = getTable(tableContainerID);
- var tableBody = table.getElementsByTagName("TBODY").item(0);
- var hiddenInput = document.getElementById('<%=showAllNameID%>');
- <%
- for (int i = 0; i < names.size(); i++) {
- %>
- addRowToNameTable(tableBody,
- "<%=HTMLUtils.JSMangle((String)nameLangs.elementAt(i))%>",
- "<%=HTMLUtils.JSMangle((String)names.elementAt(i))%>");
- <%
- }
- %>
- }
-
- function addRowToNameTable(tableBody, lang, name) {
- var newRow = document.createElement("tr");
- addKeyValueToRow(newRow, lang, name);
- tableBody.appendChild(newRow);
- }
-</script>
-
-<table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=nameTable%>','<%=xnameTable%>')"><img name="<%=xnameTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=40 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_NAME")%></strong>
- </td>
- </tr>
-</table>
-
-<table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
-</table>
-
-<div id="<%=nameTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_LANGUAGE")%></th>
- <th class="headercolor" width="100%"><%=wsilPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- </table>
-</div>
-
-<script language="javascript">
- showName('<%=nameTable%>');
- twistInit('<%=nameTable%>','<%=xnameTable%>');
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp
deleted file mode 100644
index 07c5b3b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- var wsilNavigatorContainer = perspectiveContent.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>"];
- var wsilNavigatorToolbar = wsilNavigatorContainer.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_TOOLBAR%>"];
- var wsilNavigatorContent = wsilNavigatorContainer.frames["<%=WsilFrameNames.WSIL_NAVIGATOR_CONTENT%>"];
- var wsilActionsContainer = perspectiveContent.frames["<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>"];
- var wsilPropertiesContainer = wsilActionsContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_CONTAINER%>"];
- var wsilPropertiesToolbar = wsilPropertiesContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_TOOLBAR%>"];
- var wsilPropertiesContent = wsilPropertiesContainer.frames["<%=WsilFrameNames.WSIL_PROPERTIES_CONTENT%>"];
- var wsilStatusContainer = wsilActionsContainer.frames["<%=WsilFrameNames.WSIL_STATUS_CONTAINER%>"];
- var wsilStatusToolbar = wsilStatusContainer.frames["<%=WsilFrameNames.WSIL_STATUS_TOOLBAR%>"];
- var wsilStatusContent = wsilStatusContainer.frames["<%=WsilFrameNames.WSIL_STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp
deleted file mode 100644
index 625126b..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript">
-
- function wsilHandleCheckAllClick(tableContainerId, checkAllCheckbox) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked) {
- highlightRow(table.rows[i],"rowcolor");
- rowCheckbox.name = "<%=ActionInputs.VIEWID%>";
- }
- else {
- highlightRow(table.rows[i],"tablecells");
- rowCheckbox.name = "";
- }
- }
- }
-
- function validateCheckBoxInput(checkbox, isChecked) {
- if (isChecked) {
- checkbox.name = "<%=ActionInputs.VIEWID%>";
- }
- else {
- checkbox.name = "";
- }
- handleRowCheckboxClick();
- }
-
- function twistInit(tableContainerId,twistImageName) {
- var tableContainer = document.getElementById(tableContainerId);
- var table = getTable(tableContainerId);
- if (table.rows.length > numberOfHeaderRows) {
- tableContainer.style.display = "none";
- twist(tableContainerId, twistImageName);
- }
- else {
- tableContainer.style.display = "";
- twist(tableContainerId, twistImageName);
- }
- }
-
- function addKeyValueToRow(row, key, value) {
- var keyText = document.createTextNode(key);
- var valueText = document.createTextNode(value);
- var newCol = document.createElement("td");
- var newCol2 = document.createElement("td");
- newCol.appendChild(keyText);
- newCol.className = "tablecells";
- newCol2.appendChild(valueText);
- newCol2.className = "tablecells";
- row.appendChild(newCol);
- row.appendChild(newCol2);
- }
-
- function clearTable(tableBody, numHeader) {
- for(var i = numHeader; i < tableBody.rows.length; i++) {
- tableBody.deleteRow(i);
- i--;
- }
- }
-
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp
deleted file mode 100644
index 382673f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function getActionsContainerFrameset()
- {
- return perspectiveContent.frames["<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
- }
-
- function processFramesetSizes(framesetSizesForm)
- {
- toggleDoubleClickColumnTitle();
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- framesetSizesForm.<%=WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
- framesetSizesForm.<%=WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
- framesetSizesForm.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp
deleted file mode 100644
index d69925a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp
+++ /dev/null
@@ -1,158 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
- java.util.Enumeration,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divUDDIBusinessList = "divUDDIBusinessList";
- String xdivUDDIBusinessList = "xdivUDDIBusinessList";
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("VIEW_TITLE_UDDI_BUSINESSES")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
- </script>
- <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_business_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsilPerspective.getMessage("FORM_LABEL_LIST_UDDI_BUSINESSES_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof WsilElement) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divUDDIBusinessList%>','<%=xdivUDDIBusinessList%>')"><img name="<%=xdivUDDIBusinessList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divUDDIBusinessList%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divUDDIBusinessList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_BUSINESS_NAME")%></th>
- </tr>
- <%
- ListManager uddiLinks = ((WsilElement)selectedElement).getAllUDDILinks();
- Enumeration e = uddiLinks.getListElements();
- int itemNum = 1;
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- for (int i = 0; i < sortedVector.size(); i++) {
- ListElement le = (ListElement)sortedVector.elementAt(i);
- WsilUddiBusinessElement uddiLink = (WsilUddiBusinessElement)le.getObject();
- String name = uddiLink.getName();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <%
- if (name != null) {
- %>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
- <td class="tablecells"><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=name%></a></td>
- <%
- }
- else {
- %>
- <td class="tablecells" nowrap><%=String.valueOf(itemNum)%></td>
- <td class="tablecells"><%=wsilPerspective.getMessage("FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS")%> <%=uddiLink.getUDDILinkBusinessKey()%></td>
- <%
- }
- %>
- </tr>
- <%
- itemNum++;
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divUDDIBusinessList%>','<%=xdivUDDIBusinessList%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddBusinessToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_REFRESH")%>" onClick="setFormLocationAndSubmit('<%=divUDDIBusinessList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RefreshAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
-</div>
-
-<script language="javascript">
- resumeProxyLoadPage();
-</script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp
deleted file mode 100644
index c12eb4f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp
+++ /dev/null
@@ -1,159 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
- java.util.Enumeration,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divUDDIServiceList = "divUDDIServiceList";
- String xdivUDDIServiceList = "xdivUDDIServiceList";
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("VIEW_TITLE_UDDI_SERVICES")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/resumeproxyloadpage.js"))%>">
- </script>
- <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_UDDI_service_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsilPerspective.getMessage("FORM_LABEL_LIST_UDDI_SERVICES_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
-
- <%
- if (selectedElement instanceof WsilElement) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divUDDIServiceList%>','<%=xdivUDDIServiceList%>')"><img name="<%=xdivUDDIServiceList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divUDDIServiceList%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divUDDIServiceList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_UDDI_SERVICE_NAME")%></th>
- </tr>
- <%
- ListManager uddiServices = ((WsilElement)selectedElement).getAllUDDIServices();
- Enumeration e = uddiServices.getListElements();
- int itemNum = 1;
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- for (int i = 0; i < sortedVector.size(); i++) {
- ListElement le = (ListElement)sortedVector.elementAt(i);
- WsilUddiServiceElement uddiService = (WsilUddiServiceElement)le.getObject();
- String name = uddiService.getName();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <%
- if (name != null) {
- %>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=name%></a></td>
- <%
- }
- else {
- %>
- <td class="tablecells" nowrap><%=String.valueOf(itemNum)%></td>
- <td class="tablecells" nowrap><%=wsilPerspective.getMessage("FORM_LABEL_UNAVAILABLE_UDDI_SERVICE")%> <%=uddiService.getUDDIServiceKey()%></td>
- <%
- }
- %>
- </tr>
- <%
- itemNum++;
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divUDDIServiceList%>','<%=xdivUDDIServiceList%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddServiceToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_REFRESH")%>" onClick="setFormLocationAndSubmit('<%=divUDDIServiceList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RefreshAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
-</div>
-
-<script language="javascript">
- resumeProxyLoadPage();
-</script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp
deleted file mode 100644
index 25af4d9..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp
+++ /dev/null
@@ -1,135 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
- java.util.Enumeration,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divWSDLList = "divWSDLList";
- String xdivWSDLList = "xdivWSDLList";
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("VIEW_TITLE_WSDL_SERVICES")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_WSDL_service_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsilPerspective.getMessage("FORM_LABEL_LIST_WSDL_SERVICES_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof WsilElement) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divWSDLList%>','<%=xdivWSDLList%>')"><img name="<%=xdivWSDLList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=25 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSDL_SERVICE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divWSDLList%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divWSDLList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- ListManager wsdlServices = ((WsilElement)selectedElement).getAllWSDLServices();
- Enumeration e = wsdlServices.getListElements();
- int itemNum = 1;
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- for (int i = 0; i < sortedVector.size(); i++) {
- ListElement le = (ListElement)sortedVector.elementAt(i);
- WsilWsdlServiceElement wsdlService = (WsilWsdlServiceElement)le.getObject();
- String wsdlURL = wsdlService.getWSDLServiceURL();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
- <td class="tablecells" nowrap><%=wsdlURL%></td>
- </tr>
- <%
- itemNum++;
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divWSDLList%>','<%=xdivWSDLList%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divWSDLList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(WsilAddToWSDLPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_FAVORITES")%>" onClick="setFormLocationAndSubmit('<%=divWSDLList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp
deleted file mode 100644
index 7bdb897..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp
+++ /dev/null
@@ -1,131 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Vector,
- java.util.Enumeration,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divWSILList = "divWSILList";
- String xdivWSILList = "xdivWSILList";
-
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("VIEW_TITLE_WSIL_LINKS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/wsil/scripts/wsilTable.jsp" flush="true"/>
- <jsp:include page="/wsil/scripts/wsilFormSubmit.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_WSIL_highlighted.gif";
- String title = wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=wsilPerspective.getMessage("FORM_LABEL_LIST_WSIL_LINKS")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(OpenWSILLinkAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof WsilElement) {
- %>
- <input type="hidden" name="<%=ActionInputs.NODEID%>" value="<%=selectedNode.getNodeId()%>">
- <input type="hidden" name="<%=WsilActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=25 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divWSILList%>','<%=xdivWSILList%>')"><img name="<%=xdivWSILList%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=25 valign="bottom" align="left" nowrap class="labels">
- <strong><%=wsilPerspective.getMessage("FORM_LABEL_WSIL_LINKS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divWSILList%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="wsilHandleCheckAllClick('<%=divWSILList%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_ITEM_NUMBER")%></th>
- <th class="headercolor"><%=wsilPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- ListManager wsilLinks = ((WsilElement)selectedElement).getAllWSILLinks();
- Enumeration e = wsilLinks.getListElements();
- int itemNum = 1;
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- for (int i = 0; i < sortedVector.size(); i++) {
- ListElement le = (ListElement)sortedVector.elementAt(i);
- WsilWsilLinkElement wsilLink = (WsilWsilLinkElement)le.getObject();
- String url = wsilLink.getWSILLinkLocation();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=ActionInputs.VIEWID%>" value="<%=le.getViewId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), le.getViewId(), 0, false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=String.valueOf(itemNum)%></a></td>
- <td class="tablecells" nowrap><%=url%></td>
- </tr>
- <%
- itemNum++;
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divWSILList%>','<%=xdivWSILList%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom">
- <input type="button" value="<%=wsilPerspective.getMessage("FORM_LABEL_ADD_TO_NAVIGATOR")%>" onClick="setFormLocationAndSubmit('<%=divWSILList%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(OpenWSILLinkAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%"> </td>
- </tr>
- </table>
-
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp
deleted file mode 100644
index 4b4ab97..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=wsilPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
- <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL("wsil_properties_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
- <frame name="<%=WsilFrameNames.WSIL_STATUS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL("wsil_status_container.jsp")%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp
deleted file mode 100644
index 80a3e5c..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL("wsil_navigator_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL("wsil_navigator_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp
deleted file mode 100644
index b19c397..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-</head>
-<%
- String selectedAnchorName = "";
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- int focusedNodeId = nodeManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
- <div id="treecontentborder">
- <%=nodeManager.renderTreeView(response)%>
- </div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp
deleted file mode 100644
index 50f4e20..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsilPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- else
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
- String altRefresh = wsilPerspective.getMessage("ALT_REFRESH_WSIL");
- String altClear = wsilPerspective.getMessage("ALT_CLEAR_WSIL");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/RefreshActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRefresh%>" title="<%=altRefresh%>"></a></td>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/actions/ClearWSILActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp
deleted file mode 100644
index 2a9cc0a..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<frameset cols="<%=wsilPerspective.getPerspectiveContentFramesetCols()%>" bgcolor="#ECE9D8">
- <%
- if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
- {
- %>
- <frame name="<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsil_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsil_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- else
- {
- %>
- <frame name="<%=WsilFrameNames.WSIL_NAVIGATOR_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL("wsil_navigator_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=WsilFrameNames.WSIL_ACTIONS_CONTAINER%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL("wsil_actions_container.jsp")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- %>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp
deleted file mode 100644
index a74c0ea..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL("wsil_properties_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WsilFrameNames.WSIL_PROPERTIES_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL("wsil_properties_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp
deleted file mode 100644
index f42f391..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null)
- {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
- %>
- <script language="javascript">
- location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
- </script>
- <%
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp
deleted file mode 100644
index 4f7d9cb..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WsilFrameNames.WSIL_PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsilPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (wsilPerspective.getActionsContainerFramesetRows().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- for(int i=0; i<toolManager.getNumberOfTools(); i++) {
- Tool tool = (Tool)toolManager.getTool(i);
- %>
- <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
- <%
- }
- }
-%>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp
deleted file mode 100644
index 05fac17..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=WsilFrameNames.WSIL_STATUS_TOOLBAR%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL("wsil_status_toolbar.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=WsilFrameNames.WSIL_STATUS_CONTENT%>" title="<%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL("wsil_status_content.jsp")%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp
deleted file mode 100644
index 32ebe6f..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp
+++ /dev/null
@@ -1,43 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <pre>
-<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsilPerspective.getMessageQueue().getMessagesFromList())%>
- </pre>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp
deleted file mode 100644
index b200269..0000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=wsilPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/wsil/scripts/wsilframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("wsil/actions/ResizeWSILFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(WsilFrameNames.WSIL_STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/wsil/forms/ProcessWSILFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (wsilPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (wsilPerspective.getActionsContainerFramesetRows().endsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("wsil/wsil_status_content.jsp"))%>" target="<%=WsilFrameNames.WSIL_STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
