Skip to main content
summaryrefslogtreecommitdiffstats
blob: e4fe06f85803ae6d3e4756ead664a98067d229ea (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
/*******************************************************************************
 * 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.wst.command.env.core.fragment;

import org.eclipse.wst.command.env.core.CommandFactory;
import org.eclipse.wst.command.env.core.data.DataMappingRegistry;


/**
  * This interface describes a list of interruptable commands.  The
  * order of this list of commands is defined by the getFirstSubFragment and
  * getNextSubFragment methods.
**/
public interface CommandFragment extends Cloneable
{ 
  /**
   * 
   * @return Returns a unique identifier for this fragment.
   */
  public String getId();
  
  /** 
    * Gets executable command associated with this fragment.
    *
    * @return returns the first child fragment for this fragment.  Returns
    * null when there is no first child.
  **/
  public CommandFactory getCommandFactory();

  /** 
    * 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();

  /**
    * 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 );
  
  /*
   * This method is called to retrieve the data mappings for this command fragment.
   */
  public void registerDataMappings( DataMappingRegistry registry );

  /**
   * 
   * @return If the commands for this fragment should not be run within a transaction then
   * this method should return true.  If the fragment does not care if it is run in a transaction
   * or not it should return false.
   */
  public boolean doNotRunInTransaction();
  
  /**
    * All wizard fragments need to be cloneable.
  **/
  public Object clone();  
}  

Back to the top

lass='rem' style='width: 0.6%;'/> -rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java46
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java113
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java33
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java80
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java130
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties55
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.project31
-rw-r--r--bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF32
-rw-r--r--bundles/org.eclipse.jst.ws.ui/about.html22
-rw-r--r--bundles/org.eclipse.jst.ws.ui/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gifbin568 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.ui/plugin.properties48
-rw-r--r--bundles/org.eclipse.jst.ws.ui/plugin.xml79
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java64
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java18
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java83
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java86
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java221
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java70
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java43
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java212
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java245
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java323
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java131
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java114
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java219
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java52
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java307
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java156
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java316
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java21
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties143
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF21
-rw-r--r--bundles/org.eclipse.wst.ws.parser/about.html22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/build.properties7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/plugin.properties16
-rw-r--r--bundles/org.eclipse.wst.ws.parser/plugin.xml7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java123
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java27
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java93
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java32
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java34
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java429
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java34
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java49
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java88
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java51
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java51
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java38
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java39
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java36
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java25
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java21
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java21
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java111
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java171
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java63
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java46
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java19
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java148
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java547
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties22
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF72
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/build.properties19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gifbin367 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/validate.gifbin558 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gifbin572 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/plugin.properties322
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/plugin.xml298
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java157
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java41
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java749
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java588
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java314
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java106
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java131
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java653
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java330
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java339
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java329
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java202
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java140
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java324
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java358
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java195
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java124
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java62
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java336
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java551
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java209
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java96
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java424
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java148
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java151
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java126
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java1256
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java210
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java154
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java143
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java98
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java189
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java97
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java125
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java22
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java608
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java246
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java21
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java30
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java140
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java36
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java107
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java129
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java74
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java155
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java30
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java55
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java67
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java102
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java165
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java40
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java163
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java247
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java365
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java213
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java186
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java417
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java154
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java479
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java17
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java141
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java351
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java170
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java343
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java22
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java152
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java166
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java135
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java143
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java234
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java261
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java394
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gifbin873 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gifbin610 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gifbin53 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gifbin155 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gifbin82 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gifbin360 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gifbin349 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gifbin366 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gifbin874 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gifbin315 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gifbin556 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gifbin376 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gifbin596 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gifbin232 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gifbin114 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gifbin336 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gifbin338 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gifbin581 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gifbin207 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gifbin211 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gifbin3279 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gifbin150 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gifbin615 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gifbin148 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gifbin343 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gifbin5600 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gifbin200 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gifbin220 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gifbin603 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gifbin350 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gifbin542 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gifbin580 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gifbin150 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gifbin589 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gifbin637 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gifbin585 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gifbin605 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gifbin592 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gifbin558 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gifbin572 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java25
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java414
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java1238
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java126
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java177
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java120
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java213
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java213
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java353
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java108
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java119
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java21
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java302
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java93
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java178
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java108
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java261
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java106
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java212
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java169
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java167
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java41
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java65
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java197
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java96
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java198
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java166
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java957
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java351
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java427
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java147
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java284
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java363
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java405
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java215
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java91
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java91
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java356
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java408
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java22
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java203
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java21
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java266
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java347
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java233
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java93
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java902
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java367
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java173
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java321
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java107
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java182
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java163
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java228
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java121
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java171
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java246
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java98
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java95
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java197
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java181
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java340
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java301
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java701
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java399
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java610
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java132
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java284
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java140
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java381
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java76
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java57
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java336
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java215
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java90
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java214
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java34
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java55
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.classpath8
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.cvsignore5
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF38
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/build.properties12
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd113
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd99
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd113
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd121
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore1
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/plugin.properties20
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/plugin.xml105
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java398
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java300
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java193
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java146
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java102
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java283
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java216
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java162
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java93
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java114
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java602
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java103
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java691
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java169
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java98
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java2000
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java427
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java334
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java603
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java656
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java300
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java139
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java73
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java206
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java40
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java103
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java242
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java322
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java98
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java36
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java561
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java40
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java153
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java364
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java132
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties55
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties23
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties11
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties45
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java458
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java466
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java68
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java511
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java180
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java376
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties34
-rw-r--r--bundles/org.eclipse.wst.wsdl/.classpath10
-rw-r--r--bundles/org.eclipse.wst.wsdl/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.wsdl/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF35
-rw-r--r--bundles/org.eclipse.wst.wsdl/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl/build.properties25
-rw-r--r--bundles/org.eclipse.wst.wsdl/component.xml77
-rw-r--r--bundles/org.eclipse.wst.wsdl/grabjars.xml34
-rw-r--r--bundles/org.eclipse.wst.wsdl/lib/.cvsignore1
-rw-r--r--bundles/org.eclipse.wst.wsdl/plugin.properties32
-rw-r--r--bundles/org.eclipse.wst.wsdl/plugin.xml95
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel411
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat378
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore27
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl32383
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java86
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java612
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java267
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java251
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java252
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java127
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java252
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java412
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java150
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java150
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java333
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java336
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel428
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat630
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore44
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl32998
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java106
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java559
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java330
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java164
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java259
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java236
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java427
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java195
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java298
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java295
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel429
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat945
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore46
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl32688
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java34
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java48
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java25
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java1068
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java366
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java264
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java324
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java497
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java229
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java406
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java564
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java208
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java303
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java325
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java594
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java333
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java64
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java358
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html21
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml18
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl31023
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat6997
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore606
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel393
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java137
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java160
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java291
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java208
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java200
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java230
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java3650
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java101
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java45
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java611
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java158
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java419
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java786
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java797
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java2291
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java409
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java238
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java592
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java617
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java344
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java234
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java1201
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java765
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java438
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java635
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java628
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java334
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java320
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java1487
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java523
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java2506
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java414
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java229
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java138
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java1039
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java1074
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java155
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html21
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml18
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java143
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java133
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java428
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml19
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF41
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/build.properties10
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gifbin227 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gifbin205 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/plugin.properties74
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/plugin.xml94
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java434
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Resource.java21
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java101
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java59
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java99
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIValidator.java65
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java296
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSILogFileActionDelegate.java76
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java225
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gifbin2549 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java318
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java133
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java908
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java372
-rw-r--r--bundles/org.eclipse.wst.wsi/.classpath8
-rw-r--r--bundles/org.eclipse.wst.wsi/.cvsignore5
-rw-r--r--bundles/org.eclipse.wst.wsi/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF62
-rw-r--r--bundles/org.eclipse.wst.wsi/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsi/build.properties14
-rw-r--r--bundles/org.eclipse.wst.wsi/component.xml1
-rw-r--r--bundles/org.eclipse.wst.wsi/plugin.properties13
-rw-r--r--bundles/org.eclipse.wst.wsi/plugin.xml28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java254
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolInfo.java447
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIConstants.java488
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIException.java151
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java55
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java313
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties44
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java79
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java65
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java659
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java918
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java83
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java109
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java256
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java78
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java1060
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java559
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java200
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java197
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java202
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java163
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java175
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java156
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java133
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java48
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java46
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java217
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java41
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimePart.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimeParts.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java219
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java784
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java374
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java221
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java505
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties38
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java140
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java306
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java963
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java49
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java561
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java479
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java299
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/Profile.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java176
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java193
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java543
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java256
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java222
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java68
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java96
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java55
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java154
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java1837
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java705
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java118
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java426
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java313
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java102
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java108
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java152
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java302
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java141
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java198
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java181
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java113
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java267
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java226
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java107
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java59
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java133
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java210
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java257
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java348
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java264
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java53
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java101
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java137
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java95
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java57
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java415
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java204
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java81
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java590
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java290
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java155
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java146
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java241
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java47
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java216
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java297
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java215
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java230
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java450
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java341
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java234
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java194
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java341
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java286
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java127
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java122
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java112
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java85
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java130
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java232
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java200
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java159
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java278
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java247
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java174
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java95
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java357
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java189
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java420
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java166
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java209
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java89
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java144
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java131
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java191
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java2314
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java171
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java148
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/BuildReport.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Entry.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java35
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryResult.java42
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Report.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java79
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportContext.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Reporter.java21
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/WriteReport.java47
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java236
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java287
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java276
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java151
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java514
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java63
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/toolinfo.properties18
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java140
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.java477
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/EntryType.java278
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ErrorList.java156
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java600
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java182
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java1720
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties31
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java138
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MessageList.java171
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/NullUtil.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java788
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Pair.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java629
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java212
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java192
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java577
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java336
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java1415
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java154
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java347
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java27
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/wsi.properties46
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java293
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java99
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java801
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java384
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java201
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java3271
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java1126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java233
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java590
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java241
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java62
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java90
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java45
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java190
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java117
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java129
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java1528
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java186
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java248
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java170
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java152
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSIPreferences.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java106
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java90
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java316
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java395
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/AssertionError.java131
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java369
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/wsivalidate.properties16
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml39
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml105
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/build.properties6
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF11
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties8
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html71
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html119
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html154
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html60
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html172
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml15
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/build.properties6
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml353
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml70
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wsui-f1Contexts.xml33
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html109
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html126
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/addfav.gifbin237 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/adduddi.gifbin230 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/bindnode.gifbin382 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/busasst.gifbin139 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fav.gifbin265 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/find.gifbin153 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fswsdlicon.gifbin925 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/mptwsdlicon.gifbin891 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/opnode.gifbin1044 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/publish2.gifbin163 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/pubserv.gifbin240 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/refserv.gifbin273 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/scenario7.gifbin8218 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gifbin457 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.gifbin5498 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.gifbin9793 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiview.gifbin159 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlbnddetl.gifbin17184 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldtlicon.gifbin914 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlexp.gifbin10112 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gifbin941 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gifbin952 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gifbin865 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gifbin13770 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gifbin13933 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gifbin12274 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gifbin14386 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gifbin20654 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.gifbin16346 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilview.gifbin367 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gifbin952 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html102
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html81
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html76
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html70
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html68
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html169
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html79
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html114
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html126
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html84
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tsampapp.html146
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html124
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html96
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html183
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html72
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html69
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdisc.html103
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html127
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml26
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml18
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/build.properties10
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html71
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html54
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html135
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cws.html211
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html47
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html96
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html109
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html89
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html157
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html64
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html47
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/images/roles.gifbin4283 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/images/soapudws.gifbin17234 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html82
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html108
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html77
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml68
-rw-r--r--docs/org.eclipse.jst.ws.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.infopop/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.infopop/build.properties5
-rw-r--r--docs/org.eclipse.jst.ws.infopop/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml101
-rw-r--r--docs/org.eclipse.jst.ws.infopop/wsui-f1Contexts.xml33
-rw-r--r--docs/org.eclipse.wst.ws.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.ws.infopop/.project22
-rw-r--r--docs/org.eclipse.wst.ws.infopop/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.wst.ws.infopop/about.html22
-rw-r--r--docs/org.eclipse.wst.ws.infopop/build.properties5
-rw-r--r--docs/org.eclipse.wst.ws.infopop/plugin.xml8
-rw-r--r--docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml30
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties12
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html73
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gifbin13056 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gifbin143 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gifbin13643 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gifbin14541 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml27
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html84
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html69
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html61
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html72
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html57
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html56
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html68
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html73
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html149
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html86
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html97
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html96
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml7
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml20
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/build.properties8
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/build.xml106
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gifbin27043 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gifbin217 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml27
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html106
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html59
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html58
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml17
-rw-r--r--features/org.eclipse.wst.ws_core.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_core.feature/build.properties1
-rw-r--r--features/org.eclipse.wst.ws_core.feature/build.xml158
-rw-r--r--features/org.eclipse.wst.ws_core.feature/feature.xml81
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/build.properties4
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/feature.xml37
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/.cvsignore1
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/build.properties1
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/feature.xml60
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/.cvsignore1
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/build.properties1
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/feature.xml72
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html27
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini31
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties29
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.gifbin1706 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.pngbin4594 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties12
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/build.properties1
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/feature.xml41
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/build.properties8
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl68
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java129
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java82
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java88
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java83
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java54
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java52
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java41
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java69
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java69
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java60
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java60
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java127
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/test.xml237
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.project30
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/build.properties9
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml44
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java61
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.project37
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/plugin.xml26
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java47
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java226
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java193
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java73
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java230
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java513
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java280
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java458
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java612
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java260
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java109
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java101
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java211
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java208
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java608
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java46
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java169
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/build.properties10
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java203
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java29
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java143
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java53
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java45
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java257
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java569
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java499
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java157
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/test.xml59
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log137
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl18
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd5
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl0
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl37
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl27
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl14
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.project37
-rw-r--r--tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.wsi.tests/build.properties10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java289
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java31
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java73
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java78
-rw-r--r--tests/org.eclipse.wst.wsi.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl82
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl99
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl110
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl43
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl116
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl104
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl33
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl87
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl26
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl20
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml10
1745 files changed, 0 insertions, 350702 deletions
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
deleted file mode 100644
index 802346176..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ejb.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <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>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9dad8842a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.ui,
- org.eclipse.wst.command.env.ui
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940fa0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654ef..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
+++ /dev/null
@@ -1,28 +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 Creation EJB Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Web service types
-#
-WEBSERVICETYPE_NAME_EJB_TP=EJB Web Service
-WEBSERVICETYPE_NAME_WSDL_EJB_TP=Skeleton EJB Web Service
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
deleted file mode 100644
index 4a8659f76..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- EJB Web Service Types -->
-<!--
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
- resourceTypeMetadata="File IResource"
- extensionMetadata=".wsdl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.wsdl.ejb">
- </webServiceType>
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.ejb">
- </webServiceType>
- </extension>
--->
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
- </extension>
-
-
-<!-- EJB stuff -->
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.ejb"
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </webServiceImpl>
- </extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.ejb"
- implId="org.eclipse.jst.ws.wsImpl.ejb"
- buModuleTypesInclude="jst.ejb"
- buModuleTypesExclude=""
- tdModuleTypesInclude="jst.ejb"
- tdModuleTypesExclude="">
- </serviceType>
-</extension>
-
-
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath b/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index e15b00db1..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index cd999f6fd..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.uddiregistry</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.ui</project>
- </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.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index 665da2974..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry.plugin,
- org.eclipse.jst.ws.internal.uddiregistry.widgets,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding,
- org.eclipse.jst.ws.internal.uddiregistry.wizard,
- org.eclipse.jst.ws.uddiregistry
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.frameworks
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/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.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
deleted file mode 100644
index 31611ec30..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
deleted file mode 100644
index d8cfbff82..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Universal Description Discovery and Integration Registry
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
-
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
deleted file mode 100644
index 77a2c48c5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-
-<!--
- <description>
- %PLUGIN_DESC
- </description>
- -->
- <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
- <privateUDDIRegistryType
- name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
- </privateUDDIRegistryType>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- </wizard>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
- iconbanner="icons/uddiprivateconfig_wiz.gif"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- </dynamicWizard>
- </extension>
- <!--
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
- -->
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
deleted file mode 100644
index 81df413f7..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUDDIRegistryPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUDDIRegistryPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
- * @return The WebServiceUDDIRegistryPlugin singleton.
- */
- public static WebServiceUDDIRegistryPlugin 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 installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- return Platform.getResourceString(instance_.getBundle(),key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index ea24416fc..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null
@@ -1,88 +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.uddiregistry.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.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/*
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends AbstractDataModelOperation
-{
- private byte operationType;
- private PrivateUDDIRegistryType registryType;
-
- /*
- public Status execute(Environment env)
- {
- MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
- if (registryType != null)
- {
- switch (operationType)
- {
- case PrivateUDDIRegistryType.OP_DEPLOY:
- return registryType.deploy(env);
- case PrivateUDDIRegistryType.OP_UPDATE:
- return registryType.update(env);
- case PrivateUDDIRegistryType.OP_REMOVE:
- return registryType.remove(env);
- default:
- }
- }
- return new SimpleStatus("");
- }
- */
-
- public PrivateUDDIRegistryType getRegistryType()
- {
- return getPrivateUDDIRegistryType();
- }
-
- public byte getOperationType()
- {
- return operationType;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- return registryType;
- }
-
- public void setRegistryType(PrivateUDDIRegistryType regType)
- {
- setPrivateUDDIRegistryType(regType);
- }
-
- public void setOperationType(byte type)
- {
- operationType = type;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
- {
- registryType = regType;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index 84fd197eb..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null
@@ -1,98 +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.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-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.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
- private PrivateUDDIRegistryType registryType;
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
-
- public PrivateUDDISelectionCommandFragment()
- {
- super(null, "");
- }
-
- /**
- * 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 (registryType != null)
- {
- registryType.registerCanFinish(canFinishRegistry);
- registryType.registerDataMappings(dataMappingRegistry);
- registryType.registerWidgetMappings(widgetRegistry);
- return registryType.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()
- {
- PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPrivateUDDIRegistryType(registryType);
- return fragment;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
- {
- this.registryType = registryType;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index 77c692133..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null
@@ -1,212 +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.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-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.Combo;
-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.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.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
- private MessageUtils msgUtils;
- private Listener statusListener;
-
- private Button deployRadio_;
- private Label typesLabel_;
- private Combo typesCombo_;
- private Button updateRadio_;
- private Button removeRadio_;
- private PrivateUDDIRegistryType[] types_;
- private PrivateUDDIRegistryType installedType_;
-
- // Infopop
- private final String INFOPOP_PUPR_PRIVATE_UDDI_PAGE = WebServiceUDDIRegistryPlugin.ID + ".pupr0001";
- private final String INFOPOP_PUPR_PRIVATE_UDDI_TYPE = WebServiceUDDIRegistryPlugin.ID + ".pupr0002";
- private final String INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0003";
- private final String INFOPOP_PUPR_UPDATE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0005";
- private final String INFOPOP_PUPR_REMOVE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0004";
-
- public PrivateUDDISelectionWidget()
- {
- msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this );
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_PAGE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PUPR_PRIVATE_UDDI_PAGE);
-
- GridLayout gl;
- GridData gd;
-
- Listener listener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleWidgetEvent(event);
- }
- };
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- deployRadio_ = new Button(parent, SWT.RADIO);
- deployRadio_.setText(msgUtils.getMessage("BUTTON_DEPLOY_UDDI_REGISTRY"));
- deployRadio_.setSelection(true);
- deployRadio_.addListener(SWT.Selection, listener);
- deployRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI"));
- helpSystem.setHelp(deployRadio_, INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI);
-
- Composite typeComposite = new Composite(parent,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 5;
- gl.verticalSpacing = 15;
- gl.marginWidth = 20;
- typeComposite.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- typeComposite.setLayoutData(gd);
-
- typesLabel_ = new Label(typeComposite, SWT.WRAP);
- typesLabel_.setText(msgUtils.getMessage("LABEL_PRIVATE_UDDI_REGISTRY_TYPES"));
- typesLabel_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
- helpSystem.setHelp(typesLabel_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- typesCombo_ = new Combo(typeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- typesCombo_.setLayoutData(gd);
- typesCombo_.addListener(SWT.Selection, listener);
- typesCombo_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
- helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- updateRadio_ = new Button(parent,SWT.RADIO);
- updateRadio_.setText(msgUtils.getMessage("BUTTON_UPDATE_UDDI_REGISTRY"));
- updateRadio_.setSelection(false);
- updateRadio_.addListener(SWT.Selection,listener);
- updateRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI"));
- helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
- removeRadio_ = new Button(parent, SWT.RADIO);
- removeRadio_.setText(msgUtils.getMessage("BUTTON_REMOVE_UDDI_REGISTRY"));
- removeRadio_.setSelection(false);
- removeRadio_.addListener(SWT.Selection, listener);
- removeRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI"));
- helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);
-
- loadTypes();
- init();
- return this;
- }
-
- private final void loadTypes()
- {
- types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- }
-
- private final void init()
- {
- for (int i = 0; i < types_.length; i++)
- {
- if (types_[i] != null)
- {
- typesCombo_.add(types_[i].getName());
- if (types_[i].isPrivateUDDIRegistryInstalled())
- installedType_ = types_[i];
- }
- }
- if (typesCombo_.getItemCount() > 0)
- typesCombo_.setText(typesCombo_.getItem(0));
- if (installedType_ != null)
- {
- updateRadio_.setEnabled(true);
- removeRadio_.setEnabled(true);
- }
- else
- {
- updateRadio_.setEnabled(false);
- removeRadio_.setEnabled(false);
- }
- }
-
- private void handleWidgetEvent(Event event)
- {
- if (event.widget == removeRadio_ || event.widget == updateRadio_)
- {
- boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
- typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
- }
- else if (event.widget == deployRadio_)
- {
- boolean isDeploySelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(isDeploySelected);
- typesCombo_.setEnabled(isDeploySelected);
- }
- statusListener.handleEvent(event);
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- if (deployRadio_.getSelection())
- {
- String selectedRegistryName = typesCombo_.getText();
- for (int i = 0; i < types_.length; i++)
- if (selectedRegistryName.equals(types_[i].getName()))
- return types_[i];
- return null;
- }
- else
- return installedType_;
- }
-
- public byte getOperationType()
- {
- if (deployRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_DEPLOY;
- else if (updateRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_UPDATE;
- else if (removeRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_REMOVE;
- else
- return PrivateUDDIRegistryType.OP_DEPLOY;
- }
-
- public IStatus getStatus()
- {
- PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
- if (privateUDDIRegistryType != null)
- return privateUDDIRegistryType.getOperationStatus(getOperationType());
- else
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE") );
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index f741d9c8e..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null
@@ -1,46 +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.uddiregistry.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.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition
-{
- private boolean condition;
-
- public PrivateUDDISelectionWidgetConditionCommand()
- {
- condition = true;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- condition = !condition;
- return Status.OK_STATUS;
- }
-
- public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
- {
- condition = !condition;
- return Status.OK_STATUS;
- }
-
- public boolean evaluate()
- {
- return condition;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index 78dedf196..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
+++ /dev/null
@@ -1,113 +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.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-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.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
- private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-
- public PrivateUDDIWidgetBinding()
- {
- privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
- conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
- }
-
- /* (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(conditionCommand, ""));
- root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
- root.add(new SimpleFragment(conditionCommand, ""));
- root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
- root.add(privateUDDISelFragment);
- 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;
- privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-
- canFinishRegistry.addCondition(conditionCommand);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry = dataRegistry;
- privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-
- // PrivateUDDISelectionCommand
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-
- // PrivateUDDISelectionCommandFragment
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.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)
- {
- MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
- this.widgetRegistry = widgetRegistry;
- privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("PrivateUDDISelectionWidget",
- msgUtils.getMessage("PAGE_TITLE_PRIVATE_UDDI_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_PRIVATE_UDDI_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PrivateUDDISelectionWidget();
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
deleted file mode 100644
index 7e48cf0cc..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,33 +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.uddiregistry.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
- // operation types
- public static byte OP_DEPLOY = 0x0;
- public static byte OP_UPDATE = 0x1;
- public static byte OP_REMOVE = 0x2;
-
- // general information
- public String getID();
- public String getName();
- public boolean isPrivateUDDIRegistryInstalled();
- public IStatus getOperationStatus(byte operation);
-
- // registry URLs
- public String getInquiryAPI();
- public String getPublishAPI();
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 79d092128..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,80 +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.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
- public PrivateUDDIRegistryTypeImpl() {
- }
-
- public boolean isPrivateUDDIRegistryInstalled() {
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled())
- return true;
- }
- return false;
- }
-
- public String[] getPrivateUDDIRegistryInquiryAPI() {
- Vector inquiryAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String inquiryAPI = types[i].getInquiryAPI();
- if (inquiryAPI != null && inquiryAPI.startsWith("http"))
- inquiryAPIVector.add(inquiryAPI);
- }
- }
-
- String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
- Enumeration e = inquiryAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- inquiryAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return inquiryAPIArray;
- }
-
- public String[] getPrivateUDDIRegistryPublishAPI() {
- Vector publishAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String publishAPI = types[i].getPublishAPI();
- if (publishAPI != null && publishAPI.startsWith("http"))
- publishAPIVector.add(publishAPI);
- }
- }
-
- String[] publishAPIArray = new String[publishAPIVector.size()];
- Enumeration e = publishAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- publishAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return publishAPIArray;
- }
-
- public CommandWidgetBinding getBinding()
- {
- return new PrivateUDDIWidgetBinding();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 5fd441ee4..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,130 +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.uddiregistry.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
- private static PrivateUDDIRegistryTypeRegistry instance_;
- private IConfigurationElement[] configElements_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- instance_.getConfigElements();
- }
- return instance_;
- }
-
- public IConfigurationElement[] getConfigElements() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.uddiregistry",
- "privateUDDIRegistryType");
- Vector v = new Vector();
- for (int i = 0; i < configElements_.length; i++)
- {
- int weight = getWeight(configElements_[i]);
- int index = -1;
- for (int j = v.size()-1; j >= 0; j--)
- {
- if (weight > getWeight((IConfigurationElement)v.get(j)))
- index = j;
- else
- break;
- }
- if (index != -1)
- v.add(index, configElements_[i]);
- else
- v.add(configElements_[i]);
- }
- v.copyInto(configElements_);
- return configElements_;
- }
-
- private int getWeight(IConfigurationElement e)
- {
- try
- {
- return Integer.parseInt(e.getAttribute("weight"));
- }
- catch (NumberFormatException nfe)
- {
- return -1;
- }
- }
-
- private IConfigurationElement getConfigElementByID(String id) {
- for (int i = 0; i <configElements_.length; i++) {
- if (configElements_[i].getAttribute("id").equals(id))
- return configElements_[i];
- }
- return null;
- }
-
- public PrivateUDDIRegistryType[] getTypes() {
- Vector types = new Vector();
- for (int i = 0; i < configElements_.length; i++) {
- try {
- Object typeObj = configElements_[i].createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- types.add(typeObj);
- }
- catch (Exception e) {}
- }
-
- PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
- for (int j = 0; j < types.size(); j++) {
- typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
- }
- return typesArray;
- }
-
- public PrivateUDDIRegistryType getTypeByID(String id) {
- try {
- Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)typeObj;
- }
- catch (Exception e) {}
- return null;
- }
-
- public String[] getSupportedServerFactoryIDByID(String id) {
- IConfigurationElement configElement = getConfigElementByID(id);
- if (configElement == null)
- return new String[0];
- Vector idVector = new Vector();
- StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
- while (st.hasMoreTokens()) {
- idVector.add(st.nextToken());
- }
- String[] ids = new String[idVector.size()];
- for (int i = 0; i < idVector.size(); i++) {
- ids[i] = (String)idVector.elementAt(i);
- }
- return ids;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
deleted file mode 100644
index c4d8af3a5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
+++ /dev/null
@@ -1,55 +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
-###############################################################################
-
-#
-# PrivateUDDIConfigPage
-#
-PAGE_TITLE_PRIVATE_UDDI_CONFIG=Unit Test UDDI Registry Configuration
-PAGE_DESC_PRIVATE_UDDI_CONFIG=Configure the unit test UDDI registry.
-
-#
-# Tooltip for PrivateUDDIConfigPage
-#
-TOOLTIP_PUPR_PRIVATE_UDDI_PAGE=Deploy or remove a Unit Test UDDI Registry
-TOOLTIP_PUPR_PRIVATE_UDDI_TYPE=Choose the type of Unit Test UDDI Registry you want to deploy
-TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI=Deploy a Unit Test UDDI Registry
-TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI=Update the existing Unit Test UDDI Registry
-TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI=Remove the existing Unit Test UDDI Registry
-
-#
-# Common wizard strings.
-#
-LABEL_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry type:
-BUTTON_DEPLOY_UDDI_REGISTRY=Deploy the Unit Test UDDI Registry
-BUTTON_UPDATE_UDDI_REGISTRY=Update the previously deployed UDDI registry
-BUTTON_REMOVE_UDDI_REGISTRY=Remove the previously deployed UDDI registry
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Dialog messages
-#
-
-#
-# Progress messages
-#
-
-#
-# Warning messages
-#
-
-#
-# Error messages
-#
-MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE=IWAB0363E No UDDI registry available.
diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index f8f79d43e..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index 17ef9ac85..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- </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.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 974a07877..000000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui.action,
- org.eclipse.jst.ws.internal.ui.common,
- org.eclipse.jst.ws.internal.ui.dialog,
- org.eclipse.jst.ws.internal.ui.plugin,
- org.eclipse.jst.ws.internal.ui.preferences,
- org.eclipse.jst.ws.internal.ui.uddi,
- org.eclipse.jst.ws.ui
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.j2ee.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.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.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2b3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/plugin.properties
deleted file mode 100644
index bf5d6cf21..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-# WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index 375662aaf..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
- </page>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.propertyPages">
-
-
-
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IResource"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
-
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
-
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
- <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>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
deleted file mode 100644
index 9597ab97b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null
@@ -1,64 +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.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
- private IStructuredSelection selection_;
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action)
- {
- DynamicWizard wizard = new DynamicWizard();
-
- try
- {
- wizard.setInitialData( "wsimport" );
- wizard.init( PlatformUI.getWorkbench(), selection_ );
- }
- catch( CoreException exc )
- {
- // Do nothing.
- return;
- }
-
- WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.setPageSize( 500, 400 );
- dialog.create();
- dialog.open();
- }
-
- /* (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)
- {
- if( selection instanceof IStructuredSelection )
- {
- selection_ = (IStructuredSelection)selection;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b71f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null
@@ -1,18 +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.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
- public void run(IResource selection);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
deleted file mode 100644
index a1db9cbbc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,83 +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.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
- IProject project = getSelectedResourceProject();
-
- String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
- Object theAction = null;
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
- try {
-
- if (typeIds == null || typeIds.length <= 0)
- {
- // that means the module is not attached to a server then pick the first extension found
- theAction = elements[0].createExecutableExtension("class");
- }
- else if ( typeIds.length == 1)
- {
- // that means the module is attached to one server then finds it id and a matchin extension or give a message
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- if ( typeIds[0].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction == null )
- {
- // give a message
- }
- }
- else
- {
- // The module is attached to more than one server find the first server-extension couple
- // TBD: add a dialog to choose the server for deployment
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- for ( int k=0; k< typeIds.length; k++)
- {
- if ( typeIds[k].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction != null) break;
- }
- if (theAction == null)
- {
- // give a Message
- }
- }
-
- if (theAction instanceof WebServiceDeploy)
- ((WebServiceDeploy)theAction).run(project);
- }
-
- catch (Exception e) {}
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 837e28409..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
+++ /dev/null
@@ -1,86 +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.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public abstract class WindowActionDelegate implements IWorkbenchWindowActionDelegate {
-protected IStructuredSelection fSelection;
-
-public WindowActionDelegate() {
- super();
- }
-
-public void dispose()
- {
- }
-
-public void init(org.eclipse.ui.IWorkbenchWindow window) { }
-
-public void selectionChanged(org.eclipse.jface.action.IAction action,
- org.eclipse.jface.viewers.ISelection selection) {
- if (selection instanceof IStructuredSelection)
- fSelection = (IStructuredSelection) selection;
- }
-
-public void setSelection(IStructuredSelection selection) {
- fSelection = selection;
-}
-public IStructuredSelection getSelection() {
- return fSelection;
-}
-
-public IProject getSelectedResourceProject() {
- IProject project = null;
- IResource resource_ = null;
- try {
- if (fSelection != null && fSelection.size() == 1) {
- Object obj = fSelection.getFirstElement();
-
- if (obj != null) {
- if ( obj instanceof IResource)
- {
- resource_ = (IResource) obj;
- }
- else if (obj instanceof ICompilationUnit)
- {
- ICompilationUnit compUnit = (ICompilationUnit)obj;
- resource_= compUnit.getCorrespondingResource();
- }
- else if (obj instanceof IJavaProject) {
- project = ((IJavaProject) obj).getProject();
- }
-
- else if (obj instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) obj);
- }
-
- if ( resource_ != null )
- project = resource_.getProject();
-
- }
- }
- }
- catch (Exception e) {}
- return project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
deleted file mode 100644
index 4545acac5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,221 +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.ui.common;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-*/
-public class DialogResourceBrowser extends Dialog
-{
- private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
- private IResource root_;
- private IFilter[] filters_;
- private boolean multipleSelectionEnabled_;
- private IResource[] selection_;
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
-
- public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
- {
- this(shell, root, new IFilter[]{filter});
- }
-
- /**
- * Constructs a new <code>DialogResourceBrowser</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param filters An array of java.lang.String
- */
- public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
- {
- super(shell);
-
- IResource moduleRoot = root;
- if (root instanceof IProject)
- {
- IProject p = (IProject)moduleRoot;
-
- moduleRoot = p;
-
- }
-
- root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
- filters_ = (filters == null) ? new IFilter[0] : filters;
- multipleSelectionEnabled_ = false;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getSelection()
- {
- return selection_;
- }
-
- public IResource getFirstSelection()
- {
- if (selection_ != null && selection_.length > 0)
- return selection_[0];
- else
- return null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i = 0;
- Iterator it = structuredSelection.iterator();
- while (it.hasNext())
- {
- Object object = it.next();
- if (object instanceof IResource)
- selection_[i++] = (IResource)object;
- }
- }
- 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(getMessage("%DIALOG_TITLE_RESOURCE_BROWSER"));
- }
-
- /**
- * 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.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
- resourceTree_.setToolTipText(getMessage("%TOOLTIP_RESOURCE_TREE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_, INFOPOP_RESOURCE_TREE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter()
- {
- public boolean select(Viewer viewer, Object parentObject, Object object)
- {
- if ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
- return true;
- else
- {
- for (int i = 0; i < filters_.length; i++)
- {
- if (filters_[i].accepts(object))
- return true;
- }
- return false;
- }
- }
- }
- );
- fileViewer_.setInput(root_);
- return composite;
- }
-
- private String getMessage(String msgId)
- {
- return WebServiceUIPlugin.getMessage(msgId);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
deleted file mode 100644
index ed355c40d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
+++ /dev/null
@@ -1,70 +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.ui.common;
-
-import org.eclipse.core.resources.IFile;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public class FileExtensionFilter implements IFilter
-{
- private String[] extensions_;
-
- public FileExtensionFilter(String[] extensions)
- {
- extensions_ = (extensions != null) ? extensions : new String[0];
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * 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)
- {
- if (object instanceof IFile)
- {
- IFile file = (IFile)object;
- for (int i = 0; i < extensions_.length; i++)
- {
- if (file.getFileExtension() != null && file.getFileExtension().equals(extensions_[i]))
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
deleted file mode 100644
index 2e5db8b50..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface IFilter
-{
- /**
- * 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 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.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
deleted file mode 100644
index 5115a8530..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
+++ /dev/null
@@ -1,212 +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.ui.common;
-
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class UIUtils
-{
- String infoPopid_;
- MessageUtils msgUtils_;
-
- public UIUtils( MessageUtils msgUtils, String infoPopid )
- {
- msgUtils_ = msgUtils;
- infoPopid_ = infoPopid;
- }
-
- public Button createRadioButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.RADIO, parent, labelName, tooltip, infopop );
- }
-
- public Button createCheckbox( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.CHECK, parent, labelName, tooltip, infopop );
- }
-
- public Button createPushButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.NONE, parent, labelName, tooltip, infopop );
- }
-
- public Button createButton( int kind, Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, kind );
-
- tooltip = tooltip == null ? labelName : tooltip;
- button.setText( msgUtils_.getMessage( labelName ) );
- button.setToolTipText( msgUtils_.getMessage( tooltip ) );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infoPopid_ + "." + infopop );
-
- return button;
- }
-
- public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( msgUtils_.getMessage( labelName ) );
- label.setToolTipText( msgUtils_.getMessage( tooltip ) );
- }
-
- Combo combo = new Combo( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData( griddata );
- combo.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, infoPopid_ + "." + infopop );
-
- return combo;
- }
-
- public Text createText( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( msgUtils_.getMessage( labelName ) );
- label.setToolTipText( msgUtils_.getMessage( tooltip ) );
- }
-
- Text text = new Text( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- text.setLayoutData( griddata );
- text.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, infoPopid_ + "." + infopop );
-
- return text;
- }
-
- public Composite createComposite( Composite parent, int columns )
- {
- return createComposite( parent, columns, -1, -1 );
- }
-
- public Composite createComposite( Composite parent, int columns, int marginHeight, int marginWidth )
- {
- Composite composite = new Composite( parent, SWT.NONE );
-
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- composite.setLayout( gridlayout );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- composite.setLayoutData( griddata );
-
- return composite;
-
- }
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop )
- {
- return createGroup( parent, groupName, tooltip, infopop, 1, -1, -1 );
- }
-
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop, int columns, int marginHeight, int marginWidth )
- {
- Group newGroup = new Group( parent, SWT.NONE );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- GridLayout gridlayout = new GridLayout();
-
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- tooltip = tooltip == null ? groupName : tooltip;
- newGroup.setLayout( gridlayout );
- newGroup.setText( msgUtils_.getMessage( groupName ) );
- newGroup.setLayoutData( griddata );
- newGroup.setToolTipText( msgUtils_.getMessage( tooltip ));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, infoPopid_ + "." + infopop);
-
- return newGroup;
- }
-
- public Tree createTree( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Tree tree = new Tree( parent, style );
-
- tree.setLayoutData( createFillAll() );
- tree.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( tree, infoPopid_ + "." + infopop );
-
- return tree;
-
- }
-
- public Table createTable( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Table table = new Table( parent, style );
-
- //table.setLayoutData( createFillAll() );
- table.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( table, infoPopid_ + "." + infopop );
-
- return table;
-
- }
-
- public Label createHorizontalSeparator( Composite parent, int spacing )
- {
- Composite composite = createComposite( parent, 1, spacing, -1 );
-
- Label separator = new Label( composite, SWT.SEPARATOR | SWT.HORIZONTAL );
-
- GridData griddata = new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL );
- separator.setLayoutData( griddata );
-
- return separator;
- }
-
- public GridData createFillAll()
- {
- GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL |
- GridData.GRAB_HORIZONTAL |
- GridData.VERTICAL_ALIGN_FILL |
- GridData.GRAB_VERTICAL );
- return data;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
deleted file mode 100644
index 84eaf015d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null
@@ -1,245 +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.ui.dialog;
-
-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.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-
-/**
-* Contains utility methods for launching various common dialogs.
-*/
-public final class DialogUtils
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * Raises a dialog for browsing containers.
- * @param parentShell The parent shell, optionally null.
- * @param initialPathname The initial selection.
- * @return The selected container or null if the dialog
- * is cancelled, or there is no selection, or the selection
- * is not a project or a folder.
- */
- public static String browseContainers ( Shell parentShell, String initialPathname )
- {
- String selectedPathname = null;
- IPath initialPath = new Path(initialPathname);
- IResource initialResource = ResourceUtils.getWorkspaceRoot().findMember(initialPath);
- if (initialResource == null)
- {
- if (initialPath.segmentCount() == 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getProject(initialPath.segment(0));
- }
- else if (initialPath.segmentCount() > 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getFolder(initialPath);
- }
- }
- else
- {
- if (initialResource.getType() == IResource.FILE)
- {
- initialResource = initialResource.getParent();
- }
- }
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(parentShell,(IContainer)initialResource,true,null);
- dialog.open();
- Object[] result = dialog.getResult();
- if (result != null && result.length > 0)
- {
- if (result[0] instanceof IPath)
- {
- IPath path = (IPath)result[0];
- selectedPathname = path.toString();
- }
- }
- return selectedPathname;
- }
-
- /**
- * Raises a dialog for browsing resources.
- * @param parentShell The parent shell, optionally null.
- * @param topResource The resource under which to browse.
- * If null, all resources in the workspace are browsed.
- * @param initialSelection The initial selection, or null for none.
- * If the initial selection is not null and exists in the set of
- * resources found by the browser, that resource is selected by default.
- * @param filter The resource filter object.
- * @return The selected resource.
- */
- public static IResource browseResources ( Shell parentShell, IResource topResource, IResource initialSelection, Filter filter)
- {
- ResourceSelectionDialog rds = new ResourceSelectionDialog(parentShell,topResource,initialSelection,filter);
- rds.setMultipleSelectionEnabled(false);
- if (rds.open() == Dialog.OK)
- {
- IResource[] resources = rds.getResult();
- if (resources != null && resources.length > 0)
- {
- return resources[0];
- }
- }
- return null;
- }
-
- /**
- * <b>Implementation remains TBD.</b><br>
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell, IProject project )
- {
- return browseClasses(parentShell, project, (IRunnableContext)null);
- }
-
- public static String browseClasses ( Shell parentShell, IProject project, IWizardContainer container)
- {
- return browseClasses(parentShell, project, (IRunnableContext)container);
- }
-
- /**
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell,
- IProject project,
- IRunnableContext ctxt)
- {
- return browseClasses(parentShell, new IResource[] {project}, ctxt);
- }
-
- public static String browseClasses(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- IType itype = browseClassesAsIType(parentShell, resources, ctxt);
- if (itype != null)
- return itype.getFullyQualifiedName();
- else
- return null;
- }
-
- public static IType browseClassesAsIType(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- Vector javaElements = new Vector();
- for (int i = 0; i < resources.length; i++)
- {
- IJavaElement javaElement = JavaCore.create(resources[i]);
- if (javaElement != null)
- javaElements.add(javaElement);
- }
- IJavaElement[] elements = (IJavaElement[])javaElements.toArray(new IJavaElement[0]);
-
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, ctxt, scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false);
- dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
- dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- return (IType)results[0];
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
- return null;
- }
-
- /**
- * Raises a dialog for browsing interfaces on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java interface.
- */
- public static String browseInterfaces( Shell parentShell,
- IProject project,
- IWizardContainer container)
-
- {
- String interfaceName = null;
-
- //Limiting search scope to the project
- IResource[] resources = new IResource[1];
- resources[0]=project;
- IJavaElement[] elements = new IJavaElement[1];
- elements[0] = JavaCore.create(resources[0]);
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, container, scope, IJavaElementSearchConstants.CONSIDER_TYPES, false);
- dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
- dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- IType resultInterface = (IType)results[0];
- interfaceName = resultInterface.getFullyQualifiedName();
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
-
- return interfaceName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
deleted file mode 100644
index 2a819c993..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,323 +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.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-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.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class ResourceSelectionDialog extends Dialog implements Listener
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- //
- // Dialog controls.
- //
- private Label filterLabel_;
- private Combo filterCombo_;
- /*CONTEXT_ID DRES0001 for the Resource Type combo box of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_COMBO_RESOURCE_TYPE = WebServiceUIPlugin.ID + ".DRES0001";
- private static final String TOOLTIP_DRES_COMBO_RESOURCE_TYPE = "%TOOLTIP_DRES_COMBO_RESOURCE_TYPE";
- //
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
- /*CONTEXT_ID DRES0002 for the Resource tree of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_TREE_RESOURCE = WebServiceUIPlugin.ID + ".DRES0002";
- private static final String TOOLTIP_DRES_TREE_RESOURCE = "%TOOLTIP_DRES_TREE_RESOURCE";
-
- //
- // Essential goodies.
- //
- private IResource root_;
- private IResource initialSelection_;
- private Filter[] filters_;
- private Filter currentFilter_;
- private IResource[] selection_;
- private boolean multipleSelectionEnabled_;
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
- {
- this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filter.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
- * or null to default to all resources under the <code>root</code>.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
- {
- this(parent,root,initialSelection,new Filter[] {filter});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filters.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
- * objects.
- * If the array is null or of length zero, then all resources are accepted
- * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
- * If the array is of length one, then the dialog will consist of a single
- * control showing a list of all filtered resources.
- * If the array is of length greater than one, then the dialog will
- * consist of a combo box containing the names of the filters and with the
- * first filter (ie. <code>filters[0]</code>) selected by default, followed
- * by a control showing a list of all resources filtered by the selected filter.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
- {
- super(parent);
- root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
- initialSelection_ = initialSelection;
- filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
- currentFilter_ = filters_[0];
- multipleSelectionEnabled_ = false;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getResult ()
- {
- return selection_;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed ()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed ()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i=0;
- Iterator iter = structuredSelection.iterator();
- while (iter.hasNext())
- {
- Object object = iter.next();
- if (object instanceof IResource)
- {
- selection_[i++] = (IResource)object;
- }
- }
- }
- 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(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_RESOURCE_BROWSE"));
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea ( Composite parent )
- {
- GridLayout gl;
- GridData gd;
-
- Composite composite = (Composite)super.createDialogArea(parent);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (filters_.length > 1)
- {
- Composite f = new Composite(composite,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- f.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- f.setLayoutData(gd);
-
- filterLabel_ = new Label(f,SWT.WRAP);
- filterLabel_.setText(WebServiceUIPlugin.getMessage("%LABEL_RESOURCE_FILTER"));
- filterLabel_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-
- filterCombo_ = new Combo(f,SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- filterCombo_.setLayoutData(gd);
- filterCombo_.addListener(SWT.Selection,this);
- filterCombo_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(filterCombo_,INFOPOP_DRES_COMBO_RESOURCE_TYPE);
- }
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
-// resourceTree_.addListener(SWT.Selection,this);
- resourceTree_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_TREE_RESOURCE));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_,INFOPOP_DRES_TREE_RESOURCE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(
- new DecoratingLabelProvider(
- new WorkbenchLabelProvider(),
- WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter ()
- {
- public boolean select ( Viewer viewer, Object parentObject, Object object )
- {
- return
- (
- ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
- || (ResourceSelectionDialog.this.currentFilter_.accepts(object))
- );
- }
- }
- );
- fileViewer_.setInput(root_);
- fileViewer_.addSelectionChangedListener(
- new ISelectionChangedListener ()
- {
- public void selectionChanged ( SelectionChangedEvent event )
- {
-// ResourceSelectionDialog.this.validatePageToStatus();
- }
- }
- );
- if (initialSelection_ != null)
- {
- fileViewer_.setSelection(new StructuredSelection(ResourceSelectionDialog.this.initialSelection_),true);
- }
-
- return composite;
- }
-
- /**
- * Called when an event occurs on the page.
- * Handles the event and revalidates the page.
- * @param event The event that occured.
- */
- public void handleEvent ( Event event )
- {
-// validatePageToStatus();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 7462e176b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* 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 WebServiceUIPlugin extends AbstractUIPlugin
-{
- // Copyright
- public static final String copyright =
- "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUIPlugin instance_;
-
- private PersistentActionDialogsContext actionDialogsContext_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUIPlugin() {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceUIPlugin singleton.
- */
- static public WebServiceUIPlugin getInstance() {
- return instance_;
- }
-
-
- public PersistentActionDialogsContext getActionDialogsContext()
- {
- if (actionDialogsContext_ == null)
- {
- actionDialogsContext_ = new PersistentActionDialogsContext();
- actionDialogsContext_.load();
- }
- return actionDialogsContext_;
- }
-
- /**
- * 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)
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(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;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index 7e2ba9c7d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-public class ActionDialogPreferenceType {
-
- private String id_;
- public void setId (String id) {
- id_ = id;
- }
- public String getId() {
- return id_;
- }
-
- private String name_;
- public void setName(String name) {
- name_ = name;
- }
- public String getName() {
- return name_;
- }
-
- private String infopop_;
- public void setInfopop (String infopop) {
- infopop_ = infopop;
- }
- public String getInfopop () {
- return infopop_;
- }
-
- private String tooltip_;
- public void setTooltip (String tooltip) {
- tooltip_= tooltip;
- }
- public String getTooltip () {
- return tooltip_;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index e6a3a3f39..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,114 +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.ui.preferences;
-
-import java.util.Enumeration;
-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;
-
-public class ActionDialogPreferenceTypeRegistry
-{
- private static ActionDialogPreferenceTypeRegistry instance_;
-
- private Hashtable typesByName_;
-
- //
- // Loads WebServiceType objects into this registry.
- // This is done by querying the plugin registry for all extensions
- // hanging on the webServiceType extension point. Extensions
- // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceType
- // interface.
- //
- private void loadDialogsPreferences ()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.ui",
- "actionDialogPreferenceType");
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- Object actionDialogPreferenceType = elem.createExecutableExtension("class");
- if (actionDialogPreferenceType instanceof ActionDialogPreferenceType)
- {
- ActionDialogPreferenceType dialog = (ActionDialogPreferenceType) actionDialogPreferenceType;
- dialog.setId((String)elem.getAttribute("id"));
- dialog.setName((String)elem.getAttribute("name"));
- dialog.setInfopop((String)elem.getAttribute("infopop"));
- dialog.setTooltip((String)elem.getAttribute("tooltip"));
- add(dialog);
- }
- } catch (CoreException e)
- {
- }
- }
- }
-
- //
- // Loads actionDialogPreferenceType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- typesByName_ = new Hashtable();
- loadDialogsPreferences();
- }
-
- //
- // Add the given WebServiceType to this registry.
- // See method load().
- //
- private void add ( ActionDialogPreferenceType dialog )
- {
- typesByName_.put(dialog.getId(),dialog);
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceTypeRegistry object.
- */
- public static ActionDialogPreferenceTypeRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new ActionDialogPreferenceTypeRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- /**
- * Returns all registered <code>WebServiceType</code> objects.
- * @return All registered <code>WebServiceType</code> objects.
- */
- public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
- {
- ActionDialogPreferenceType[] dialogs = new ActionDialogPreferenceType[typesByName_.size()];
- Enumeration e = typesByName_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- dialogs[i] = (ActionDialogPreferenceType)e.nextElement();
- }
- return dialogs;
- }
-
- public ActionDialogPreferenceType getActionDialogPrefrenceTypeByName (String name)
- {
- return (name == null ? null : (ActionDialogPreferenceType)typesByName_.get(name));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index fa7bc4aa1..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,219 +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.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-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.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-;
-
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
- /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_PAGE = WebServiceUIPlugin.ID + ".PPAD0001";
- //
- private Button showAll;
- /*CONTEXT_ID PPAD0002 for the show all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_SHOW_ALL = WebServiceUIPlugin.ID + ".PPAD0002";
- //
- private Button hideAll;
- /*CONTEXT_ID PPAD0003 for the hide all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_HIDE_ALL = WebServiceUIPlugin.ID + ".PPAD0003";
-
- private Hashtable checkBoxes_;
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- checkBoxes_ = new Hashtable();
- addOptionalDialogsCheckBoxes (superparent);
- new Label(superparent, SWT.HORIZONTAL);
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PPAD_PAGE"));
- helpSystem.setHelp(parent,INFOPOP_PPAD_PAGE);
-
- showAll = new Button(parent, SWT.NONE);
- showAll.setText(getMessage("%BUTTON_SHOW_ALL_DIALOGS"));
- showAll.addListener(SWT.Selection, this);
- showAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
- helpSystem.setHelp(showAll,INFOPOP_PPAD_BUTTON_SHOW_ALL);
-
- hideAll = new Button(parent, SWT.NONE);
- hideAll.setText(getMessage("%BUTTON_HIDE_ALL_DIALOGS"));
- hideAll.addListener ( SWT.Selection, this);
- hideAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
- helpSystem.setHelp(hideAll,INFOPOP_PPAD_BUTTON_HIDE_ALL);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- public void handleEvent (Event event)
- {
- if (showAll == event.widget)
- handleShowAllEvent();
-
- else if ( hideAll == event.widget)
- handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( true );
- }
- }
-
- private void handleHideAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( false );
- }
- }
-
- private void addOptionalDialogsCheckBoxes ( Composite parent)
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
- ActionDialogPreferenceType[] dialogs = context.getDialogs();
- for (int i = 0; i < dialogs.length; i++) {
- Button checkBox = createCheckBox(parent , dialogs[i].getName());
- checkBox.setToolTipText(getMessage(dialogs[i].getTooltip()));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox,dialogs[i].getInfopop());
- checkBoxes_.put(dialogs[i].getId(), checkBox);
- }
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * 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) { }
-
- /**
- * The proxy information is stored in the preference store.
- */
- public IPreferenceStore getPreferenceStore()
- {
- return WebServiceUIPlugin.getInstance().getPreferenceStore();
- }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection(true);
- }
- }
-
- /**
- * Initializes states of the controls from the preferences.
- */
- private void initializeValues()
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- Button button = (Button) checkBoxes_.get(id);
- button.setSelection(context.isActionDialogEnabled(id));
- }
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
- }
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
deleted file mode 100644
index cabefe40f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,52 +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.ui.preferences;
-
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceType [] dialogs_;
-
-public PersistentActionDialogsContext ()
-{
- super( WebServiceUIPlugin.getInstance());
-}
-public void load()
-{
- ActionDialogPreferenceTypeRegistry reg = ActionDialogPreferenceTypeRegistry.getInstance();
- dialogs_ = reg.getActionDialogsPrefrences();
- for (int i = 0; i < dialogs_.length; i++) {
- setDefault(dialogs_[i].getId(), true);
- }
-}
-
-public ActionDialogPreferenceType[] getDialogs()
-{
- return dialogs_;
-}
-
-public void setActionDialogEnabled ( String id, boolean value)
-{
- setValue (id, value);
-}
-
-public boolean isActionDialogEnabled( String id)
-{
- if (id == null )
- return true;
- return getValueAsBoolean(id);
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index c4b0fdcff..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,307 +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.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-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.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
- /*CONTEXT_ID PPSD0001 for the Project Topology Preference Page*/
- private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PPTP0001";
-
- 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(getMessage("%TOOLTIP_PTPP_PAGE"));
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PTPP_PAGE);
-
- Text clientTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
- clientTypeLabel.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
- clientTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL));
-
- Composite clientTypeComposite = new Composite(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 ));
-
- Table table= 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;
- table.setLayoutData(gd);
- table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
- clientTypes_ = new Vector();
- clientTypeViewer_ = new TableViewer(table);
- clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
- clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
- clientTypeViewer_.setInput(clientTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE"));
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- table.setLayout(tableLayout);
-
- Composite c = new Composite(clientTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginHeight = 10;
- gl.marginWidth = 0;
- c.setLayout(gl);
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
- twoEAR_ = new Button(parent, SWT.CHECK | SWT.WRAP );
- twoEAR_.setText(getMessage("%LABEL_ENABLE_TWO_EARS"));
- twoEAR_.setToolTipText(getMessage("%TOOLTIP_ENABLE_TWO_EARS"));
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- /**
- * 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) { }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- clientTypes_.clear();
- String[] types = ProjectTopologyDefaults.getClientTypes();
- for (int i = 0; i < types.length; i++)
- clientTypes_.add(types[i]);
- clientTypeViewer_.refresh();
- twoEAR_.setSelection(true);
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
- String[] types = context.getClientTypes();
- for (int i = 0; i < types.length; i++)
- clientTypes_.add(types[i]);
- // check whether we missed any types from the default list
- boolean missed = false;
- types = ProjectTopologyDefaults.getClientTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (clientTypes_.indexOf(types[i]) == -1)
- {
- clientTypes_.add(types[i]);
- missed = true;
- }
- }
- if (missed)
- {
- types = new String[clientTypes_.size()];
- clientTypes_.copyInto(types);
- context.setClientTypes(types);
- }
- // refresh viewer
- clientTypeViewer_.refresh();
- twoEAR_.setSelection(context.isUseTwoEARs());
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
- 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)
- {
- 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();
- }
- }
- }
-
- 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
- {
- private IConfigurationElement[] configElements_;
-
- public ClientTypeLabelProvider()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
- }
-
- private IConfigurationElement getElementByAttribute(String name, String value)
- {
- for (int i = 0; i < configElements_.length; i++)
- if (configElements_[i].getAttribute(name).equals(value))
- return configElements_[i];
- return null;
- }
-
- /**
- * @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)
- {
- return getElementByAttribute("id", value.toString()).getAttribute("label");
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index deb26ba7d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null
@@ -1,156 +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.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-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.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
- private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
- //
- private Button overWriteFiles;
- /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
- //
- private Button createFolders;
- /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
- //
- private Button checkoutFiles;
- /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PPRM_PAGE"));
- helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
- overWriteFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_OVERWRITE_FILES" ));
- overWriteFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES"));
- helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
- createFolders = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CREATE_FOLDERS" ));
- createFolders.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS"));
- helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
- checkoutFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CHECKOUT_FILES" ));
- checkoutFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CHECK_OUT"));
- helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * 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) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- overWriteFiles.setSelection( ResourceDefaults.getOverwriteFilesDefault());
- createFolders.setSelection( ResourceDefaults.getCreateFoldersDefault());
- checkoutFiles.setSelection( ResourceDefaults.getCheckoutFilesDefault());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- overWriteFiles.setSelection( context.isOverwriteFilesEnabled());
- createFolders.setSelection( context.isCreateFoldersEnabled());
- checkoutFiles.setSelection( context.isCheckoutFilesEnabled());
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- context.setOverwriteFilesEnabled( overWriteFiles.getSelection() );
- context.setCreateFoldersEnabled( createFolders.getSelection() );
- context.setCheckoutFilesEnabled( checkoutFiles.getSelection() );
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d08a8a7a9..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,316 +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.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.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-
- private TableViewer webServiceTestTypeViewer_;
- private Button moveUp_;
- private Button moveDown_;
- private Vector webServiceTestTypes_;
-
- /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
- private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
- //
- private Button launchSample;
- /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
- private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
- //
-
- /**
- * 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(getMessage("%TOOLTIP_PPSD_PAGE"));
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);
-
- launchSample = createCheckBox(parent, getMessage("%BUTTON_LAUNCH_SAMPLE"));
- launchSample.setToolTipText(getMessage("%TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(launchSample, INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
-
-
- Text testServiceTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
- testServiceTypeLabel.setText(getMessage("%LABEL_SAMPLE_TYPES"));
- testServiceTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- webServiceTestTypeComposite.setLayout(gl);
- webServiceTestTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- Table table= new Table(webServiceTestTypeComposite, 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;
- table.setLayoutData(gd);
- table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
- webServiceTestTypes_ = new Vector();
- webServiceTestTypeViewer_ = new TableViewer(table);
- webServiceTestTypeViewer_.setContentProvider(new WebServiceTestTypeContentProvider());
- webServiceTestTypeViewer_.setLabelProvider(new WebServiceTestTypeLabelProvider());
- webServiceTestTypeViewer_.setInput(webServiceTestTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- table.setLayout(tableLayout);
-
- Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginHeight = 10;
- gl.marginWidth = 0;
- c.setLayout(gl);
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * 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()
- {
- try{
- storeValues();
- }catch (Exception exc){
- exc.printStackTrace();}
- return true;
- }
-
- protected void performApply()
- {
- try{
- performOk();
- }catch(NullPointerException exc){
- exc.printStackTrace();
- }
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-
- webServiceTestTypes_.clear();
- String[] types = defaults.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- webServiceTestTypeViewer_.refresh();
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( context.isLaunchSampleEnabled());
-
- String[] types = context.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- // check whether we missed any types from the default list
- boolean missed = false;
- types = defaults.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (webServiceTestTypes_.indexOf(types[i]) == -1)
- {
- webServiceTestTypes_.add(types[i]);
- missed = true;
- }
- }
- if (missed)
- {
- types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestTypes(types);
- }
- // refresh viewer
- webServiceTestTypeViewer_.refresh();
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- String[] types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestTypes(types);
-
- //pgm context.setLaunchSampleEnabled(launchSample.getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == moveUp_ && index > 0)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index-1);
- webServiceTestTypeViewer_.refresh();
- }
- else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index+1);
- webServiceTestTypeViewer_.refresh();
- }
- }
- }
-
- private class WebServiceTestTypeContentProvider 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 WebServiceTestTypeLabelProvider extends LabelProvider
- {
- public WebServiceTestTypeLabelProvider()
- {
- }
-
- /**
- * @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)
- {
- //return getElementByAttribute("id", value.toString()).getAttribute("label");
- return value.toString();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index e37abc3d3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,21 +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.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
- public boolean isPrivateUDDIRegistryInstalled();
- public String[] getPrivateUDDIRegistryInquiryAPI();
- public String[] getPrivateUDDIRegistryPublishAPI();
- public CommandWidgetBinding getBinding();
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
deleted file mode 100644
index 76e4e9aca..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
+++ /dev/null
@@ -1,143 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=International Business Machines Corp.
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function of the \
-Web services plugin.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-PREFERENCE_CATEGORY_CODE_GENERATION=Code Generation
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_DRIVER_JARS=JDBC drivers
-
-
-#
-#Scenario Defaults
-BUTTON_LAUNCH_SAMPLE=Launch the sample when generated
-LABEL_UDDI_CAT_DATA_COLUMN_DELIM=User defined UDDI Category data column delimiter:
-LABEL_UDDI_CAT_DATA_STRING_DELIM=User defined UDDI Category data string delimiter:
-MSG_ERROR_COLUMN_STRING_DELIMS_IDENTICAL=IWAB0481E UDDI column and string delimiters must not be identical.
-LABEL_MOVE_UP=Move up
-LABEL_MOVE_DOWN=Move down
-
-#
-# Preferences Tooltips
-#
-
-#Scenario Defaults
-TOOLTIP_PPSD_PAGE=Set the defaults for the Web service scenarios.
-TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE=Launch the sample application after generation.
-TOOLTIP_PPSD_COMBO_SAMPLE_GEN=Select the type of sample JSP to be generated.
-TOOLTIP_PPSD_COMBO_EXPLORER=Select the type of the Web services explorer to be used.
-TOOLTIP_PPSD_UDDI_CAT_DATA_COLUMN_DELIM=column delimiter for user defined UDDI category data
-TOOLTIP_PPSD_UDDI_CAT_DATA_STRING_DELIM=string delimiter for user defined UDDI category data
-TOOLTIP_CLIENT_TYPE_TABLE_VIEWER=Preferred order of the list of client types
-TOOLTIP_MOVE_UP=Move the selected client type up the list
-TOOLTIP_MOVE_DOWN=Move the selected client type down the list
-
-#
-# Resource Managment
-TOOLTIP_PPRM_PAGE=Set preferences that control resources used/generated by the Web service.
-TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES=Overwrite files without warning.
-TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS=Create folders when necessary.
-TOOLTIP_PPRM_CHECKBOX_CHECK_OUT=Check out files without warning.
-BUTTON_CREATE_FOLDERS=Create folders when necessary
-BUTTON_OVERWRITE_FILES=Overwrite files without warning
-BUTTON_CHECKOUT_FILES=Check out files without warning
-
-#
-# General messages.
-#
-ISTATUS_WITHOUT_EXCEPTION={0}
-ISTATUS_WITH_EXCEPTION={0}\nException: {1}
-MSG_INFO_SAVED_STATUS=IWAB0297I Press the Details button to see informational messages.
-
-#
-# TypeSelectionDialog
-#
-DIALOG_TITLE_CLASS_BROWSE=Browse Classes
-DIALOG_TITLE_INTERFACE_BROWSE=Browse Interfaces
-
-#
-# Common wizard strings.
-#
-LABEL_WSEXPLORER_TYPES=Web Services Explorer
-LABEL_SAMPLE_TYPES=Java proxy sample
-
-#
-# ResourceSelectionDialog
-#
-DIALOG_TITLE_RESOURCE_BROWSE=Browse Files
-LABEL_RESOURCE_FILTER=Filter:
-
-#
-# Tooltips for dialog.ResourceSelectionDialog
-# DRES=Dialog/RESources
-#
-TOOLTIP_DRES_COMBO_RESOURCE_TYPE=Type of resources to browse.
-TOOLTIP_DRES_TREE_RESOURCE=Resources available for selection.
-
-
-
-#
-# HTTP Basic Authentication
-#
-PREFERENCE_CATEGORY_HTTP_BASIC_AUTH=HTTP Basic Auth
-CHECKBOX_PREFERENCE_ENABLE_HTTP_BASIC_AUTH=Enable HTTP basic authentication
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_USERNAME=HTTP basic auth user name:
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_PASSWORD=HTTP basic auth password:
-
-TOOLTIP_ENABLE_HTTP_BASIC_AUTH=Specify HTTP basic authentication setting for Web services toolings.
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=User name for HTTP basic authentication.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Password for HTTP basic authentication.
-
-
-#
-# Messages for project topology preference page
-#
-TOOLTIP_PTPP_PAGE=Preference that control the project topology of your Web service and client scenarios.
-TOOLTIP_ENABLE_TWO_EARS=Enable this option if you want to generate your Web service and Web service client in different EAR projects.
-
-LABEL_ENABLE_TWO_EARS=Generate Web service and Web service client in different EAR projects
-LABEL_CLIENT_TYPE_NAME=Client type:
-
-
-#
-# ActionDialogs Page
-#
-PREFERENCE_CATEGORY_DIALOGS=Dialogs
-
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
-
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.ws.parser/.classpath b/bundles/org.eclipse.wst.ws.parser/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.parser/.cvsignore b/bundles/org.eclipse.wst.ws.parser/.cvsignore
deleted file mode 100644
index 6248f15aa..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-.cdtproject
-build.xml
-temp.folder
-parser.jar
-@dot
diff --git a/bundles/org.eclipse.wst.ws.parser/.project b/bundles/org.eclipse.wst.ws.parser/.project
deleted file mode 100644
index feb66400b..000000000
--- a/bundles/org.eclipse.wst.ws.parser/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws.parser</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.parser/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
deleted file mode 100644
index 307f4ce37..000000000
--- a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.parser
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.parser.disco,
- org.eclipse.wst.ws.internal.parser.discovery,
- org.eclipse.wst.ws.internal.parser.favorites,
- org.eclipse.wst.ws.internal.parser.plugin,
- org.eclipse.wst.ws.internal.parser.wsil
-Require-Bundle: org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.eclipse.core.runtime,
- org.apache.wsil4j,
- org.uddi4j,
- org.eclipse.wst.command.env.core,
- org.apache.axis
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws.parser/about.html b/bundles/org.eclipse.wst.ws.parser/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws.parser/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/build.properties b/bundles/org.eclipse.wst.ws.parser/build.properties
deleted file mode 100644
index f41b40a78..000000000
--- a/bundles/org.eclipse.wst.ws.parser/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- plugin.properties,\
- about.html
-source.. = src/
-output.. = bin/
diff --git a/bundles/org.eclipse.wst.ws.parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/plugin.properties
deleted file mode 100644
index 395ac6e50..000000000
--- a/bundles/org.eclipse.wst.ws.parser/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001,2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 Description Parser
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.wst.ws.parser/plugin.xml b/bundles/org.eclipse.wst.ws.parser/plugin.xml
deleted file mode 100644
index 98566ef4a..000000000
--- a/bundles/org.eclipse.wst.ws.parser/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
deleted file mode 100644
index a96dad292..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOContractReference extends DISCOReference
-{
- private String docRef_;
-
- public DISCOContractReference(String ref,String docRef)
- {
- super(ref);
- docRef_ = docRef;
- }
-
- public String getDocRef()
- {
- return docRef_;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
deleted file mode 100644
index 620944923..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-import java.util.Vector;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more
- * details on DISCO.
- */
-public class DISCOParser
-{
- private DocumentBuilder parser_;
- private final String NS_DISCO = "http://schemas.xmlsoap.org/disco/";
- private final String DISCOVERY = "discovery";
- private final String DISCOVERY_REF = "discoveryRef";
- private final String NS_CONTRACT_REF = "http://schemas.xmlsoap.org/disco/scl/";
- private final String CONTRACT_REF = "contractRef";
- private final String REF = "ref";
- private final String DOC_REF = "docRef";
-
- public DISCOParser()
- {
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- docBuilderFactory.setNamespaceAware(true);
- parser_ = docBuilderFactory.newDocumentBuilder();
- }
- catch (ParserConfigurationException pce)
- {
- parser_ = null;
- }
- }
-
- public DISCOReference[] parse(String discoURI, InputSource source) throws Exception
- {
- if (parser_ != null)
- {
- Document doc = parser_.parse(source);
- Element rootElement = doc.getDocumentElement();
- // Root element must by <disco:discovery
- // xmlns:disco="http://schemas.xmlsoap.org/disco/">
- if (rootElement != null && rootElement.getNamespaceURI().equals(NS_DISCO) && rootElement.getLocalName().equals(DISCOVERY))
- {
- NodeList childNodes = rootElement.getChildNodes();
- Vector discoReferences = new Vector();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node childNode = childNodes.item(i);
- if (childNode instanceof Element)
- {
- Element element = (Element)childNode;
- String localName = element.getLocalName();
- String nsURI = element.getNamespaceURI();
- if (nsURI.equals(NS_DISCO) && localName.equals(DISCOVERY_REF))
- {
- // DISCO link.
- String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
- discoReferences.addElement(new DISCOReference(ref));
- }
- else if (nsURI.equals(NS_CONTRACT_REF) && localName.equals(CONTRACT_REF))
- {
- // WSDL link.
- String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
- String docRef = convertToAbsoluteURI(discoURI, element.getAttribute(DOC_REF));
- discoReferences.addElement(new DISCOContractReference(ref, docRef));
- }
- }
- }
- int numberOfDISCOReferences = discoReferences.size();
- if (numberOfDISCOReferences > 0)
- {
- DISCOReference[] references = new DISCOReference[numberOfDISCOReferences];
- discoReferences.copyInto(references);
- return references;
- }
- }
- else
- {
- // The document is not a valid DISCO document.
- throw new Exception();
- }
- }
- return null;
- }
-
- private String convertToAbsoluteURI(String discoURI, String refURI)
- {
- if (refURI != null)
- {
- if (refURI.indexOf("://") > -1)
- {
- // refURI is already absolute.
- return refURI;
- }
- else
- {
- StringBuffer absoluteURI = new StringBuffer(discoURI.substring(0, Math.max(discoURI.lastIndexOf('\\'), discoURI.lastIndexOf('/') + 1)));
- absoluteURI.append(refURI);
- return absoluteURI.toString();
- }
- }
- return null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
deleted file mode 100644
index dd2175edb..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOReference
-{
- private String ref_;
-
- public DISCOReference(String ref)
- {
- ref_ = ref;
- }
-
- public String getRef()
- {
- return ref_;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
deleted file mode 100644
index 527a489b1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import sun.misc.BASE64Encoder;
-
-public final class NetUtils
-{
-
- /**
- * Get the java.net.URLConnection given a string representing the URL. This class ensures
- * that proxy settings in WSAD are respected.
- * @param urlString String representing the URL.
- * @return java.net.URLCDonnection URLConnection to the URL.
- */
- public static final URLConnection getURLConnection(String urlString)
- {
- try
- {
- URL url = createURL(urlString);
- URLConnection uc = url.openConnection();
- String proxyUserName = System.getProperty("http.proxyUserName");
- String proxyPassword = System.getProperty("http.proxyPassword");
- if (proxyUserName != null && proxyPassword != null)
- {
- StringBuffer userNamePassword = new StringBuffer(proxyUserName);
- userNamePassword.append(':').append(proxyPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encoding = encoder.encode(userNamePassword.toString().getBytes());
- userNamePassword.setLength(0);
- userNamePassword.append("Basic ").append(encoding);
- uc.setRequestProperty("Proxy-authorization",userNamePassword.toString());
- }
- return uc;
- }
- catch (MalformedURLException e)
- {
- }
- catch (IOException e)
- {
- }
- return null;
- }
-
- /**
- * Get the java.io.InputStream for a URL given a string representing the URL. This class
- * ensures that proxy settings in WSAD are respected.
- * @param urlString String representing the URL.
- * @return java.io.InputStream InputStream for reading the URL stream.
- */
- public static final InputStream getURLInputStream(String urlString)
- {
- try
- {
- URLConnection uc = getURLConnection(urlString);
- if (uc != null)
- {
- InputStream is = uc.getInputStream();
- return is;
- }
- }
- catch (IOException e)
- {
- }
- return null;
- }
-
- /**
- * Create a URL from a string.
- * @param urlString String representing the URL.
- * @return URL java.lang.URL representation of the URL.
- * @throws MalformedURLException
- */
- public static final URL createURL(String urlString) throws MalformedURLException
- {
- return new URL(urlString);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
deleted file mode 100644
index 4e907538f..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WebServicesParserExt extends WebServicesParser {
-
- public WebServicesParserExt() {
- super();
- }
-
- public WebServicesParserExt(String uri) {
- super(uri);
- }
-
- protected URL createURL(String url) throws MalformedURLException {
- return NetUtils.createURL(url);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
deleted file mode 100644
index 5b2e956e7..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesConstants
-{
- // Namespace
- public static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- public static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
- public static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
- public static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
- public static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
deleted file mode 100644
index c8c912955..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
+++ /dev/null
@@ -1,34 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Link;
-
-public class FavoritesLink
-{
- protected Link link_;
-
- public FavoritesLink()
- {
- link_ = null;
- }
-
- public Link getLink()
- {
- return link_;
- }
-
- public void setLink(Link link)
- {
- link_ = link;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
deleted file mode 100644
index d167fbea6..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
+++ /dev/null
@@ -1,429 +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.wst.ws.internal.parser.favorites;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-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.ServiceName;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.impl.AbstractImpl;
-import org.apache.wsil.impl.DescriptionImpl;
-import org.apache.wsil.impl.LinkImpl;
-import org.apache.wsil.impl.ServiceImpl;
-import org.apache.wsil.impl.ServiceNameImpl;
-import org.apache.wsil.impl.extension.uddi.BusinessDescriptionImpl;
-import org.apache.wsil.impl.extension.uddi.ServiceDescriptionImpl;
-import org.uddi4j.util.BusinessKey;
-import org.uddi4j.util.ServiceKey;
-
-public abstract class FavoritesRegistryTypeAbstract implements IFavoritesRegistryType
-{
- public FavoritesRegistryTypeAbstract()
- {
- }
-
- public abstract String getReadLocation();
- public abstract String getWriteLocation();
- protected abstract WSILDocument getWSILDocument();
-
- public void init()
- {
- getWSILDocument();
- }
-
- protected WSILDocument loadWSILDocument(String path, boolean force)
- {
- try
- {
- WSILDocument wsilDoc = WSILDocument.newInstance();
- wsilDoc.read(new FileReader(new File(path)));
- return wsilDoc;
- }
- catch (Throwable t)
- {
- if (force)
- {
- try
- {
- return WSILDocument.newInstance();
- }
- catch (Throwable t2)
- {
- return null;
- }
- }
- else
- return null;
- }
- }
-
- public String getFavoritesVersion()
- {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Abstract[] abstracts = inspection.getAbstracts();
- if (abstracts.length > 0)
- return abstracts[0].getText();
- else
- return null;
- }
-
- public void setFavoritesVersion(String version)
- {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Abstract abst = new AbstractImpl();
- abst.setText(version);
- inspection.removeAbstracts();
- inspection.addAbstract(abst);
- }
-
- public synchronized void save() throws WSILException, IOException
- {
- WSILDocument wsilDoc = getWSILDocument();
- if (wsilDoc != null)
- wsilDoc.write(getWriteLocation());
- }
-
- public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries()
- {
- Link[] links = loadUDDIRegistries();
- FavoritesUDDIRegistry[] registries = new FavoritesUDDIRegistry[links.length];
- for (int i = 0; i < links.length; i++)
- {
- registries[i] = new FavoritesUDDIRegistry();
- registries[i].setLink(links[i]);
- }
- return registries;
- }
-
- public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses()
- {
- Link[] links = loadUDDIBusinesses();
- FavoritesUDDIBusiness[] businesses = new FavoritesUDDIBusiness[links.length];
- for (int i = 0; i < links.length; i++)
- {
- businesses[i] = new FavoritesUDDIBusiness();
- businesses[i].setLink(links[i]);
- }
- return businesses;
- }
-
- public IFavoritesUDDIService[] getFavoritesUDDIServices()
- {
- Service[] services = loadUDDIServices();
- FavoritesUDDIService[] uddiServices = new FavoritesUDDIService[services.length];
- for (int i = 0; i < services.length; i++)
- {
- uddiServices[i] = new FavoritesUDDIService();
- uddiServices[i].setService(services[i]);
- }
- return uddiServices;
- }
-
- public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces()
- {
- Service[] services = loadUDDIServiceInterfaces();
- FavoritesUDDIServiceInterface[] serInts = new FavoritesUDDIServiceInterface[services.length];
- for (int i = 0; i < services.length; i++)
- {
- serInts[i] = new FavoritesUDDIServiceInterface();
- serInts[i].setService(services[i]);
- }
- return serInts;
- }
-
- public IFavoritesWSDL[] getFavoritesWSDLs()
- {
- Service[] services = loadWSDLServices();
- FavoritesWSDL[] wsdls = new FavoritesWSDL[services.length];
- for (int i = 0; i < services.length; i++)
- {
- wsdls[i] = new FavoritesWSDL();
- wsdls[i].setService(services[i]);
- }
- return wsdls;
- }
-
- public IFavoritesWSIL[] getFavoritesWSILs()
- {
- Link[] links = loadWSILs();
- FavoritesWSIL[] wsils = new FavoritesWSIL[links.length];
- for (int i = 0; i < links.length; i++)
- {
- wsils[i] = new FavoritesWSIL();
- wsils[i].setLink(links[i]);
- }
- return wsils;
- }
-
- public Link[] loadUDDIRegistries() {
- return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
- }
-
- public Link[] loadUDDIBusinesses() {
- return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
- }
-
- public Service[] loadUDDIServices() {
- return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
- }
-
- public Service[] loadUDDIServiceInterfaces() {
- return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
- }
-
- public Service[] loadWSDLServices() {
- return loadServicesByNamespace(FavoritesConstants.NAMESPACE_WSDL);
- }
-
- public Link[] loadWSILs() {
- return loadLinksByNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
- }
-
- private Service[] loadServicesByNamespace(String namespace) {
- Vector serviceVector = new Vector();
- WSILDocument wsilDoc = getWSILDocument();
- if (wsilDoc != null)
- {
- Inspection inspection = wsilDoc.getInspection();
- Service[] services = inspection.getServices();
- for (int i = 0; i < services.length; i++)
- {
- Description[] desc = services[i].getDescriptions();
- if (desc[0].getReferencedNamespace().equals(namespace))
- serviceVector.add(services[i]);
- }
- }
- Service[] services = new Service[serviceVector.size()];
- serviceVector.copyInto(services);
- return services;
- }
-
- private Link[] loadLinksByNamespace(String namespace) {
- Vector linkVector = new Vector();
- WSILDocument wsilDoc = getWSILDocument();
- if (wsilDoc != null)
- {
- Inspection inspection = wsilDoc.getInspection();
- Link[] links = inspection.getLinks();
- for (int i = 0; i < links.length; i++)
- {
- if (links[i].getReferencedNamespace().equals(namespace))
- linkVector.add(links[i]);
- }
- }
- Link[] links = new Link[linkVector.size()];
- linkVector.copyInto(links);
- return links;
- }
-
- public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
- {
- addUDDIRegistry(registry.getName(), registry.getInquiryURL(), registry.getPublishURL(), registry.getRegistrationURL());
- }
-
- public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
- {
- addUDDIBusiness(business.getName(), business.getInquiryURL(), business.getBusinessKey());
- }
-
- public void addFavoritesUDDIService(IFavoritesUDDIService service)
- {
- addUDDIService(service.getName(), service.getInquiryURL(), service.getServiceKey());
- }
-
- public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
- {
- addUDDIServiceInterface(serviceInterface.getName(), serviceInterface.getInquiryURL(), serviceInterface.getServiceInterfaceKey());
- }
-
- public void addFavoritesWSDL(IFavoritesWSDL wsdl)
- {
- addWSDLService(wsdl.getWsdlUrl());
- }
-
- public void addFavoritesWSIL(IFavoritesWSIL wsil)
- {
- addWSILLink(wsil.getWsilUrl());
- }
-
- public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Link link = new LinkImpl();
- // registry name
- Abstract abst = new AbstractImpl();
- abst.setText(registryName);
- link.addAbstract(abst);
- // inquiry URL
- Abstract abst2 = new AbstractImpl();
- abst2.setText(inquiryAPI);
- link.addAbstract(abst2);
- // publish URL
- Abstract abst3 = new AbstractImpl();
- if (publishAPI != null)
- abst3.setText(publishAPI);
- else
- abst3.setText("");
- link.addAbstract(abst3);
- // registration URL
- Abstract abst4 = new AbstractImpl();
- if (registrationURL != null)
- abst4.setText(registrationURL);
- else
- abst4.setText("");
- link.addAbstract(abst4);
- // add namespace
- link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
- inspection.addLink(link);
- return link;
- }
-
- public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Link link = new LinkImpl();
- Abstract abst = new AbstractImpl();
- abst.setText(businessName);
- link.addAbstract(abst);
- link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
- BusinessDescription bd = new BusinessDescriptionImpl();
- bd.setLocation(inquiryAPI);
- BusinessKey key = new BusinessKey(businessKey);
- bd.setBusinessKey(key);
- link.setExtensionElement(bd);
- inspection.addLink(link);
- return link;
- }
-
- public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Service service = new ServiceImpl();
- ServiceName name = new ServiceNameImpl();
- name.setText(serviceName);
- service.addServiceName(name);
- Description desc = new DescriptionImpl();
- desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
- ServiceDescription sd = new ServiceDescriptionImpl();
- sd.setLocation(inquiryAPI);
- ServiceKey key = new ServiceKey(serviceKey);
- sd.setServiceKey(key);
- desc.setExtensionElement(sd);
- service.addDescription(desc);
- inspection.addService(service);
- return service;
- }
-
- public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Service service = new ServiceImpl();
- ServiceName name = new ServiceNameImpl();
- name.setText(serIntName);
- service.addServiceName(name);
- Description desc = new DescriptionImpl();
- desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
- ServiceDescription sd = new ServiceDescriptionImpl();
- sd.setLocation(inquiryAPI);
- ServiceKey key = new ServiceKey(serIntKey);
- sd.setServiceKey(key);
- desc.setExtensionElement(sd);
- service.addDescription(desc);
- inspection.addService(service);
- return service;
- }
-
- public Service addWSDLService(String url) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Service service = new ServiceImpl();
- Description desc = new DescriptionImpl();
- desc.setLocation(url);
- desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSDL);
- service.addDescription(desc);
- inspection.addService(service);
- return service;
- }
-
- public Link addWSILLink(String url) {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- Link link = new LinkImpl();
- link.setLocation(url);
- link.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
- inspection.addLink(link);
- return link;
- }
-
- public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
- {
- if (registry instanceof FavoritesUDDIRegistry)
- removeLink(((FavoritesUDDIRegistry)registry).getLink());
- }
-
- public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
- {
- if (business instanceof FavoritesUDDIBusiness)
- removeLink(((FavoritesUDDIBusiness)business).getLink());
- }
-
- public void removeFavoritesUDDIService(IFavoritesUDDIService service)
- {
- if (service instanceof FavoritesUDDIService)
- removeService(((FavoritesUDDIService)service).getService());
- }
-
- public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
- {
- if (serviceInterface instanceof FavoritesUDDIServiceInterface)
- removeService(((FavoritesUDDIServiceInterface)serviceInterface).getService());
- }
-
- public void removeFavoritesWSDL(IFavoritesWSDL wsdl)
- {
- if (wsdl instanceof FavoritesWSDL)
- removeService(((FavoritesWSDL)wsdl).getService());
- }
-
- public void removeFavoritesWSIL(IFavoritesWSIL wsil)
- {
- if (wsil instanceof FavoritesWSIL)
- removeLink(((FavoritesWSIL)wsil).getLink());
- }
-
- public void removeService(Service service)
- {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- inspection.removeService(service);
- }
-
- public void removeLink(Link link)
- {
- WSILDocument wsilDoc = getWSILDocument();
- Inspection inspection = wsilDoc.getInspection();
- inspection.removeLink(link);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
deleted file mode 100644
index 4520f9aaf..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
+++ /dev/null
@@ -1,34 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Service;
-
-public class FavoritesService
-{
- protected Service service_;
-
- public FavoritesService()
- {
- service_ = null;
- }
-
- public Service getService()
- {
- return service_;
- }
-
- public void setService(Service service)
- {
- service_ = service;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
deleted file mode 100644
index f53883c86..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
+++ /dev/null
@@ -1,49 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.BusinessDescription;
-
-public class FavoritesUDDIBusiness extends FavoritesLink implements IFavoritesUDDIBusiness
-{
- public FavoritesUDDIBusiness()
- {
- super();
- }
-
- public String getName()
- {
- return (link_.getAbstracts())[0].getText();
- }
-
- public String getInquiryURL()
- {
- return ((BusinessDescription)link_.getExtensionElement()).getLocation();
- }
-
- public String getBusinessKey()
- {
- return ((BusinessDescription)link_.getExtensionElement()).getBusinessKey().getText();
- }
-
- public void setName(String name)
- {
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- }
-
- public void setBusinessKey(String key)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
deleted file mode 100644
index 7cc8076dd..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
+++ /dev/null
@@ -1,88 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Abstract;
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class FavoritesUDDIRegistry extends FavoritesLink implements IFavoritesUDDIRegistry
-{
- public FavoritesUDDIRegistry()
- {
- super();
- }
-
- public String getName()
- {
- String name = (link_.getAbstracts())[0].getText();
- if (name.startsWith("%"))
- {
- String translatedName = ParserPlugin.getMessage(name);
- if (translatedName != null)
- name = translatedName;
- }
- return name;
- }
-
- public String getInquiryURL()
- {
- return (link_.getAbstracts())[1].getText();
- }
-
- public String getPublishURL()
- {
- Abstract[] abstracts = link_.getAbstracts();
- if (abstracts.length > 2)
- {
- String publishURL = abstracts[2].getText();
- if (publishURL != null && publishURL.length() > 0)
- return publishURL;
- }
- return null;
- }
-
- public String getRegistrationURL()
- {
- Abstract[] abstracts = link_.getAbstracts();
- if (abstracts.length > 3)
- {
- String registrationURL = abstracts[3].getText();
- if (registrationURL != null && registrationURL.length() > 0)
- return registrationURL;
- }
- return null;
- }
-
- public void setName(String name)
- {
- (link_.getAbstracts())[0].setText(name);
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- (link_.getAbstracts())[1].setText(inquiryURL);
- }
-
- public void setPublishURL(String publishURL)
- {
- Abstract[] abstracts = link_.getAbstracts();
- if (abstracts.length > 2)
- abstracts[2].setText(publishURL);
- }
-
- public void setRegistrationURL(String registrationURL)
- {
- Abstract[] abstracts = link_.getAbstracts();
- if (abstracts.length > 3)
- abstracts[3].setText(registrationURL);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
deleted file mode 100644
index 0954f5712..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
+++ /dev/null
@@ -1,51 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIService extends FavoritesService implements IFavoritesUDDIService
-{
- public FavoritesUDDIService()
- {
- super();
- }
-
- public String getName()
- {
- return (service_.getServiceNames())[0].getText();
- }
-
- public String getInquiryURL()
- {
- ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
- return sd.getLocation();
- }
-
- public String getServiceKey()
- {
- ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
- return sd.getServiceKey().getText();
- }
-
- public void setName(String name)
- {
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- }
-
- public void setServiceKey(String key)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
deleted file mode 100644
index 56ec674c1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
+++ /dev/null
@@ -1,51 +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.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIServiceInterface extends FavoritesService implements IFavoritesUDDIServiceInterface
-{
- public FavoritesUDDIServiceInterface()
- {
- super();
- }
-
- public String getName()
- {
- return (service_.getServiceNames())[0].getText();
- }
-
- public String getInquiryURL()
- {
- ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
- return sd.getLocation();
- }
-
- public String getServiceInterfaceKey()
- {
- ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
- return sd.getServiceKey().getText();
- }
-
- public void setName(String name)
- {
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- }
-
- public void setServiceInterfaceKey(String key)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
deleted file mode 100644
index 0f340e053..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
+++ /dev/null
@@ -1,38 +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.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSDL extends FavoritesService implements IFavoritesWSDL
-{
- public FavoritesWSDL()
- {
- super();
- }
-
- public String getName()
- {
- return getWsdlUrl();
- }
-
- public String getWsdlUrl()
- {
- return (service_.getDescriptions())[0].getLocation();
- }
-
- public void setName(String name)
- {
- }
-
- public void setWsdlUrl(String wsdlURL)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
deleted file mode 100644
index 6622c7dea..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
+++ /dev/null
@@ -1,39 +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.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSIL extends FavoritesLink implements IFavoritesWSIL
-{
- public FavoritesWSIL()
- {
- super();
- }
-
- public String getName()
- {
- return getWsilUrl();
- }
-
-
- public String getWsilUrl()
- {
- return link_.getLocation();
- }
-
- public void setName(String name)
- {
- }
-
- public void setWsilUrl(String wsilURL)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
deleted file mode 100644
index b2c96c1cb..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesRegistryType
-{
- public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries();
- public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses();
- public IFavoritesUDDIService[] getFavoritesUDDIServices();
- public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces();
- public IFavoritesWSDL[] getFavoritesWSDLs();
- public IFavoritesWSIL[] getFavoritesWSILs();
-
- public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
- public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
- public void addFavoritesUDDIService(IFavoritesUDDIService service);
- public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
- public void addFavoritesWSDL(IFavoritesWSDL wsdl);
- public void addFavoritesWSIL(IFavoritesWSIL wsil);
-
- public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
- public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
- public void removeFavoritesUDDIService(IFavoritesUDDIService service);
- public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
- public void removeFavoritesWSDL(IFavoritesWSDL wsdl);
- public void removeFavoritesWSIL(IFavoritesWSIL wsil);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
deleted file mode 100644
index dd2d2c950..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
+++ /dev/null
@@ -1,23 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIBusiness
-{
- public String getName();
- public String getInquiryURL();
- public String getBusinessKey();
-
- public void setName(String name);
- public void setInquiryURL(String inquiryURL);
- public void setBusinessKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
deleted file mode 100644
index bb035f1c1..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
+++ /dev/null
@@ -1,25 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIRegistry
-{
- public String getName();
- public String getInquiryURL();
- public String getPublishURL();
- public String getRegistrationURL();
-
- public void setName(String name);
- public void setInquiryURL(String inquiryURL);
- public void setPublishURL(String publishURL);
- public void setRegistrationURL(String registrationURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
deleted file mode 100644
index 286370df0..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
+++ /dev/null
@@ -1,23 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIService
-{
- public String getName();
- public String getInquiryURL();
- public String getServiceKey();
-
- public void setName(String name);
- public void setInquiryURL(String inquiryURL);
- public void setServiceKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
deleted file mode 100644
index ad426cbb6..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
+++ /dev/null
@@ -1,23 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIServiceInterface
-{
- public String getName();
- public String getInquiryURL();
- public String getServiceInterfaceKey();
-
- public void setName(String name);
- public void setInquiryURL(String inquiryURL);
- public void setServiceInterfaceKey(String key);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
deleted file mode 100644
index d69f824cf..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSDL
-{
- public String getName();
- public String getWsdlUrl();
-
- public void setName(String name);
- public void setWsdlUrl(String wsdlURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
deleted file mode 100644
index 4c129e13b..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
+++ /dev/null
@@ -1,21 +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.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSIL
-{
- public String getName();
- public String getWsilUrl();
-
- public void setName(String name);
- public void setWsilUrl(String wsilURL);
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
deleted file mode 100644
index 19e827284..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ParserPlugin extends Plugin {
- //The shared instance.
- private static ParserPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public ParserPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.ws.parser.ParserPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static ParserPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = ParserPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /**
- * 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 )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.wst.ws.parser.plugin", plugin );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(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);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
deleted file mode 100644
index 36994bb05..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Vector;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class HTMLHeadHandler extends DefaultHandler
-{
- private final char START_TAG = '<';
- private final char END_TAG = '>';
- private final String HEAD_START_TAG = "<head>";
- private final String HEAD_END_TAG = "</head>";
- private final String ROOT_START_TAG = "<root>";
- private final String ROOT_END_TAG = "</root>";
- private final String UTF8 = "UTF-8";
-
- // WSIL tag information.
- private final String META = "meta";
- private final String NAME = "name";
- private final String SERVICE_INSPECTION = "serviceInspection";
- private final String CONTENT = "content";
-
- // DISCO tag information.
- private final String LINK = "link";
- private final String TYPE = "type";
- private final String TEXT_XML = "text/xml";
- private final String REL = "rel";
- private final String ALTERNATE = "alternate";
- private final String HREF = "href";
-
- private String baseURI_;
- private Vector wsils_;
- private Vector discos_;
-
- public HTMLHeadHandler(String baseURI)
- {
- super();
- baseURI_ = baseURI;
- wsils_ = new Vector();
- discos_ = new Vector();
- }
-
- public String[] getWsils()
- {
- String[] wsils = new String[wsils_.size()];
- wsils_.copyInto(wsils);
- return wsils;
- }
-
- public String[] getDiscos()
- {
- String[] discos = new String[discos_.size()];
- discos_.copyInto(discos);
- return discos;
- }
-
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
- {
- String qNameLC = qName.toLowerCase();
- if (qNameLC.equals(META))
- {
- String nameValue = attributes.getValue(NAME);
- if (SERVICE_INSPECTION.equals(nameValue))
- {
- String wsilURI = attributes.getValue(CONTENT);
- if (baseURI_ != null && wsilURI.indexOf(":/") == -1)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(baseURI_.substring(0, baseURI_.lastIndexOf("/")+1));
- sb.append(wsilURI);
- wsilURI = sb.toString();
- }
- if (!wsils_.contains(wsilURI))
- wsils_.add(wsilURI);
- }
- }
- else if (qNameLC.equals(LINK))
- {
- // See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more details on DISCO.
- String type = attributes.getValue(TYPE);
- String rel = attributes.getValue(REL);
- String href = attributes.getValue(HREF);
- if (TEXT_XML.equals(type) && ALTERNATE.equals(rel) && href != null)
- {
- String discoURI = href;
- if (discoURI.indexOf(":/") == -1)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(baseURI_.substring(0,baseURI_.lastIndexOf("/")+1));
- sb.append(discoURI);
- discoURI = sb.toString();
- }
- if (!discos_.contains(discoURI))
- discos_.add(discoURI);
- }
- }
- }
-
- public void error(SAXParseException e) throws SAXException
- {
- }
-
- public void fatalError(SAXParseException e) throws SAXException
- {
- }
-
- public void warning(SAXParseException e) throws SAXException
- {
- }
-
- private void harvestTags(StringBuffer target,String document,String tag)
- {
- int index = document.indexOf(START_TAG);
- int documentLength = document.length();
- int tagLength = tag.length();
- while (index != -1 && (index+1+tagLength)<documentLength)
- {
- String str = document.substring(index+1,index+1+tagLength);
- if (str.toLowerCase().equals(tag))
- {
- str = document.substring(index,document.indexOf(END_TAG,index+1)+1);
- target.append(str);
- index += str.length();
- }
- else
- index++;
- index = document.indexOf(START_TAG,index);
- }
- }
-
- public byte[] harvestHeadTags(byte[] b)
- {
- String s;
- try
- {
- s = new String(b, UTF8);
- }
- catch (UnsupportedEncodingException uee)
- {
- s = new String(b);
- }
- String head = s.toLowerCase();
- int headStartIndex = head.indexOf(HEAD_START_TAG);
- int headEndIndex = head.indexOf(HEAD_END_TAG);
- StringBuffer sb = new StringBuffer();
- sb.append(ROOT_START_TAG);
- if (headStartIndex != -1 && headEndIndex != -1)
- {
- head = s.substring(headStartIndex, headEndIndex+HEAD_END_TAG.length());
- harvestTags(sb,head,META);
- harvestTags(sb,head,LINK);
- }
- sb.append(ROOT_END_TAG);
- return sb.toString().getBytes();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
deleted file mode 100644
index bf42dc6b9..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public class IllegalArgumentsException extends Exception
-{
- private static final long serialVersionUID = -2533981176285561234L;
-
- public IllegalArgumentsException(String arg)
- {
- super(arg);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
deleted file mode 100644
index 3d007ac66..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.text.MessageFormat;
-import java.text.ParseException;
-
-public class UDDIURIHelper
-{
- private static final String QUERYSERVICE_URI_TEMPLATE = "uddiservice:query:{0}:query:{1}";
- private static final String SERVICEKEY_URI_TEMPLATE = "uddiservice:serviceKey:{0}:serviceKey:{1}";
-
- public static final String getQueryServiceURI(String query,String inquiryURL)
- {
- String[] uriParams = {query,inquiryURL};
- return MessageFormat.format(QUERYSERVICE_URI_TEMPLATE,uriParams);
- }
-
- public static final String getServiceKeyURI(String serviceKey,String inquiryURL)
- {
- String[] uriParams = {serviceKey,inquiryURL};
- return MessageFormat.format(SERVICEKEY_URI_TEMPLATE,uriParams);
- }
-
- private static final String[] parseURI(String pattern,String uri)
- {
- try
- {
- MessageFormat mf = new MessageFormat(pattern);
- Object[] parsedResults = mf.parse(uri);
- if (parsedResults != null && parsedResults.length > 0)
- {
- String[] results = new String[parsedResults.length];
- for (int i=0;i<parsedResults.length;i++)
- results[i] = (String)parsedResults[i];
- return results;
- }
- }
- catch (ParseException e)
- {
- }
- return null;
- }
-
- public static final String[] parseServiceKeyURI(String uri)
- {
- return parseURI(SERVICEKEY_URI_TEMPLATE,uri);
- }
-
- public static final String[] parseQueryServiceURI(String uri)
- {
- return parseURI(QUERYSERVICE_URI_TEMPLATE,uri);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
deleted file mode 100644
index 8ac66a620..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.IOException;
-
-public class WWWAuthenticationException extends Exception
-{
- private static final long serialVersionUID = -4918211021620316049L;
-
- private IOException ioe_;
- private String wwwAuthMsg_;
- private String url_;
-
- public WWWAuthenticationException(IOException ioe, String wwwAuthMsg, String url)
- {
- super(ioe.getMessage());
- ioe_ = ioe;
- wwwAuthMsg_ = wwwAuthMsg;
- url_ = url;
- }
-
- public IOException getIOException()
- {
- return ioe_;
- }
-
- public String getWWWAuthenticationMsg()
- {
- return wwwAuthMsg_;
- }
-
- public String getURL()
- {
- return url_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
deleted file mode 100644
index c7a8cab19..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
+++ /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
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public interface WWWAuthenticationHandler
-{
- public void handleWWWAuthentication(WWWAuthenticationException wwwae);
- public String getUsername();
- public String getPassword();
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
deleted file mode 100644
index 33e38a77f..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class WebServiceEntity
-{
- public static final int TYPE_UNKNOWN = -1;
- public static final int TYPE_HTML = 0;
- public static final int TYPE_WSIL = 1;
- public static final int TYPE_WSDL = 2;
- public static final int TYPE_UDDI_SERVICE = 3;
- public static final int TYPE_DISCO = 4;
-
- private Object parent_;
- private List children_;
- private int type_;
- private String uri_;
- private byte[] bytes_;
- private String httpUsername_;
- private String httpPassword_;
- private String documentation_;
- private Object model_;
-
- public WebServiceEntity()
- {
- parent_ = null;
- children_ = new ArrayList();
- type_ = TYPE_UNKNOWN;
- uri_ = null;
- bytes_ = null;
- httpUsername_ = null;
- httpPassword_ = null;
- documentation_ = null;
- model_ = null;
- }
-
- public Object getParent()
- {
- return parent_;
- }
-
- public void setParent(Object parent)
- {
- parent_ = parent;
- }
-
- public List getChildren()
- {
- return children_;
- }
-
- public void addChild(Object child)
- {
- children_.add(child);
- }
-
- public void removeChild(Object child)
- {
- children_.remove(child);
- }
-
- public int getType()
- {
- return type_;
- }
-
- public void setType(int type)
- {
- type_ = type;
- }
-
- public String getURI()
- {
- return uri_;
- }
-
- public void setURI(String uri)
- {
- uri_ = uri;
- }
-
- public byte[] getBytes()
- {
- return bytes_;
- }
-
- public void setBytes(byte[] bytes)
- {
- bytes_ = bytes;
- }
-
- public String getHTTPUsername()
- {
- return httpUsername_;
- }
-
- public void setHTTPUsername(String httpUsername)
- {
- httpUsername_ = httpUsername;
- }
-
- public String getHTTPPassword()
- {
- return httpPassword_;
- }
-
- public void setHTTPPassword(String httpPassword)
- {
- httpPassword_ = httpPassword;
- }
-
- public String getDocumentation()
- {
- return documentation_;
- }
-
- public void setDocumentation(String documentation)
- {
- documentation_ = documentation;
- }
-
- public Object getModel()
- {
- return model_;
- }
-
- public void setModel(Object model)
- {
- model_ = model;
- }
-
- public boolean isEntityResolved()
- {
- return (bytes_ != null);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
deleted file mode 100644
index 1acc20c68..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Hashtable;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-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.WSILConstants;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.extension.uddi.UDDIConstants;
-import org.apache.wsil.extension.wsdl.WSDLConstants;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOContractReference;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOParser;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOReference;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import sun.misc.BASE64Encoder;
-
-public class WebServicesParser
-{
- public static final int PARSE_NONE = 0;
- public static final int PARSE_WSIL = 1<<0;
- public static final int PARSE_WSDL = 1<<1;
- public static final int PARSE_LINKS = 1<<2;
- public static final int PARSE_DISCO = 1<<3;
-
- private String uri_;
- private Hashtable uriToEntityTable_;
-
- private String httpBasicAuthUsername_;
- private String httpBasicAuthPassword_;
-
- public WebServicesParser()
- {
- this(null);
- }
-
- public WebServicesParser(String uri)
- {
- uri_ = uri;
- uriToEntityTable_ = new Hashtable();
- httpBasicAuthUsername_ = null;
- httpBasicAuthPassword_ = null;
- }
-
- public String getURI()
- {
- return uri_;
- }
-
- public void setURI(String uri)
- {
- uri_ = uri;
- }
-
- public WebServiceEntity getWebServiceEntityByURI(String uri)
- {
- if (uri != null)
- return (WebServiceEntity)uriToEntityTable_.get(uri);
- else
- return null;
- }
-
- public WSILDocument getWSILDocument(String wsilURI)
- {
- try
- {
- return getWSILDocumentVerbose(wsilURI);
- }
- catch (Throwable t)
- {
- }
- return null;
- }
-
- public WSILDocument getWSILDocumentVerbose(String wsilURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSILException
- {
- WebServiceEntity wsEntity = getWebServiceEntityByURI(wsilURI);
- if (wsEntity == null)
- {
- wsEntity = new WebServiceEntity();
- wsEntity.setURI(wsilURI);
- uriToEntityTable_.put(wsilURI, wsEntity);
- }
- WSILDocument wsilDocument = (WSILDocument)wsEntity.getModel();
- if (wsilDocument == null)
- {
- byte[] b = getInputStreamAsByteArray(wsilURI);
- wsEntity.setBytes(b);
- setHTTPSettings(wsEntity);
- InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(b));
- wsilDocument = WSILDocument.newInstance();
- wsilDocument.read(isr);
- wsEntity.setType(WebServiceEntity.TYPE_WSIL);
- wsEntity.setModel(wsilDocument);
- }
- return wsilDocument;
- }
-
- public Definition getWSDLDefinition(String wsdlURI)
- {
- try
- {
- return getWSDLDefinitionVerbose(wsdlURI);
- }
- catch (Throwable t)
- {
- }
- return null;
- }
-
- public Definition getWSDLDefinitionVerbose(String wsdlURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSDLException
- {
- WebServiceEntity wsEntity = getWebServiceEntityByURI(wsdlURI);
- if (wsEntity == null)
- {
- wsEntity = new WebServiceEntity();
- wsEntity.setURI(wsdlURI);
- uriToEntityTable_.put(wsdlURI, wsEntity);
- }
- Definition definition = (Definition)wsEntity.getModel();
- if (definition == null)
- {
- byte[] b = getInputStreamAsByteArray(wsdlURI);
- wsEntity.setBytes(b);
- setHTTPSettings(wsEntity);
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
- WSDLFactory factory = WSDLPlugin.INSTANCE.createWSDL4JFactory();
- WSDLReader wsdlReader = factory.newWSDLReader();
- definition = wsdlReader.readWSDL(wsdlURI, new InputSource(bais));
- wsEntity.setType(WebServiceEntity.TYPE_WSDL);
- wsEntity.setModel(definition);
- }
- return definition;
- }
-
- public void parse() throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
- {
- parseURL(PARSE_WSIL | PARSE_WSDL | PARSE_LINKS | PARSE_DISCO);
- }
-
- public void parse(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
- {
- parseURL(parseOption);
- }
-
- private void parseURL(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
- {
- WebServiceEntity wsEntity = new WebServiceEntity();
- wsEntity.setURI(uri_);
- byte[] b = getInputStreamAsByteArray(uri_);
- wsEntity.setBytes(b);
- setHTTPSettings(wsEntity);
- uriToEntityTable_.put(uri_, wsEntity);
- // parse uri_ as a HTML document
- HTMLHeadHandler headHandler = new HTMLHeadHandler(uri_);
- byte[] head = headHandler.harvestHeadTags(b);
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(false);
- factory.setValidating(false);
- SAXParser parser = factory.newSAXParser();
- try
- {
- parser.parse(new ByteArrayInputStream(head), headHandler);
- }
- catch (Throwable t)
- {
- }
- String[] wsilURIs = headHandler.getWsils();
- String[] discoURIs = headHandler.getDiscos();
- // true if uri_ is a HTML document
- if (wsilURIs.length > 0 || discoURIs.length > 0)
- {
- wsEntity.setType(WebServiceEntity.TYPE_HTML);
- for (int i = 0; i < wsilURIs.length; i++)
- {
- String absoluteURI = convertToAbsoluteURI(uri_, wsilURIs[i]);
- WebServiceEntity wsilEntity = new WebServiceEntity();
- wsilEntity.setType(WebServiceEntity.TYPE_WSIL);
- wsilEntity.setURI(absoluteURI);
- associate(wsEntity, wsilEntity);
- uriToEntityTable_.put(absoluteURI, wsilEntity);
- if ((parseOption | PARSE_WSIL) == parseOption)
- {
- try
- {
- parseWSIL(absoluteURI, parseOption);
- }
- catch (Throwable t)
- {
- }
- }
- }
- for (int i=0;i<discoURIs.length;i++)
- {
- WebServiceEntity discoEntity = new WebServiceEntity();
- discoEntity.setType(WebServiceEntity.TYPE_DISCO);
- discoEntity.setURI(discoURIs[i]);
- associate(wsEntity,discoEntity);
- uriToEntityTable_.put(discoURIs[i],discoEntity);
- if ((parseOption | PARSE_DISCO) == parseOption)
- {
- try
- {
- parseDISCO(discoURIs[i],parseOption);
- }
- catch (Throwable t)
- {
- }
- }
- }
- }
- // false if uri_ is not a HTML document
- // then parse uri_ as a WSIL document
- else
- {
- try
- {
- parseWSIL(uri_, parseOption);
- // no exception thrown if uri_ is a WSIL document
- wsEntity.setType(WebServiceEntity.TYPE_WSIL);
- }
- catch (Throwable t)
- {
- // exception thrown if uri_ is not a WSIL document
- // then parse uri_ as a DISCO document.
- try
- {
- parseDISCO(uri_, parseOption);
- // no exception thrown if uri_ is a DISCO document
- wsEntity.setType(WebServiceEntity.TYPE_DISCO);
- }
- catch (Throwable t2)
- {
- // exception thrown if uri_ is not a DISCO document
- // then parse uri_ as a WSDL document
- try
- {
- parseWSDL(uri_);
- // no exception thrown if uri_ is a WSDL document
- wsEntity.setType(WebServiceEntity.TYPE_WSDL);
- }
- catch (Throwable t3)
- {
- // exception thrown if uri_ is not a WSDL document
- // then do nothing
- }
- }
- }
- }
- }
-
- private void parseWSIL(String wsilURI, int parseOption) throws WSILException, MalformedURLException, IOException, WSDLException, WWWAuthenticationException
- {
- WebServiceEntity wsilEntity = getWebServiceEntityByURI(wsilURI);
- WSILDocument wsilDoc = (WSILDocument)wsilEntity.getModel();
- if (wsilDoc != null)
- {
- // Prevent infinite loops from occurring when a WSIL cycles occur.
- return;
- }
- wsilDoc = getWSILDocumentVerbose(wsilURI);
- Inspection inspection = wsilDoc.getInspection();
- Service[] services = inspection.getServices();
- for (int i = 0; i < services.length; i++)
- {
- Description[] descs = services[i].getDescriptions();
- // Set the documentation to the <service> element's first abstract.
- String documentation = null;
- Abstract[] abstracts = services[i].getAbstracts();
- if (abstracts != null && abstracts.length > 0)
- documentation = abstracts[0].getText();
- for (int j = 0; j < descs.length; j++)
- {
- String referencedNS = descs[j].getReferencedNamespace();
- // If a <description> element contains an abstract, use it to override the service documentation.
- abstracts = descs[j].getAbstracts();
- if (abstracts != null && abstracts.length > 0)
- documentation = abstracts[0].getText();
- if (WSDLConstants.NS_URI_WSDL.equals(referencedNS))
- {
- String location = descs[j].getLocation();
- if (location != null && location.length() > 0)
- {
- String absoluteURI = convertToAbsoluteURI(wsilURI, location);
- WebServiceEntity wsdlEntity = new WebServiceEntity();
- wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
- wsdlEntity.setURI(absoluteURI);
- wsdlEntity.setDocumentation(documentation);
- associate(wsilEntity, wsdlEntity);
- uriToEntityTable_.put(absoluteURI, wsdlEntity);
- if ((parseOption | PARSE_WSDL) == parseOption)
- parseWSDL(absoluteURI);
- }
- }
- else if (UDDIConstants.NS_URI_UDDI_V2.equals(referencedNS))
- {
- ExtensionElement ee = descs[j].getExtensionElement();
- if (ee instanceof ServiceDescription)
- {
- ServiceDescription sd = (ServiceDescription)ee;
- String inquiryURL = sd.getLocation();
- String serviceKey = sd.getServiceKey().getText();
- WebServiceEntity uddiServiceEntity = new WebServiceEntity();
- uddiServiceEntity.setType(WebServiceEntity.TYPE_UDDI_SERVICE);
- String uddiServiceKeyURI = UDDIURIHelper.getServiceKeyURI(serviceKey,inquiryURL);
- uddiServiceEntity.setURI(uddiServiceKeyURI);
- uddiServiceEntity.setDocumentation(documentation);
- associate(wsilEntity,uddiServiceEntity);
- uriToEntityTable_.put(uddiServiceKeyURI,uddiServiceEntity);
- // TODO: parse WSDL if necessary...
- }
- }
- }
- }
- Link[] links = inspection.getLinks();
- for (int i = 0; i < links.length; i++)
- {
- if (WSILConstants.NS_URI_WSIL.equals(links[i].getReferencedNamespace()))
- {
- String documentation = null;
- Abstract[] abstracts = links[i].getAbstracts();
- if (abstracts != null && abstracts.length > 0)
- documentation = abstracts[0].getText();
- String linkLocation = links[i].getLocation();
- String absoluteURI = convertToAbsoluteURI(wsilURI, linkLocation);
- // Prevent cycles.
- WebServiceEntity wsilLinkEntity = getWebServiceEntityByURI(absoluteURI);
- if (wsilLinkEntity == null)
- {
- wsilLinkEntity = new WebServiceEntity();
- wsilLinkEntity.setType(WebServiceEntity.TYPE_WSIL);
- wsilLinkEntity.setURI(absoluteURI);
- wsilLinkEntity.setDocumentation(documentation);
- uriToEntityTable_.put(absoluteURI, wsilLinkEntity);
- if ((parseOption | PARSE_LINKS) == parseOption)
- parseWSIL(absoluteURI, parseOption);
- }
- associate(wsilEntity,wsilLinkEntity);
- }
- }
- }
-
- private void parseDISCO(String discoURI, int parseOption) throws MalformedURLException, WWWAuthenticationException, Exception
- {
- WebServiceEntity discoEntity = getWebServiceEntityByURI(discoURI);
- byte[] b = getInputStreamAsByteArray(discoURI);
- discoEntity.setBytes(b);
- setHTTPSettings(discoEntity);
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
- DISCOParser parser = new DISCOParser();
- DISCOReference[] references = parser.parse(discoURI,new InputSource(bais));
- if (references != null && references.length > 0)
- {
- for (int i=0;i<references.length;i++)
- {
- if (references[i] instanceof DISCOContractReference)
- {
- // contractRef
- DISCOContractReference reference = (DISCOContractReference)references[i];
- String ref = reference.getRef();
- String docRef = reference.getDocRef();
- WebServiceEntity wsdlEntity = new WebServiceEntity();
- wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
- wsdlEntity.setURI(ref);
- wsdlEntity.setDocumentation(docRef);
- associate(discoEntity,wsdlEntity);
- uriToEntityTable_.put(ref,wsdlEntity);
- if ((parseOption | PARSE_WSDL) == parseOption)
- parseWSDL(ref);
- }
- else
- {
- // discoveryRef
- String ref = references[i].getRef();
- // Prevent cycles.
- WebServiceEntity discoLinkEntity = getWebServiceEntityByURI(ref);
- if (discoLinkEntity == null)
- {
- discoLinkEntity = new WebServiceEntity();
- discoLinkEntity.setType(WebServiceEntity.TYPE_DISCO);
- discoLinkEntity.setURI(ref);
- uriToEntityTable_.put(ref,discoLinkEntity);
- if ((parseOption | PARSE_LINKS) == parseOption)
- parseDISCO(ref,parseOption);
- }
- associate(discoEntity,discoLinkEntity);
- }
- }
- }
- }
-
- private Definition parseWSDL(String wsdlURI) throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
- {
- return getWSDLDefinitionVerbose(wsdlURI);
- }
-
- private byte[] getInputStreamAsByteArray(String uriString) throws MalformedURLException, IOException, WWWAuthenticationException
- {
- // Try to get a cached copy of the byte[]
- WebServiceEntity wsEntity = getWebServiceEntityByURI(uriString);
- if (wsEntity != null)
- {
- byte[] bytes = wsEntity.getBytes();
- if (bytes != null)
- return bytes;
- }
- // Get the byte[] by opening a stream to the URI
- URL url = createURL(uriString);
- URLConnection conn = url.openConnection();
- // proxy server setting
- String proxyUserName = System.getProperty("http.proxyUserName");
- String proxyPassword = System.getProperty("http.proxyPassword");
- if (proxyUserName != null && proxyPassword != null)
- {
- StringBuffer userNamePassword = new StringBuffer(proxyUserName);
- userNamePassword.append(':').append(proxyPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encoding = encoder.encode(userNamePassword.toString().getBytes());
- userNamePassword.setLength(0);
- userNamePassword.append("Basic ").append(encoding);
- conn.setRequestProperty("Proxy-authorization", userNamePassword.toString());
- }
- // HTTP basic authentication setting
- if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
- {
- StringBuffer sb = new StringBuffer(httpBasicAuthUsername_);
- sb.append(':').append(httpBasicAuthPassword_);
- BASE64Encoder encoder = new BASE64Encoder();
- String encoding = encoder.encode(sb.toString().getBytes());
- sb.setLength(0);
- sb.append("Basic ").append(encoding);
- conn.setRequestProperty("Authorization", sb.toString());
- }
- InputStream is = null;
- try
- {
- is = conn.getInputStream();
- String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
- if (wwwAuthMsg != null)
- throw new WWWAuthenticationException(new IOException(), wwwAuthMsg, uriString);
- }
- catch (IOException ioe)
- {
- String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
- if (wwwAuthMsg != null)
- throw new WWWAuthenticationException(ioe, wwwAuthMsg, uriString);
- else
- throw ioe;
- }
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] b = new byte[1024];
- int byteRead = is.read(b);
- while (byteRead != -1)
- {
- baos.write(b, 0, byteRead);
- byteRead = is.read(b);
- }
- is.close();
- return baos.toByteArray();
- }
-
- protected URL createURL(String url) throws MalformedURLException
- {
- return new URL(url);
- }
-
- private void associate(WebServiceEntity parent, WebServiceEntity child)
- {
- parent.addChild(child);
- child.setParent(parent);
- }
-
- private String convertToAbsoluteURI(String baseURI,String refURI)
- {
- if (refURI != null && refURI.indexOf(":") < 0)
- {
- StringBuffer absoluteURI = new StringBuffer(baseURI.substring(0,Math.max(baseURI.lastIndexOf('\\'),baseURI.lastIndexOf('/')+1)));
- absoluteURI.append(refURI);
- return absoluteURI.toString();
- }
- return refURI;
- }
-
- private void setHTTPSettings(WebServiceEntity entity)
- {
- if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
- {
- entity.setHTTPUsername(httpBasicAuthUsername_);
- entity.setHTTPPassword(httpBasicAuthPassword_);
- }
- }
-
- public String getHTTPBasicAuthUsername()
- {
- return httpBasicAuthUsername_;
- }
-
- public void setHTTPBasicAuthUsername(String username)
- {
- httpBasicAuthUsername_ = username;
- }
-
- public String getHTTPBasicAuthPassword()
- {
- return httpBasicAuthPassword_;
- }
-
- public void setHTTPBasicAuthPassword(String password)
- {
- httpBasicAuthPassword_ = password;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
deleted file mode 100644
index 1e60c01ba..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
+++ /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
-###############################################################################
-
-#
-# Messages for AddWSDLToWSILCommand
-#
-MSG_ERROR_INVALID_ARGUMENTS=IWAB0055E Invalid command arguments.
-MSG_ERROR_ILLEGAL_ARGUMENTS=IWAB0105E Illegal argument.
-MSG_ERROR_INVALID_WSDL_URI=IWAB0185E Invalid WSDL URI.
-MSG_ERROR_INVALID_WSIL_URI=IWAB0206E Invalid WSIL URI.
-MSG_ERROR_UNRESOLVABLE_WSDL=IWAB0405E WSDL is unresolvable.
-MSG_ERROR_UNEXPECTED_EXCEPTION=IWAB0451E An unexpected exception has occured.
-MSG_ERROR_MALFORMED_WSDL=IWAB0452E WSDL is malformed, error parsing WSDL.
-MSG_ERROR_WRITE_WSIL=IWAB0453E Error writing WSIL.
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
deleted file mode 100644
index ec8bde8ed..000000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
+++ /dev/null
@@ -1,22 +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
-###############################################################################
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-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 \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.classpath b/bundles/org.eclipse.wst.wsdl.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.wst.wsdl.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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore b/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
deleted file mode 100644
index 506fe66f5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-wsdleditor.jar
-temp.folder
-org.eclipse.wst.wsdl.ui_1.0.0.jar
-@dot
diff --git a/bundles/org.eclipse.wst.wsdl.ui/.project b/bundles/org.eclipse.wst.wsdl.ui/.project
deleted file mode 100644
index c5a4ddcd0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.wsdl.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.wst.wsdl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
deleted file mode 100644: 0.5%;'/>
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java78
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java1060
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java570
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java200
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java197
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java202
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java163
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java175
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java133
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java48
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java46
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java217
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java41
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimePart.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimeParts.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java219
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java784
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java374
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java225
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java508
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties38
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java140
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java306
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java965
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java49
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java561
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java479
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java299
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/Profile.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java176
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java193
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java515
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java256
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java222
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java68
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java96
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java55
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java1838
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java714
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java118
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java426
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java315
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java102
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java108
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java152
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java302
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java141
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java198
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java181
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java113
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java267
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java226
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java107
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java59
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java210
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java257
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java348
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java264
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java53
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java101
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java137
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java95
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java57
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java415
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java204
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java81
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java595
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java290
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java146
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java241
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java216
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java297
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java215
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java230
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java450
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java341
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java234
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java194
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java343
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java286
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java127
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java112
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java85
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java118
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java130
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java232
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java202
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java204
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java159
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java278
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java247
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java174
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java109
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java357
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java189
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java423
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java166
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java209
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java89
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java144
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java191
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java2319
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java171
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java148
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/BuildReport.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Entry.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java35
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryResult.java42
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Report.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java79
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportContext.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Reporter.java21
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/WriteReport.java47
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java236
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java287
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java276
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java151
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java514
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java63
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/toolinfo.properties18
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java140
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.java479
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/EntryType.java278
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ErrorList.java156
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java600
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java182
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java1739
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties31
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java138
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MessageList.java171
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/NullUtil.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java788
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Pair.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java649
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java213
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java192
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java578
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java336
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java1418
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java154
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java347
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java27
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/wsi.properties46
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java293
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java99
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java802
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java385
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java205
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java3271
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java1126
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java233
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java59
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java591
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java242
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java112
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java62
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java90
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java45
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java191
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java65
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java122
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java129
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java1531
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java186
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java248
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java145
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java173
-rw-r--r--bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java156
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java205
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSIPreferences.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java106
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java90
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java324
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java394
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/AssertionError.java131
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java369
-rw-r--r--bundles/org.eclipse.wst.wsi/wsivalidate/wsivalidate.properties16
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.cvsignore2
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.project28
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/build.properties7
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/plugin.xml43
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java155
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java135
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java130
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java32
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java71
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/test.xml49
-rw-r--r--tests/org.eclipse.jst.ws.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.tests/.cvsignore2
-rw-r--r--tests/org.eclipse.jst.ws.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF38
-rw-r--r--tests/org.eclipse.jst.ws.tests/build.properties10
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp38
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java9
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl80
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf6
-rw-r--r--tests/org.eclipse.jst.ws.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.jst.ws.tests/readme.txt5
-rw-r--r--tests/org.eclipse.jst.ws.tests/test.xml51
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java182
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java41
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java81
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java91
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java112
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java214
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java33
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java23
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java40
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java29
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java110
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java45
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java414
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java45
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/build.properties8
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl68
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java129
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java82
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java88
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java83
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java54
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java52
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java41
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java43
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml29
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/test.xml162
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.project30
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/build.properties13
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml44
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java61
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.project37
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/build.properties26
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/plugin.xml25
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java47
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java225
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java164
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java73
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java230
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java513
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java279
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java458
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java611
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java260
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java112
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java211
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java208
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java608
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java46
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF20
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/build.properties9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java203
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java29
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java143
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java43
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java357
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java569
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java418
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java157
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/test.xml59
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log137
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingUsingClasspath.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl18
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportedUsingClasspath.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingUsingClasspath.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd5
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl0
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl27
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl14
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.project42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF20
-rw-r--r--tests/org.eclipse.wst.wsi.tests/build.properties9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java289
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java31
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java73
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java78
-rw-r--r--tests/org.eclipse.wst.wsi.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl82
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl99
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl110
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl43
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl116
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl104
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl33
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl87
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl26
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl20
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml10
3348 files changed, 0 insertions, 536591 deletions
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index 862f49caa..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project b/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
deleted file mode 100644
index 846a39435..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.core</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env.core</project>
- </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.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6eb10eb0f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: wsc-axis.jar
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common,
- org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis11
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index 947da506c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.wsc-axis.jar = src/
-bin.includes = wsc-axis.jar,\
- plugin.properties,\
- plugin.xml,\
- readme.html,\
- META-INF/
-src.includes = build.properties,\
- plugin.properties,\
- plugin.xml,\
- readme.html,\
- src/
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index 5e9ff7c46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
deleted file mode 100644
index c911fbfbd..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.jst.ws.consumption.wsfinder">
- <wsfinder
- id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
- </wsfinder>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
deleted file mode 100644
index 0038ec5d8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
+++ /dev/null
@@ -1,46 +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
-###############################################################################
-
-#
-# Messages for AxisDeployCommand
-#
-MSG_ERROR_PROJECT_URL_PARAM_NOT_SET=IWAB0054E Web project URL for deployment of Web service is not set in AxisDeployCommand
-MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET=IWAB0488E Location of Axis deployment file is not set in AxisDeployCommand
-MSG_ERROR_AXIS_DEPLOY=IWAB0489E Error when deploying Web service to Axis runtime
-MSG_AXIS_DEPLOY=Deploying Web service to Axis run-time environment
-MSG_AXIS_DEPLOY_OK=Web service successfuly deployed to Axis run-time environment
-
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-#
-# Messages for Java2WSDLCommand
-#
-TASK_LABEL_JAVA_WSDL_COMMAND=Java2WSDLCommand
-TASK_DESC_JAVA_WSDL_COMMAND=Calls to AXIS Java2WSDLCommand.
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
-
-#
-# Messages for WSDL2JavaCommand
-#
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-
-#
-# Messages common for Java2WSDLCommand and WSDL2JavaCommand
-#
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
deleted file mode 100644
index 46cb492ed..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null
@@ -1,176 +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.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends SimpleCommand
-{
- private static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
-
- private JavaWSDLParameter javaWSDLParam;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- /**
- * Constructor for AxisDeployCommand.
- * @param String description
- * @param String name
- *
- */
- public AxisDeployCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand");
- }
-
- public Status execute(Environment environment)
- {
- if (javaWSDLParam == null)
- {
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"), Status.ERROR);
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"), Status.ERROR);
- }
-
- environment.getProgressMonitor().report(getMessage("MSG_AXIS_DEPLOY"));
-
- Status status = executeAntTask();
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
- protected Status executeAntTask()
- {
- final class DeployTask extends AdminClientTask
- {
- public DeployTask()
- {
- project = new Project();
- project.init();
- taskType = "axis"; //$NON-NLS-1$
- taskName = "axis-admin"; //$NON-NLS-1$
- target = new Target();
- }
- }
-
- DeployTask adminClient = new DeployTask();
- String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
- adminClient.setUrl(url);
- adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
- // Since the admin server may not be available right away we will try
- // several times to execute it.
- try
- {
- BuildException lastException = null;
-
- for( int index = 0; index < 20; index++ )
- {
- try
- {
- lastException = null;
- adminClient.execute();
- }
- catch( BuildException exc )
- {
- lastException = exc;
-
- try
- {
- Thread.sleep( 200 );
- }
- catch( InterruptedException threadException )
- {
- }
- }
-
- // If no exception occured then we should break out of the loop.
- if( lastException == null ) break;
- }
-
- // If after many tries we still get an exception, then we will re throw it.
- if( lastException != null ) throw lastException;
- }
- catch (BuildException e)
- {
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- Status[] childStatus = new Status[1];
- childStatus[0] = new SimpleStatus("AxisDeployCommand", message, Status.ERROR);
- return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
- }
- return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
- getMessage("MSG_AXIS_DEPLOY_OK"), Status.OK);
-
- }
-
- private String getMessage(String messageId, String parm1)
- {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[] { parm1 });
- }
-
- /**
- * Returns the message string identified by the given key from plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key)
- {
- return resource.getString(key);
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
deleted file mode 100644
index cdf8cf592..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null
@@ -1,201 +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.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends SimpleCommand {
-
- private JavaWSDLParameter javaWSDLParam_;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- private String LABEL = "TASK_LABEL_JAVA_WSDL_COMMAND";
- private String DESCRIPTION = "TASK_DESC_JAVA_WSDL_COMMAND";
-
- public Java2WSDLCommand() {
- super();
- setName (getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- }
- /**
- * Constructor for Java2WSDLCommand.
- */
- public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
- super();
- setName (getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam_.getBeanName() == null) {
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- environment.getProgressMonitor().report(
- getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ) );
-
- return executeAntTask(environment);
- }
-
- protected Status executeAntTask(Environment environment) {
-
- final class Emitter extends Java2WsdlAntTask {
- public Emitter() {
- project = new Project();
- project.init();
- taskType = "axis"; //$NON-NLS-1$
- taskName = "axis-java2wsdl"; //$NON-NLS-1$
- target = new Target();
- }
- }
-
- Emitter emitter = new Emitter();
- emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
- environment.getLog().log(Log.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-
- emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
- environment.getLog().log(Log.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-
- emitter.setServiceElementName(javaWSDLParam_.getServiceName());
- environment.getLog().log(Log.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-
- emitter.setLocation(javaWSDLParam_.getUrlLocation());
- environment.getLog().log(Log.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-
- emitter.setMethods(javaWSDLParam_.getMethodString());
- environment.getLog().log(Log.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-
- emitter.setStyle(javaWSDLParam_.getStyle());
- environment.getLog().log(Log.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-
- emitter.setUse(javaWSDLParam_.getUse());
- environment.getLog().log(Log.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-
- emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
- environment.getLog().log(Log.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-
- emitter.setNamespace(javaWSDLParam_.getNamespace());
- environment.getLog().log(Log.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-
- emitter.setClassName(javaWSDLParam_.getBeanName());
- environment.getLog().log(Log.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-
- emitter.setImplClass(javaWSDLParam_.getBeanName());
-
- HashMap mappings = javaWSDLParam_.getMappings();
- if(mappings != null){
- Iterator keys = mappings.keySet().iterator();
- while(keys.hasNext()){
- String pakage = (String)keys.next();
- String namespace = (String)mappings.get(pakage);
- NamespaceMapping map = new NamespaceMapping();
- map.setPackage(pakage);
- map.setNamespace(namespace);
- emitter.addMapping(map);
- }
- }
-
-
- try {
- emitter.execute();
- } catch (BuildException e) {
- environment.getLog().log(Log.ERROR, 5018, this, "executeAntTask", e);
- Status status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
- +e.getCause().toString(), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus( "" );
-
- }
-
- public Status undo(Environment environment) {
- return null;
- }
-
- public Status redo(Environment environment) {
- return null;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[] { parm1 });
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParm) {
- this.javaWSDLParam_ = javaWSDLParm;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
deleted file mode 100644
index a7b7abdd1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,215 +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.axis.consumption.core.command;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class WSDL2JavaCommand extends SimpleCommand {
-
- private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
- private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
- private String LABEL = "TASK_LABEL_WSDL_JAVA_COMMAND";
- private String DESCRIPTION = "TASK_DESC_WSDL_JAVA_COMMAND";
-
-
- public WSDL2JavaCommand() {
- super();
- setName(getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam == null) {
- status = new SimpleStatus("WSDL2JavaCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
- {
- javaWSDLParam.setInputWsdlLocation(wsdlURI);
- }
- javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
- javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-
- Emitter wsdl2Java = new Emitter();
- if (environment.getLog().isEnabled("emitter")) {
- wsdl2Java.setVerbose(true);
- } else {
- wsdl2Java.setVerbose(false);
- }
- boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
- wsdl2Java.setServerSide(serverSide);
- if (serverSide) {
- wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
- }
- if (javaWSDLParam.isMetaInfOnly()) {
- // for the case Java2WSDL-WSDL2Java
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getOutput()));
- HashMap pck2nsMap = javaWSDLParam.getMappings();
- if (pck2nsMap != null) {
- HashMap ns2pckMap = new HashMap();
- Iterator keys = pck2nsMap.keySet().iterator();
- while (keys.hasNext()) {
- String pakage = (String) keys.next();
- String namespace = (String) pck2nsMap.get(pakage);
- ns2pckMap.put(namespace, pakage);
- }
- wsdl2Java.setNamespaceMap(ns2pckMap);
- }
- } else {
- // for the case WSDL2Java
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getJavaOutput()));
- if (javaWSDLParam.getMappings() != null) {
- wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
- }
- }
- environment.getLog().log(Log.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
- if (javaWSDLParam.getHTTPPassword() != null) {
- wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
- environment.getLog().log(Log.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
- }
- if (javaWSDLParam.getHTTPUsername() != null) {
- wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
- environment.getLog().log(Log.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
- }
- environment.getLog().log(Log.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
- environment.getProgressMonitor().report(getMessage("MSG_PARSING_WSDL", javaWSDLParam.getInputWsdlLocation() ) );
- try {
- wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
- if (serverSide) {
- // set deployment files
- List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
- List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
- ArrayList deplFiles = new ArrayList();
- if (deploymentFiles1 != null && deploymentFiles2 != null) {
- deploymentFiles1.addAll(deploymentFiles2);
- for (int i = 0; i < deploymentFiles1.size(); i++) {
- GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
- deplFiles.add(entry.fileName);
- }
- String[] deplFilesArray = new String[deplFiles.size()];
- deplFiles.toArray(deplFilesArray);
- javaWSDLParam.setDeploymentFiles(deplFilesArray);
- }
- // set java files
- List javaFiles = wsdl2Java.getGeneratedFileNames();
- javaFiles.removeAll(deplFiles);
- String[] javaFileNames = new String[javaFiles.size()];
- javaFiles.toArray(javaFileNames);
- javaWSDLParam.setJavaFiles(javaFileNames);
- }
-
- } catch (Exception e) {
- environment.getLog().log(Log.ERROR, 5021, this, "execute", e);
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
- + e.toString(), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- /*
- * Hack: Axis doesn't like file URLs
- */
- private String removeFileProtocol(String s) {
- if (s.startsWith("file:")) {
- String newS = s.substring(5, s.length());
- int i = newS.indexOf(':');
- if (i != -1) {
- String protocol = newS.substring(0, i);
- int j = protocol.indexOf('/');
- int k = protocol.indexOf('\\');
- int max = Math.max(j, k);
- if (max != -1)
- newS = newS.substring(max + 1, newS.length());
- }
- return newS;
- }
- return s;
- }
-
- public Status undo(Environment environment) {
- return null;
- }
-
- public Status redo(Environment environment) {
- return null;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[]{parm1});
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @param httpBasicAuthPassword
- * The httpBasicAuthPassword to set.
- */
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- /**
- * @param httpBasicAuthUsername
- * The httpBasicAuthUsername to set.
- */
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
deleted file mode 100644
index c3da781b3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null
@@ -1,448 +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.axis.consumption.core.common;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-
-public class JavaWSDLParameter {
-
- public static final byte SERVER_SIDE_NONE = 0;
- public static final byte SERVER_SIDE_BEAN = 1;
- public static final byte SERVER_SIDE_EJB = 2;
-
- public static final String STYLE_RPC = "RPC"; //$NON-NLS-1$
- public static final String STYLE_DOCUMENT = "DOCUMENT"; //$NON-NLS-1$
- public static final String STYLE_WRAPPED = "WRAPPED"; //$NON-NLS-1$
-
- public static final String USE_LITERAL = "LITERAL"; //$NON-NLS-1$
- public static final String USE_ENCODED = "ENCODED"; //$NON-NLS-1$
-
- private String beanName = null; // The name of the Java bean
- private String classpath = null;
- // The class path for loading the bean and command execution
- private String beanPackage = null; // The package location of the bean
- private String portTypeName = null; // The name of the port type element
- private String serviceName = null; // The name of the service element
- private String outputWsdlLocation = null;
- // The output location of the WSDL file
- private String inputWsdlLocation = null;
- // The input location of the WSDL file
- private String urlLocation = null; // The URL location of the web service
- private Hashtable methods = null; // The array of method names
- private String style = null;
- // The style (RPC | DOCUMENT | WRAPPED) attribute for the generated WSDL
- private String use = null;
- // The use (LITERAL | ENCODED) attribtue for the generated WSDL
- private String output = null;
- // The output location for deployment descriptors & Java code (output from WSDL2Java command)
- private String javaOutput = null;
- // The output location for Java code (output from WSDL2Java command)
- private boolean metaInfOnly = false; // META-INF-ONLY flag
- private byte serverSide = SERVER_SIDE_NONE;
- // server-side flag (SERVER_SIDE_NONE | SERVER_SIDE_BEAN | SERVER_SIDE_EJB)
- private String namespace = null;
- private boolean skeletonDeploy = true;
- private String container = null;
- private String[] deploymentFiles = null;
- private String[] javaFiles = null;
- private String projectURL = null;
- private HashMap mappingPairs;
- private String httpUsername_ = null;
- private String httpPassword_ = null;
-
- public void setContainer(String container) {
- this.container = container;
- }
-
- public String getContainer() {
- return container;
- }
-
- /**
- * Constructor for JavaWSDLParameter.
- */
- public JavaWSDLParameter() {
- }
-
- /**
- * Returns the beanName.
- * @return String
- */
- public String getBeanName() {
- return beanName;
- }
-
- public String getBeanPackage() {
- return beanPackage;
- }
-
- /**
- * Returns the portTypeName.
- * @return String
- */
- public String getPortTypeName() {
- return portTypeName;
- }
-
- /**
- * Returns the serviceName.
- * @return String
- */
- public String getServiceName() {
- return serviceName;
- }
-
- /**
- * Returns the output.
- * @return String
- */
- public String getOutput() {
- return output;
- }
-
- /**
- * Returns the methods.
- * @return String[]
- */
- public Hashtable getMethods() {
- return methods;
- }
-
- /**
- * Returns the comma seperated string represetation of the methods.
- * @return String
- */
- public String getMethodString() {
- String methodString = ""; //$NON-NLS-1$
- Enumeration e = methods.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
-
- String signature = (String) e.nextElement();
- if (((Boolean) methods.get(signature)).booleanValue()){
- int index = signature.indexOf('(');
- String name = signature.substring(0, index);
- methodString += name;
- }
- if (i != methods.size() -1) // this is not the last array item
- {
- methodString += ",";
- }
- }
- return methodString;
- }
-
- /**
- * Returns the style attribute.
- * @return String
- */
- public String getStyle() {
- return style;
- }
-
- /**
- * Returns the urlLocation.
- * @return String
- */
- public String getUrlLocation() {
- return urlLocation;
- }
-
- /**
- * Returns the use attribute.
- * @return String
- */
- public String getUse() {
- return use;
- }
-
- /**
- * Returns the outputWsdlLocation.
- * @return String
- */
- public String getOutputWsdlLocation() {
- return outputWsdlLocation;
- }
-
- /**
- * Sets the beanName.
- * @param beanName The beanName to set
- */
- public void setBeanName(String beanName) {
- this.beanName = beanName;
- }
-
- public void setBeanPackage(String beanPackage) {
- this.beanPackage = beanPackage;
- }
-
- /**
- * Sets the portTypeName.
- * @param portTypeName The portTypeName to set
- */
- public void setPortTypeName(String portTypeName) {
- this.portTypeName = portTypeName;
- }
-
- /**
- * Sets the serviceName.
- * @param serviceName The serviceName to set
- */
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- /**
- * Sets the output.
- * @param output The output to set
- */
- public void setOutput(String output) {
- this.output = output;
- }
-
- /**
- * Sets the methods.
- * @param methods The methods to set
- */
- public void setMethods(Hashtable methods) {
- this.methods = methods;
- }
-
- /**
- * Sets the style.
- * @param style The style to set
- */
- public void setStyle(String style) {
- this.style = style;
- }
-
- /**
- * Sets the urlLocation.
- * @param urlLocation The urlLocation to set
- */
- public void setUrlLocation(String urlLocation) {
- this.urlLocation = urlLocation;
- }
-
- /**
- * Sets the use.
- * @param use The use to set
- */
- public void setUse(String use) {
- this.use = use;
- }
-
- /**
- * Sets the outputWsdlLocation.
- * @param outputWsdlLocation The outputWsdlLocation to set
- */
- public void setOutputWsdlLocation(String wsdlLocation) {
- this.outputWsdlLocation = wsdlLocation;
- }
-
- /**
- * Returns the metaInfOnly.
- * @return boolean
- */
- public boolean isMetaInfOnly() {
- return metaInfOnly;
- }
-
- /**
- * Sets the metaInfOnly.
- * @param metaInfOnly The metaInfOnly to set
- */
- public void setMetaInfOnly(boolean metaInfOnly) {
- this.metaInfOnly = metaInfOnly;
- }
-
- /**
- * Returns the serverSide.
- * @return byte
- */
- public byte getServerSide() {
- return serverSide;
- }
-
- /**
- * Sets the serverSide.
- * @param serverSide The serverSide to set
- */
- public void setServerSide(byte serverSide) {
- this.serverSide = serverSide;
- }
-
- /**
- * Returns the inputWsdlLocation.
- * @return String
- */
- public String getInputWsdlLocation() {
- return inputWsdlLocation;
- }
-
- /**
- * Sets the inputWsdlLocation.
- * @param inputWsdlLocation The inputWsdlLocation to set
- */
- public void setInputWsdlLocation(String inputWsdlLocation) {
- this.inputWsdlLocation = inputWsdlLocation;
- }
-
- /**
- * Returns the namespace.
- * @return String
- */
- public String getNamespace() {
- return namespace;
- }
-
- /**
- * Sets the namespace.
- * @param namespace The namespace to set
- */
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- /**
- * Returns the Java output.
- * @return String
- */
- public String getJavaOutput() {
- return javaOutput;
- }
-
- /**
- * Sets the javaOutput.
- * @param javaOutput The Java output to set
- */
- public void setJavaOutput(String javaOutput) {
- this.javaOutput = javaOutput;
- }
-
- /**
- * @return
- */
- public String getClasspath() {
- return classpath;
- }
-
- /**
- * @param string
- */
- public void setClasspath(String string) {
- classpath = string;
- }
-
- /**
- * @return
- */
- public boolean isSkeletonDeploy() {
- return skeletonDeploy;
- }
-
- /**
- * @param b
- */
- public void setSkeletonDeploy(boolean b) {
- skeletonDeploy = b;
- }
-
- /**
- * @return
- */
- public String[] getDeploymentFiles() {
- return deploymentFiles;
- }
-
- /**
- * @param strings
- */
- public void setDeploymentFiles(String[] strings) {
- deploymentFiles = strings;
- }
-
- /**
- * @return
- */
- public String[] getJavaFiles() {
- return javaFiles;
- }
-
- /**
- * @param strings
- */
- public void setJavaFiles(String[] strings) {
- javaFiles = strings;
- }
-
- /**
- * @return
- */
- public String getProjectURL() {
- return projectURL;
- }
-
- /**
- * @param string
- */
- public void setProjectURL(String string) {
- projectURL = string;
- }
-
- public HashMap getMappings()
- {
- return mappingPairs;
- }
-
- public void setMappings(HashMap map)
- {
- mappingPairs = map;
- }
-
- /**
- * Returns the user name for HTTP basic authentication
- * @return String
- */
- public String getHTTPUsername()
- {
- return httpUsername_;
- }
-
- /**
- * Sets the user name for HTTP basic authentication
- * @param String
- */
- public void setHTTPUsername(String httpUsername)
- {
- httpUsername_ = httpUsername;
- }
-
- /**
- * Returns the password for HTTP basic authentication
- * @return String
- */
- public String getHTTPPassword()
- {
- return httpPassword_;
- }
-
- /**
- * @param string
- */
- public void setHTTPPassword(String httpPassword) {
- httpPassword_ = httpPassword;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
deleted file mode 100644
index 84cd5f4d7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.LiveWSDLFilter;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.WSFinderCommon;
-
-public class WSFinderAxis extends WSFinderCommon
-{
- public WSFinderAxis()
- {
- super();
- }
-
- public List find()
- {
- final Vector wsdlURLs = new Vector();
- IProject[] projects = getWorkspaceProjects();
- for (int i = 0; i < projects.length; i++)
- {
- J2EEWebNatureRuntime webNature = getWebNature(projects[i]);
- if (webNature != null)
- {
- final String webProjectURL = ResourceUtils.getWebProjectURL(projects[i]);
- if (webProjectURL != null && webProjectURL.length() > 0)
- {
- final IFolder folderWSDL = getFolderRootPublishable(webNature).getFolder("wsdl");
- try
- {
- folderWSDL.accept(
- new IResourceVisitor()
- {
- public boolean visit(IResource resource)
- {
- if (resource.getType() == IResource.FILE)
- {
- String ext = resource.getFileExtension();
- if (ext != null && ext.equalsIgnoreCase("wsdl"))
- {
- String resPath = resource.getFullPath().toString();
- String folderPath = folderWSDL.getFullPath().toString();
- int index = resPath.indexOf(folderPath);
- if (index != -1)
- resPath = resPath.substring(index+folderPath.length(), resPath.length());
- StringBuffer sb = new StringBuffer(webProjectURL);
- sb.append("/wsdl");
- sb.append(resPath);
- wsdlURLs.add(sb.toString());
- }
- }
- return true;
- }
- }
- );
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- LiveWSDLFilter[] filters = new LiveWSDLFilter[wsdlURLs.size()];
- for (int i = 0; i < filters.length; i++)
- {
- filters[i] = new LiveWSDLFilter((String)wsdlURLs.get(i));
- filters[i].start();
- }
- for (int i = 0; i < filters.length; i++)
- {
- if (!filters[i].isFinish())
- {
- Thread.yield();
- i = -1;
- }
- }
- for (int i = 0; i < filters.length; i++)
- {
- if (!filters[i].isWSDLLive())
- wsdlURLs.remove(filters[i].getWSDLURL());
- }
- return wsdlURLs;
- }
-}
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 275b34c69..000000000
--- 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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 a21e9e032..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
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 cb0ee10ec..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 1bbf10aca..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,50 +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.0
-Bundle-ClassPath: wsc-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command,
- org.eclipse.jst.ws.internal.axis.consumption.ui.env,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jem,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jem.workbench,
- org.eclipse.wst.web,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.modulecore,
- org.wsdl4j,
- org.apache.axis11
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
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 fe52e3543..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.wsc-axis-ui.jar = src/
-bin.includes = wsc-axis-ui.jar,\
- plugin.properties,\
- plugin.xml,\
- META-INF/
-src.includes = build.properties,\
- plugin.properties,\
- plugin.xml,\
- src/
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 cb7a83ddf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# 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 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
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 9bfda1ae6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Web Service Client Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceClientType">
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.32"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.40"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.41"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.50"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceServer>
-
- <webServiceRuntime
- label="%LABEL_RUNTIME_AXIS_11"
- description="%DESC_RUNTIME_AXIS_11"
- isDefault="false"
- j2eeversion="13 14"
- id="org.eclipse.jst.ws.runtime.axis11">
- </webServiceRuntime>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT32_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat32Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat40Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat41Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat50Local">
- </webServiceClientType>
-
- </extension>
-
- <!-- J2EE Service Reference Generator -->
-
- <extension
- point="org.eclipse.jst.j2ee.WebServiceClientGenerator">
- <generator
- className="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator">
- <runtime
- serverTarget="Generic J2EE Container">
- </runtime>
- </generator>
- </extension>
-
- <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>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
deleted file mode 100644
index 5a9b0bbbb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,118 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_READ_WSDL=IWAB0494E Error in reading WSDL file {0}
-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
-#
-TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS=DefaultsForClientJavaWSDL
-TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for client side.
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-TASK_LABEL_JARS_TO_PROJECT=AddJarsToProjectBuildPathTask
-TASK_DESC_JARS_TO_PROJECT=Add Jars to project build path.
-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
-#
-TASK_DESC_COPY_JARS_TO_PROJECT=CopyAxisJarCommand
-TASK_LABEL_COPY_JARS_TO_PROJECT=Copy required Axis runtime jars from plugin to web project.
-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
-#
-TASK_LABEL_REFESH_PROJECT=RefreshProjectTask
-TASK_DESC_REFESH_PROJECT=Refresh the files on the project with the local file system.
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-
-#
-#WebServiceAxisProxyFragment
-#
-
-#
-#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
-
-#
-# CheckAxisDeploymentDescriptorsTask
-#
-CHECK_WS_DD_TASK_DESCRIPTION=CheckAxisDeploymentDescriptorsTask
-CHECK_WS_DD_TASK_LABEL=CheckAxisDeploymentDescriptorsTask
-
-#
-#ClasspathUtils
-#
-MSG_ERROR_CLASSPATH_UTILS_IOEXCEPTION=IWAB0509E IOException in ClasspathUtils
-
-#
-# 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 CheckAxisDeploymentDescriptorsTask
-#
-MSG_ERROR_XML_FILE_OVERWRITE_DISABLED=IWAB0532E Do you want to overwrite the Apache Axis deployment descriptor?
-
-#
-#Messages for CopyClientWSDLCommand
-#
-TASK_DESC_COPY_CLIENT_WSDL=Copies WSDL to Client project
-TASK_LABEL_COPY_CLIENT_WSDL=Copy WSDL to Client project
-
-#
-#AxisClientInputCommand and AxisClientOutputCommand
-#
-
-TASK_LABEL_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_DESC_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_LABEL_AXIS_CLIENT_OUTPUT=Axis client output commmand
-TASK_DESC_AXIS_CLIENT_OUTPUT=Axis client output commmand
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
deleted file mode 100644
index b4ed22828..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
+++ /dev/null
@@ -1,166 +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
- *******************************************************************************/
-/*
- * Command to add axis.jar to the build path of a project as an external variable
- */
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-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.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AddAxisJARToBuildPathCommand extends SimpleCommand
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils;
- private String jarPluginId = "org.apache.axis11";
- private String jarPluginRelPath = "lib";
- private String jarName = "axis.jar";
- private IProject project;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- Status status = new SimpleStatus("");
-
- //Add JARs to the classpath
- IClasspathEntry[] oldClasspath;
- IClasspathEntry[] newClasspath;
- IJavaProject javaProject;
-
- //Get the old classpath
- try
- {
- javaProject = JavaCore.create(project);
- if (javaProject == null)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
- oldClasspath = javaProject.getRawClasspath();
- }
- catch (JavaModelException e)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
- //Check if the axis.jar is already on the build path
- boolean found = false;
- for (int i=0; i<oldClasspath.length; i++)
- {
- found = found || oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- }
-
- if (found)
- {
- return status;
- }
-
- //Add axis.jar to the build path
- newClasspath = new IClasspathEntry[oldClasspath.length + 1];
- int i = 0;
- for (i=0 ; i < oldClasspath.length; i++)
- {
- newClasspath[i] = oldClasspath[i];
- }
-
- IClasspathEntry newEntry = getClasspathEntry();
- if (newEntry==null)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
- newClasspath[i] = newEntry;
-
- try
- {
- javaProject.setRawClasspath(newClasspath,null);
- }
- catch (JavaModelException e)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
-
- return status;
-
- }
-
- private IClasspathEntry getClasspathEntry()
- {
- try
- {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(jarPluginId);
-
- StringBuffer theJar = new StringBuffer();
- theJar.append(jarPluginRelPath);
-
- if (jarPluginRelPath.length()>0)
- theJar.append(IPath.SEPARATOR);
-
- theJar.append(jarName);
-
- URL localURL = Platform.asLocalURL(new URL(pluginDescriptor.getInstallURL(),theJar.toString()));
- Path jarPath = new Path(localURL.getFile());
- IClasspathEntry cpEntry = JavaCore.newLibraryEntry(jarPath, null, null);
- return cpEntry;
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- catch (IOException e)
- {
- return null;
- }
-
- }
-
-
- /**
- * @param project The project to set.
- */
- 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/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 0dbdba1c6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,273 +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.axis.consumption.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-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.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-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 SimpleCommand
-{
- 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 String clientServerTypeId_;
- private boolean clientIsExistingServer_;
- private String proxyProjectFolder_;
- private WebServicesParser webServicesParser_;
- private String moduleName_;
-
-
- public AxisClientDefaultingCommand( String moduleName )
- {
- moduleName_ = moduleName;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment) {
- Status status = new SimpleStatus("");
-
- clientExistingServer_ = getServerFromServerLabel();
- if (clientExistingServer_ != null) {
- clientServerTypeId_ = 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
- Vector serverIds = new Vector();
- {
- 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_, moduleName_ ).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/AxisClientGenerator.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
deleted file mode 100644
index ce77f467c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-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.IStatus;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceClientGenerator;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.env.J2EEEnvironment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-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.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class AxisClientGenerator extends WebServiceClientGenerator
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- public IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
- {
- //get info from the model
- String wsdlURL = dataModel.getWSDLUrl();
- String project = dataModel.getProjectName();
- String outputWSDLFilePathName = dataModel.getOutputWSDLFileName();
- String serviceQName = dataModel.getServiceQName();
- boolean shouldDeploy = dataModel.shouldDeploy();
-
-
- //Generate the artifacts
- Status status = new SimpleStatus("");
- //AxisClientDefaultingCommand
- AxisClientDefaultingCommand axisClientDefaultingCommand = new AxisClientDefaultingCommand("");
- axisClientDefaultingCommand.setWsdlURL(wsdlURL);
- axisClientDefaultingCommand.setWebServicesParser(new WebServicesParserExt());
- axisClientDefaultingCommand.setClientProject((IProject)(new StringToIProjectTransformer().transform(project)));
- axisClientDefaultingCommand.setTestProxySelected(false);
- axisClientDefaultingCommand.setIsClientScenario(true);
- axisClientDefaultingCommand.setGenerateProxy(true);
- J2EEEnvironment j2eeEnvironment = new J2EEEnvironment();
- status = axisClientDefaultingCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
-// Figure out if this is a Web, EJB, or AppClient project
- boolean isWebProject = ResourceUtils.isWebProject(axisClientDefaultingCommand.getClientProject());
-
- //DefaultsForHTTPBasicAuthCommand
- DefaultsForHTTPBasicAuthCommand httpCommand = new DefaultsForHTTPBasicAuthCommand();
- httpCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- httpCommand.setWsdlServiceURL(axisClientDefaultingCommand.getWsdlURL());
- httpCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- status = httpCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //CopyAxisJarCommand
- //The code generated by the Axis WSDL2Java emitter requires axis.jar in order to compile.
- //In the case of a Web project, we add it to the lib directory.
- //In the case of an EJB or App Client project, we add it as an external JAR. This breaks
- //the team environment scenario. We will have to think of a better way to deal with this
- //in the future.
- if (isWebProject)
- {
- CopyAxisJarCommand axjCommand = new CopyAxisJarCommand("");
- axjCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = axjCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
- }
- else
- {
- AddAxisJARToBuildPathCommand addAxisCommand = new AddAxisJARToBuildPathCommand();
- addAxisCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = addAxisCommand.execute(j2eeEnvironment);
- if (status.getSeverity() != Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
- }
-
- //AddJarsToProjectBuildPathTask
- AddJarsToProjectBuildPathTask addJarsCommand = new AddJarsToProjectBuildPathTask();
- addJarsCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = addJarsCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //DefaultsForClientJavaWSDLCommand
- DefaultsForClientJavaWSDLCommand defClientCommand = new DefaultsForClientJavaWSDLCommand("");
- defClientCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- defClientCommand.setProxyProject(axisClientDefaultingCommand.getClientProject());
- defClientCommand.setWSDLServiceURL(axisClientDefaultingCommand.getWsdlURL());
- status = defClientCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //ValidateWSDLCommand
- ValidateWSDLCommand valWSDLCommand = new ValidateWSDLCommand();
- valWSDLCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
- valWSDLCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- status = valWSDLCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //WSDL2JavaCommand
- WSDL2JavaCommand w2jCommand = new WSDL2JavaCommand();
- w2jCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- w2jCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
- status = w2jCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //RefreshProjectCommand
- RefreshProjectCommand refreshCommand = new RefreshProjectCommand();
- refreshCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = refreshCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- Stub2BeanCommand s2bCommand = new Stub2BeanCommand();
- s2bCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- s2bCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- s2bCommand.setClientProject(axisClientDefaultingCommand.getClientProject());
- status = s2bCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //CopyClientWSDLCommand
- CopyClientWSDLCommand copyCommand = new CopyClientWSDLCommand();
- copyCommand.setWsdlURL(axisClientDefaultingCommand.getWsdlURL());
- copyCommand.setClientWSDLPathName(outputWSDLFilePathName);
- copyCommand.setWsParser(axisClientDefaultingCommand.getWebServicesParser());
- status = copyCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
-
- //BuildProjectCommand
- BuildProjectCommand buildCommand = new BuildProjectCommand();
- buildCommand.setProject(axisClientDefaultingCommand.getClientProject());
- buildCommand.setForceBuild(true);
- status = buildCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //Calculate the service interface and service endpoint interface names
- InterfaceNames interfaceNames = calculateSIandSEIName(axisClientDefaultingCommand.getWsdlURL(), serviceQName, axisClientDefaultingCommand.getWebServicesParser());
- String siName = interfaceNames.getSiName();
- String[] seiNames = interfaceNames.getSeiNames();
- if (siName==null || siName.length()==0 || seiNames==null || seiNames.length==0)
- {
- return new org.eclipse.core.runtime.Status(IStatus.ERROR,pluginId_,0,"Problems!!",null);
- }
-
- //Set info on the dataModel
- dataModel.setServiceInterfaceName(siName);
- dataModel.setServiceEndpointInterfaceNames(seiNames);
- dataModel.setDidGenDescriptors(false);
-
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- private InterfaceNames calculateSIandSEIName(String wsdlURL, String serviceQName, WebServicesParser wsParser)
- {
- InterfaceNames iNames = new InterfaceNames();
- String serviceLocalPart = serviceQName.substring(serviceQName.lastIndexOf(':')+1);
- Map pkg2nsMapping = null;
- Definition def = wsParser.getWSDLDefinition(wsdlURL);
-
- Map services = def.getServices();
- Service service = null;
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- service = (Service)it.next();
- if (serviceLocalPart.equals(service.getQName().getLocalPart()))
- break;
- }
-
- if (service!=null)
- {
- String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
- String serviceClassName = service.getQName().getLocalPart();
- String jndiName = serviceClassName;
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- if (serviceClassName.equals(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart()))
- {
- serviceClassName = serviceClassName + "_Service";
- break;
- }
- }
- ArrayList seiNames = new ArrayList();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- 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)
- {
- PortType portType = port.getBinding().getPortType();
- QName portTypeQName = portType.getQName();
- String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
- String portTypeClassName = portTypeQName.getLocalPart();
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_Port";
- seiNames.add(portTypePkgName+"."+portTypeClassName);
- }
- }
- iNames.setSiName(servicePkgName+"."+serviceClassName);
- iNames.setSEINames(convertToStringArray(seiNames.toArray()));
- }
- return iNames;
- }
-
- 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;
- }
- private class InterfaceNames
- {
- private String siName_;
- private String[] seiNames_;
-
- public String getSiName()
- {
- return siName_;
- }
-
- public String[] getSeiNames()
- {
- return seiNames_;
- }
-
-
- public void setSiName(String siName)
- {
- siName_ = siName;
- }
-
- public void setSEINames(String[] seiNames)
- {
- seiNames_ = seiNames;
- }
-
- }
-}
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 dd77be000..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,101 +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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_AXIS_CLIENT_INPUT";
- private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_INPUT";
-
- private IWebServiceClient wsc_;
- private String serverProject_;
- private String serverModule_;
- private IContext context_;
-
- private String serviceServerTypeID_;
-
- private boolean generateProxy_ = true;
- private JavaWSDLParameter javaWSDLParam_;
- private String clientProject_ = null;
- private String clientModule_ = null;
- private String wsdlURL_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private WebServicesParser webServicesParser_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisClientInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- wsc_ = wsc;
- context_ = context;
- clientProject_ = project;
- clientModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- generateProxy_ = context_.getClient();
- wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
- clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-
- return new SimpleStatus("");
- }
-
- public String getClientServer() {
- return clientServer_;
- }
-
- public String getClientProject() {
- return clientProject_;
- }
-
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
-
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- public String getClientModule() {
- return clientModule_;
- }
-
-
-}
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 12b9ac1c8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,62 +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.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_AXIS_CLIENT_OUTPUT";
- private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_OUTPUT";
-
- private IWebServiceClient wsc_;
- private String proxyBean_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- wsc_ = wsc;
- }
-
- public Status execute(Environment env)
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- return new SimpleStatus("");
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
-
-}
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 4515739c4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.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.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends SimpleCommand
-{
- private String DESCRIPTION = "TASK_DESC_COPY_CLIENT_WSDL";
- private String LABEL = "TASK_LABEL_COPY_CLIENT_WSDL";
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils_;
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
- Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
- if(def==null)
- {
- status = new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION",new String[]{wsdlURL_}),Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- IPath clientWSDLPath = new Path(clientWSDLPathName_);
- IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
- status = resolveWSDL(workspaceRoot, def, clientWSDLPath,env);
- return status;
- }
-
- private Status resolveWSDL(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- Environment env) {
- try {
- writeWSDLFile(workspace, wsdlDef, wsdlPath, env);
- 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 new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_IMPORT_WSDL",new String[]{importDef.getLocationURI()}), Status.ERROR);
- }
- IPath newPath =
- new Path(newPathString + importDef.getLocationURI());
- Status status = resolveWSDL(workspace, def, newPath, env);
- if (status != null
- && status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
- }
- } catch (Exception e) {
- return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL",new String[] { wsdlPath.toString() }), Status.ERROR, e);
- }
- return new SimpleStatus("");
- }
-
- 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,
- Environment env)
- 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 =
- WebServicePlugin.getInstance().getResourceContext();
- FileResourceUtils.createFile(
- context,
- wsdlPath.makeAbsolute(),
- bais,
- env.getProgressMonitor(),
- 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 bdd9d3584..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,154 +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.axis.consumption.ui.command;
-
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DefaultsForClientJavaWSDLCommand extends SimpleCommand {
-
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_;
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private String moduleName_;
-
- private String LABEL = "TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS";
- private String DESCRIPTION = "TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS";
-
- public DefaultsForClientJavaWSDLCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Constructor for DefaultsForClientJavaWSDLCommand.
- */
- public DefaultsForClientJavaWSDLCommand(
- JavaWSDLParameter javaWSDLParam,
- Model model) {
- //super();
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
- coreMsgUtils_.getMessage(
- "MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- javaWSDLParam_.setMetaInfOnly(false);
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ );
- //String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-// String output = ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
- javaWSDLParam_.setJavaOutput(output);
-
-
- IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_, moduleName_);
- if (webModuleContainer !=null)
- {
- IPath webModulePath = webModuleContainer.getFullPath();
- //output = PlatformUtils.getPlatformURL(webModulePath);
- IResource res = ResourceUtils.findResource(webModulePath);
- if (res!=null){
- output = res.getLocation().toString();
- }
- javaWSDLParam_.setOutput(output);
- }
-
-
- if (WSDLServicePathname_ == null) {
-
- if (WSDLServiceURL_ == null) {
- status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_WSDL_LOCATION_NOT_SET"),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- } else {
- WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
- }
-
- javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
- return new SimpleStatus( "" );
- }
-
- /**
- * 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;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
deleted file mode 100644
index 63e0ff4ce..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
- *
- */
-public class J2EECommandManager implements CommandManager
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.CommandManager#isUndoEnabled()
- */
- public boolean isUndoEnabled()
- {
- return false;
- }
-
-public DataMappingRegistry getMappingRegistry() {
- return null;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
deleted file mode 100644
index d0536f46b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.URIFactory;
-
-
-/**
-*
-*/
-public class J2EEEnvironment implements Environment
-{
- J2EELog j2eeLog_;
- J2EEProgressMonitor j2eeProgressMonitor_;
- J2EEStatusHandler j2eeStatusHandler_;
- SimpleURIFactory simpleURIFactory_;
- J2EECommandManager j2eeCommandManager_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getLog()
- */
- public Log getLog()
- {
- if (j2eeLog_ == null)
- {
- j2eeLog_ = new J2EELog();
- }
- return j2eeLog_;
-
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getProgressMonitor()
- */
- public ProgressMonitor getProgressMonitor()
- {
- if (j2eeProgressMonitor_==null)
- {
- j2eeProgressMonitor_ = new J2EEProgressMonitor();
-
- }
- return j2eeProgressMonitor_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getStatusHandler()
- */
- public StatusHandler getStatusHandler()
- {
- if (j2eeStatusHandler_==null)
- {
- j2eeStatusHandler_ = new J2EEStatusHandler();
- }
- return j2eeStatusHandler_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getURIFactory()
- */
- public URIFactory getURIFactory()
- {
- if (simpleURIFactory_ == null)
- {
- simpleURIFactory_ = new SimpleURIFactory();
- }
- return simpleURIFactory_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getJavaCompiler()
- */
- public JavaCompiler getJavaCompiler()
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getCommandManager()
- */
- public CommandManager getCommandManager()
- {
- if(j2eeCommandManager_ == null)
- {
- j2eeCommandManager_ = new J2EECommandManager();
- }
- return j2eeCommandManager_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
deleted file mode 100644
index cbe455d34..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
-*
-*/
-public class J2EELog implements Log
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled()
- */
- public boolean isEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled(java.lang.String)
- */
- public boolean isEnabled(String option) {
- // TODO Auto-generated method stub
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Object object) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Status status) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Throwable throwable) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Object object) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Status status) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Throwable throwable) {
- // TODO Auto-generated method stub
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
deleted file mode 100644
index fec15b9c1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEProgressMonitor implements ProgressMonitor
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#report(java.lang.String)
- */
- public void report(String progress)
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#getChildProgressMonitor()
- */
- public ProgressMonitor getChildProgressMonitor()
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#isCancelRequested()
- */
- public boolean isCancelRequested()
- {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
deleted file mode 100644
index 9a891abaa..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-/**
- *
- */
-public class J2EEStatusHandler implements StatusHandler
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status, org.eclipse.wst.command.internal.provisional.env.core.common.Choice[])
- */
- public Choice report(Status status, Choice[] choices)
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void report(Status status) throws StatusException
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void reportError(Status status)
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void reportInfo(Status status)
- {
- // TODO Auto-generated method stub
- }
-}
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 a1b2e2a00..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,134 +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.axis.consumption.ui.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-
-/**
-* 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 Log 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(IPluginDescriptor descriptor) {
- super(descriptor);
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = new EclipseLog();
-
- }
-
- /**
- * 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 startup() throws CoreException {
- log_.log(Log.INFO, 5066, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
- super.startup();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void shutdown() throws CoreException {
- log_.log(Log.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
- super.shutdown();
- }
-
- /**
- * 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 instance_.getDescriptor().getResourceString(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);
- }
-
- public String getPluginStateLocation() {
- return Platform
- .getPluginStateLocation(this)
- .addTrailingSeparator()
- .toOSString();
- }
-
- public String getPluginInstallLocation() {
- try {
- return Platform.resolve(getDescriptor().getInstallURL()).getFile();
- } catch (Exception e) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
deleted file mode 100644
index 72b5ca4d0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
+++ /dev/null
@@ -1,355 +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.axis.consumption.ui.task;
-
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-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.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-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.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.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-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 AddJarsToProjectBuildPathTask extends SimpleCommand {
-
- private String DESCRIPTION = "TASK_DESC_JARS_TO_PROJECT";
- private String LABEL = "TASK_LABEL_JARS_TO_PROJECT";
-
- private IJavaProject javaProject_;
- private IClasspathEntry[] oldClasspath_;
- private IClasspathEntry[] newClasspath_;
- private JavaWSDLParameter javaWSDLParam_;
- private boolean isJ2EE_13 = true;
- private MessageUtils msgUtils_;
-
- private IProject project;
- private String module_;
-
- public AddJarsToProjectBuildPathTask()
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- module_ = J2EEUtils.getFirstWebModuleName(project);
- }
-
- public AddJarsToProjectBuildPathTask(String module)
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- module_ = module;
- }
-
- /**
- * Execute AddJarsToProjectBuildPathTask
- */
- public Status execute(Environment env) {
-// try {
-// if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webNatureRuntime =
-// (J2EEWebNatureRuntime) project.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// isJ2EE_13 = webNatureRuntime.isJ2EE1_3();
-// }
-// } catch (Exception e) {
-// }
-// Status status = new SimpleStatus("");
-// if (!isJ2EE_13)
-// {
-// // AddJar(project, null, "XERCES_API_JAR", status, environment);
-// }
-// return status;
-
- Status status = new SimpleStatus("");
-// TODO: workaround for 90515
- //
- // Get the current classpath.
- //
- javaProject_ = null;
- oldClasspath_ = null;
- try
- {
- javaProject_ = JavaCore.create(project);
- if (javaProject_ != null)
- {
- oldClasspath_ = javaProject_.getRawClasspath();
- }
- else
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- try {
-
- ArrayList aList = new ArrayList();
- String classpathEntry = null;
- IVirtualComponent component = ComponentCore.createComponent(project, module_);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.getFolder(new Path(
- "/WEB-INF/lib"));
- if (webInfLib != null) {
- IVirtualResource[] resources = webInfLib.members();
- IResource aResource = null;
-
- for (int i = 0; i < resources.length; i++) {
- aResource = resources[i].getUnderlyingResource();
- classpathEntry = aResource.getLocation().toString();
- if (!FoundClasspathEntry(classpathEntry)) {
- aList.add(classpathEntry);
- }
- }
- }
- }
-
- int newListSize = aList.size();
-
- if (newListSize == 0) {
- return status;
- }
-
- // Update classpath
- newClasspath_ = new IClasspathEntry[oldClasspath_.length + newListSize];
- Iterator iter = aList.iterator();
-
- int j=0;
- while (iter.hasNext()) {
- newClasspath_[j] = JavaCore.newLibraryEntry(new Path((String)iter.next()), null, null);
- j++;
- }
- for (int i=0; i<oldClasspath_.length; i++) {
- newClasspath_[j+i] = oldClasspath_[i];
- }
-
- ProgressMonitor monitor = env.getProgressMonitor();
- IProgressMonitor eclipseMonitor = null;
- if (monitor instanceof EclipseProgressMonitor)
- {
- eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
- }
- javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted", Status.ERROR);
- }
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-// end of workaround
- return status;
- }
-
-
- private boolean FoundClasspathEntry(String classpathEntry) {
-
-
- boolean found = false;
- for (int i=0; i<oldClasspath_.length && !found; i++)
- {
- if (oldClasspath_[i].getPath().toString().toLowerCase().equals(classpathEntry.toLowerCase())) {
- found=true;
- }
- }
- return found;
- }
-
- private void AddJar(IProject webProject, String pluginId, String jarName, Status status, Environment env) {
- //
- // Get the current classpath.
- //
- javaProject_ = null;
- oldClasspath_ = null;
- try
- {
- javaProject_ = JavaCore.create(webProject);
- if (javaProject_ != null)
- {
- oldClasspath_ = javaProject_.getRawClasspath();
- }
- else
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- boolean found = false;
- for (int i=0; i<oldClasspath_.length; i++)
- {
- found = found || oldClasspath_[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- }
-
- if (found)
- {
- return;
- }
-
- newClasspath_ = new IClasspathEntry[oldClasspath_.length + 1];
- int i=0;
- while (i<oldClasspath_.length)
- {
- newClasspath_[i] = oldClasspath_[i];
- i++;
- }
-
- try
- {
- if(pluginId!=null)
- {
- newClasspath_[i++] = JavaCore.newLibraryEntry(getTheJarPath(pluginId,jarName), null, null);
- }
- else
- {
- newClasspath_[i++] = JavaCore.newVariableEntry(getTheJarPath(pluginId,jarName), null, null);
- }
- }
- catch (CoreException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("","User aborted",Status.ERROR);
- }
- return;
- }
-
- //
- // Then update the project classpath.
- //
- try
- {
- ProgressMonitor monitor = env.getProgressMonitor();
- IProgressMonitor eclipseMonitor = null;
- if (monitor instanceof EclipseProgressMonitor)
- {
- eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
- }
- javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted", Status.ERROR);
- }
- return;
- }
- }
-
- //
- // Returns the local native pathname of the jar.
- //
- private IPath getTheJarPath(String pluginId, String theJar)
- throws CoreException {
- try {
- if (pluginId != null) {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor =
- pluginRegistry.getPluginDescriptor(pluginId);
- URL localURL =
- Platform.asLocalURL(
- new URL(pluginDescriptor.getInstallURL(), theJar));
- return new Path(localURL.getFile());
- } else {
- return new Path(theJar);
- }
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- }
- }
-
- 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/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
deleted file mode 100644
index 7edd10a66..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,85 +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.axis.consumption.ui.task;
-
-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.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-public class CheckAxisDeploymentDescriptorsTask extends SimpleCommand {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- public CheckAxisDeploymentDescriptorsTask( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage("CHECK_WS_DD_TASK_DESCRIPTION"));
- setName(msgUtils_.getMessage("CHECK_WS_DD_TASK_LABEL"));
-
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment env) {
- Status status = new SimpleStatus( "" );
- if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- return status;
- }
-
- IPath filePath = null;
- IProject project = serverProject;
-
-
- filePath = J2EEUtils.getWebInfPath( project, moduleName_ );
- filePath = filePath.append("/server-config.wsdd");
-
- if(filePath==null || filePath.isEmpty())
- {
- status = new SimpleStatus("", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"), Status.WARNING);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted",Status.ERROR);
- }
-
- return status;
- }
- return status;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-}
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 70cc60b34..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-public class CopyAxisJarCommand extends SimpleCommand {
-
- public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis11"; //$NON-NLS-1$
- public static String[] JARLIST = new String[] {
- "axis-ant.jar",
- "axis.jar",
- "commons-discovery.jar",
- "commons-logging.jar",
- "jaxrpc.jar",
- "log4j-1.2.8.jar",
- "saaj.jar",
- "wsdl4j.jar"
-
- };
-
- private String DESCRIPTION = "TASK_DESC_COPY_JARS_TO_PROJECT";
- private String LABEL = "TASK_LABEL_COPY_JARS_TO_PROJECT";
-
- private MessageUtils msgUtils_;
- private MessageUtils baseConMsgUtils_;
- private IProject project;
- private Boolean projectRestartRequired_ = Boolean.FALSE;
- private String moduleName_;
-
- /**
- * Default CTOR;
- */
- public CopyAxisJarCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
- copyAxisJarsToProject(project, status, env);
- return status;
-
- }
-
- private void copyAxisJarsToProject(IProject project, Status status, Environment env) {
-// IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
- IPath webModulePath = J2EEUtils.getWebContentPath( project, moduleName_ );
- if (webModulePath == null) {
- status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- for (int i=0; i<JARLIST.length; ) {
- copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env);
- if (status.getSeverity() == Status.ERROR)
- return;
- }
- return;
- }
-
- /**
- *
- */
- private void copyIFile(String source, IPath targetPath, String targetFile, Status status, Environment env) {
- IPath target = targetPath.append(new Path(targetFile));
- env.getProgressMonitor().report(baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(AXIS_RUNTIME_PLUGIN_ID);
- Plugin axisrt_plugin = pluginDescriptor.getPlugin();
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
- if (!resource.exists()) {
- IFile file = FileResourceUtils.createFile(context, target, axisrt_plugin.openStream(new Path(source)), env.getProgressMonitor(), env
- .getStatusHandler());
- if (projectRestartRequired_.booleanValue() == false && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- catch (Exception e) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_FILECOPY"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public boolean getProjectRestartRequired() {
- return projectRestartRequired_.booleanValue();
- }
-}
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 1ffb7d090..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,144 +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.axis.consumption.ui.task;
-
-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.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-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 SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlServiceURL;
- private JavaWSDLParameter javaWSDLParam;
- private Model model;
-
- public DefaultsForHTTPBasicAuthCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand");
- }
-
- public Status execute(Environment env)
- {
- //WebServiceElement wse = WebServiceElement.getWebServiceElement(model);
- //setWebServicesParser((WebServicesParser)wse.getWSParser());
- //setWsdlServiceURL(wse.getWSDLServiceURL());
- //if (wsdlServiceURL == null || wsdlServiceURL.length() <= 0)
- // setWsdlServiceURL((new Utils()).toFileSystemURI(wse.getWSDLServicePathname()));
-
- 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 new SimpleStatus("");
- }
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param model The model to set.
- */
- public void setModel(Model model) {
- this.model = model;
- }
-
- /**
- * @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 ae95c0f8b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,67 +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.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class RefreshProjectCommand extends SimpleCommand
-{
- private static final String LABEL = "TASK_LABEL_REFESH_PROJECT";
- private static final String DESCRIPTION = "TASK_DESC_REFESH_PROJECT";
-
- private IProject project;
- private MessageUtils msgUtils_;
-
- public RefreshProjectCommand()
- {
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- setName( msgUtils_.getMessage( LABEL ) );
- setDescription( msgUtils_.getMessage( DESCRIPTION ));
- }
-
- /**
- * Execute RefreshProjectTask
- */
- public Status execute(Environment env)
- {
- try
- {
- if (project!=null)
- project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
- }
- catch (CoreException e)
- {
- Status status = new SimpleStatus(WebServiceAxisConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_REFRESH_PROJECT"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- 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 8cba8ba3f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,263 +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.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.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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam_;
- private String discoveredWsdlPortElementName;
- private Vector portTypes_;
- private String proxyBean_;
-
- private String module_ = "";
-
- private IProject clientProject_;
-
- public Stub2BeanCommand()
- {
- super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
- portTypes_ = new Vector();
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Stub2BeanCommand(String moduleName){
- super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
- portTypes_ = new Vector();
- module_ = moduleName;
- }
-
- /**
- * Execute
- */
- public Status execute(Environment env)
- {
- 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)
- {
- }
- }
- }
- Map pkg2nsMapping = javaWSDLParam_.getMappings();
- Map services = def.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- String servicePkgName = WSDLUtils.getPackageName(service, 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)
- {
- 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.setClientModuleName(module_);
- String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
- String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
- stub2BeanInfo.setPackage(portTypePkgName);
- stub2BeanInfo.setClass(portTypeClassName + "Proxy");
- proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_Port";
- stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, port.getName());
- try
- {
- stub2BeanInfo.write( env.getProgressMonitor(), env.getStatusHandler() );
- if (discoveredWsdlPortElementName != null)
- {
- // The discovered port was processed. Ignore all other ports and services.
- return new SimpleStatus("");
- }
- }
- catch (CoreException ce)
- {
- }
- catch (IOException ioe)
- {
- }
- }
- }
- }
- }
- return new SimpleStatus("");
- }
-
- private final char UNDERSCORE = '_';
-
- private String computeClassName(String className)
- {
- String classNameCopy = className;
- int i = classNameCopy.indexOf(UNDERSCORE);
- while (i != -1)
- {
- char c = classNameCopy.charAt(i+1);
- if (Character.isLowerCase(c))
- {
- StringBuffer sb = new StringBuffer();
- sb.append(classNameCopy.substring(0, i+1));
- sb.append(Character.toUpperCase(c));
- sb.append(classNameCopy.substring(i+2, classNameCopy.length()));
- classNameCopy = sb.toString();
- }
- i = classNameCopy.indexOf(UNDERSCORE, i+1);
- }
- char[] cArray = new char[classNameCopy.length()];
- boolean foundDigit = false;
- for (int j = 0; j < cArray.length; j++)
- {
- char c = classNameCopy.charAt(j);
- if (Character.isDigit(c))
- {
- cArray[j] = c;
- foundDigit = true;
- }
- else
- {
- if (foundDigit)
- cArray[j] = Character.toUpperCase(c);
- else
- cArray[j] = c;
- foundDigit = false;
- }
- }
- return new String(cArray);
- }
-
- /**
- * 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_;
- }
-}
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 04b3ab142..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,678 +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.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.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-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.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-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 moduleName_;
-
- 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 setClientModuleName(String moduleName) {
- this.moduleName_ = moduleName;
- }
-
- public void setPackage(String pkgName)
- {
- if (pkgName != null && pkgName.length() > 0)
- package_ = manglePackageName(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)
- {
- if (className != null && className.length() > 0)
- class_ = mangleClassName(className);
- }
-
- private String toFullyQualifiedClassName(String pkgName, String className)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(manglePackageName(pkgName));
- sb.append(".");
- sb.append(mangleClassName(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 manglePackageName(String s)
- {
- return replaceInvalidJavaChars(s);
- }
-
- private String mangleClassName(String s)
- {
- s = firstCharToUpperCase(WSDLUtils.resolveDotInPortName(s));
- return replaceInvalidJavaChars(s);
- }
-
- private String replaceInvalidJavaChars(String s)
- {
- char[] c = s.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (!Character.isJavaIdentifierPart(c[i]))
- c[i] = '.';
- }
- return new String(c);
- }
-
- private String firstCharToUpperCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toUpperCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- 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 trimArraySymbol(String s)
- {
- int index = s.indexOf("[");
- if (index != -1)
- return s.substring(0, index);
- else
- return s;
- }
-
- private String getFullyQualifiedName(JavaHelpers javaHelpers)
- {
- if (javaHelpers.isPrimitive())
- return javaHelpers.getJavaName();
- else
- return javaHelpers.getQualifiedName();
- }
-
- public void write(ProgressMonitor progressMonitor, StatusHandler statusMonitor) throws CoreException, IOException
- {
- StringWriter sw = new StringWriter(2048);
- writePackage(sw);
- writeImports(sw);
- writeClass(sw);
- sw.close();
- byte[] bytes = sw.getBuffer().toString().getBytes();
- 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");
-
- JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- IPath sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_, moduleName_);
- IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
- IPath filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
- FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, 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);
- }
-
- 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(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(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 writeUseJNDI(Writer w) throws IOException
- {
- newLine(w);
- w.write("public void useJNDI(boolean useJNDI) {");
- incrementIndent();
- newLine(w);
- w.write("_useJNDI = useJNDI;");
- newLine(w);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write(firstCharToLowerCase(getClassName(st.nextToken())));
- w.write(" = null;");
- newLine(w);
- }
- decrementIndent();
- newLine(w);
- w.write("}");
- 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();
- JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- JavaClass javaClass = (JavaClass)JavaClassImpl.reflect(getPackageName(sei), getClassName(sei), javaMOF.getResourceSet());
- if (javaClass != null)
- {
- List 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 createParentFolder(IResource res) throws CoreException
- {
- IResource parent = res.getParent();
- if (parent != null && parent != res && parent instanceof IFolder)
- {
- IFolder folder = (IFolder)parent;
- if (!folder.exists())
- {
- createParentFolder(folder);
- folder.create(true, true, null);
- }
- }
- }
-
- 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 8b973b2e3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,73 +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.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
-
- public ValidateWSDLCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand");
- }
-
- public Status execute(Environment env)
- {
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-
- if (wsdlURI != null && wsdlURI.length() > 0)
- {
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- int numServices = definition.getServices().size();
- if (numServices < 1)
- {
- Status status = new SimpleStatus(WebServiceConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT", new Object[] {wsdlURI}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return new SimpleStatus("");
- }
-
- /**
- * @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 392cf0844..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,294 +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.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Vector;
-
-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.Path;
-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.common.J2EEUtils;
-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;
-
-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 DIR_CLASSES = "classes"; //$NON-NLS-1$
- private static String DIR_LIB = "lib"; //$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 static String WEBINF = "WEB-INF"; //$NON-NLS-1$
-
- private ClasspathUtils() {
- }
-
- public static ClasspathUtils getInstance() {
- if (instance_ == null)
- instance_ = new ClasspathUtils();
- return instance_;
- }
-
- public String getClasspathString(IProject project, String module) {
- StringBuffer classpath = new StringBuffer();
- String[] classpathEntries = getClasspath(project, false, module);
-
- 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 inputModule) {
-// inputModule is valid only if it's not a dependent project
- String[] moduleClasspath = new String[0];
- ArrayList projectClasspath = new ArrayList();
- boolean needJavaClasspath = false;
- StructureEdit mc = null;
- IFolder webModuleServerRoot = null;
- String resourceLocation = null;
- IFolder webModuleClasses = null;
-
- try {
- String module;
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- for (int i = 0; i < wbcs.length; i++) {
- module = wbcs[i].getName();
- // get the module's classpath
- if (J2EEUtils.isEARComponent(project, module)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- } else if (J2EEUtils.isWebComponent(project, module)) {
- webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
- if (webModuleServerRoot != null) {
- webModuleClasses = webModuleServerRoot.getFolder(WEBINF).getFolder(DIR_CLASSES);
- if (webModuleClasses != null)
- moduleClasspath = new String[] { webModuleClasses.getLocation().toOSString() };
- }
- } else if (J2EEUtils.isJavaComponent(project, module)) {
- needJavaClasspath = true;
- webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
- if (webModuleServerRoot != null) {
- moduleClasspath = new String[] { webModuleServerRoot.getLocation().toOSString() };
- }
- }
-
- // add module classpath to project classpath
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- if (!isDependent) {
- if (J2EEUtils.isWebComponent(project, inputModule)) {
- needJavaClasspath = true;
- moduleClasspath = getWEBINFLib(project, inputModule);
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- // 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
- }
- }
- } finally {
- if (mc != null)
- mc.dispose();
- }
- 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[] moduleClasspath = new String[0];
- ArrayList utilityJarsClasspath = new ArrayList();
- StructureEdit mc = null;
- try {
- String module;
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- for (int i = 0; i < wbcs.length; i++) {
- module = wbcs[i].getName();
- if (J2EEUtils.isEARComponent(project, module)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- for (int j = 0; j < moduleClasspath.length; j++) {
- utilityJarsClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- } finally {
- if (mc != null)
- mc.dispose();
- }
- return (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
- }
-
- 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 module) {
- String[] webinfLibJars = new String[0];
- ArrayList anArrayList = new ArrayList();
- try {
- String resourceLocation = null;
- IVirtualComponent component = ComponentCore.createComponent(project, module);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.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 68269d186..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,121 +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.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);
- byte buff[] = new byte[1024];
- 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 cb652a18a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,177 +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.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 42afccbb1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,538 +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.axis.consumption.ui.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-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;
-
-public class WSDLUtils {
-
- private static final String DOT = ".";
- private static final String SLASH = "/";
- private static final String PROTOCOL_SUFFIX = "://";
-
- /**
- * Tokens in a namespace that are treated as package name part separators.
- * Used by normalizePackageName.
- */
- private static final char[] pkgSeparators = { ':', '\\', '/' };
-
- /**
- * 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;
- String wsdlLocation = 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));
- }
-
- /**
- * normalizePackageName
- * @param pkg
- * @param separator
- * @return normalize a String (package name) and repalcing
- * ':', '\\', '/' by separator (DOT).
- */
- private static String normalizePackageName(String pkg, char separator)
- {
- if (pkg == null) {
- return pkg;
- }
- for(int i=0; i<pkgSeparators.length; i++)
- pkg = pkg.replace(pkgSeparators[i], separator);
- return pkg;
- }
-
- 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/AxisClientCommandsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
deleted file mode 100644
index bf515af3a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-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.provisional.env.core.common.Condition;
-
-
-public class AxisClientCommandsFragment extends BooleanFragment
-{
- private boolean genProxy_;
-
- public AxisClientCommandsFragment()
- {
- SequenceFragment root = new SequenceFragment();
-
- root.add(new SimpleFragment(new DefaultsForHTTPBasicAuthCommand(), ""));
- //root.add(new SimpleFragment(new CopyAxisJarCommand(), ""));
- root.add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
- //root.add(new SimpleFragment(new DefaultsForClientJavaWSDLCommand(), ""));
- root.add(new SimpleFragment(new ValidateWSDLCommand(), ""));
- root.add(new SimpleFragment(new WSDL2JavaCommand(), ""));
- root.add(new SimpleFragment(new RefreshProjectCommand(), ""));
- root.add(new SimpleFragment(new Stub2BeanCommand(), ""));
- root.add(new SimpleFragment(new BuildProjectCommand(), ""));
-
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return genProxy_;
- }
- });
- setTrueFragment( root );
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
deleted file mode 100644
index 9048ea8d2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-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.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-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.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class AxisClientFragment extends SequenceFragment
-{
-
- public AxisClientFragment()
- {
- //add(new SimpleFragment(new AxisClientDefaultingCommand(), ""));
- add(new SimpleFragment("AxisClientStart"));
- add(new MappingFragment());
- add(new AxisClientCommandsFragment());
- // TODO: Look into AddWSDLtoWSILCommand for the client scenario
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- // AxisClientDefaultingCommand
- registry.addMapping(ClientExtensionDefaultingCommand.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(ClientExtensionDefaultingCommand.class, "WsdlURI", AxisClientDefaultingCommand.class, "WsdlURL", null); // URI
- // to
- // URL
- // transformer
- // req'd??
- registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
- "TestProxySelected", null);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
- registry.addMapping(ClientExtensionDefaultingCommand.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, "CustomizeClientMappings", MappingFragment.class );
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "ServiceProject",
- // CreateWebProjectCommand.class);
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "EJBProjectName",
- // CreateWebProjectCommand.class);
- // CopyAxisJarCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
- // AddJarsToProjectBuildPathTask()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.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", WSDL2JavaCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
- // to
- // URI??
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.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(Stub2BeanCommand.class, "ProxyBean", ClientExtensionOutputCommand.class, "ProxyBean", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-
- public class MappingFragment extends BooleanFragment {
-
- private boolean showMappings_;
- public MappingFragment() {
-
- super();
- setTrueFragment(new SimpleFragment("AxisClientBeanMapping"));
- setCondition(new Condition() {
-
- public boolean evaluate() {
-
- return showMappings_;
- }
- });
- }
- public void setCustomizeClientMappings(boolean showMappings) {
-
- showMappings_ = showMappings;
- }
- }
-} \ 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/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 267156313..000000000
--- 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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-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;
- }
-} \ 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/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 0c31a343d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-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;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-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 = "default.javapackage";
- private final String DEFAULT_NAMESPACE = "http://default.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 )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- // 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 );
-
- // TODO No tooltip or infopop for this group.
- Group mappingGroup = uiUtils.createGroup( parent, "LABEL_MAPPING_PAIRS", null, null );
-
- List initValues = new ArrayList();
-
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML)
- {
- String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
- msgUtils.getMessage("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 = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
- msgUtils.getMessage("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( mappingGroup, statusListener );
-
- return this;
- }
-
- public Status 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),pairs[i].getText(1));
- }
- 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 ffe4c672b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-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;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-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 final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-
- private Text folderText_;
- /*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 final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
- 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 final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-
- 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 )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJB_PAGE);
-
- genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
- 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 );
-
- folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
- TOOLTIP_PWJB_TEXT_FOLDER,
- INFOPOP_PWJB_TEXT_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- folderText_.addListener( SWT.Modify, statusListener );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "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();
-
- folderText_.setEnabled( enabled );
- showMappingsCheckbox_.setEnabled( enabled );
- }
-
- public void setProxyFolder( String proxyFolder )
- {
- folderText_.setText( proxyFolder );
- }
-
- public String getProxyFolder()
- {
- return folderText_.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/widgets/DefaultsForClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
deleted file mode 100644
index 05446c960..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-public class DefaultsForClient extends SimpleCommand
-{
- private boolean customizeMappings_ = true;
-
- public boolean getCustomizeClientMappings()
- {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings( boolean value )
- {
- customizeMappings_ = value;
- }
-
- public String getProxyFolder()
- {
- return "/proxyproject/myfolder";
- }
-}
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 a892c8141..000000000
--- 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,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment;
-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.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-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.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * 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.provisional.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, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // AxisProxyWidget
- dataRegistry.addMapping( AxisProxyWidget.class, "CustomizeClientMappings", AxisClientFragment.MappingFragment.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", AxisClientCommandsFragment.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.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", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- String axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisClientStart",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
- axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisProxyWidget();
- }
- } );
-
- widgetRegistry.add( "AxisClientBeanMapping",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
- msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
- 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()
- {
- return new AxisClientFragment();
- }
- };
- }
- /* (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/wizard/test/TestWizardPage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
deleted file mode 100644
index fb2a5e220..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/*
- * Add the stuff below to the properties file to make this work.
-#
-#Test only - do not commit
-#
-wsdlURI=wsdlURI
-clientProject=clientProject
-serviceQName=serviceQName
-outputWSDLpath=outputWSDLpath
-GO=GO
-pop1=pop1
-pop2=pop2
-*/
-public class TestWizardPage extends WizardPage
-{
- private String pluginId_= "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils_;
-
- private Text wsdlURIText_;
- private Text clientProjectText_;
- private Text serviceQNameText_;
- private Text outputWSDLPathText_;
- private Button goButton_;
- private Button pop1Button_;
- private Button pop2Button_;
-
- public TestWizardPage(String name)
- {
- super(name);
- setTitle("Test Page");
- setDescription("Test page description");
- }
-
- public void createControl(Composite parent)
- {
- Composite page = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- page.setLayout(gl);
- GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- page.setLayoutData(gd);
- page.setSize(500,500);
-
-
- //Composite outerGroup_ = new Composite(page,SWT.H_SCROLL | SWT.V_SCROLL);
- Composite outerGroup_ = new Composite(page,SWT.NONE);
- GridLayout gl2 = new GridLayout();
- gl2.numColumns = 2;
- gl2.marginHeight = 0;
- gl2.marginWidth = 0;
- outerGroup_.setLayout(gl2);
- //GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- GridData gd2 = new GridData(GridData.FILL_BOTH);
- outerGroup_.setLayoutData(gd2);
-
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- wsdlURIText_ = uiUtils.createText(outerGroup_,"wsdlURI","wsdlURI","wsdlURI",SWT.SINGLE|SWT.BORDER);
- clientProjectText_ = uiUtils.createText(outerGroup_,"clientProject","clientProject","clientProject",SWT.SINGLE|SWT.BORDER);
- serviceQNameText_ = uiUtils.createText(outerGroup_,"serviceQName","serviceQName","",SWT.SINGLE|SWT.BORDER);
- outputWSDLPathText_ = uiUtils.createText(outerGroup_,"outputWSDLpath","outputWSDLpath","",SWT.SINGLE|SWT.BORDER);
- goButton_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"GO","GO","");
- goButton_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handleGOPushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handleGOPushed();
- }
- });
- pop1Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop1","pop1","");
- pop1Button_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handlePop1Pushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handlePop1Pushed();
- }
- });
- pop2Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop2","pop2","");
- pop2Button_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handlePop2Pushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handlePop2Pushed();
- }
- });
-
- setControl(page);
- }
-
- private void handlePop1Pushed()
- {
- wsdlURIText_.setText("http://www.xmethods.net/sd/2001/TemperatureService.wsdl");
- clientProjectText_.setText("cwp");
- serviceQNameText_.setText("http://www.xmethods.net/sd/TemperatureService.wsdl:TemperatureService");
- outputWSDLPathText_.setText("/cwp/Web Content/WEB-INF/wsdl/TemperatureService.wsdl");
- }
-
- private void handlePop2Pushed()
- {
- wsdlURIText_.setText("file:/D:/Eclipse/eclipse/runtime-workspace_t1/wp2/Web Content/Converters.wsdl");
- clientProjectText_.setText("cwp2");
- serviceQNameText_.setText("http://sample.converters:ConvertDistanceService");
- outputWSDLPathText_.setText("/cwp2/Web Content/WEB-INF/wsdl/Converters.wsdl");
- }
-
- private void handleGOPushed()
- {
- AxisClientGenerator generator = new AxisClientGenerator();
- TestWSCDataHelper dataModel = new TestWSCDataHelper();
- dataModel.populate(wsdlURIText_.getText(), serviceQNameText_.getText(), clientProjectText_.getText(), outputWSDLPathText_.getText(),false);
-
- generator.genWebServiceClientArtifacts(dataModel);
- System.out.println("Generated service interface= "+dataModel.getServiceInterfaceName());
- String[] seis = dataModel.getServiceEndpointInterfaceNames();
- System.out.println("Generated service endpoint interfaces:");
- for (int i=0;i<seis.length;i++)
- {
- System.out.println(seis[i]);
- }
- System.out.println("Touched descriptors? "+dataModel.shouldGenDescriptors());
- }
-
- private class TestWSCDataHelper implements WebServicesClientDataHelper
- {
- private String wsdlUrl_;
- private String serviceQName_;
- private String projectName_;
- private String outputWSDLFileName_;
- private String serviceInterfaceName_;
- private String[] serviceEndpointInterfaceNames_;
- private boolean shouldDeploy_;
- private boolean shouldGenDescriptors_;
-
- public void populate(String wsdlURL, String serviceQName, String projectName, String outputWSDLFileName, boolean shouldDeploy)
- {
- wsdlUrl_ = wsdlURL;
- serviceQName_ = serviceQName;
- projectName_ = projectName;
- outputWSDLFileName_ = outputWSDLFileName;
- shouldDeploy_ = shouldDeploy;
- }
- /**
- * @return the URL for the associated original WSDL file referenced by the client
- */
- public String getWSDLUrl()
- {
- return wsdlUrl_;
- }
-
- /**
- * @return the QName for the associated web service for the client
- */
- public String getServiceQName()
- {
- return serviceQName_;
- }
-
- /**
- * @return the name of the target project for the web service client
- */
- public String getProjectName()
- {
- return projectName_;
- }
-
- /**
- * @return the fileName location for the copied WSDL file into the client project
- */
- public String getOutputWSDLFileName()
- {
- return outputWSDLFileName_;
- }
-
- /**
- * @return the qualified classname of the generated Service Interface
- */
- public String getServiceInterfaceName()
- {
- return serviceInterfaceName_;
- }
-
- /**
- * @return the qualified classname of the generated Service Endpoint Interface
- */
- public String[] getServiceEndpointInterfaceNames()
- {
- return serviceEndpointInterfaceNames_;
- }
-
- /**
- * @return should generate code for deployment?
- */
- public boolean shouldDeploy()
- {
- return shouldDeploy_;
- }
-
- /**
- * @return whether the extension generated the descriptors or not
- */
- public boolean shouldGenDescriptors()
- {
- return shouldGenDescriptors_;
- }
-
- /**
- * Set the SI classname for the web service client
- */
- public void setServiceInterfaceName(String name)
- {
- serviceInterfaceName_ = name;
- }
-
- /**
- * Set the SEI classnames for the web service client
- */
- public void setServiceEndpointInterfaceNames(String[] names)
- {
- serviceEndpointInterfaceNames_ = names;
- }
-
- /**
- * Set whether descriptors were generated
- */
- public void setDidGenDescriptors(boolean b)
- {
- shouldGenDescriptors_ = b;
- }
-
- /**
- * This method will invoke any operations required to set up web services client, SI, and SEI
- */
- public void genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
- {
- // Do nothing. This shouldn't be on the interface!
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
deleted file mode 100644
index 551c8d2b5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class WebServiceTestWizard extends Wizard implements INewWizard
-{
-
- public WebServiceTestWizard()
- {
- super();
-
- TestWizardPage page = new TestWizardPage("Test page");
- }
-
-
-
- /**
- * Initializes this "New" wizard.
- * @param workbench The workbench that launched this wizard.
- * @param selection The selection context of this wizard.
- * @return This wizard.
- */
- public void init ( IWorkbench workbench, IStructuredSelection selection )
- {
- //Do nothing
- }
-
-
- public void addPages()
- {
-
- TestWizardPage page = new TestWizardPage("Test page");
- addPage(page);
- }
-
- public boolean performFinish()
- {
- //Always allow finish
- return true;
- }
-
-}
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 dbb43b648..000000000
--- 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.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-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 33b674c73..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment.MappingFragment;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{
-
- public AxisWebServiceClient(WebServiceClientInfo info)
- {
- super(info);
- // TODO Auto-generated constructor stub
- }
-
- public ICommandFactory assemble(Environment env, IContext ctx,
- ISelection sel, String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- registerDataMappings( env.getCommandManager().getMappingRegistry());
-
- Vector commands = new Vector();
- commands.add(new AxisClientInputCommand(this, ctx, project, module));
- commands.add(new AxisClientDefaultingCommand(module));
-// commands.add(new SimpleFragment("AxisClientStart"));
-// commands.add(new SimpleFragment("AxisClientBeanMapping"));
- commands.add(new DefaultsForHTTPBasicAuthCommand());
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new DefaultsForClientJavaWSDLCommand(module));
- commands.add(new ValidateWSDLCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new Stub2BeanCommand(module));
- commands.add(new AxisClientOutputCommand(this,ctx,module));
- commands.add(new BuildProjectCommand());
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- 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, "CustomizeClientMappings", MappingFragment.class );
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "ServiceProject",
- // CreateWebProjectCommand.class);
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "EJBProjectName",
- // CreateWebProjectCommand.class);
- // CopyAxisJarCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
- // AddJarsToProjectBuildPathTask()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.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", WSDL2JavaCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
- // to
- // URI??
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.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(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index 8bb59e1f7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 0a3d1e91a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.creation.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.axis.consumption.ui</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.creation.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 909b34989..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,53 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: wss-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.jdt.launching,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 5673301a9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.wss-axis-ui.jar = src/
-bin.includes = wss-axis-ui.jar,\
- deploy.xsl,\
- plugin.properties,\
- plugin.xml,\
- src.includes = build.properties,\
- deploy.xsl,\
- plugin.xml,\
- plugin.properties,\
- src/,\
- META-INF/
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164ac..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt"
- xmlns:ns1="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <xsl:output method="xml" encoding="UTF-8"/>
-
- <xsl:param name="newClassName" select="ss"/>
-
- <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
- <xsl:copy>
- <xsl:attribute name="name">className</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of select="$newClassName"/>
- </xsl:attribute>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index 4d4dd705a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 47ca20c12..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Web Service Server Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceRuntime
- label="%LABEL_RUNTIME_AXIS_11"
- description="%DESC_RUNTIME_AXIS_11"
- isDefault="false"
- j2eeversion="13 14"
- id="org.eclipse.jst.ws.runtime.axis11">
- </webServiceRuntime>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.32"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.40"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.41"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.50"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceServer>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT50LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT50LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT41LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT41LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT40LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT40LOCAL">
- </webServiceServerRuntimeType>
-
- </extension>
-
- <!-- Server Defaulters -->
-
- <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
- <serverDefaulter
- class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
- </serverDefaulter>
- </extension>
-
- <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
- <webServiceRuntime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serviceTypes="org.eclipse.jst.ws.serviceType.java"
- clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
- servletLevels="23 24"
- j2eeLevels="13 14"
- servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
- </webServiceRuntime>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisBeanConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisSkeletonConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 07b7fc5a3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,170 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.1 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL Folder:
-LABEL_OUTPUT_FILE_NAME=WSDL File:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and Use
-STYLE_RPC_LITERAL=Document/ Literal
-STYLE_DOC_LITERAL=Document/ Literal (Wrapped)
-STYLE_RPC_ENCODED=RPC/ Encoded
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-
-#
-#LiteralSupportMessageTask
-#
-TASK_LABEL_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-TASK_DESC_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index a65876c70..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class AxisOutputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_OUTPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_OUTPUT";
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
-
- private String wsdlURI_;
-
- private boolean isWebProjectStartupRequested_ = false;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisOutputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisOutputCommand(AxisWebService ws) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- }
-
- public Status execute(Environment env){
-
- Status status = new SimpleStatus("");
- ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
- AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
- axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
- ws_.setAxisWebServiceInfo(axisWSInfo);
-
- return status;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
- this.javaWSDLParam_ = javaWSDLParam_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index de3a51569..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class AxisRunInputCommand extends SimpleCommand{
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
- private String serverProject_;
- private String serverModule_;
-
- private MessageUtils msgUtils_;
-
- public AxisRunInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisRunInputCommand(AxisWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b78..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
- */
- public ServerInfo recommendDefaultServer(IProject project)
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index 316fa71b5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-
- private IWebService ws_;
- private String serverProject_;
- private String serverModule_;
- private String javaBeanName_;
-
- private String serviceServerTypeID_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public BUAxisInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public BUAxisInputCommand(IWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module; }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-
- IServer serviceExistingServer=null;
-
- if (serverInstanceId != null) { // server exists
- serviceExistingServer = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer != null)
- {
- serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getServerModule() {
- return serverModule_;
- }
-
- public String getJavaBeanName() {
- return javaBeanName_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index 1007507ef..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends SimpleCommand
-{
- private List classNames;
- //private String wsdlURI;
- //private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParameter;
-
- public ComputeAxisSkeletonBeanCommand()
- {
- }
-
- public Status execute(Environment environment)
- {
- classNames = new Vector();
- if (javaWSDLParameter != null)
- {
- String beanName = javaWSDLParameter.getBeanName();
- if (beanName != null)
- classNames.add(beanName);
- }
- return new SimpleStatus("");
- }
-
- public List getClassNames()
- {
- return classNames;
- }
-
- /**
- * @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 void setJavaWSDLParam(JavaWSDLParameter javaWSDLParameter)
- {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 7aa3ad24e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,229 +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.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class JavaToWSDLMethodCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_JAVA_TO_WSDL";
- private static String DESCRIPTION = "TASK_DESC_JAVA_TO_WSDL";
- private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
- private Hashtable fMethodNames;
- private String fClassName;
- private String fBeanName;
- private String fbeanBaseName;
- private IProject fProject;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand(
- JavaWSDLParameter javaParameter,
- IProject serviceProject) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- javaWSDLParam_ = javaParameter;
- serviceProject_ = serviceProject;
-
- }
-
- /**
- * JavaToToWSDLMethod execute
- */
- public Status execute(Environment environment) {
- fbeanBaseName = javaWSDLParam_.getBeanName();
- environment.getLog().log(Log.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
- Status status;
- try {
- //Get the qualified bean name; my.package.MyClass
- fMethodNames = new Hashtable();
- Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
- String qName = fbeanBaseName;
-
- if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
- || qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qName = qName.substring(0, qName.lastIndexOf('.'));
- }
-
- JavaEMFNature jMOF =
- (JavaEMFNature) JavaEMFNature.createRuntime(
- serviceProject_);
- JavaClass javaClass =
- (JavaClass) JavaClassImpl.reflect(qName, jMOF.getResourceSet());
- if (!javaClass.isExistingType()) {
- environment.getLog().log(Log.ERROR, 5022, this, "execute", msgUtils_.getMessage(
- "MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
- new String[] { qName }));
-
- status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
- new String[] { qName }),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Get the qualified name
- fClassName = javaClass.getQualifiedName();
- fBeanName = fClassName;
- String beanName;
- if (fClassName.lastIndexOf('.') != -1) {
- beanName =
- fClassName.substring(
- fClassName.lastIndexOf('.') + 1,
- fClassName.length());
- } else
- beanName = fClassName;
-
- // Walk the java class and get the method names
- gatherMethods(javaClass, beanName, oldMethodsNames);
- /*
- Iterator m = javaClass.getPublicMethodsExtended().iterator();
- while (m.hasNext()) {
- Method method = (Method) m.next();
- if ( ! method.isConstructor()){
- if (!beanName.equals(method.getName())
- && !(isDuplicateMethodName(method
- .getMethodElementSignature()))
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject[]")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object[]"))) { //$NON-NLS-1$
- // add the method name to our list of method names
- String methodName =method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- }
- */
- javaWSDLParam_.setMethods(fMethodNames);
-
- return new SimpleStatus( "" );
-
- } catch (Exception e) {
- environment.getLog().log(Log.ERROR, 5023, this, "execute", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-
- status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_JAVA_TO_METHOD"),
- Status.ERROR, e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
- {
- String javaName = javaClass.getJavaName();
- if (!javaClass.isInterface()
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
- && !javaName.equalsIgnoreCase("java.lang.Object[]")
- && !javaName.equalsIgnoreCase("java.lang.Object"))
- {
- List publicMethods = javaClass.getPublicMethods();
- for (Iterator it = publicMethods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor()
- && !beanName.equals(method.getName())
- && !(isDuplicateMethodName(method.getMethodElementSignature())))
- {
- // add the method name to our list of method names
- String methodName = method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
- }
- }
-
- //Returns true if the provided method name already exists in the
- //fMethodNames vector. This method is used to detect overloaded
- //methods in Beans and EJBs, which are currently unsupported.
- private boolean isDuplicateMethodName(String methodName) {
- return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index 64b89753f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.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.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_TD_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_TD_AXIS_INPUT";
-
- private IWebService ws_;
- private String serverProject_;
- private String serverModule_;
-
- private String serverServer_;
- private String wsdlURI_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public TDAxisInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public TDAxisInputCommand(IWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServerServer()
- {
- return serverServer_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-
- public String getServerModule() {
- return serverModule_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index 7116b8944..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,201 +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.axis.creation.ui.command;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class UpdateWEBXMLCommand extends SimpleCommand {
-
- private String LABEL = "TASK_LABEL_UPDATE_WEB_XML";
- private String DESCRIPTION = "TASK_DESC_UPDATE_WEB_XML";
-
- private MessageUtils msgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- public UpdateWEBXMLCommand( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
-
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment environment) {
- if (serverProject != null) {
- Status status = null;
- status = addServlet(serverProject, moduleName_, getAxisServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- addServlet(serverProject, moduleName_, getAdmintServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- return new SimpleStatus( "" );
- }
-
- private ServletDescriptor getAxisServletDescriptor() {
-
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AxisServlet"; //$NON-NLS-1$
- sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
- "*.jws", //$NON-NLS-1$
- "/services/*" }; //$NON-NLS-1$
- return sd;
- }
-
- private ServletDescriptor getAdmintServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AdminServlet"; //$NON-NLS-1$
- sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- return sd;
- }
-
- private ServletDescriptor getSoapMonitorServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "SOAPMonitorService"; //$NON-NLS-1$
- sd._displayName = "SOAPMonitorService"; //$NON-NLS-1$
- sd._className = "org.apache.axis.monitor.SOAPMonitorService"; //$NON-NLS-1$
- sd._mappings = new String[] { "/SOAPMonitor" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- Map params = new HashMap();
- params.put("SOAPMonitorPort", //$NON-NLS-1$
- "5001"); //$NON-NLS-1$
- sd._params = params;
- return sd;
- }
-
- public Status addServlet(
- IProject webProject,
- String moduleName,
- ServletDescriptor servletDescriptor) {
-
- Object accessorKey = new Object();
- WebArtifactEdit webEdit = null;
- try {
- //
- WebApp webapp = null;
- IVirtualComponent vc = ComponentCore.createComponent(webProject, moduleName);
- System.out.println("WebProject: "+webProject+" moduleName: "+moduleName);
- webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
- if (webEdit != null)
- {
- webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-
- boolean foundServlet = false;
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- Servlet aServlet = (Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- foundServlet = true;
- }
- }
-
- if (foundServlet) {
- return new SimpleStatus( "" );
- }
-
- WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
- Servlet servlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- servlet.setWebType(servletType);
- servlet.setServletName(servletDescriptor._name);
- servletType.setClassName(servletDescriptor._className);
- if(servletDescriptor._displayName != null){
- servlet.setDisplayName(servletDescriptor._displayName);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
- if(servletDescriptor._params != null){
- Properties properties = servlet.getParamsAsProperties();
- properties.putAll(servletDescriptor._params);
- }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServlet(servlet);
- servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
- webapp.getServletMappings().add(servletMapping);
- }
- }
-
- webEdit.save(new NullProgressMonitor());
- }
-
- return new SimpleStatus( "" );
- } catch (Exception e) {
-
- return new SimpleStatus(
- "UpdateWEBXMLCommand.addServlet", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
- Status.ERROR, e);
- }
- finally{
- if (webEdit != null)
- webEdit.dispose();
- }
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public class ServletDescriptor {
- String _name;
- String _className;
- String _displayName;
- Map _params;
- String[] _mappings;
- Integer _loadOnStartup;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 2ce94ca1d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.axis.creation.ui"; //$NON-NLS-1$
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisCreationUIPlugin instance_;
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisCreationUIPlugin ( IPluginDescriptor descriptor )
- {
- super(descriptor);
- if (instance_ == null)
- {
- instance_ = this;
- }
- log_ = new EclipseLog();
-
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceAxisCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void startup () throws CoreException
- {
- log_.log(Log.INFO, 5068, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
- super.startup();
- setPreferences();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void shutdown () throws CoreException
- {
- log_.log(Log.INFO, 5069, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
- super.shutdown();
- }
-
-
- /**
- * Sets the general preferences to the values in the preferences store.
- **/
- public void setPreferences()
- {
- // setDialogsPreferences();
- }
-
- /**
- * @see AbstractUIPlugin#initializeDefaultPreferences
- */
- protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
- // Set the defaults Preference
-// ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
- }
-
- /**
- * 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 instance_.getDescriptor().getResourceString(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_.getDescriptor().getInstallURL();
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- public String getPluginStateLocation() {
- return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
- }
-
- public String getPluginInstallLocation() {
- try {
- return Platform.resolve(getDescriptor().getInstallURL()).getFile();
- }
- catch (Exception e) {
- return null;
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 8676c3f4a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public BUCheckAxisDeploymentDescriptors(String moduleName)
- {
- super(moduleName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index c3ee802c9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends SimpleCommand {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private MessageUtils conMsgUtils_;
-
- // rm private Model model_;
- private JavaWSDLParameter javaWSDLParam_ = null;
- private IProject serviceProject_;
- private String javaBeanName_; // this needs to be set by the extension with initial selection
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private WebServicesParser WSParser_;
- // rm private WebServiceElement wse_; // temporary
- private String moduleName_;
-
- private String LABEL = "TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS";
- private String DESCRIPTION = "TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS";
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public final byte MODE_BEAN = (byte) 0;
- public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
-
- public DefaultsForServerJavaWSDLCommand( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- moduleName_ = moduleName;
-
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
-
- public DefaultsForServerJavaWSDLCommand(
- JavaWSDLParameter javaWSDLParam,
- Model model) {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- //rm setModel(model);
- setJavaWSDLParam(javaWSDLParam);
-
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute( Environment env ) {
-
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaBeanName_ == null) { // either set by extension point or bean class page
- javaBeanName_ = javaWSDLParam_.getBeanName();
- if (javaBeanName_ == null) {
- //rm javaBeanName_ = isdElement.getJavaBeanName();
- javaWSDLParam_.setBeanName(javaBeanName_);
- }
- }
- // rm WSParser_ = (WebServicesParser) wse_.getWSParser();
-
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam_.setSkeletonDeploy(false);
-
- javaWSDLParam_.setBeanName(javaBeanName_);
- String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_, moduleName_);
- javaWSDLParam_.setClasspath(classpath);
-
- String simpleBeanName = javaBeanName_;
- String beanPackageName = null;
- if (javaBeanName_ != null) {
- int index = javaBeanName_.lastIndexOf('.');
- if (index != -1) {
- simpleBeanName = javaBeanName_.substring(index + 1);
- beanPackageName = javaBeanName_.substring(0, index);
- }
- }
- String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
- javaWSDLParam_.setNamespace(namespace);
-
- javaWSDLParam_.setPortTypeName(simpleBeanName);
- javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
- IPath moduleServerRoot = null;
-
- IPath modulePath = serviceProject_.getFullPath();
- IPath webinfPath = serviceProject_.getFullPath();
- try {
- //if ( ResourceUtils.isWebProject(serviceProject_)) {
- if (J2EEUtils.isWebComponent(serviceProject_, moduleName_)){
- moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_, moduleName_);
-
- // should use ModuleCore.getSourceContainers();
-// IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-// if (container!=null) {
-// moduleServerRoot = container.getFullPath();
-// }
-
- modulePath = J2EEUtils.getWebContentPath(serviceProject_, moduleName_);
- webinfPath = J2EEUtils.getWebInfPath( serviceProject_, moduleName_ );
-
- }
-
- } catch (Exception e) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), Status.ERROR, e );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IPath wsdlPath =
- modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
- try{
- IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
-
- }
- catch(CoreException e){
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), Status.ERROR, e );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
- javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
- javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
- WSDLServicePathname_ = wsdlPath.toString();
-
- if (wsdlPath != null) {
- String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
- WSDLServiceURL_ = wsdlURL;
- // set parser
- if (wsdlURL == null || wsdlURL.length() <= 0) {
- IResource res =
- ResourceUtils.findResource(WSDLServicePathname_);
- if (res != null)
- wsdlURL = (new Utils()).toFileSystemURI(res);
- }
- Definition definition = null;
- if (wsdlURL != null && wsdlURL.length() > 0) {
- if (WSParser_ == null) {
- WSParser_ = new WebServicesParserExt();
- }
- definition = WSParser_.getWSDLDefinition(wsdlURL);
- }
- }
-
- javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaWSDLParam_.setUse(JavaWSDLParameter.USE_ENCODED);
-
- String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-// else {
-// javaWSDLParam_.setUrlLocation("http://localhost:8080/"+moduleName_);
-// }
-
- String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
- javaWSDLParam_.setUrlLocation(serviceURL);
-
- javaWSDLParam_.setMetaInfOnly(true);
- // String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
- // String output = PlatformUtils.getPlatformURL(modulePath);
-
- String javaOutput = ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-// String javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(moduleServerRoot).getLocation().toString();
-
- String serviceName = javaWSDLParam_.getServiceName();
- IPath outputPath = ResourceUtils.findResource(webinfPath).getLocation();
- String output = serviceProject_.getFullPath().toString();
- if (outputPath!=null)
- output = outputPath.append(serviceName).toString();
-
- javaWSDLParam_.setJavaOutput(javaOutput);
- javaWSDLParam_.setOutput(output);
-
- return new SimpleStatus( "" );
- }
-
- /**
- * 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;
- }
-
- // rm
- /*
- public void setModel(Model model) {
- this.model_ = model;
- }
- */
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
- }
-
- public String getWSDLServiceURL() {
- return WSDLServiceURL_;
- }
-
- public String getWSDLServicePathname() {
- return WSDLServicePathname_;
- }
-
- public void setParser(WebServicesParser wsParser) {
- this.WSParser_ = wsParser;
- }
-
- public WebServicesParser getParser() {
- return WSParser_;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- setJavaBeanName((String)object);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
deleted file mode 100644
index 6e44bb2eb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
+++ /dev/null
@@ -1,87 +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.axis.creation.ui.task;
-
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-
-
-public class LiteralSupportMessageTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_LITERAL_SUPPORT_MESSAGE";
- private final String DESCRIPTION =
- "TASK_DESC_LITERAL_SUPPORT_MESSAGE";
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
-
- private JavaWSDLParameter javaWSDLParam_;
-
- public LiteralSupportMessageTask() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId+".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public LiteralSupportMessageTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId+".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
-
- }
-
-
- /**
- * Execute LiteralSupportMessageTask
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- String use = javaWSDLParam_.getUse();
- if(use != null &&
- use.equals(JavaWSDLParameter.USE_LITERAL)){
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_LITERAL_SUPPORT_MESSAGE"), Status.WARNING);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("","User aborted",Status.ERROR);
- }
- }
-
- return status;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index 2fe3eaaf0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-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.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class MoveDeploymentFilesTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_MOVE_DEPLOYMENT_FILES";
- private final String DESCRIPTION = "TASK_DESC_MOVE_DEPLOYMENT_FILES";
- private final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
- private final String META_INF = "META-INF"; //$NON-NLS-1$
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- private JavaWSDLParameter javaWSDLParam_;
-
- public MoveDeploymentFilesTask( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject project = serverProject;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- try {
-// if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// return status;
-// } catch (Exception ex) {
-// status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
- String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
- String javaOutput = javaWSDLParam_.getJavaOutput();
-
- if (deployFiles == null || javaOutput == null) {
- return status;
- }
-
-
- IPath webinfPath = J2EEUtils.getWebInfPath(project, moduleName_ );
-
- for (int i = 0; i < deployFiles.length; i++) {
- File f = new File(deployFiles[i]);
- String resourceToMove = f.getName();
- String targetFileName = ResourceUtils.getWorkspaceRoot().getFile(webinfPath.addTrailingSeparator().append(resourceToMove)).getLocation().toString();
- FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
- File deploymentFile = new File(deployFiles[i]);
- deploymentFile.delete();
- deployFiles[i] = targetFileName;
- }
-
- } catch (Exception e) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index d513f136f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,160 +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.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class MoveJavaFilesTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_MOVE_JAVA_FILES";
- private final String DESCRIPTION = "TASK_DESC_MOVE_JAVA_FILES";
-
- private JavaWSDLParameter javaWSDLParam_;
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serviceProject_;
-
- private String moduleName_;
- // rm private Model model_;
-
- public MoveJavaFilesTask(String moduleName) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- this.moduleName_ = moduleName;
- }
-
- public MoveJavaFilesTask() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public MoveJavaFilesTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
-
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute(Environment env) {
-
- // rm
- /*
- //Begin Setters
- WebServiceElement wse =
- WebServiceElement.getWebServiceElement(model_);
- setServiceProject(wse.getServiceProject());
- //End Setters
- */
- Status status = new SimpleStatus("");
-
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
-
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- String[] javaFiles = javaWSDLParam_.getJavaFiles();
- String javaoutput = javaWSDLParam_.getJavaOutput(); // <webproject>/JavaSource
- String output = javaWSDLParam_.getOutput(); // <webproject>/WebContent/META_INF
-
- if(javaFiles == null || javaoutput == null && output == null ){
- return status;
- }
- try {
- for (int i = 0; i < javaFiles.length; i++) {
- String resourceToMove = javaFiles[i].substring(output.length());
- String targetFileName = javaoutput + resourceToMove;
- File resultFile = new File(targetFileName);
- // copy java files that without overwtriting existing ones
-// if (!resultFile.exists()) {
-// FileUtil.createTargetFile(
-// javaFiles[i],
-// javaoutput + resourceToMove);
-// }
- // delete java files from the output directory
- File source = new File(javaFiles[i]);
- source.delete();
- }
- } catch (Exception e) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index 83a4a3216..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends SimpleCommand
-{
- private static final String LABEL = "TASK_LABEL_SKELETON_WSDL";
- private static final String DESCRIPTION = "TASK_DESC_SKELETON_WSDL";
- private static final String IMPL = "Impl"; //$NON-NLS-1$
- private static final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private static final String DOT = "."; //$NON-NLS-1$
- private static final String SLASH = "/"; //$NON-NLS-1$
- private static final String PROTOCOL_SUFFIX = "://"; //$NON-NLS-1$
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private IProject serverProject;
- private HashMap visitedLinks;
- private MessageUtils msgUtils_;
- private String moduleName_;
-
- public Skeleton2WSDLCommand( String moduleName ) {
- super(WebServiceAxisCreationUIPlugin.getMessage(LABEL), WebServiceAxisCreationUIPlugin.getMessage(DESCRIPTION));
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
- setName( LABEL );
- setDescription( DESCRIPTION );
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute Skeleton2WSDLCommand
- */
- public Status execute(Environment env)
- {
- if (!(env instanceof EclipseEnvironment))
- {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- if (javaWSDLParam == null)
- {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- if (definition != null) {
- StringBuffer beanName = new StringBuffer();
- beanName.append(WSDLUtils.getPackageName(definition));
- beanName.append(DOT);
- try{
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
- Binding binding = port.getBinding();
- beanName.append(binding.getQName().getLocalPart());
- beanName.append(IMPL);
- javaWSDLParam.setBeanName(beanName.toString());
-
- javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
- javaWSDLParam.setServiceName(
- WSDLUtils.getServiceElementName(definition));
- javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
- }
- catch(Throwable e){
- e.printStackTrace();
- }
- }
- else {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // Modify WSDL endpoint
- if (port == null) {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_PORT", new String[] {wsdlURL}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service s = (Service)servicesIt.next();
- Map ports = s.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port p = (Port)portsIt.next();
- modifyEndpoint(p);
- }
- }
-
- visitedLinks = new HashMap();
-
- // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
- IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
- String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
- IPath wsdlPath = null;
- IFile outputFile = null;
- try {
- if(wsdlLocation != null){
- outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
- }
- else{
-// wsdlPath = serverProject.getFullPath();
-//
-// if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webProject =
-// (J2EEWebNatureRuntime) serverProject.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-// //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-// }
-// else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-// {
-// EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-// wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-// }
-// TODO: handle EJB case
- wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
- IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
- IFolder folder = ResourceUtils
- .getWorkspaceRoot()
- .getFolder(wsdlPath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
- outputFile = workspace.getFile(wsdlFilePath);
- wsdlLocation = outputFile.getLocation().toString();
- javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-
- }
-
- // copy WSDL
- CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
- copyWSDLCommand.setWebServicesParser(webServicesParser);
- copyWSDLCommand.setWsdlURI(wsdlURL);
- copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
- copyWSDLCommand.setDefinition(definition);
- Status status = copyWSDLCommand.execute(env);
- if(status!=null && status.getSeverity()==Status.ERROR) {
- return status;
- }
- }
- catch (Exception e) {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL", new String[] { wsdlLocation }), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- private Status modifyEndpoint(Port port)
- {
- Iterator it = port.getExtensibilityElements().iterator();
- SOAPAddress soapAddress = null;
- while (it.hasNext())
- {
- Object obj = it.next();
- if (obj instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)obj;
- break;
- }
- }
- if (soapAddress != null)
- {
-// String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
- String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, moduleName_);
- if (projectURL == null)
- return new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}), Status.ERROR, null);
- StringBuffer serviceURL = new StringBuffer(projectURL);
- serviceURL.append(SERVICE_EXT).append(port.getName());
- javaWSDLParam.setUrlLocation(serviceURL.toString());
- soapAddress.setLocationURI(serviceURL.toString());
- }
- return new SimpleStatus("");
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index d83dc372f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public TDCheckAxisDeploymentDescriptors(String moduleName)
- {
- super(moduleName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index 9de2a11e1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,235 +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.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class UpdateAxisWSDDFileTask extends SimpleCommand {
-
-
- private final String LABEL = "TASK_LABEL_UPDATE_AXIS_WSDD";
- private final String DESCRIPTION = "TASK_DESC_UPDATE_AXIS_WSDD";
- private final String DEPLOY_XSL = "deploy.xsl"; //$NON-NLS-1$
- private final String DEPLOY_BAK = "deploy.wsdd.bak"; //$NON-NLS-1$
- private final String CLASSNAME_PARAM = "newClassName"; //$NON-NLS-1$
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
- // rm private Model model_;
-
- private String moduleName_;
-
- public UpdateAxisWSDDFileTask( String moduleName)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- public UpdateAxisWSDDFileTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * Execute UpdateAxisWSDDFileTask
- */
- public Status execute(Environment env) {
-
- // rm
- /*
- //Begin Setters
- WebServiceElement wse =
- WebServiceElement.getWebServiceElement(model_);
- setServiceProject(wse.getServiceProject());
- //End Setters
- */
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
- String outputLocation = javaWSDLParam_.getJavaOutput();
- if (outputLocation == null) {
- return status;
- }
-// try {
-// if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// return status;
-// } catch (Exception ex) {
-// status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
- String[] javaFiles = javaWSDLParam_.getJavaFiles();
- String javaoutput = javaWSDLParam_.getJavaOutput();
- String output = javaWSDLParam_.getOutput();
-
-// String webContentPath = ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
- String webContentPath = J2EEUtils.getWebContentContainer( project, moduleName_ ).getLocation().toString();
- try {
-
- if (javaWSDLParam_.getDeploymentFiles() != null
- && javaWSDLParam_.getDeploymentFiles().length > 0) {
-
- String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
- Path deployPath = new Path(wsdd_deploy);
- String deployBackup =
- deployPath
- .removeLastSegments(1)
- .append(DEPLOY_BAK)
- .toString();
- FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
- String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
- TransformerFactory tFactory = TransformerFactory.newInstance();
-
- // Use the TransformerFactory to instantiate a Transformer that will work with
- // the stylesheet you specify. This method call also processes the stylesheet
- // into a compiled Templates object.
- Transformer transformer =
- tFactory.newTransformer(new StreamSource(deployXSL));
- transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
- // Use the Transformer to apply the associated Templates object to an XML document
- // (foo.xml) and write the output to a file (foo.out).
- transformer.transform(
- new StreamSource(deployBackup),
- new StreamResult(new FileOutputStream(wsdd_deploy)));
-
- }
-
- } catch (Exception e) {
- String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()};
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- private IPath getPluginFilePath(String pluginfileName)
- throws CoreException {
- try {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor =
- pluginRegistry.getPluginDescriptor(WebServiceAxisCreationUIPlugin.ID);
-
- URL localURL =
- Platform.asLocalURL(
- new URL(pluginDescriptor.getInstallURL(), pluginfileName));
- return new Path(localURL.getFile());
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "MSG_PLUGIN_FILE_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "MSG_PLUGIN_FILE_URL"),
- e));
- }
- }
-
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
deleted file mode 100644
index 346a63be8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-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.wst.command.internal.env.common.WaitForAutoBuildCommand;
-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.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class AxisBeanFragment extends SequenceFragment
-{
-
- public AxisBeanFragment()
- {
- add( new SimpleFragment( new ValidateObjectSelectionCommand(), ""));
- add( new SimpleFragment( new BUAxisDefaultingCommand(), "" ) );
- add( new BUAxisCommandsFragment1());
- add( new BUAxisCommandsFragment2());
- add( new SimpleFragment( "BeanConfig" ) );
- add( new MappingFragment() );
- add( new BUAxisCommandsFragment3());
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- //ValidateObjectSelectionCommand
- registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
- registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- //WSINonCompliantRuntimeCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
- //LiteralSupportMessageTask
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-
- //CheckAxisDeploymentDescriptorsTask
- //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", new StringToIProjectTransformer());
-
- //CopyAxisJarCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- //AddJarsToProjectBuildPathTask
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //WSDL2JavaCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
-
- //MoveJavaFilesTask
- registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateAxisWSDDFileTask
- registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- //AxisDeployCommand
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- //CopyAxisServerConfigTask
- /*
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", CopyAxisServerConfigTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisServerConfigTask.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", CopyAxisServerConfigTask.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", CopyAxisServerConfigTask.class);
- */
-
- // ServerExtensionOutputCommand
- registry.addMapping(Java2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
- }
-
- private class BUAxisCommandsFragment1 extends SequenceFragment
- {
- public BUAxisCommandsFragment1()
- {
- add(new SimpleFragment(new WSINonCompliantRuntimeCommand(), ""));
- }
- }
-
- private class BUAxisCommandsFragment2 extends SequenceFragment
- {
- public BUAxisCommandsFragment2()
- {
- //add(new SimpleFragment(new DefaultsForServerJavaWSDLCommand(), ""));
- add(new SimpleFragment(new JavaToWSDLMethodCommand(), ""));
- }
- }
-
- private class BUAxisCommandsFragment3 extends SequenceFragment
- {
- public BUAxisCommandsFragment3()
- {
- add(new SimpleFragment(new LiteralSupportMessageTask(), ""));
- //add(new SimpleFragment(new CheckAxisDeploymentDescriptorsTask(), ""));
- //add(new SimpleFragment(new CopyAxisJarCommand(), ""));
- add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
- add(new SimpleFragment(new WaitForAutoBuildCommand(), "" ));
- add(new SimpleFragment(new Java2WSDLCommand(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- add(new SimpleFragment(new WSDL2JavaCommand(), ""));
- add(new SimpleFragment(new MoveJavaFilesTask(), ""));
- //add(new SimpleFragment(new UpdateAxisWSDDFileTask(), ""));
- //add(new SimpleFragment(new UpdateWEBXMLCommand(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- add(new SimpleFragment(new BuildProjectCommand(), ""));
- //add(new SimpleFragment(new StartProjectCommand(), ""));
- add(new SimpleFragment(new AxisDeployCommand(), ""));
- //add(new SimpleFragment(new CopyAxisServerConfigTask(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- }
- }
-
- public class MappingFragment extends BooleanFragment
- {
- private boolean showMappings_;
-
- public MappingFragment()
- {
- super();
-
- setTrueFragment( new SimpleFragment( "AxisServiceBeanMapping" ));
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return showMappings_;
- }
- } );
- }
-
- public void setCustomizeServiceMappings( boolean showMappings )
- {
- showMappings_ = showMappings;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 417e21b01..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,275 +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.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class BUAxisDefaultingCommand extends SimpleCommand
-{
- //Need
- private IStructuredSelection initialSelection_;
- private TypeRuntimeServer serviceIds_;
-
- //Provide
- private IServer serviceExistingServer_;
- private String serviceServerTypeID_; // rsk revisit
- private JavaWSDLParameter javaWSDLParam_;
- private String javaBeanName_;
- private WebServicesParser parser_;
- private boolean forceBuild_ = true;
- private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
- private ValidationManager validationManager_;
- private boolean customizeServiceMappings_ = false;
-
- //This is proxy and client related information
- //which can be nulled for commands dealing
- //with service creation.
- //rsk revisit
- private Boolean isProxyProject_ = Boolean.FALSE;
- private String clientRuntimeID_ = null;
- private IProject proxyProject_ = null;
- private IProject sampleProject_ = null;
- private String sampleServerTypeID_ = null;
- private IServer sampleExistingServer_ = null;
-
- private MessageUtils msgUtils_;
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
-// if (serviceIds_.getServerInstanceId() != null) { // server exists
-// serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-// }
-// if (serviceExistingServer_ != null)
-// {
-// serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-// }
-// else
-// {
-// serviceServerTypeID_ = serviceIds_.getServerId();
-// // server will be created in ServerDeployableConfigurationCommand
-// }
-
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
-// if (initialSelection_ == null) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-
- if (javaBeanName_ == null) {
- Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"), //$NON-NLS-1$
- Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-// try {
-//
-// javaBeanName_ = getJavaBeanFromInitialSelection(env);
-//
-// } catch (CoreException e) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-// +e.getCause().toString(), Status.ERROR);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-
- //parser
- parser_ = new WebServicesParserExt();
-
-
-
- //validationManager
- validationManager_ = new ValidationManager();
-
- return new SimpleStatus("");
- }
-
- private String getJavaBeanFromInitialSelection(Environment env) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- IStructuredSelection selection = initialSelection_;
- //
- if (selection != null)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
- /**
- * @return Returns the clientRuntimeID_.
- */
- public String getClientRuntimeID()
- {
- return clientRuntimeID_;
- }
- /**
- * @return Returns the forceBuild_.
- */
- public boolean getForceBuild()
- {
- return forceBuild_;
- }
- /**
- * @return Returns the isProxyProject_.
- */
- public Boolean getIsProxyProject()
- {
- return isProxyProject_;
- }
- /**
- * @return Returns the javaBeanName_.
- */
- public String getJavaBeanName()
- {
- return javaBeanName_;
- }
- /**
- * @return Returns the javaWSDLParam_.
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getParser()
- {
- return parser_;
- }
- /**
- * @return Returns the proxyProject_.
- */
- public IProject getProxyProject()
- {
- return proxyProject_;
- }
- /**
- * @return Returns the sampleExistingServer_.
- */
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer_;
- }
- /**
- * @return Returns the sampleProject_.
- */
- public IProject getSampleProject()
- {
- return sampleProject_;
- }
- /**
- * @return Returns the sampleServerTypeID_.
- */
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID_;
- }
- /**
- * @return Returns the validationManager_.
- */
- public ValidationManager getValidationManager()
- {
- return validationManager_;
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- initialSelection_ = initialSelection;
- }
- /**
- * @return Returns the serviceExistingServer_.
- */
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-// public String getServiceServerTypeID()
-// {
-// return serviceServerTypeID_;
-// }
-
- public boolean getCustomizeServiceMappings()
- {
- return customizeServiceMappings_;
- }
- /**
- * @return Returns the isWebProjectStartupRequested.
- */
- public Boolean getIsWebProjectStartupRequested()
- {
- return IsWebProjectStartupRequested;
- }
-
-public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
-}
-
-// public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-// {
-// serviceIds_ = ids;
-// }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 2345bc160..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-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.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-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;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private String thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
- private IProject serverProject_ = null;
- private Composite parent_ = null;
- private IWizardContainer context_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
-
- /*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 )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, thisPlugin );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
- "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
- "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, "BUTTON_BROWSE_FILES",
- "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 handleBrowseClasses()
- {
- String className = DialogUtils.browseClasses( parent_.getShell(),
- serverProject_, context_ );
-
- if (className!=null) beanClassText_.setText(className);
-
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = serverProject_;
-
- if (topResource == null)
- {
- topResource = ResourceUtils.getWorkspaceRoot();
- }
-
- IResource resource
- = DialogUtils.browseResources( parent_.getShell(),
- topResource,
- initialResource_,
- filter_ );
-
- if( resource != null )
- {
- 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 ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- public void setCurrentPage( IWizardPage page )
- {
- context_ = page.getWizard().getContainer();
- }
-
- public void setBeanClassName(String beanClassName)
- {
- beanClassText_.setText(beanClassName);
- }
-
- public String getBeanClassName()
- {
- return beanClassText_.getText().trim();
- }
-
- public void setServerProjectName( String name )
- {
- serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );
- }
-
- public void setInitialResource( IResource resource )
- {
- initialResource_ = resource;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 053d10065..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-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.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.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.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-
- private Button rpcEncodedButton_;
- private Button rpcLiteralButton_;
- private Button docLiteralButton_;
-
- private Listener statusListener_;
-
- private JavaWSDLParameter javaParameter_;
-
- /* CONTEXT_ID PBCF0001 for the Bean Config Page */
- private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-
- private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- private Text wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- private Tree methodsTree_;
- /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
- private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-
- private Button selectAllMethodsButton_;
- /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-
- private Button deselectAllMethodsButton_;
- /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- String baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
- UIUtils baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-
- statusListener_ = statusListener;
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-
- Composite configGroup = uiUtils.createComposite( parent, 2 );
-
- uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER );
- wsdlFileText_.addListener( SWT.Modify, statusListener );
-
- Label separator = uiUtils.createHorizontalSeparator( parent, 6 );
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group methodsGroup = baseConUiUtils.createGroup( parent, "LABEL_METHODS", null, null );
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- methodsTree_ = uiUtils.createTree( methodsGroup, TOOLTIP_PBME_TREE_METHODS,
- INFOPOP_PBME_TREE_METHODS,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
- methodsTree_.addListener( SWT.Selection, statusListener );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL",
- TOOLTIP_PBME_BUTTON_SELECT_ALL,
- INFOPOP_PBME_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL",
- TOOLTIP_PBME_BUTTON_DESELECT_ALL,
- INFOPOP_PBME_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group styleGroup = uiUtils.createGroup( parent, "LABEL_STYLE_USE", null, null );
-
- // TODO radio buttons have no TOOLTIP or INFOPOP.
- docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
- rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
- rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
- "TOOLTIP_P2N_SHOW_MAPPINGS",
- INFOPOP_P2N_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
-
- statusListener_.handleEvent( null );
- }
-
- public void setCustomizeServiceMappings( boolean value )
- {
- showMappingsCheckbox_.setSelection( value );
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
- }
-
- public void setJavaParameter( JavaWSDLParameter javaParameter )
- {
- javaParameter_ = javaParameter;
-
- String wsdlLocation = javaParameter.getOutputWsdlLocation();
-
- // TODO Verify that we need to find the WSDL in the eclipse file system.
- //IFile file
- // = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
- //IPath wsdlPath = file.getFullPath();
- IPath wsdlPath = new Path( wsdlLocation );
-
- wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
- wsdlFileText_.setText(wsdlPath.lastSegment());
-
- String location = javaParameter.getUrlLocation();
- uriText_.setText(location == null ? "" : location);
-
- methodsTree_.removeAll();
- Hashtable methods = javaParameter.getMethods();
- Enumeration e = methods.keys();
-
- while( e.hasMoreElements() )
- {
- String name = (String) e.nextElement();
- TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-
- item.setData(name);
- item.setText(name);
- item.setChecked((((Boolean) methods.get(name)).booleanValue()));
- }
-
- TreeItem[] items = methodsTree_.getItems();
-
- if( items.length > 0 )
- {
- methodsTree_.setSelection( new TreeItem[]{ items[0] } );
- }
-
- String style = javaParameter.getStyle();
-
- if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
- {
- rpcEncodedButton_.setSelection(true);
- }
- else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
- {
- rpcLiteralButton_.setSelection(true);
- }
- else
- {
- docLiteralButton_.setSelection(true);
- }
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
- IPath wsdlPath
- = new Path( wsdlFolderText_.getText().trim() ).append( wsdlFileText_.getText().trim() );
- IWorkspaceRoot workspace = ResourceUtils.getWorkspaceRoot();
-
- // TODO Do we need to go to the eclipse file system??
- //String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
- String wsdlLocation = wsdlPath.toString();
-
- javaParameter_.setOutputWsdlLocation(wsdlLocation);
- javaParameter_.setInputWsdlLocation(wsdlLocation);
-
- String fileURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-
- Hashtable methods = new Hashtable();
-
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- TreeItem item = items[i];
- methods.put((String)item.getData(), new Boolean(item.getChecked()));
- }
-
- javaParameter_.setMethods(methods);
-
- if( rpcEncodedButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
- }
- else if( rpcLiteralButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
- else
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
-
- return javaParameter_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus()
- {
- Status result = null;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- if( wsdlFileText_.getText().equals( "" ) )
- {
- result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_FILE_SPECIFIED" ), Status.ERROR );
- }
- else
- {
- TreeItem[] items = methodsTree_.getItems();
- boolean itemSelected = false;
-
- for( int index = 0; index < items.length; index++ )
- {
- if( items[index].getChecked() )
- {
- itemSelected = true;
- break;
- }
- }
-
- if( !itemSelected )
- {
- result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_METHOD_SELECTED" ), Status.ERROR );
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
deleted file mode 100644
index e96b20ea4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Hashtable;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-
-public class DefaultsForConfig extends SimpleCommand
-{
- public JavaWSDLParameter getJavaParameter()
- {
- JavaWSDLParameter parameter = new JavaWSDLParameter();
- Hashtable methods = new Hashtable();
-
- methods.put( "method1", new Boolean( true ) );
- methods.put( "method2", new Boolean( false ) );
- methods.put( "method3", new Boolean( true ) );
-
- parameter.setMethods( methods );
- parameter.setOutputWsdlLocation( "/SomeProj/SomeFolder/SomeFile" );
- parameter.setUrlLocation( "SomeURLLocation" );
- parameter.setStyle( JavaWSDLParameter.STYLE_DOCUMENT );
-
- return parameter;
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index 0a6710b78..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class ValidateObjectSelectionCommand extends SimpleCommand
-{
- private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
- private MessageUtils msgUtils_;
- private IStructuredSelection objectSelection;
- private String serviceProjectName;
-
-
- /**
- * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
- */
- public ValidateObjectSelectionCommand()
- {
- super();
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
- public Status execute(Environment env)
- {
- //Make sure a bean is selected
- String javaBeanName = null;
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- {
- javaBeanName = ((String)object);
- }
- else
- {
- //The ObjectSelectionWidget never appeared and so the IStucturedSelection from
- //ObjectSelectionWidgetOutputCommand is the initial selection.
- //Get the Java bean name from the selection.
- try
- {
- System.out.println(object.getClass().toString());
- javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
- } catch (CoreException ce)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
- }
-
- if (javaBeanName==null || javaBeanName.length()==0)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure a project is selected
- IProject serviceProject = (IProject)((new StringToIProjectTransformer()).transform(serviceProjectName));
- if (serviceProject==null)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_NO_PROJECT"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure the selected bean can be loaded from the selected project
- if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
- || javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
- }
-
- try
- {
- JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(serviceProject);
- JavaClass javaClass =(JavaClass) JavaClassImpl.reflect(javaBeanName, jMOF.getResourceSet());
- if (!javaClass.isExistingType())
- {
- Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- } catch (CoreException ce)
- {
- Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- return new SimpleStatus("");
- }
-
- /**
- * @param serviceProjectName The serviceProjectName to set.
- */
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName = serviceProjectName;
- }
-
- /**
- * @param objectSelection The objectSelection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- //IStructuredSelection selection = initialSelection_;
- //
- if (objectSelection != null)
- {
- Object obj = objectSelection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 0b6a14d97..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends SimpleCommand
-{
- private IStructuredSelection initialSelection;
- private IStructuredSelection objectSelection;
- private WebServicesParser webServicesParser;
- private String wsdlURI_;
- private JavaWSDLParameter javaWSDLParam;
-
- public Status execute(Environment env){
-
- javaWSDLParam = new JavaWSDLParameter();
- javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam.setSkeletonDeploy(true);
- javaWSDLParam.setMetaInfOnly(false);
- return new SimpleStatus("");
-
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = WSDLParserFactory.getWSDLParser();
- return webServicesParser;
- }
-
- public String getWebServiceURI()
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof IFile)
- {
- IFile ifile = (IFile)firstElement;
- String fileExtension = ifile.getFileExtension();
- if (fileExtension.equals("wsdl") ||
- fileExtension.equals("wsil") ||
- fileExtension.equals("html"))
- {
- return ifile.getFullPath().toString();
- }
- }
- }
- return "";
- }
-
- public String getWsdlURI()
- {
-// if (objectSelection != null && !objectSelection.isEmpty())
-// {
-// Object object = objectSelection.getFirstElement();
-// if (object instanceof IResource)
-// return ((IResource)object).getLocation().toString();
-// else
-// return object.toString();
-// }
-// return "";
- return wsdlURI_;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
-
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWsdlURI();
- int index = wsURI.lastIndexOf('.');
- if (index != -1)
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
- sb.append(".wsil");
- return sb.toString();
- }
- return "";
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return getWebServicesParser().getHTTPBasicAuthPassword();
- }
-
- public String getHttpBasicAuthUsername()
- {
- return getWebServicesParser().getHTTPBasicAuthUsername();
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
deleted file mode 100644
index 7e86a18a0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerName2IServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-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.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.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-public class AxisSkeletonFragment extends SequenceFragment
-{
- public AxisSkeletonFragment()
- {
- add( new SimpleFragment( new AxisSkeletonDefaultingCommand(), "" ) );
- add( new SimpleFragment( new ValidateWSDLCommand(), ""));
- //add( new SimpleFragment( new SkeletonConfigWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "SkeletonConfig") );
- add( new AxisMappingsFragment() );
- //add( new SimpleFragment( new CheckAxisDeploymentDescriptorsTask(), ""));
- add( new SimpleFragment( new AddJarsToProjectBuildPathTask(), ""));
- //add( new SimpleFragment( new CopyAxisJarCommand(), ""));
- add( new SimpleFragment( new WSDL2JavaCommand(), ""));
- //add( new SimpleFragment( new MoveDeploymentFilesTask(), ""));
- //add( new SimpleFragment( new Skeleton2WSDLCommand(), ""));
- //add( new SimpleFragment( new UpdateWEBXMLCommand(), ""));
- add( new SimpleFragment( new RefreshProjectCommand(), ""));
- add( new SimpleFragment( new BuildProjectCommand(), ""));
- //add( new SimpleFragment( new StartProjectCommand(), ""));
- // the second build project command is needed to synchronize with workspace auto build
- add( new SimpleFragment( new BuildProjectCommand(), ""));
- add( new SimpleFragment( new AxisDeployCommand(), ""));
- add( new SimpleFragment( new RefreshProjectCommand(), ""));
- add (new SimpleFragment( new ComputeAxisSkeletonBeanCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
- }
-
- /* (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)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-
- // CheckAxisDeploymentDescriptorsTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", projectTransformer);
-
- // AddJarsToProjectBuildPathTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
- //dataRegistry.addMapping(WSDLSelectionTreeWidget.class, "WsdlURI", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
- // MoveDeploymentFilesTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
- // CopyAxisJarCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
- // UpdateWEBXMLCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // StartProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
- dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
- // AxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // ServerExtensionOutputCommand
- dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ServerExtensionOutputCommand.class);
-
- // ComputeAxisSkeletonBeanCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-
- // OpenJavaEditorCommand
- dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 5f2115a93..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.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.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
- private JavaWSDLParameter javaWSDLParam;
-
- /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
- private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
- private static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-
- // private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- private Text wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- private Combo skeletonFolderText_;
- /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
- private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
- private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
- //
-
- /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
- // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
- // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- String conPluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- String baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- MessageUtils conMsgUtils = new MessageUtils( conPluginId + ".plugin", this );
- MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils( msgUtils, pluginId );
- UIUtils conUiUtils = new UIUtils( conMsgUtils, pluginId );
- UIUtils baseConUiUtils = new UIUtils( baseConMsgUtils, pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PBSC_PAGE );
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBSC_PAGE ) );
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
- /*
- uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- */
-
- wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
- TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
- INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- Label separator = uiUtils.createHorizontalSeparator( parent, 5 );
-
- showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "TOOLTIP_N2P_SHOW_MAPPINGS",
- INFOPOP_N2P_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void setEndpointURI(String endpointURI)
- {
- /*
- if (endpointURI != null)
- uriText_.setText(endpointURI);
- */
- }
-
- public void setOutputWSDLFolder(String outputWSDLFolder)
- {
- if (outputWSDLFolder != null)
- wsdlFolderText_.setText(outputWSDLFolder);
- }
-
- public void setOutputWSDLFile(String outputWSDLFile)
- {
- if (outputWSDLFile != null)
- wsdlFileText_.setText(outputWSDLFile);
- }
-
- public void setOutputJavaFolder(String outputJavaFolder)
- {
- if (outputJavaFolder != null)
- {
- int index = skeletonFolderText_.indexOf(outputJavaFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else if (skeletonFolderText_.getItemCount() <= 0)
- {
- String root = getWorkspaceRootLocation();
- if (outputJavaFolder.startsWith(root))
- skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
- else
- skeletonFolderText_.setText(outputJavaFolder);
- }
- }
- }
-
- public void setShowMapping(boolean showMapping)
- {
- showMappingsCheckbox_.setSelection(showMapping);
- }
-
- public boolean getShowMapping()
- {
- return showMappingsCheckbox_.getSelection();
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- String root = getWorkspaceRootLocation();
- File file = new File(root);
- try
- {
- root = file.toURL().toString();
- char lastChar = root.charAt(root.length()-1);
- if (lastChar == '/' || lastChar == '\\')
- root = root.substring(0, root.length()-1);
- }
- catch (MalformedURLException murle)
- {
- }
- javaWSDLParam.setOutput(root + wsdlFolderText_.getText());
- javaWSDLParam.setJavaOutput(root + skeletonFolderText_.getText());
- return javaWSDLParam;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServerProject(IProject serviceProject)
- {
- String originalSkeletonFolder = skeletonFolderText_.getText();
- skeletonFolderText_.removeAll();
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
- for (int i = 0; i < paths.length ; i++)
- skeletonFolderText_.add(paths[i].toString());
- int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else
- skeletonFolderText_.select(0);
- }
-
- private String getWorkspaceRootLocation()
- {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index 3d79e0e97..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class SkeletonConfigWidgetDefaultingCommand extends SimpleCommand
-{
- private String wsdlURI;
- private IProject serverProject;
- private JavaWSDLParameter javaWSDLParam;
- private String moduleName_;
-
- public SkeletonConfigWidgetDefaultingCommand( String moduleName )
- {
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment env) {
-
- javaWSDLParam.setOutput(getOutputWSDLFolder());
- javaWSDLParam.setJavaOutput(getOutputJavaFolder());
- return new SimpleStatus("");
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
- }
-
- public String getEndpointURI()
- {
- return null;
- }
-
- public String getOutputWSDLFolder()
- {
- IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject, moduleName_ ).append("wsdl");
- return wsdlPath.toString();
- }
-
- public String getOutputWSDLFile()
- {
- int index = wsdlURI.lastIndexOf('/');
- if (index == -1)
- index = wsdlURI.lastIndexOf('\\');
- return wsdlURI.substring(index+1, wsdlURI.length());
- }
-
- public String getOutputJavaFolder()
- {
- if (serverProject!=null){
- return ResourceUtils.getJavaSourceLocation(serverProject, moduleName_).toString();
- }
- return null;
- }
-
- public boolean getShowMapping()
- {
- return false;
- }
-
- public boolean isShowMapping()
- {
- return getShowMapping();
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index 36cc921f4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,267 +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.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-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.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.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-* This is the class for the
-* Java Bean
-* {@link org.eclipse.jst.ws.was.creation.ui.wizard.WebServiceServerRuntimeType WebServiceServerRuntimeType}.
-*/
-public class WSBeanAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding
-{
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getName ()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_BEANWAXIS");
- }
-
- /**
- * Returns a locale specific description of this Web Service type.
- * @return A locale specific description of this Web Service type.
- */
- public String getDescription ()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_BEANWAXIS");
- }
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel()
- {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel)
- {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel()
- {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel)
- {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
- * @return A label for the Web Service type
- */
- public String getWebServiceTypeLabel()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WEBSERVICETYPE_NAME_JAVA_AXIS");
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired()
- {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule)
- {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /**
- * Returns a string representation of this object.
- * @return A string representation of this object.
- */
- public String toString ()
- {
- return getName();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- /*
- dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
- //BeanClassWidget - as target
- dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
- //BeanClassWidget - as source
- dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null); //BeanConfigWidget
- */
- // ObjectSelectionWidget
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-
- //BeanConfigWidget - as target
- dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
- //BeanConfigWidget - as source
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
- //MappingFragment (optionally displays the AxisMappingsWidget)
- dataRegistry.addMapping(BeanConfigWidget.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //AxisMappingsWidget - as target
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-
- //AxisMappingsWidget - as source
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
- //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
- //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.class );
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "BeanSelection",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CLASS"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CLASS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanClassWidget();
- }
- } );
- */
-
- widgetRegistry.add( "BeanConfig",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanConfigWidget();
- }
- } );
-
- String consPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils consMsgUtils = new MessageUtils( consPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisServiceBeanMapping",
- consMsgUtils.getMessage("PAGE_TITLE_WS_BEAN2XML"),
- consMsgUtils.getMessage("PAGE_DESC_P2N_MAPPINGS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new AxisBeanFragment();
- }
- };
- }
-
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index 1114fde6f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,246 +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.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-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.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.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding
-{
- private WSDLResourceFilter filter_ = new WSDLResourceFilter();
-
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getName() {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_WSDLAXIS");
- }
-
- /**
- * Returns a locale specific description of this Web Service type.
- * @return A locale specific description of this Web Service type.
- */
- public String getDescription() {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_WSDLAXIS");
- }
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel() {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel) {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel() {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel) {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
- * @return A label for the Web Service type
- */
- public String getWebServiceTypeLabel() {
- return WebServiceAxisCreationUIPlugin.getMessage(
- "%WEBSERVICETYPE_NAME_WSDL_AXIS");
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired() {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule) {
- isWebModuleRequired_ = requireWebModule;
- }
-
- /**
- * Returns a string representation of this object.
- * @return A string representation of this object.
- */
- public String toString() {
- return getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
-
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // SkeletonConfigWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFile", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
- // AxisMappingsFragment
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
- // AxisMappingsWidget
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // WSDL2JavaCommand
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "WSDLSelection",
- msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionTreeWidget",
- msgUtils.getMessage("PAGE_TITLE_WSDL_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WSDL_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionTreeWidget();
- }
- });
- */
-
- widgetRegistry.add( "SkeletonConfig",
- msgUtils.getMessage("PAGE_TITLE_WSSKEL_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSSKEL_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new SkeletonConfigWidget();
- }
- } );
-
- widgetRegistry.add( "AxisMappingsWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_XML2BEAN"),
- msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new AxisSkeletonFragment();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index c5d15943e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor beanConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private BeanConfigWidget beanWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisBeanConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-
- beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
- beanWidget_ = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisServiceBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return beanConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index cbab9b4e9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor skelConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private SkeletonConfigWidget skelWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisSkeletonConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-
- skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
- skelWidget_ = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisMappingsWidget" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return skelConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 83ed75595..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
- private AxisWebServiceInfo axisWebServiceInfo_;
-
- public AxisWebService(WebServiceInfo info)
- {
- super(info);
- }
-
- public ICommandFactory assemble(Environment env, IContext ctx,
- ISelection sel, String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
-
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-
- registerBUDataMappings( env.getCommandManager().getMappingRegistry());
-
- commands.add(new BUAxisInputCommand(this, project, module));
-// commands.add(new ValidateObjectSelectionCommand());
- commands.add(new BUAxisDefaultingCommand());
- commands.add(new WSINonCompliantRuntimeCommand());
- commands.add(new DefaultsForServerJavaWSDLCommand(module));
- commands.add(new JavaToWSDLMethodCommand());
- // commands.add(new SimpleFragment( "BeanConfig" ));
- // commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
- commands.add(new BUCheckAxisDeploymentDescriptors(module));
- commands.add(new LiteralSupportMessageTask());
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new WaitForAutoBuildCommand());
- commands.add(new Java2WSDLCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveJavaFilesTask(module));
- commands.add(new UpdateAxisWSDDFileTask(module));
- commands.add(new UpdateWEBXMLCommand(module));
- commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-
- registerTDDataMappings( env.getCommandManager().getMappingRegistry());
-
- commands.add(new TDAxisInputCommand(this, project, module));
- commands.add(new AxisSkeletonDefaultingCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new SkeletonConfigWidgetDefaultingCommand(module));
-// commands.add(new SimpleFragment( "SkeletonConfig" ));
-// commands.add(new SimpleFragment( "AxisMappingsWidget" ));
- commands.add(new TDCheckAxisDeploymentDescriptors(module));
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveDeploymentFilesTask(module));
- commands.add(new Skeleton2WSDLCommand(module));
- commands.add(new UpdateWEBXMLCommand(module));
- commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else {
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- }
-
-
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
- System.out
- .println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- } else {// For BOTTOM_UP and TOP_DOWN
- commands.add(new AxisRunInputCommand(this, project, module));
-// commands.add(new StartProjectCommand(module));
- commands.add(new AxisDeployCommand());
- commands.add(new RefreshProjectCommand());
- if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- commands.add(new ComputeAxisSkeletonBeanCommand());
- commands.add(new OpenJavaEditorCommand());
- }
- return new SimpleCommandFactory(commands);
- }
- }
-
- public void registerBUDataMappings(DataMappingRegistry registry)
- {
- //BUAxisInputCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.class );
-
- //ValidateObjectSelectionCommand
-// registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
-// registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- //WSINonCompliantRuntimeCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
- //LiteralSupportMessageTask
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-
- //CheckAxisDeploymentDescriptorsTask
- //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCheckAxisDeploymentDescriptors.class, "ServerProject", new StringToIProjectTransformer());
-
- //CopyAxisJarCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- //AddJarsToProjectBuildPathTask
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //WSDL2JavaCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
-
- //MoveJavaFilesTask
- registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateAxisWSDDFileTask
- registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- // AxisOutputCommand
- registry.addMapping(Java2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisOutputCommand.class);
-
- // Run extension
-
- //AxisDeployCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
- //RefreshProjectCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
-
-
- }
-
- public void registerTDDataMappings(DataMappingRegistry dataRegistry)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- // TODO: map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-
-// dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-
- // CheckAxisDeploymentDescriptorsTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCheckAxisDeploymentDescriptors.class, "ServerProject", projectTransformer);
-
- // AddJarsToProjectBuildPathTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-// WSDL2JavaCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
- // MoveDeploymentFilesTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
- // CopyAxisJarCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
- // UpdateWEBXMLCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // StartProjectCommand
-// dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
-// dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
- // AxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // AxisOutputCommand
- dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisOutputCommand.class);
-// dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", AxisOutputCommand.class);
-
- // ComputeAxisSkeletonBeanCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-
- // OpenJavaEditorCommand
- dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
- }
- public AxisWebServiceInfo getAxisWebServiceInfo() {
- return axisWebServiceInfo_;
- }
-
- public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
- axisWebServiceInfo_ = axisWebServiceInfo;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78be2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-
- private JavaWSDLParameter javaWSDLParameter;
-
- public JavaWSDLParameter getJavaWSDLParameter() {
- return javaWSDLParameter;
- }
-
- public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index 38c8c87d7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
- public IWebService getWebService(WebServiceInfo info)
- {
- return new AxisWebService(info);
- }
-
- public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
- {
- return new AxisWebServiceClient(info);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- 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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 491c19c4f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-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 788372810..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 775481dca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,72 +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.0.0
-Bundle-ClassPath: wsc-ui.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.internal.consumption.ui.action,
- org.eclipse.jst.ws.internal.consumption.ui.command,
- org.eclipse.jst.ws.internal.consumption.ui.command.data,
- org.eclipse.jst.ws.internal.consumption.ui.common,
- org.eclipse.jst.ws.internal.consumption.ui.extension,
- org.eclipse.jst.ws.internal.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.consumption.ui.preferences,
- org.eclipse.jst.ws.internal.consumption.ui.selection,
- org.eclipse.jst.ws.internal.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample,
- org.eclipse.jst.ws.internal.consumption.ui.wizard,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi,
- org.eclipse.jst.ws.internal.consumption.ui.wsil,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt
-Require-Bundle: org.eclipse.wst.ws.parser,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.wst.ws,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.internet.webbrowser,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jst.j2ee.webservices.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.ws.ui,
- org.wsdl4j,
- org.apache.wsil4j
-Eclipse-AutoStart: true
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 9f7c87caa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-source.wsc-ui.jar = src/
-bin.includes = wsc-ui.jar,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/
-src.includes = build.properties,\
- doc/,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- src/,\
- schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
deleted file mode 100644
index 8da3a2131..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /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 a113c85cc..000000000
--- 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 eaba51f62..000000000
--- 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 1ee05fa2e..000000000
--- 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 1060dd967..000000000
--- 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 590d3965f..000000000
--- 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/webservicesclient_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
deleted file mode 100644
index 68b7a2651..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
deleted file mode 100644
index 927ad5ad4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /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 641fe843a..000000000
--- 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/import_ws_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
deleted file mode 100644
index a3061e6ff..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.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 5b43cae7b..000000000
--- 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/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7d7..000000000
--- 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 afb6cb7d7..000000000
--- 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 53e7dbd12..000000000
--- 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_wiz_banner_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
deleted file mode 100644
index 11b34b7db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.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 618a946cd..000000000
--- 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 8fb844f5b..000000000
--- 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 7c5916fb6..000000000
--- 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 ccd373839..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,121 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-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 Sample 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
-
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-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
-
-#
-# 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
-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 34d39c594..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,788 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension-point
- id="publicUDDIRegistryType"
- name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="privateUDDIRegistryType"
- name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="webServiceClientType"
- name="%XP_WEB_SERVICE_CLIENT_TYPES"
- schema="schema/webServiceClientType.exsd"/>
-
- <extension-point
- id="webServiceTest"
- name="%XP_WEB_SERVICE_TEST"
- schema="schema/webServiceTest.exsd"/>
-
- <extension-point
- id="webServiceServerRuntimeType"
- name="%XP_WEB_SERVICE_SERVER_RUNTIME_TYPES"
- schema="schema/webServiceServerRuntimeType.exsd"/>
-
- <extension-point
- id="clientProjectType"
- name="%XP_WEB_SERVICE_CLIENT_PROJECT_TYPE"
- schema="schema/clientProjectType.exsd"/>
-
- <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_IBM_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft">
- </publicUDDIRegistryType>
- </extension>
-
- <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>
-
- <!-- Java Beans -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_JAVA"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.web.WebNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.java">
- </webServiceType>
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_WSDL"
- resourceTypeMetadata="File IResource String ServiceImpl ServiceRefImpl WSDLResourceImpl"
- extensionMetadata=".wsdl .wsil .html .ServiceImpl .ServiceRefImpl .WSDLResourceImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.web.WebNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.wsdl">
- </webServiceType>
-
- </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.gif"
- 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/gen_sample_wiz.gif"
- 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>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- 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/config_handler_wiz.gif"
- 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/config_handler_wiz.gif"
- 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">
- <wizard
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- icon="icons/import_ws.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsimport">
- <description>
- %PLUGIN_IMPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/import_ws_wiz.gif"
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
- id="wsimport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%IMPORT_WIZARD_NAME_WSIL"
- icon="icons/wsil/import_wsil.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsilimport">
- <description>
- %IMPORT_WIZARD_DESC_WSIL
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/wsil/import_wiz_banner_wsil.gif"
- name="%IMPORT_WIZARD_NAME_WSIL"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
- id="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.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage">
- </page>
-
- </extension>
-
- <!-- Main Menu Actions -->
-
- <extension point="org.eclipse.ui.actionSets">
-
- <actionSet
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- visible="true"
- id="org.eclipse.jst.ws.consumption">
- <menu
- label="%MENU_RUN"
- path="additions"
- id="org.eclipse.ui.run">
- <separator name="explorer">
- </separator>
- </menu>
- <action
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- icon="icons/registry.gif"
- tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
- class="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction"
- menubarPath="org.eclipse.ui.run/explorer"
- toolbarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction">
- </action>
- </actionSet>
-
- </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"
- 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"
- 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.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%ACTION_GEN_SAMPLE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%ACTION_GEN_SAMPLE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <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">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservices.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <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">
- <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">
- <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">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.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">
- <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.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <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">
- <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">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- 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="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- </extension>
-
- <!-- Client Project Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.web.WebNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_WEB"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jdt.core.javanature"
- exclude="org.eclipse.jst.j2ee.web.WebNature org.eclipse.jst.j2ee.ejb.EJBNature org.eclipse.jst.j2ee.ApplicationClientNature"
- label="%LABEL_CLIENT_TYPE_CONTAINERLESS"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.ejb.EJBNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_EJB"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.ApplicationClientNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_APP_CLIENT"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient">
- </clientProjectType>
- </extension>
-
- <!-- Object Selection Widgets -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <!-- New extension points for WTP M4 -->
- <extension-point id="discovery" name="UI Browsers for implementation artifacts"/>
- <extension-point id="wsImpl" name="Web service implementations"/>
- <extension-point id="wsClientImpl" name="Web service client implementations"/>
- <extension-point id="serviceType" name="Extensions that provide unique combinations of service implementations, scenarios, and module types "/>
- <extension-point id="clientType" name="Extensions that provide unique combinations of client implementations and module types"/>
- <extension-point id="webServiceRuntime" name="Web service runtimes"/>
- <extension-point id="tester" name="Web service test facilities"/>
- <extension-point id="publisher" name="Web service publication facilities"/>
-
-<!-- M4 Extensions to the new extension points -->
-
-<!-- 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"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="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"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="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">
- </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.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.java"
- implId="org.eclipse.jst.ws.wsImpl.java"
- buModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
- buModuleTypesExclude=""
- tdModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
- tdModuleTypesExclude="">
- </serviceType>
-</extension>
-<!--
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.wsdl"
- implId="org.eclipse.jst.ws.wsImpl.java"
- buModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
- buModuleTypesExclude=""
- tdModuleTypesInclude="org.eclipse.jst.j2ee.web.WebNature"
- tdModuleTypesExclude=""
- webServiceTypeId="org.eclipse.jst.ws.type.wsdl">
- </serviceType>
-</extension>
--->
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
- <clientType
- id="org.eclipse.jst.ws.clientType.java.webOnly"
- implId="org.eclipse.jst.ws.client.type.java"
- moduleTypesInclude="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web"
- moduleTypesExclude="">
- </clientType>
-</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 699521323..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,118 +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="clientProjectType"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines client container types.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.clientProjectType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </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>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/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 61cefe041..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,111 +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="objectSelectionWidget"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.objectSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </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.provisional.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>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/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 3bbe2f214..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,201 +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="" 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>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceClientType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </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 &quot;true&quot; or &quot;false&quot;.
- </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 &quot;true&quot; or &quot;false&quot;.
- </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 &quot;12 13&quot;.
- </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>
-
-</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 ec44bcaf7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,269 +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>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </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 &quot;true&quot; or &quot;false&quot;.
- </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 &quot;true&quot; or &quot;false&quot;.
- </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 &quot;12 13&quot;.
- </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 &quot;CompilationUnit&quot; 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 &quot;.java .class&quot; 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>
-
-</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 e462b0487..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,132 +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>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines Web service test facilities that can be plugged into the Web services wizards.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceTest.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </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>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
deleted file mode 100644
index 529dcf308..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,514 +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
-###############################################################################
-
-#
-# 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
-#
IDOMDocument domDoc = ((IDOMModel) model).getDocument();
- if (domDoc != null) {
- WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
- /*
- * ISSUE: if adapter does not already exist for domDoc
- * getAdapterFor will create one. So why is this null
- * check/creation needed?
- */
- if (modelAdapter == null) {
- modelAdapter = new WSDLModelAdapter();
- domDoc.addAdapter(modelAdapter);
- modelAdapter.createDefinition(domDoc.getDocumentElement());
- }
-
- definition = modelAdapter.getDefinition();
- }
- }
- return definition;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
deleted file mode 100644
index 5afe4fe09..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class HTTPLabelProvider extends LabelProvider
-{
- protected final static String ADDRESS = "address";
- protected final static String BINDING = "binding";
- protected final static String OPERATION = "operation";
- protected final static String URL_ENCODED = "urlEncoded";
- protected final static String URL_REPLACEMENT = "urlReplacement";
-
- protected HashMap map = new HashMap();
-
- public HTTPLabelProvider()
- {
- map.put(ADDRESS, "icons/httpaddress_obj.gif");
- map.put(BINDING, "icons/httpbinding_obj.gif");
- map.put(OPERATION, "icons/httpoperation_obj.gif");
- map.put(URL_ENCODED, "icons/httpurlencoded_obj.gif");
- map.put(URL_REPLACEMENT, "icons/httpurlreplacement_obj.gif");
- }
-
- public Image getImage(Object object)
- {
- Node node = (Node)object;
- String imageName = (String)map.get(node.getLocalName());
- return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null;
- }
-
- public String getText(Object object)
- {
- Node node = (Node)object;
- return node.getNodeName();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
deleted file mode 100644
index 7068aad06..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-
-
-
-public class ModelAdapterContentProvider implements ITreeContentProvider, ModelAdapterListener
-{
- protected Viewer viewer;
- protected ModelAdapterFactory adapterFactory;
-
- public ModelAdapterContentProvider(ModelAdapterFactory adapterFactory)
- {
- this.adapterFactory = adapterFactory;
- }
-
- protected void attachListener(Object object)
- {
- ModelAdapter adapter = adapterFactory.getAdapter(object);
-// TODO: port check
-// ModelAdapter adapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
- if (adapter != null)
- {
- adapter.addListener(this);
- }
- }
-
- public void propertyChanged(Object object, String property)
- {
- if (viewer != null)
- {
- if (viewer instanceof StructuredViewer)
- {
- ((StructuredViewer)viewer).refresh(object);
- }
- else
- {
- viewer.refresh();
- }
- }
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentObject)
- {
- attachListener(parentObject);
-
- List list = null;
-// TODO: port check
- ModelAdapter modelAdapter = adapterFactory.getAdapter(parentObject);
-// ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),parentObject);
- if (modelAdapter != null)
- {
- list = (List)modelAdapter.getProperty(parentObject, ModelAdapter.CHILDREN_PROPERTY);
- }
- list = list != null ? list : Collections.EMPTY_LIST;
- return list.toArray();
- }
-
- /*
- * @see ITreeContentProvider#getParent(Object)
- */
- public Object getParent(Object element)
- {
- return null;
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element)
- {
- Object[] children = getChildren(element);
- return children != null && children.length > 0;
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement)
- {
- return getChildren(inputElement);
- }
-
- /*
- * @see IContentProvider#dispose()
- */
- public void dispose()
- {
- viewer = null;
- }
-
- /*
- * @see IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- this.viewer = viewer;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
deleted file mode 100644
index 720c74ca9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-
-
-
-public class ModelAdapterLabelProvider extends LabelProvider
-{
- protected ModelAdapterFactory adapterFactory;
-
- public ModelAdapterLabelProvider(ModelAdapterFactory adapterFactory)
- {
- this.adapterFactory = adapterFactory;
- }
-
-
- public Image getImage(Object object)
- {
- Image result = null;
-// TODO: port check
- ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-// ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
- if (modelAdapter != null)
- {
- result = (Image)modelAdapter.getProperty(object, ModelAdapter.IMAGE_PROPERTY);
- }
- return result;
- }
-
-
- public String getText(Object object)
- {
- String result = null;
-// TODO: port check
- ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-// ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
- if (modelAdapter != null)
- {
- result = (String)modelAdapter.getProperty(object, ModelAdapter.LABEL_PROPERTY);
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
deleted file mode 100644
index 93cefa40d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class SOAPLabelProvider extends LabelProvider
-{
- protected final static String ADDRESS = "address";
- protected final static String BODY = "body";
- protected final static String BINDING = "binding";
- protected final static String FAULT = "fault";
- protected final static String HEADER = "header";
- protected final static String HEADER_FAULT = "headerfault";
- protected final static String OPERATION = "operation";
-
- protected HashMap map = new HashMap();
-
- public SOAPLabelProvider()
- {
- map.put(ADDRESS, "icons/soapaddress_obj.gif");
- map.put(BINDING, "icons/soapbinding_obj.gif");
- map.put(BODY, "icons/soapbody_obj.gif");
- map.put(FAULT, "icons/soapfault_obj.gif");
- map.put(HEADER, "icons/soapheader_obj.gif");
- map.put(HEADER_FAULT, "icons/soapheaderfault_obj.gif");
- map.put(OPERATION, "icons/soapoperation_obj.gif");
- }
-
- public Image getImage(Object object)
- {
- Node node = (Node)object;
- String imageName = (String)map.get(node.getLocalName());
- return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null;
- }
-
- public String getText(Object object)
- {
- Node node = (Node)object;
- return node.getNodeName();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
deleted file mode 100644
index 92c5078fd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
+++ /dev/null
@@ -1,213 +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 Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- */
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLContentOutlineConfiguration extends ContentOutlineConfiguration {
- private ExtensibleOutlineProvider fOutlineProvider = null;
- private KeyListener[] fKeyListeners = null;
- private IMenuListener fMenuListener = null;
- private WSDLEditor fEditor = null;
-
- private ExtensibleOutlineProvider getOutlineProvider() {
- if (fOutlineProvider == null) {
- // ISSUE: what happens if cannot get WSDL Editor? (See
- // getWSDLEditor comment)
- fOutlineProvider = new ExtensibleOutlineProvider(getWSDLEditor());
- }
- return fOutlineProvider;
- }
-
- public IContentProvider getContentProvider(TreeViewer viewer) {
- return getOutlineProvider();
- }
-
- public ILabelProvider getLabelProvider(TreeViewer viewer) {
- return getOutlineProvider();
- }
-
- public KeyListener[] getKeyListeners(TreeViewer viewer) {
- if (fKeyListeners == null) {
- final TreeViewer finalViewer = viewer;
- KeyAdapter keyListener = new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.F3 && getWSDLEditor() != null) {
- ISelection selection = getWSDLEditor().getSelectionManager().getSelection();
- if (selection instanceof IStructuredSelection) {
- Object object = ((IStructuredSelection) selection).getFirstElement();
- if (object instanceof EObject) {
- OpenOnSelectionHelper helper = new OpenOnSelectionHelper(getDefinition(finalViewer));
- helper.openEditor((EObject) object);
- }
- }
- }
- }
- };
- fKeyListeners = new KeyListener[]{keyListener};
- }
-
- return fKeyListeners;
- }
-
- public IMenuListener getMenuListener(TreeViewer viewer) {
- if (fMenuListener == null) {
- // ISSUE: what happens if cannot get WSDL Editor? (See
- // getWSDLEditor comment)
- if (getWSDLEditor() != null)
- fMenuListener = new WSDLMenuListener(getWSDLEditor(), getWSDLEditor().getSelectionManager());
- }
- return fMenuListener;
- }
-
- public ISelection getSelection(TreeViewer viewer, ISelection selection) {
- ISelection sel = selection;
-
- if (selection instanceof IStructuredSelection) {
- List wsdlSelections = new ArrayList();
- for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
- Object domNode = i.next();
- Object wsdlNode = getWSDLNode(domNode, viewer);
- if (wsdlNode != null) {
- wsdlSelections.add(wsdlNode);
- }
- }
-
- if (!wsdlSelections.isEmpty()) {
- sel = new StructuredSelection(wsdlSelections);
- }
- }
- return sel;
- }
-
- /**
- * Gets the definition from treeviewer's input
- *
- * @param model
- * (of type Object but really should be IStructuredModel)
- * @return Definition
- */
- private Definition getDefinition(TreeViewer viewer) {
- Definition definition = null;
- Object model = null;
- if (viewer != null)
- model = viewer.getInput();
-
- if (model instanceof IDOMModel) {
- IDOMDocument domDoc = ((IDOMModel) model).getDocument();
- if (domDoc != null) {
- WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
- /*
- * ISSUE: if adapter does not already exist for domDoc
- * getAdapterFor will create one. So why is this null
- * check/creation needed?
- */
- if (modelAdapter == null) {
- modelAdapter = new WSDLModelAdapter();
- domDoc.addAdapter(modelAdapter);
- modelAdapter.createDefinition(domDoc.getDocumentElement());
- }
-
- definition = modelAdapter.getDefinition();
- }
- }
- return definition;
- }
-
- // ISSUE: There are some cases where outline comes up before editor
- private WSDLEditor getWSDLEditor() {
- if (fEditor == null) {
- IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench != null) {
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- if (window != null) {
- IWorkbenchPage page = window.getActivePage();
- if (page != null) {
- IEditorPart editor = page.getActiveEditor();
- if (editor instanceof WSDLEditor)
- fEditor = (WSDLEditor) editor;
- }
- }
- }
- }
- return fEditor;
- }
-
- public void unconfigure(TreeViewer viewer) {
- super.unconfigure(viewer);
- fEditor = null;
- }
-
- /**
- * Determines WSDL node based on object (DOM node)
- *
- * @param object
- * @return
- */
- private Object getWSDLNode(Object object, TreeViewer viewer) {
- // get the element node
- Element element = null;
- if (object instanceof Node) {
- Node node = (Node) object;
- if (node != null) {
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- element = (Element) node;
- }
- else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
- element = ((Attr) node).getOwnerElement();
- }
- }
- }
- Object o = element;
- if (element != null) {
- Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(viewer), element);
- if (modelObject != null) {
- o = modelObject;
- }
- }
- return o;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
deleted file mode 100644
index ffa80ee2e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ILabelProvider;
-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.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-
-/**
- * @deprecated Using SSE's ConfiguratbleContentOutlinePage
- * instead via WSDLContentOutlineCOnfiguration
- */
-public class WSDLContentOutlinePage extends ContentOutlinePage
-{
- protected WSDLEditor wsdlEditor;
- protected int level = 0;
- protected Object model;
- protected ITreeContentProvider contentProvider;
- protected ILabelProvider labelProvider;
- protected WSDLSelectionManager selectionManager;
- protected SelectionManagerSelectionChangeListener selectionManagerSelectionChangeListener = new SelectionManagerSelectionChangeListener();
- protected TreeSelectionChangeListener treeSelectionChangeListener = new TreeSelectionChangeListener();
-
- public WSDLContentOutlinePage(WSDLEditor wsdlEditor)
- {
- this.wsdlEditor = wsdlEditor;
- }
-
-
- public void setContentProvider(ITreeContentProvider contentProvider)
- {
- this.contentProvider = contentProvider;
- }
-
-
- public void setLabelProvider(ILabelProvider labelProvider)
- {
- this.labelProvider = labelProvider;
- }
-
-
- // expose
- public TreeViewer getTreeViewer()
- {
- return super.getTreeViewer();
- }
-
- public void createControl(Composite parent)
- {
- super.createControl(parent);
-
- getTreeViewer().setContentProvider(contentProvider);
- getTreeViewer().setLabelProvider(labelProvider);
- getTreeViewer().setInput(model);
- getTreeViewer().addSelectionChangedListener(this);
-
- KeyAdapter keyListener = new KeyAdapter()
- {
- public void keyReleased(KeyEvent e)
- {
- if (e.keyCode == SWT.F3)
- {
- ISelection selection = selectionManager.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- Object object = ((IStructuredSelection)selection).getFirstElement();
- if (object instanceof EObject)
- {
- OpenOnSelectionHelper helper = new OpenOnSelectionHelper(wsdlEditor.getDefinition());
- helper.openEditor((EObject)object);
- }
- }
- }
- }
- };
- getTreeViewer().getTree().addKeyListener(keyListener);
-
- MenuManager menuManager = new MenuManager("#popup");//$NON-NLS-1$
- menuManager.setRemoveAllWhenShown(true);
- Menu menu = menuManager.createContextMenu(getTreeViewer().getControl());
- getTreeViewer().getControl().setMenu(menu);
-
- WSDLMenuListener menuListener = new WSDLMenuListener(wsdlEditor, wsdlEditor.getSelectionManager());//, (XSDTextEditor)fTextEditor);
- menuManager.addMenuListener(menuListener);
-
- setSelectionManager(wsdlEditor.getSelectionManager());
-
- // enable popupMenus extension - Rich - this class is deprecated. TODO - change this
- getSite().registerContextMenu("org.eclipse.wst.wsdl.ui.popup.outline", menuManager, wsdlEditor.getSelectionManager());
- }
-
-
- public void setModel(Object object)
- {
- model = object;
- }
-
-
- public void setExpandToLevel(int i)
- {
- level = i;
- }
-
-
- public void setInput(Object value)
- {
- getTreeViewer().setInput(value);
- getTreeViewer().expandToLevel(level);
- }
-
-
- public void setSelectionManager(WSDLSelectionManager newSelectionManager)
- {
- TreeViewer treeViewer = getTreeViewer();
-
- // disconnect from old one
- if (selectionManager != null)
- {
- selectionManager.removeSelectionChangedListener(selectionManagerSelectionChangeListener);
- treeViewer.removeSelectionChangedListener(treeSelectionChangeListener);
- }
-
- selectionManager = newSelectionManager;
-
- // connect to new one
- if (selectionManager != null)
- {
- selectionManager.addSelectionChangedListener(selectionManagerSelectionChangeListener);
- treeViewer.addSelectionChangedListener(treeSelectionChangeListener);
- }
- }
-
- class SelectionManagerSelectionChangeListener implements ISelectionChangedListener
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- if (event.getSelectionProvider() != getTreeViewer())
- {
- getTreeViewer().setSelection(event.getSelection(), true);
- }
- }
- }
-
- class TreeSelectionChangeListener implements ISelectionChangedListener
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- if (selectionManager != null)
- {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- Object o = structuredSelection.getFirstElement();
-
- // TODO ...
- // we need to implement a selectionManagerMapping extension point
- // so that extensions can specify how they'd like to map view objects
- // to selection objects
- //
-// if (o instanceof Element)
-// {
-// try
-// {
-// Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)o);
-// if (modelObject != null && !(modelObject instanceof UnknownExtensibilityElement))
-// {
-// o = modelObject;
-// }
-// }
-// catch (Exception e)
-// {
-// }
-// }
-
- if (o != null)
- {
- selectionManager.setSelection(new StructuredSelection(o), getTreeViewer());
- }
- else
- {
- selectionManager.setSelection(new StructuredSelection(), getTreeViewer());
- }
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
deleted file mode 100644
index 2988ee289..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.w3c.dom.Element;
-
-public class AbstractSection implements ISection, IPropertyChangeListener, Listener, SelectionListener
-{
- private TabbedPropertySheetWidgetFactory factory;
- private WSDLElement element;
- protected boolean isReadOnly = false;
- protected Composite composite;
- protected int rightMarginSpace;
- protected int tableMinimumWidth = 50;
-
- public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage)
- {
- createControls(parent, tabbedPropertySheetPage.getWidgetFactory());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory aFactory)
- {
- this.factory = aFactory;
- GC gc = new GC(parent);
- Point extent = gc.textExtent(" ... "); //$NON-NLS-1$
- rightMarginSpace = extent.x;
- gc.dispose();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- Assert.isTrue(selection instanceof IStructuredSelection);
- Object input = ((IStructuredSelection)selection).getFirstElement();
-
- if (input instanceof WSDLElement)
- {
- this.element = (WSDLElement)input;
- ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(input);
- if (adapter != null)
- {
- isReadOnly = Boolean.TRUE.equals(adapter.getProperty(input, "isReadOnly")); //$NON-NLS-1$
- }
- }
- else if (input instanceof WSDLGroupObject)
- {
- this.element = ((WSDLGroupObject)input).getDefinition();
- }
- refresh();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeShown()
- */
- public void aboutToBeShown()
- {
- refresh();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeHidden()
- */
- public void aboutToBeHidden()
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#dispose()
- */
- public void dispose()
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#getMinimumHeight()
- */
- public int getMinimumHeight()
- {
- return SWT.DEFAULT;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
- */
- public boolean shouldUseExtraSpace()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#refresh()
- */
- public void refresh()
- {
- if (isReadOnly)
- {
- composite.setEnabled(false);
- }
- else
- {
- composite.setEnabled(true);
- }
- }
-
- public WSDLElement getElement()
- {
- return element;
- }
-
- /**
- * Get the widget factory.
- * @return the widget factory.
- */
- public TabbedPropertySheetWidgetFactory getWidgetFactory() {
- return factory;
- }
-
- public void propertyChange(PropertyChangeEvent event)
- {
- refresh();
- }
-
-
- public void doWidgetDefaultSelected(SelectionEvent e)
- {}
-
- public void doWidgetSelected(SelectionEvent e)
- {}
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e)
- {
- if (isListenerEnabled() &&
- getElement() != null &&
- !isInDoHandle)
- {
- isInDoHandle = true;
- doWidgetDefaultSelected(e);
- isInDoHandle = false;
- }
-
- }
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e)
- {
- if (isListenerEnabled() &&
- getElement() != null &&
- !isInDoHandle)
- {
- isInDoHandle = true;
- doWidgetSelected(e);
- isInDoHandle = false;
- }
-
- }
-
- boolean listenerEnabled = true;
- /**
- * Get the value of listenerEnabled.
- * @return value of listenerEnabled.
- */
- public boolean isListenerEnabled()
- {
- return listenerEnabled;
- }
-
- /**
- * Set the value of listenerEnabled.
- * @param v Value to assign to listenerEnabled.
- */
- public void setListenerEnabled(boolean v)
- {
- this.listenerEnabled = v;
- }
-
- public void handleEvent(Event event)
- {
- if (isListenerEnabled() && !isInDoHandle)
- {
- isInDoHandle = true;
- startDelayedEvent(event);
- isInDoHandle = false;
- } // end of if ()
- }
-
- public void doHandleEvent(Event event)
- {
-
- }
-
- protected DelayedEvent delayedTask;
-
- protected void startDelayedEvent(Event e)
- {
- if (delayedTask == null ||
- delayedTask.getEvent() == null)
- {
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500,delayedTask);
- }
- else
- {
- Event delayedEvent = delayedTask.getEvent();
-
- if (e.widget == delayedEvent.widget &&
- e.type == delayedEvent.type)
- {
- // same event, just different data, delay new event
- delayedTask.setEvent(null);
- }
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500,delayedTask);
- }
- }
-
- class DelayedEvent implements Runnable
- {
- protected Event event;
-
- /*
- * @see Runnable#run()
- */
- public void run()
- {
- if (event != null)
- {
- isInDoHandle = true;
- doHandleEvent(event);
- isInDoHandle = false;
- event = null;
- }
- }
-
- /**
- * Gets the event.
- * @return Returns a Event
- */
- public Event getEvent()
- {
- return event;
- }
-
- /**
- * Sets the event.
- * @param event The event to set
- */
- public void setEvent(Event event)
- {
- this.event = event;
- }
-
- }
-
- boolean isInDoHandle;
- /**
- * Get the value of isInDoHandle.
- * @return value of isInDoHandle.
- */
- public boolean isInDoHandle()
- {
- return isInDoHandle;
- }
-
-
- static protected IEditorPart getActiveEditor()
- {
- IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
- return editorPart;
- }
-
- static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
- {
- IStatusLineManager result = null;
- try
- {
- EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
- result = contributor.getActionBars().getStatusLineManager();
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
- public DocumentImpl getDocument(Element element)
- {
- return (DocumentImpl) element.getOwnerDocument();
- }
-
- public void beginRecording(String description, Element element)
- {
- getDocument(element).getModel().beginRecording(this, description);
- }
-
- public void endRecording(Element element)
- {
- DocumentImpl doc = (DocumentImpl) getDocument(element);
-
- doc.getModel().endRecording(this);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
deleted file mode 100644
index f65456d8b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class AbstractSectionDescriptor implements ISectionDescriptor
-{
- /**
- *
- */
- public AbstractSectionDescriptor()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
- */
- public ITypeMapper getFilter()
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(WSDLElement.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof WSDLElement || object instanceof WSDLGroupObject)
- {
- return true;
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection()
- {
- return "";
- }
-
- public int getEnablesFor()
- {
- return ENABLES_FOR_ANY;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
deleted file mode 100644
index 93fe1e61d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class DocumentationSection extends AbstractSection {
-
- Text docText;
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- composite = getWidgetFactory().createFlatFormComposite(parent);
-
- docText = getWidgetFactory().createText(composite, "", SWT.MULTI | SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL); //$NON-NLS-1$
- docText.addListener(SWT.Modify, this);
- FormData data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(100, 0);
- data.top = new FormAttachment(0, 0);
- data.bottom = new FormAttachment(100, 0);
- docText.setLayoutData(data);
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
- if (docText.isFocusControl())
- {
- return;
- }
- setListenerEnabled(false);
- docText.setText("");
- if (getElement() != null)
- {
- Element docNode = getElement().getDocumentationElement();
- if (docNode != null)
- {
- Node textNode = docNode.getFirstChild();
- if (textNode != null)
- {
- String docValue = textNode.getNodeValue();
- if (docValue != null)
- {
- docText.setText(docValue);
- }
- }
- }
- }
- setListenerEnabled(true);
- }
-
- public void doHandleEvent(Event event)
- {
- if (event.widget == docText)
- {
- String value = docText.getText();
- if (getElement() != null)
- {
- Element docNode = getElement().getDocumentationElement();
- if (docNode != null)
- {
- Node textNode = docNode.getFirstChild();
- if (textNode != null)
- {
- textNode.setNodeValue(value);
- }
- else
- {
- if (value.length() > 0)
- {
- Document document = docNode.getOwnerDocument();
- org.w3c.dom.Text newTextNode = document.createTextNode(value);
- docNode.appendChild(newTextNode);
- }
- }
- }
- else
- {
- Element element = getElement().getElement();
- AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild()); //$NON-NLS-1$
- action.run();
- Element newDocumentation = action.getNewElement();
-
- Document document = newDocumentation.getOwnerDocument();
- org.w3c.dom.Text newTextNode = document.createTextNode(value);
- newDocumentation.appendChild(newTextNode);
- getElement().setDocumentationElement(newDocumentation);
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
deleted file mode 100644
index 7213861e7..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class DocumentationSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- /**
- *
- */
- public DocumentationSectionDescriptor()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.documentation";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- // TODO Auto-generated method stub
- return new DocumentationSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- // TODO Auto-generated method stub
- return "org.eclipse.wst.xmlwebservices.documentation";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof WSDLElement)
- {
- return true;
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
deleted file mode 100644
index 2022a8a37..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-public class ExtensibilityElementSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- /**
- *
- */
- public ExtensibilityElementSectionDescriptor()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.extensibilityelement";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- // TODO Auto-generated method stub
- return new ExtensiblityElementSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- // TODO Auto-generated method stub
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof ExtensibilityElement)
- {
- return true;
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection()
- {
- return "";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
deleted file mode 100644
index 62646e2f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.viewers.ExtensibilityElementViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-
-public class ExtensiblityElementSection extends AbstractSection implements ModelAdapterListener
-{
- ExtensibilityElementViewer viewer;
- protected AttributesTable attributesTable;
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
-
- composite = getWidgetFactory().createFlatFormComposite(parent);
-
-// viewer = new ExtensibilityElementViewer(composite, getActiveEditor(), true);
- attributesTable = new AttributesTable(getActiveEditor(), composite);
- FormData data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(100, 0);
- data.top = new FormAttachment(0, 0);
- data.bottom = new FormAttachment(100, 0);
- attributesTable.getControl().setLayoutData(data);
-// viewer.getControl().setLayoutData(data);
- }
-
- public void propertyChanged(Object object, String property)
- {
- if (isListenerEnabled())
- {
- setListenerEnabled(false);
- refresh();
- setListenerEnabled(true);
- }
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
- attributesTable.setInput(getElement().getElement());
-
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- if (!attributesTable.getControl().isDisposed())
- {
- attributesTable.refresh();
- }
- }
- };
- Display.getCurrent().asyncExec(runnable);
-
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
deleted file mode 100644
index c5f1e93b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.w3c.dom.Element;
-
-public interface IPropertyDescriptorProvider
-{
- //public void init(IEditorPart editor);
- public IPropertyDescriptor getPropertyDescriptor(IEditorPart editor, Element ownerElement, String attributeNamespace, String attributeName);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
deleted file mode 100644
index f218cc5b0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-public class ImportSection extends AbstractSection
-{
- protected Text namespaceText, prefixText, locationText;
- private String oldPrefixValue;
- Button button;
- IEditorPart editorPart;
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- Composite composite = getWidgetFactory().createFlatFormComposite(parent);
- FormData data;
-
- namespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
- namespaceText.setEditable(false);
-// namespaceText.addListener(SWT.Modify, this);
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(0, 0);
- namespaceText.setLayoutData(data);
-
- CLabel namespaceLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(namespaceText, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(namespaceText, 0, SWT.CENTER);
- namespaceLabel.setLayoutData(data);
-
- prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-// prefixText.setEditable(false);
- prefixText.addListener(SWT.Modify, this);
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(namespaceText, +ITabbedPropertyConstants.VSPACE);
- prefixText.setLayoutData(data);
-
- CLabel prefixLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(prefixText, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(prefixText, 0, SWT.CENTER);
- prefixLabel.setLayoutData(data);
-
- locationText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
- locationText.setEditable(false);
-// locationText.addListener(SWT.Modify, this);
-
- CLabel locationLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(locationText, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(locationText, 0, SWT.CENTER);
- locationLabel.setLayoutData(data);
-
- button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
- button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
- button.addSelectionListener(this);
- data = new FormData();
- data.left = new FormAttachment(100, -rightMarginSpace + 2);
- data.right = new FormAttachment(100,0);
- data.top = new FormAttachment(locationText, 0, SWT.CENTER);
- button.setLayoutData(data);
-
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(button, 0);
- data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
- locationText.setLayoutData(data);
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- setListenerEnabled(false);
- Object obj = getElement();
- boolean refreshPrefixText = true;
- boolean refreshLocationText = true;
- boolean refreshNamespaceText = true;
- if (prefixText.isFocusControl())
- {
- refreshPrefixText = false;
- }
- if (locationText.isFocusControl())
- {
- refreshLocationText = false;
- }
- if (namespaceText.isFocusControl())
- {
- refreshNamespaceText = false;
- }
-
- if (refreshPrefixText)
- {
- prefixText.setText(""); //$NON-NLS-1$
- }
- if (refreshLocationText)
- {
- locationText.setText(""); //$NON-NLS-1$
- }
- if (refreshNamespaceText)
- {
- namespaceText.setText(""); //$NON-NLS-1$
- }
- if (obj instanceof Import)
- {
- Element element = ((Import)obj).getElement();
- if (refreshLocationText)
- {
- String locationValue = element.getAttribute("location"); //$NON-NLS-1$
- locationText.setText(locationValue != null ? locationValue : ""); //$NON-NLS-1$
- }
-
- String namespaceValue = element.getAttribute("namespace"); //$NON-NLS-1$
- if (refreshNamespaceText)
- {
- namespaceText.setText(namespaceValue != null ? namespaceValue : ""); //$NON-NLS-1$
- }
-
- if (refreshPrefixText)
- {
- String prefix = ((Import)obj).getEnclosingDefinition().getPrefix(namespaceValue);
- prefixText.setText(prefix != null ? prefix : ""); //$NON-NLS-1$
- }
- }
- oldPrefixValue = prefixText.getText();
- setListenerEnabled(true);
- }
-
- public void doHandleEvent(Event event) {
- if (event.widget == prefixText && locationText.getText().length() > 0 && namespaceText.getText().length() > 0) {
- Object input = getElement();
- Import importObj = (Import)input;
-// org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
- Map namespacesMap = importObj.getEnclosingDefinition().getNamespaces();
-
- if (namespacesMap.containsKey(prefixText.getText())) {
- // We should add error messages.........
- // setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_LABEL_PREFIX_EXISTS"));
- }
- else {
- Element definitionElement = importObj.getEnclosingDefinition().getElement();
- definitionElement.removeAttribute("xmlns:"+oldPrefixValue);
- definitionElement.setAttribute("xmlns:" + prefixText.getText(), namespaceText.getText());
-
-// clearErrorMessage();
- oldPrefixValue = prefixText.getText();
- }
- }
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == button)
- {
- Object input = getElement();
-
- WSDLEditor editor = (WSDLEditor)editorPart;
- IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-
- SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
- String [] filters = { "xsd", "wsdl" }; //$NON-NLS-1$
- IFile [] excludedFiles = { currentWSDLFile };
-
- dialog.addFilterExtensions(filters, excludedFiles);
- dialog.create();
- dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
- dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
- dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
- int rc = dialog.open();
- if (rc == IDialogConstants.OK_ID)
- {
- IFile selectedFile = dialog.getFile();
-
- //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
- //{
- // System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
- //}
-
- String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-
- Import importObj = (Import)input;
- org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
- Definition definition = importObj.getEnclosingDefinition();
- org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
- String importTargetNamespace = ""; //$NON-NLS-1$
- String prefix = prefixText.getText();
- String uniquePrefix = ""; //$NON-NLS-1$
-
- URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());
-
- // note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
- // I should change the name of this convenience method
- importTargetNamespace = XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-
- if (prefix.trim().equals("")) //$NON-NLS-1$
- {
- uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
- }
- else
- {
- uniquePrefix = prefix;
- }
-
-
- if (importTargetNamespace == null ||
- (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
- {
- return; // what to do with no namespace docs?
- }
-
- importElement.setAttribute("location", location); //$NON-NLS-1$
- importElement.setAttribute("namespace", importTargetNamespace); //$NON-NLS-1$
-
- definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace); //$NON-NLS-1$
-
- namespaceText.setText(importTargetNamespace);
- locationText.setText(location);
- prefixText.setText(uniquePrefix);
- }
-
- refresh();
- }
- }
-
-
- private String getUniquePrefix(Definition definition, String initPrefix)
- {
- String uniquePrefix;
- Map map = definition.getNamespaces();
-
- if (definition.getNamespace(initPrefix) == null)
- {
- uniquePrefix = initPrefix;
- }
- else // if used, then try to create a unique one
- {
- String tempPrefix = initPrefix;
- int i = 1;
- while(map.containsKey(tempPrefix + i))
- {
- i++;
- }
- uniquePrefix = tempPrefix + i;
- }
- return uniquePrefix;
- }
-
- public void setEditorPart(IEditorPart editorPart)
- {
- this.editorPart = editorPart;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
deleted file mode 100644
index 012236932..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Import;
-
-public class ImportSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- ImportSection importSection;
- /**
- *
- */
- public ImportSectionDescriptor()
- {
- super();
- importSection = new ImportSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.import";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(Import.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return importSection;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- importSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof Import)
- {
- return true;
- }
- }
- return false;
- }
-
- public String getAfterSection()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.name";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
deleted file mode 100644
index 8a2f11c38..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-
-
-public class NameSection extends AbstractSection
-{
-
- Text nameText;
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent,TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- composite = getWidgetFactory().createFlatFormComposite(parent);
- FormData data;
-
-
- nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(0, 0);
- nameText.setLayoutData(data);
-
- CLabel nameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":"); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(nameText, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(nameText, 0, SWT.CENTER);
- nameLabel.setLayoutData(data);
-
- nameText.addListener(SWT.Modify, this);
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
- if (nameText.isFocusControl())
- {
- return;
- }
- setListenerEnabled(false);
- nameText.setText(""); //$NON-NLS-1$
- if (getElement() != null)
- {
- if (getElement().getElement()!= null)
- {
- String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
- if (name==null) name="";
- nameText.setText(name);
- }
- }
- setListenerEnabled(true);
- }
-
- public boolean shouldUseExtraSpace()
- {
- return false;
- }
-
- public void doHandleEvent(Event event)
- {
- if (event.widget == nameText && !nameText.isDisposed()) {
- String newValue = nameText.getText();
- Object wsdlElement = getElement();
-
- if (wsdlElement instanceof Definition) {
- Definition definition = (Definition) wsdlElement;
- String uri = "";
- if (definition.getQName() != null) {
- uri = definition.getQName().getNamespaceURI();
- }
- definition.setQName(new QName(uri, newValue));
- }
- else if (wsdlElement instanceof Service) {
- Service service = (Service) wsdlElement;
- String uri = service.getQName().getNamespaceURI();
- service.setQName(new QName(uri, newValue));
- }
- else if (wsdlElement instanceof Port) {
- new SmartRenameAction(wsdlElement, newValue).run();
-// ((Port) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof Binding) {
- Binding binding = (Binding) wsdlElement;
- String uri = binding.getQName().getNamespaceURI();
- binding.setQName(new QName(uri, newValue));
- }
- else if (wsdlElement instanceof BindingOperation) {
- ((BindingOperation) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof BindingInput) {
- if(((BindingInput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
- return;
-
- ((BindingInput) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof BindingOutput) {
- if (((BindingOutput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
- return;
-
- ((BindingOutput) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof BindingFault) {
- ((BindingFault) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof PortType) {
- PortType portType = (PortType) wsdlElement;
- String uri = portType.getQName().getNamespaceURI();
- portType.setQName(new QName(uri, newValue));
- }
- else if (wsdlElement instanceof Operation) {
- new SmartRenameAction(wsdlElement, newValue).run();
-// ((Operation) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof MessageReference) {
- if (((MessageReference) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
- return;
-
- new SmartRenameAction(wsdlElement, newValue).run();
-// ((MessageReference) wsdlElement).setName(newValue);
- }
- else if (wsdlElement instanceof Message) {
-/*
- Message message = (Message) wsdlElement;
- String uri = message.getQName().getNamespaceURI();
- message.setQName(new QName(uri, newValue));
- */
- new SmartRenameAction(wsdlElement, newValue).run();
- }
- else if (wsdlElement instanceof Part) {
-// ((Part) wsdlElement).setName(newValue);
- new SmartRenameAction(wsdlElement, newValue).run();
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
deleted file mode 100644
index b64135018..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class NameSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- /**
- *
- */
- public NameSectionDescriptor()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.name";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(WSDLElement.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return new NameSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof WSDLElement &&
- !(object instanceof ExtensibilityElement) &&
- !(object instanceof Import))
- {
- if (object instanceof WSDLElement) {
- Definition definition = ((WSDLElement) object).getEnclosingDefinition();
- if (definition.getElement() != null && !(object instanceof Definition)) {
- return true;
- }
-
- return false;
- }
- /*
- else if (object instanceof WSDLGroupObject) {
- Definition definition = ((WSDLGroupObject) object).getDefinition();
- if (definition.getElement() != null) {
- return true;
- }
-
- return false;
- }
- */
- }
- }
- return false;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
deleted file mode 100644
index 93cc7715d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonNamespaceInfoTable;
-import org.w3c.dom.Element;
-
-public class NamespaceSection extends AbstractSection
-{
- protected String targetNamespace;
- protected List namespaceInfoList;
- protected CommonEditNamespacesTargetFieldDialog editWSDLNamespacesControl;
- protected Button button;
-
- Text nameText;
- Text prefixText;
- Text targetNamespaceText;
- protected CommonNamespaceInfoTable tableViewer;
- private boolean handlingEvent;
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- composite = getWidgetFactory().createFlatFormComposite(parent);
-
- String nameString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":";
- String prefixString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX") + ":";
- String namespaceString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE");
- GC gc = new GC(parent);
- int xoffset = Math.max(115, gc.textExtent(nameString).x + 20); // adds 20 due to borders
- xoffset = Math.max(xoffset, gc.textExtent(prefixString).x + 20); // adds 20 due to borders
- xoffset = Math.max(xoffset, gc.textExtent(namespaceString).x + 20); // adds 20 due to borders
- gc.dispose();
-
- // name
- CLabel nameLabel = getWidgetFactory().createCLabel(composite, nameString); //$NON-NLS-1$
- nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
- // prefix
- CLabel prefixLabel = getWidgetFactory().createCLabel(composite, prefixString); //$NON-NLS-1$
- prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
- // targetnamespace
- CLabel targetNamespaceLabel = getWidgetFactory().createCLabel(composite, namespaceString); //$NON-NLS-1$
- targetNamespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
- // Advanced button
- button = getWidgetFactory().createButton(composite, WSDLEditorPlugin.getWSDLString("_UI_SECTION_ADVANCED_ATTRIBUTES") + "...", SWT.PUSH); //$NON-NLS-1$
-
-
- ///////////////////// Labels
- // name layout
- FormData dataNameLabel = new FormData();
- dataNameLabel.top = new FormAttachment(nameText, 0, SWT.CENTER);
- nameLabel.setLayoutData(dataNameLabel);
-
- // prefix layout
- FormData dataPrefixLabel = new FormData();
- dataPrefixLabel.left = new FormAttachment(0, 0);
- dataPrefixLabel.top = new FormAttachment(prefixText, 0, SWT.CENTER);
- prefixLabel.setLayoutData(dataPrefixLabel);
-
- // targetNamespaceLabel layout
- FormData datatnsLabel = new FormData();
- datatnsLabel.left = new FormAttachment(0, 0);
- datatnsLabel.right = new FormAttachment(targetNamespaceText, 0);
- datatnsLabel.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
- targetNamespaceLabel.setLayoutData(datatnsLabel);
-
-
- ///////////////////// Text Fields
- // name text field
- FormData dataNameText = new FormData();
- dataNameText.left = new FormAttachment(0, xoffset);
- dataNameText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- dataNameText.top = new FormAttachment(0, 0);
- nameText.setLayoutData(dataNameText);
- nameText.addListener(SWT.Modify, this);
-
- // prefix text field
- FormData dataPrefixText = new FormData();
- dataPrefixText.left = new FormAttachment(0, xoffset);
- dataPrefixText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- dataPrefixText.top = new FormAttachment(nameText, +ITabbedPropertyConstants.VSPACE);
- prefixText.setLayoutData(dataPrefixText);
- prefixText.addListener(SWT.Modify, this);
-
- // targetnamespace text field
- FormData data = new FormData();
- data.left = new FormAttachment(0, xoffset);
- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
- targetNamespaceText.setLayoutData(data);
- targetNamespaceText.addListener(SWT.Modify, this);
-
- // Advanced button layout
- FormData dataButton = new FormData();
-// dataButton.left = new FormAttachment(100, -rightMarginSpace + 2);
- dataButton.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- dataButton.top = new FormAttachment(targetNamespaceText, +ITabbedPropertyConstants.VSPACE);
-// dataButton.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
- button.setLayoutData(dataButton);
- button.addSelectionListener(this);
- }
-
- public void doHandleEvent(Event event)
- {
- handlingEvent = true;
- if (event.widget == nameText) {
- Object obj = getElement();
- if (obj instanceof Definition) {
- Definition definition = (Definition) obj;
- String uri = "";
- if (definition.getQName() != null) {
- uri = definition.getQName().getNamespaceURI();
- }
- definition.setQName(new QName(uri, nameText.getText()));
- }
- }
- else if (event.widget == prefixText) {
- Object obj = getElement();
- if (obj instanceof Definition) {
- Definition definition = (Definition) obj;
- Element element = definition.getElement();
-
- // Remove the old prefix
- String oldPrefix = definition.getPrefix(definition.getTargetNamespace());
- element.removeAttribute("xmlns:"+oldPrefix);
-
- // Set the new prefix
- element.setAttribute("xmlns:" + prefixText.getText(), definition.getTargetNamespace());
- }
- }
- else if (event.widget == targetNamespaceText)
- {
- Object obj = getElement();
- if (obj instanceof Definition)
- {
- Definition definition = (Definition)obj;
- String newValue = targetNamespaceText.getText();
- String prefix = definition.getPrefix(definition.getTargetNamespace());
- definition.setTargetNamespace(newValue);
- definition.getElement().setAttribute("xmlns:" + prefix, newValue);
- }
- }
- handlingEvent = false;
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
-
- if (targetNamespaceText.isFocusControl() || handlingEvent)
- {
- return;
- }
- setListenerEnabled(false);
- Object obj = getElement();
- if (obj instanceof Definition)
- {
- Definition definition = (Definition)obj;
- String targetNS = definition.getTargetNamespace();
-
- // set targetnamespace field and prefix field
- if (targetNS != null)
- {
- targetNamespaceText.setText(targetNS);
-
- Element element = definition.getElement();
-
- String newPrefix = definition.getPrefix(targetNS);
- if (newPrefix == null) newPrefix = "";
- // TODO: remove this code
- if (element != null)
- {
- for (int index = 0; index < element.getAttributes().getLength(); index++) {
- AttrImpl attr = (AttrImpl) element.getAttributes().item(index);
- String nodeName = attr.getNodeName();
- String nsValue = attr.getNodeValue();
- if (nsValue.equals(targetNS)) {
- if (nodeName.indexOf(":") != -1) {
- String xmlnsString = nodeName.substring(0, nodeName.indexOf(":"));
-
- if (xmlnsString.equals("xmlns")) {
- newPrefix = attr.getLocalName();
- break;
- }
- }
- }
- }
- }
- prefixText.setText(newPrefix);
- }
- }
-
- // set name field
- if (getElement() != null)
- {
- if (getElement().getElement()!= null)
- {
- String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
- if (name==null) name="";
- nameText.setText(name);
- }
- }
-
- setListenerEnabled(true);
- }
-
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == button)
- {
- Object obj = getElement();
- if (obj instanceof Definition)
- {
- Definition definition = (Definition)obj;
- EditNamespacesAction action = new EditNamespacesAction(definition);
- action.run();
- refresh();
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
deleted file mode 100644
index eb0ffef34..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class NamespaceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- /**
- *
- */
- public NamespaceSectionDescriptor()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.namespace";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(WSDLGroupObject.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return new NamespaceSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof WSDLGroupObject)
- {
- Definition definition = ((WSDLGroupObject) object).getDefinition();
- if (definition.getElement() != null) {
- return true;
- }
-
- return false;
- }
- else if (object instanceof org.eclipse.wst.wsdl.Definition) {
- Definition definition = (Definition) object;
- if (definition.getElement() != null) {
- return true;
- }
-
- return false;
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection()
- {
- return "";
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
deleted file mode 100644
index c3936aac5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-
-public class PartSection extends AbstractSection
-{
- CCombo componentNameCombo;
- CCombo referenceKindCombo;
- CLabel componentNameLabel;
- Button button;
- IEditorPart editorPart;
-
- public void handleEvent (Event event)
- {
- if (event.type == SWT.Modify)
- {
- if (event.widget == referenceKindCombo)
- {
- boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
- ComponentReferenceUtil.setComponentReference((Part)getElement(), isType, null);
- refresh();
- }
- }
-
- }
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- composite = getWidgetFactory().createFlatFormComposite(parent);
-
- FormData data;
-
- referenceKindCombo = getWidgetFactory().createCCombo(composite);
- referenceKindCombo.setBackground(composite.getBackground());
- referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
- referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-
- CLabel valueLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(referenceKindCombo, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(referenceKindCombo, 0, SWT.CENTER);
- valueLabel.setLayoutData(data);
-
- componentNameCombo = getWidgetFactory().createCCombo(composite);
- componentNameCombo.setBackground(composite.getBackground());
- componentNameCombo.addListener(SWT.Modify, this);
- componentNameCombo.addSelectionListener(this);
-
- componentNameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
- componentNameLabel.setLayoutData(data);
-
- button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
- button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
- button.addSelectionListener(this);
- data = new FormData();
- data.left = new FormAttachment(100, -rightMarginSpace + 2);
- data.right = new FormAttachment(100, 0);
- data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
- button.setLayoutData(data);
-
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(0, 0);
- referenceKindCombo.setLayoutData(data);
-
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(button, 0);
- data.top = new FormAttachment(referenceKindCombo, +ITabbedPropertyConstants.VSPACE);
- componentNameCombo.setLayoutData(data);
-
- referenceKindCombo.addListener(SWT.Modify, this);
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
- referenceKindCombo.removeListener(SWT.Modify, this);
- if (((Part)getElement()).getTypeDefinition() != null)
- {
- referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
- }
- else
- {
- referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
- }
-
- try
- {
- Part part = (Part)getElement();
- boolean isType = ComponentReferenceUtil.isType(part);
- String value = ComponentReferenceUtil.getPartComponentReference(part);
-
- // update the combo-box content
- //
- componentNameCombo.removeAll();
- List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
- if (compList != null)
- {
- for (Iterator iterator = compList.iterator(); iterator.hasNext();)
- {
- componentNameCombo.add((String)iterator.next());
- }
- }
-
- if (isType)
- {
- referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
- componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE") + ":"); //$NON-NLS-1$
- componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-// button.setReferenceKind("type");
- }
- else
- {
- referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
- componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$
- componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-
-// button.setReferenceKind("element");
- }
-// button.setInput(input);
-// button.setEditor(editorPart);
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- referenceKindCombo.addListener(SWT.Modify, this);
- }
- }
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e)
- {
- Part part = (Part)getElement();
- boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
- if (e.widget == componentNameCombo)
- {
- ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());
- refresh();
- }
- else if (e.widget == button)
- {
- InvokeSetDialog dialog = new InvokeSetDialog();
-
- if (getElement() instanceof Part)
- {
- dialog.setReferenceKind(referenceKindCombo.getText());
- }
- dialog.setReferenceKind(referenceKindCombo.getText());
- dialog.run(getElement(), editorPart);
-
- WSDLEditor editor = (WSDLEditor) editorPart;
- editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
- }
- }
-
- public void setEditorPart(IEditorPart editorPart)
- {
- this.editorPart = editorPart;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
deleted file mode 100644
index 78f601215..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Part;
-
-
-public class PartSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- PartSection partSection;
- /**
- *
- */
- public PartSectionDescriptor()
- {
- super();
- partSection = new PartSection();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.part";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(Part.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return partSection;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- partSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof Part)
- {
- return true;
- }
- }
- return false;
- }
-
- public String getAfterSection()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.name";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
deleted file mode 100644
index dffb3df1f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class ReferenceSection extends AbstractSection
-{
- protected CCombo componentNameCombo;
- protected ComponentNameComboHelper componentNameComboHelper;
- Button button;
- IEditorPart editorPart;
- CLabel messageLabel;
-
- /**
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
- */
- public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
- {
- super.createControls(parent, factory);
- composite = getWidgetFactory().createFlatFormComposite(parent);
- FormData data;
-
- messageLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
- componentNameCombo = getWidgetFactory().createCCombo(composite);
- componentNameCombo.setBackground(composite.getBackground());
- button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
- button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
- button.addSelectionListener(this);
-
- data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
- data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
- messageLabel.setLayoutData(data);
-
- data = new FormData();
- data.left = new FormAttachment(100, -rightMarginSpace + 2);
- data.right = new FormAttachment(100,0);
- data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
- button.setLayoutData(data);
-
- data = new FormData();
- data.left = new FormAttachment(0, 100);
- data.right = new FormAttachment(button, 0);
- componentNameCombo.setLayoutData(data);
-
- componentNameCombo.addListener(SWT.Modify, this);
- }
-
- /*
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
- */
- public void refresh()
- {
- super.refresh();
- setListenerEnabled(false);
- componentNameCombo.removeListener(SWT.Modify, this);
- Object obj = getElement();
- if (obj instanceof MessageReference)
- {
- messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getMessageNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.MESSAGE_ATTRIBUTE;
- }
- };
-
- }
- else if (obj instanceof Binding)
- {
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getPortTypeNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.TYPE_ATTRIBUTE;
- }
- };
-
- messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
- }
- else if (obj instanceof Port)
- {
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getBindingNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.BINDING_ATTRIBUTE;
- }
- };
- messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
- }
-
- componentNameComboHelper.update(getElement());
- setListenerEnabled(true);
- componentNameCombo.addListener(SWT.Modify, this);
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == button)
- {
- InvokeSetDialog dialog = new InvokeSetDialog();
- dialog.run(getElement(), editorPart);
-
- WSDLEditor editor = (WSDLEditor) editorPart;
- editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
- }
- }
-
- public void handleEvent(Event event)
- {
- componentNameComboHelper.handleEventHelper(getElement().getElement(), event);
- }
-
- public void setEditorPart(IEditorPart editorPart)
- {
- this.editorPart = editorPart;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
deleted file mode 100644
index 7978dc9b8..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-
-
-public class ReferenceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
- ReferenceSection referenceSection;
-
- /**
- *
- */
- public ReferenceSectionDescriptor()
- {
- super();
- this.referenceSection = new ReferenceSection();
- }
-
-
- /**
- *
- */
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.reference";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes()
- {
- List list = new ArrayList();
- list.add(MessageReference.class);
- list.add(Binding.class);
- list.add(Port.class);
- return list;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass()
- {
- return referenceSection;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab()
- {
- return "org.eclipse.wst.xmlwebservices.general";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection)
- {
- referenceSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
- Object object = null;
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof MessageReference || object instanceof Binding || object instanceof Port)
- {
- return true;
- }
- }
- return false;
- }
-
- public String getAfterSection()
- {
- return "org.eclipse.wst.wsdl.ui.internal.section.name";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
deleted file mode 100644
index 124ed18cd..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * TextChangeHelper notifies the listner of text lifecycle events
- * on behalf of the widget(s) it listens to.
- *
- * @author Anthony Hunter
- * <a href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com</a>
- */
-public abstract class TextChangeHelper implements Listener {
-
- private boolean nonUserChange;
-
- /**
- * Marks the start of a programmatic change to the widget contents.
- * Clients must call startNonUserChange() before directly setting
- * the widget contents to avoid unwanted lifecycle events.
- * @throws IllegalArgumentException if a programmatic change is
- * already in progress.
- */
- public void startNonUserChange() {
- if (nonUserChange)
- throw new IllegalStateException("we already started a non user change");//$NON-NLS-1$
- nonUserChange = true;
- }
-
- /**
- * Clients who call startNonUserChange() should call
- * finishNonUserChange() as soon as possible after the change is done.
- * @throws IllegalArgumentException if no change is in progress.
- */
- public void finishNonUserChange() {
- if (!nonUserChange)
- throw new IllegalStateException("we are not in a non user change");//$NON-NLS-1$
- nonUserChange = false;
- }
-
- /**
- * Returns true if a programmatic change is in progress.
- */
- public boolean isNonUserChange() {
- return nonUserChange;
- }
-
- /**
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event event) {
- switch (event.type) {
- case SWT.KeyDown :
- if (event.character == SWT.CR)
- textChanged((Control)event.widget);
- break;
- case SWT.FocusOut :
- textChanged((Control)event.widget);
- break;
- }
- }
-
- /**
- * Abstract method notified when a text field has been changed.
- * @param control
- */
- public abstract void textChanged(Control control);
-
- /**
- * Registers this helper with the given control to listen for events
- * which indicate that a change is in progress (or done).
- */
- public void startListeningTo(Control control) {
- control.addListener(SWT.FocusOut, this);
- control.addListener(SWT.Modify, this);
- }
-
- /**
- * Registers this helper with the given control to listen for the
- * Enter key. When Enter is pressed, the change is considered done
- * (this is only appropriate for single-line Text widgets).
- */
- public void startListeningForEnter(Control control) {
- // NOTE: KeyDown rather than KeyUp, because of similar usage in CCombo.
- control.addListener(SWT.KeyDown, this);
- }
-
- /**
- * Unregisters this helper from a control previously passed to
- * startListeningTo() and/or startListeningForEnter().
- */
- public void stopListeningTo(Control control) {
- control.removeListener(SWT.FocusOut, this);
- control.removeListener(SWT.Modify, this);
- control.removeListener(SWT.KeyDown, this);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
deleted file mode 100644
index a5de0b653..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public class WSDLLabelProvider extends LabelProvider
-{
- protected ModelAdapterFactory adapterFactory = new WSDLModelAdapterFactory();
- private WSDLTypeMapper typeMapper;
-
- protected WSDLEditorExtension[] labelProviderExtensions;
- protected LabelProvider[] labelProviders;
- IEditorPart editorPart;
-
- /**
- *
- */
- public WSDLLabelProvider()
- {
- super();
- typeMapper = new WSDLTypeMapper();
- editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
- labelProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER);
- labelProviders = new LabelProvider[labelProviderExtensions.length];
- for (int i = 0; i < labelProviderExtensions.length; i++)
- {
- labelProviders[i] = (LabelProvider)labelProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER, (WSDLEditor)editorPart);
- }
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object object)
- {
- if (object == null || object.equals(StructuredSelection.EMPTY)) {
- return null;
- }
- Image result = null;
- if (object instanceof StructuredSelection)
- {
- Object selected = ((StructuredSelection)object).getFirstElement();
- selected = typeMapper.remapObject(selected);
- for (int i = 0; i < labelProviders.length; i++)
- {
- result = labelProviders[i].getImage(selected);
- if (result!=null)
- break;
- }
-// if (result != null)
-// {
-// ModelAdapter modelAdapter = adapterFactory.getAdapter(selected);
-// if (modelAdapter != null)
-// {
-// result = (Image)modelAdapter.getProperty(selected, ModelAdapter.IMAGE_PROPERTY);
-// }
-// }
- }
- return result;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object object)
- {
- if (object == null || object.equals(StructuredSelection.EMPTY)) {
- return "No items selected";//$NON-NLS-1$
- }
- String result = null;
- Object selected = null;
- if (object instanceof StructuredSelection)
- {
- selected = ((StructuredSelection)object).getFirstElement();
- selected = typeMapper.remapObject(selected);
-
- // Override outline provider's getText for WSDLElements
- if (selected instanceof WSDLElement)
- {
- if (((WSDLElement)selected).getElement() == null) {
- return "";
- }
- boolean isReadOnly = false;
- ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(selected);
- if (adapter != null)
- {
- isReadOnly = Boolean.TRUE.equals(adapter.getProperty(selected, "isReadOnly"));
- }
- if (isReadOnly)
- {
- result = ((WSDLElement)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")"; //$NON-NLS-1$
- }
- else
- {
- result = ((WSDLElement)selected).getElement().getLocalName();
- }
- return result;
- }
- else if (selected instanceof XSDConcreteComponent)
- {
- // Override for XSD Components
-
- Element element = ((XSDConcreteComponent)selected).getElement();
- if (element != null)
- {
- if (element instanceof IDOMNode)
- {
- return ((XSDConcreteComponent)selected).getElement().getLocalName();
- }
- else
- {
- return ((XSDConcreteComponent)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")"; //$NON-NLS-1$
- }
- }
- else
- {
- return "(" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")"; //$NON-NLS-1$
- }
-
- }
- // otherwise get it from the extensions
- for (int i = 0; i < labelProviders.length; i++)
- {
- result = labelProviders[i].getText(selected);
- if (result!=null)
- break;
- }
- }
- else if (object instanceof TextSelection)
- {
- }
-
-
- return result;
- }
-
- /**
- * Determine if a multiple object selection has been passed to the
- * label provider. If the objects is a IStructuredSelection, see if
- * all the objects in the selection are the same and if so, we want
- * to provide labels for the common selected element.
- * @param objects a single object or a IStructuredSelection.
- * @param multiple first element in the array is true if there is multiple
- * unequal selected elements in a IStructuredSelection.
- * @return the object to get labels for.
- */
-// private Object getObject(Object objects, boolean multiple[]) {
-// Assert.isNotNull(objects);
-// Object object = null;
-// return object;
-// }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
deleted file mode 100644
index 73d165899..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class WSDLSectionDescriptorProvider implements ISectionDescriptorProvider
-{
- protected WSDLEditorExtension[] propertySectionDescriptorProviderExtensions;
- protected ISectionDescriptorProvider[] propertySectionDescriptorProviders;
-
- protected WSDLEditorExtension[] labelProviderExtensions;
-
- protected final static Object[] EMPTY_ARRAY = {};
-
- IEditorPart editorPart;
-
- /**
- *
- */
- public WSDLSectionDescriptorProvider()
- {
- super();
- // TODO Check this
- this.editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
- */
- public ISectionDescriptor[] getSectionDescriptors()
- {
- List list = new ArrayList();
-
-
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-
- propertySectionDescriptorProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER);
- propertySectionDescriptorProviders = new ISectionDescriptorProvider[propertySectionDescriptorProviderExtensions.length];
- for (int i = 0; i < propertySectionDescriptorProviderExtensions.length; i++)
- {
- propertySectionDescriptorProviders[i] = (ISectionDescriptorProvider)propertySectionDescriptorProviderExtensions[i].createExtensionObject(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER, (WSDLEditor)editorPart);
-
- ISectionDescriptor [] extensionSectionDescriptors = propertySectionDescriptorProviders[i].getSectionDescriptors();
- for (int j = 0; j < extensionSectionDescriptors.length; j++)
- {
- list.add(extensionSectionDescriptors[j]);
- }
- }
-
-
- list.add(new NameSectionDescriptor());
- list.add(new PartSectionDescriptor());
- list.add(new DocumentationSectionDescriptor());
- list.add(new ReferenceSectionDescriptor());
- list.add(new NamespaceSectionDescriptor());
- list.add(new ExtensibilityElementSectionDescriptor());
- list.add(new ImportSectionDescriptor());
-
- ISectionDescriptor[] descriptors = new ISectionDescriptor[list.size()];
- list.toArray(descriptors);
-
- return descriptors;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
deleted file mode 100644
index ad924f7e3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLTabbedPropertySheetPage extends TabbedPropertySheetPage implements ISelectionChangedListener, INodeSelectionListener, ModelAdapterListener
-{
- private WSDLSelectionManager fViewerSelectionManager;
- private WSDLEditor wsdlEditor;
- private Object currentObject;
-
- /**
- * @param tabbedPropertySheetPageContributor
- */
- public WSDLTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor, WSDLEditor editor)
- {
- super(tabbedPropertySheetPageContributor);
- this.wsdlEditor = editor;
- }
-
- public void createControl(Composite parent) {
- super.createControl(parent);
- wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(wsdlEditor.getDefinition()));
- }
-
- public void setSelectionManager(WSDLSelectionManager viewerSelectionManager) {
- // disconnect from old one
- if (fViewerSelectionManager != null) {
- fViewerSelectionManager.removeSelectionChangedListener(this);
- }
-
- fViewerSelectionManager = viewerSelectionManager;
-
- // connect to new one
- if (fViewerSelectionManager != null) {
- fViewerSelectionManager.addSelectionChangedListener(this);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event)
- {
- if (!event.getSelection().isEmpty()) {
- selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
- //super.selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
- }
- }
-
- public void selectionChanged(IWorkbenchPart part, ISelection selection)
- {
- // override for category
- if (selection != null)
- {
- if (selection instanceof StructuredSelection)
- {
- StructuredSelection structuredSelection = (StructuredSelection)selection;
- if (structuredSelection.isEmpty())
- {
- return;
- }
- Object obj = structuredSelection.getFirstElement();
- Node node = WSDLEditorUtil.getInstance().getNodeForObject(obj);
- Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)node);
-
- // bad hack to get schema from category
- // until we provide a better mechanism (selection manager extension)
- // see also WSDLGraphViewer
- if (o instanceof XSDSchemaExtensibilityElement)
- {
- obj = ((XSDSchemaExtensibilityElement)o).getSchema();
- selection = new StructuredSelection(obj);
- }
-
- attachListener(o);
- }
- else if (selection instanceof TextSelection)
- {
- return;
- }
- }
-
- super.selectionChanged(wsdlEditor.getEditorPart(), selection); // event.getSelection());
- }
-
- protected void attachListener(Object object)
- {
- WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
- ModelAdapter adapter = adapterFactory.getAdapter(object);
- if (adapter != null)
- {
- // remove listener from the previously selected object
- removeListener(currentObject);
-
- // add listener to the newly selected object
- adapter.addListener(this);
- currentObject = object;
- }
- }
-
- protected void removeListener(Object object)
- {
- WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
- ModelAdapter adapter = adapterFactory.getAdapter(object);
- if (adapter != null)
- {
- adapter.removeListener(this);
- currentObject = null;
- }
- }
- public void dispose() {
- // disconnect from the ViewerSelectionManager
- if (fViewerSelectionManager != null) {
- fViewerSelectionManager.removeSelectionChangedListener(this);
- }
-
- // disconnect listener from the current object
- if (currentObject != null) {
- removeListener(currentObject);
- }
-
- super.dispose();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.sse.editor.view.events.INodeSelectionListener#nodeSelectionChanged(org.eclipse.wst.sse.editor.view.events.NodeSelectionChangedEvent)
- */
- public void nodeSelectionChanged(NodeSelectionChangedEvent event)
- {
- }
-
- public void propertyChanged(Object object, String property) {
- if (getCurrentTab() != null) {
- refresh();
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
deleted file mode 100644
index 37ed0556c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class WSDLTypeMapper implements ITypeMapper
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper#remapType(java.lang.Object, java.lang.Class)
- */
- public Class remapType(Object object, Class effectiveType)
- {
- Class type = effectiveType;
-
- if (object instanceof WSDLGroupObject) {
- type = ((WSDLGroupObject) object).getDefinition().getClass();
- }
-
- return type;
- }
-
- public Object remapObject(Object object)
- {
- Object type = object;
-
- if (object instanceof WSDLGroupObject)
- {
- type = ((WSDLGroupObject) object).getDefinition();
- }
- return type;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
deleted file mode 100644
index f251731db..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- *
- */
-public class DelegatingSourceValidatorForWSDL extends DelegatingSourceValidator
-{
-
- final private static String VALIDATOR_CLASS = "org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator";
-
- public DelegatingSourceValidatorForWSDL()
- { super();
- }
-
- protected IValidator getDelegateValidator()
- {
- try
- {
- ValidationRegistryReader registry = ValidationRegistryReader.getReader();
- return registry.getValidator(VALIDATOR_CLASS);
- }
- catch (Exception e)
- { //
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
deleted file mode 100644
index 58a0759d0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-
-
-
-// TODO.. we should probably be keying off of the node's qname (perhaps supporting 'null' as a wild card for local names)
-// in order to compute an applicable reconciler
-//
-public class ExtensibleNodeReconciler
-{
- protected WSDLEditorExtension[] extensions;
- protected INodeReconciler[] reconcilers;
-
- public ExtensibleNodeReconciler()
- {
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
- extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_RECONCILER);
- reconcilers = new INodeReconciler[extensions.length];
- for (int i = 0; i < extensions.length; i++)
- {
- reconcilers[i] = (INodeReconciler)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_RECONCILER, null);
- }
- }
-
- protected INodeReconciler getApplicableNodeReconciler(Object object)
- {
- INodeReconciler reconciler = null;
- for (int i = 0; i < extensions.length; i++)
- {
- if (extensions[i].isApplicable(object))
- {
- reconciler = reconcilers[i];
- if (reconciler != null)
- {
- break;
- }
- }
- }
- return reconciler;
- }
-
- public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- INodeReconciler reconciler = getApplicableNodeReconciler(modelObject);
- if (reconciler != null)
- {
- reconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
deleted file mode 100644
index 10c5dd5cc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class SEDDocumentAdapter
-{
- protected Document document;
- protected Definition definition;
- protected ExtensibleNodeReconciler extensibleNodeReconciler;
-
- public SEDDocumentAdapter(IStructuredModel model, Definition definition)
- {
- this.document = (model instanceof IDOMModel) ? ((IDOMModel)model).getDocument() : null;
- this.definition = definition;
- this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
- new MyDocumentAdapter(document);
- }
-
-
- class MyDocumentAdapter extends DocumentAdapter
- {
-// private boolean isValidDefinition = true;
-
- MyDocumentAdapter(Document document)
- {
- super(document);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- if (eventType == INodeNotifier.ADD)
- {
- if (newValue instanceof Element)
- {
- adapt((Element)newValue);
-
- // See Bug 5366
- // We need to sync up the Model and the DOM
- Element newDocumentElement = (Element)newValue;
- String wsdlPrefix = newDocumentElement.getPrefix();
- if (wsdlPrefix == null) wsdlPrefix = "";
- String ns = definition.getNamespace(wsdlPrefix);
- if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
- && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
- // !isValidDefinition)
- {
-// System.out.println("****** Setting new definition");
- definition.setElement(newDocumentElement);
- }
- }
- }
-
- switch (eventType)
- {
- // we make the assumption that reconciling will only be triggered by one of these notifications
- // (ADD and REMOVE notifications are omitted)
- //
- case INodeNotifier.CHANGE:
- case INodeNotifier.STRUCTURE_CHANGED:
- case INodeNotifier.CONTENT_CHANGED:
- {
- if (notifier instanceof Element)
- {
- reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
- }
- else if (notifier instanceof Document)
- {
- Document document = (Document)notifier;
- Element definitionElement = null;
-
- for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
- {
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- Element element = (Element)node;
- if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
- {
- definitionElement = element;
- break;
- }
- }
- }
-
- // TODO... revisit definition.removeAllContent() and who should call this?
- //
- if (definitionElement != null)
- {
-// isValidDefinition = true;
-// System.out.println("VALID DEFINITION ELEMENT");
- ((DefinitionImpl)definition).elementChanged(definitionElement);
- }
- else
- {
-// System.out.println("INVALID DEFINITION ELEMENT");
-// isValidDefinition = false;
- ((DefinitionImpl)definition).removeAll();
- }
- }
- break;
- }
- }
- }
-
- protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
- if (modelObject != null)
- {
- if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
- ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
- ee.elementChanged(element);
- }
- else if (modelObject instanceof WSDLElementImpl)
- {
- ((WSDLElementImpl)modelObject).elementChanged(element);
- }
- else if (modelObject instanceof XSDConcreteComponent)
- {
- ((XSDConcreteComponent)modelObject).elementChanged(element);
- extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);
- }
- }
- }
- }
-
-
- // An abstract adapter that ensures that the children of a new Node are also adapted
- //
- abstract class DocumentAdapter implements INodeAdapter
- {
- public DocumentAdapter(Document document)
- {
- ((INodeNotifier)document).addAdapter(this);
-
- for (Node child = document.getFirstChild(); child != null; child = child.getNextSibling())
- {
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- adapt((Element)child);
- }
- }
- }
-
- public void adapt(Element element)
- {
- if (element != null)
- {
- if (((INodeNotifier)element).getExistingAdapter(this) == null)
- {
- ((INodeNotifier)element).addAdapter(this);
-
- for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
- {
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- adapt((Element)child);
- }
- }
- }
- }
- }
-
- public boolean isAdapterForType(Object type)
- {
- return type == this;
- }
-
- abstract public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
deleted file mode 100644
index e4ec0f3d9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.emf.common.util.URI;
-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.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.typesystem.ExtensibleTypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLModelLocatorAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.util.XSDSchemaLocationResolverAdapterFactory;
-import org.w3c.dom.Element;
-
-public class WSDLModelAdapter implements INodeAdapter
-{
- protected ResourceSet resourceSet;
- protected Definition definition;
-
- public Definition getDefinition()
- {
- return definition;
- }
-
- public void setDefinition(Definition definition)
- {
- this.definition = definition;
- }
-
- public boolean isAdapterForType(Object type)
- {
- return type == WSDLModelAdapter.class;
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- }
-
- public Definition createDefinition(Element element)
- {
- try
- {
- IDOMNode domNode = (IDOMNode)element;
- String baseLocation = domNode.getModel().getBaseLocation();
-
- definition = WSDLFactory.eINSTANCE.createDefinition();
-
- resourceSet = new ResourceSetImpl();
- resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory());
- resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-
- // TODO.. .revist the best approach to obtain a URI from the SSE model
- //
- URI uri = null;
- if (baseLocation.startsWith("/"))
- {
- uri = URI.createPlatformResourceURI(baseLocation);
- }
- else
- {
- uri = URI.createFileURI(baseLocation);
- }
-
- definition = WSDLFactory.eINSTANCE.createDefinition();
- definition.setDocumentBaseURI(uri.toString());
- definition.setElement(element);
-
- WSDLResourceFactoryImpl resourceFactory = new WSDLResourceFactoryImpl();
- Resource resource = resourceFactory.createResource(uri);
- resourceSet.getResources().add(resource);
- resource.getContents().add(definition);
- resource.setModified(false);
- ((DefinitionImpl)definition).reconcileReferences(true);
-
- // attach an adapter to keep the WSDL model and DOM in sync
- //
- new WSDLModelReconcileAdapter(element.getOwnerDocument(), definition);
-
- // TODO... CS : revisit this line
- // currently this is used to associate a 'type' system with the definition
- // I suspect that this could be made a whole lot more simple
- //
- WSDLEditorUtil.getInstance().setTypeSystemProvider(definition, new ExtensibleTypeSystemProvider());
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
- return definition;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
deleted file mode 100644
index 73e5a2341..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.filter.ExtensiblityElementFilter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelQueryExtension;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLModelQueryExtension extends XSDModelQueryExtension
-{
- public WSDLModelQueryExtension()
- {
- }
-
- protected boolean isParentElementMessageReference(String parentElementName)
- {
- return parentElementName.equals("input") || parentElementName.equals("output") || parentElementName.equals("fault");
- }
-
- protected boolean isMessageReference(String elementName)
- {
- return elementName.equals("body") || elementName.equals("header") || elementName.equals("fault") || elementName.equals("urlReplacement") || elementName.equals("urlEncoded");
- }
-
-
- public boolean isApplicableChildElement(Node parentNode, String namespace, String name)
- {
- boolean result = true;
- if (parentNode.getNodeType() == Node.ELEMENT_NODE)
- {
- Element element = (Element) parentNode;
- String parentElementNamespaceURI = parentNode.getNamespaceURI();
- String parentElementName = parentNode.getLocalName();
- // only filter children for 'non-schema' elements
- //
- if (!WSDLConstants.XSD_NAMESPACE_URI.equals(parentElementNamespaceURI))
- {
- if (parentElementName != null && name != null)
- {
- if (namespace != null)
- {
- // the following namespace are one that always should be filtered out
- // for now this is hardcoded
- //
- if (namespace.equals("http://schemas.xmlsoap.org/soap/encoding/"))
- {
- // exclude soap-enc elements
- //
- result = false;
- }
- else if (namespace.equals(WSDLConstants.XSD_NAMESPACE_URI))
- {
- // eclipse all schema elements, except for 'schema' withing wsdl types elements
- result = parentElementName.equals("types") && name.equals("schema");
- }
- else
- {
- // TODO.. we should investigate removing the ExtensiblityElementFilter extension point
- // shouldn't this be a ModelQueryExtension defined on the extension languages?
- //
- ExtensiblityElementFilter filter = (ExtensiblityElementFilter) WSDLEditorPlugin.getInstance().getExtensiblityElementFilterRegistry().getProperty(namespace, "");
- if (filter != null)
- {
- result = filter.isValidContext(element, name);
- }
- }
- }
- }
- }
- }
- return result;
- }
-
- public String[] getAttributeValues(Element element, String namespace, String name)
- {
- if (WSDLConstants.WSDL_NAMESPACE_URI.equals(namespace))
- {
- List list = new ArrayList();
- ComponentReferenceUtil util = new ComponentReferenceUtil(lookupOrCreateDefinition(element));
- String currentElementName = element.getLocalName();
- if (checkName(name, "message"))
- {
- list.addAll(util.getMessageNames());
- }
- else if (checkName(name, "binding"))
- {
- list.addAll(util.getBindingNames());
- }
- else if (checkName(name, "type"))
- {
- if (checkName(currentElementName, "binding"))
- {
- list.addAll(util.getPortTypeNames());
- }
- else if (checkName(currentElementName, "part"))
- {
- list.addAll(util.getComponentNameList(true));
- }
- }
- else if (checkName(name, "element"))
- {
- if (checkName(currentElementName, "part"))
- {
- list.addAll(util.getComponentNameList(false));
- }
- }
- String[] result = new String[list.size()];
- list.toArray(result);
- return result;
- }
- else
- {
- return super.getAttributeValues(element, namespace, name);
- }
- }
-
-
- protected XSDSchema lookupOrCreateSchemaForElement(Element element)
- {
- XSDSchema schema = null;
- Definition definition = lookupOrCreateDefinition(element);
- Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
- if (o instanceof XSDConcreteComponent)
- {
- schema = ((XSDConcreteComponent) o).getSchema();
- }
- return schema;
- }
-
-
- protected Definition lookupOrCreateDefinition(Element element)
- {
- Definition definition = null;
- Document document = element.getOwnerDocument();
- if (document instanceof INodeNotifier)
- {
- INodeNotifier notifier = (INodeNotifier) document;
- WSDLModelAdapter adapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
- if (adapter == null)
- {
- adapter = new WSDLModelAdapter();
- notifier.addAdapter(adapter);
- adapter.createDefinition(document.getDocumentElement());
- }
- definition = adapter.getDefinition();
- }
- return definition;
- }
-
-
- protected TypesHelper getTypesHelper(final Element element)
- {
- XSDSchema schema = lookupOrCreateSchemaForElement(element);
- return new TypesHelper(schema)
- {
- // TODO... it seems as though the model is not correctly
- // mainting the list of prefixes for a given namespace
- // must be a bug!
- //
- protected List getPrefixesForNamespace(String namespace)
- {
- List list = super.getPrefixesForNamespace(namespace);
- Definition definition = lookupOrCreateDefinition(element);
- if (definition != null)
- {
- Map map = definition.getNamespaces();
- for (Iterator i = map.keySet().iterator(); i.hasNext();)
- {
- String prefix = (String) i.next();
- String ns = (String) map.get(prefix);
- if (ns != null && ns.equals(namespace))
- {
- if (!list.contains(prefix))
- {
- list.add(prefix);
- }
- }
- }
- }
- return list;
- }
- };
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
deleted file mode 100644
index b9f22129d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.reconciler.ExtensibleNodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-class WSDLModelReconcileAdapter extends DocumentAdapter
-{
- protected Definition definition;
- protected ExtensibleNodeReconciler extensibleNodeReconciler;
-
- public WSDLModelReconcileAdapter(Document document, Definition definition)
- {
- super(document);
- this.definition = definition;
- this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
- }
-
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- if (eventType == INodeNotifier.ADD)
- {
- if (newValue instanceof Element)
- {
- adapt((Element)newValue);
-
- // See Bug 5366
- // We need to sync up the Model and the DOM
- Element newDocumentElement = (Element)newValue;
- String wsdlPrefix = newDocumentElement.getPrefix();
- if (wsdlPrefix == null) wsdlPrefix = "";
- String ns = definition.getNamespace(wsdlPrefix);
- if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
- && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
- // !isValidDefinition)
- {
-// System.out.println("****** Setting new definition");
- definition.setElement(newDocumentElement);
- }
- }
- }
-
- switch (eventType)
- {
- // we make the assumption that reconciling will only be triggered by one of these notifications
- // (ADD and REMOVE notifications are omitted)
- //
- case INodeNotifier.CHANGE:
- case INodeNotifier.STRUCTURE_CHANGED:
- case INodeNotifier.CONTENT_CHANGED:
- {
- if (notifier instanceof Element)
- {
- reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
- }
- else if (notifier instanceof Document)
- {
- Document document = (Document)notifier;
- Element definitionElement = null;
-
- for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
- {
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- Element element = (Element)node;
- if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
- {
- definitionElement = element;
- break;
- }
- }
- }
-
- // TODO... revisit definition.removeAllContent() and who should call this?
- //
- if (definitionElement != null)
- {
-// isValidDefinition = true;
-// System.out.println("VALID DEFINITION ELEMENT");
- ((DefinitionImpl)definition).elementChanged(definitionElement);
- }
- else
- {
-// System.out.println("INVALID DEFINITION ELEMENT");
-// isValidDefinition = false;
- ((DefinitionImpl)definition).removeAll();
- }
- }
- break;
- }
- }
- }
-
- protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
- if (modelObject != null)
- {
- if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
- ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
- ee.elementChanged(element);
- }
- else if (modelObject instanceof WSDLElementImpl)
- {
- ((WSDLElementImpl)modelObject).elementChanged(element);
- }
- else if (modelObject instanceof XSDConcreteComponent)
- {
- ((XSDConcreteComponent)modelObject).elementChanged(element);
- extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);
- }
- }
- }
-}
-
-
-abstract class DocumentAdapter implements INodeAdapter
-{
- Document document;
-
- public DocumentAdapter(Document document)
- {
- this.document = document;
- ((INodeNotifier)document).addAdapter(this);
- adapt(document.getDocumentElement());
- }
-
- public void adapt(Element element)
- {
- if (((INodeNotifier)element).getExistingAdapter(this) == null)
- {
- ((INodeNotifier)element).addAdapter(this);
-
- for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
- {
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- adapt((Element)child);
- }
- }
- }
- }
-
- public boolean isAdapterForType(Object type)
- {
- return type == this;
- }
-
- abstract public void notifyChanged
- (INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
deleted file mode 100644
index d6bc54a0a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.typesystem;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDSchema;
-
-public class ExtensibleTypeSystemProvider implements ITypeSystemProvider
-{
- protected WSDLEditorExtension[] extensions;
- protected ITypeSystemProvider[] typeSystemProviders;
-
- protected final static Object[] EMPTY_ARRAY = {};
-
- public ExtensibleTypeSystemProvider()
- {
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-
- extensions = registry.getRegisteredExtensions(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER);
- typeSystemProviders = new ITypeSystemProvider[extensions.length];
- for (int i = 0; i < extensions.length; i++)
- {
- typeSystemProviders[i] = (ITypeSystemProvider)extensions[i].createExtensionObject(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER, null);
- }
- }
-
- public List getAvailableTypeNames(Definition definition, int typeNameCategory)
- {
- List list = new ArrayList();
- for (int i = 0; i < typeSystemProviders.length; i++)
- {
- list.addAll(typeSystemProviders[i].getAvailableTypeNames(definition, typeNameCategory));
- }
- return list;
- }
-
- public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
- {
- List list = new ArrayList();
- for (int i = 0; i < typeSystemProviders.length; i++)
- {
- list.addAll(typeSystemProviders[i].getAvailableTypes(definition, schema, typeNameCategory));
- }
- return list;
- }
-
- public List getAvailableElementNames(Definition definition)
- {
- List list = new ArrayList();
- for (int i = 0; i < typeSystemProviders.length; i++)
- {
- list.addAll(typeSystemProviders[i].getAvailableElementNames(definition));
- }
- return list;
- }
-
- public int getCategoryForTypeName(Definition definition, String typeName)
- {
- int result = UNKNOWN_TYPE;
- for (int i = 0; i < typeSystemProviders.length; i++)
- {
- result = typeSystemProviders[i].getCategoryForTypeName(definition, typeName);
- if (result != UNKNOWN_TYPE)
- {
- break;
- }
- }
- return result;
- }
-
- public List getPrefixedNames(Definition definition, String namespace, String localName) {
- List list = new ArrayList();
- for (int i = 0; i < typeSystemProviders.length; i++)
- {
- list.addAll(typeSystemProviders[i].getPrefixedNames(definition, namespace, localName));
- }
- return list;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
deleted file mode 100644
index cbf51ae69..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
+++ /dev/null
@@ -1,957 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class ComponentReferenceUtil
-{
- protected Definition rootDefinition;
-
- public ComponentReferenceUtil(Definition rootDefinition)
- {
- this.rootDefinition = rootDefinition;
- }
-
- protected static boolean isEqual(String a, String b)
- {
- boolean result = false;
- if (a != null)
- {
- result = a.equals(b) || (a.length() == 0 && b == null);
- }
- else
- {
- result = (b == null || b.length() == 0);
- }
- return result;
- }
-
- protected static boolean isEqualInputName(Operation operation, BindingOperation bindingOperation)
- {
- boolean result = false;
- Input operationInput = operation.getEInput();
- BindingInput bindingOperationInput = bindingOperation.getEBindingInput();
-
- if (operationInput != null && bindingOperationInput != null)
- {
- result = isEqual(operationInput.getName(), bindingOperationInput.getName());
- }
- else if (operationInput == null && bindingOperationInput == null)
- {
- result = true;
- }
- return result;
- }
-
- protected static boolean isEqualOutputName(Operation operation, BindingOperation bindingOperation)
- {
- boolean result = false;
- Output operationOutput = operation.getEOutput();
- BindingOutput bindingOperationOutput = bindingOperation.getEBindingOutput();
-
- if (operationOutput != null && bindingOperationOutput != null)
- {
- result = isEqual(operationOutput.getName(), bindingOperationOutput.getName());
- }
- else if (operationOutput == null && bindingOperationOutput == null)
- {
- result = true;
- }
- return result;
- }
-
- protected static boolean isMatchingBinding(Operation operation, BindingOperation bindingOperation)
- {
- return isEqual(operation.getName(), bindingOperation.getName()) && isEqualInputName(operation, bindingOperation) && isEqualOutputName(operation, bindingOperation);
- }
-
- public List getPortsForPortType(PortType portType)
- {
- List list = new ArrayList();
- for (Iterator i = getServices().iterator(); i.hasNext();)
- {
- Service service = (Service) i.next();
- for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
- {
- Port port = (Port) j.next();
- Binding binding = port.getEBinding();
- if (binding != null && binding.getEPortType() == portType)
- {
- list.add(port);
- }
- }
- }
- return list;
- }
-
- public List getPortsForBinding(Binding binding)
- {
- List list = new ArrayList();
- for (Iterator i = getServices().iterator(); i.hasNext();)
- {
- Service service = (Service) i.next();
- for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
- {
- Port port = (Port) j.next();
- if (port.getEBinding() == binding)
- {
- list.add(port);
- }
- }
- }
- return list;
- }
-
- public List getBindingOperations(Operation operation)
- {
- List list = new ArrayList();
- String operationName = operation.getName();
-
- if (operationName != null)
- {
- PortType portType = getEnclosingPortType(operation);
- for (Iterator i = getBindings(portType).iterator(); i.hasNext();)
- {
- Binding binding = (Binding) i.next();
- BindingOperation bindingOperation = getBindingOperation(operation, binding);
- if (bindingOperation != null)
- {
- list.add(bindingOperation);
- }
- }
- }
- return list;
- }
-
- public BindingOperation getBindingOperation(Operation operation, Binding binding)
- {
- BindingOperation result = null;
- for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
- {
- BindingOperation bindingOperation = (BindingOperation) j.next();
- if (isMatchingBinding(operation, bindingOperation))
- {
- result = bindingOperation;
- break;
- }
- }
- return result;
- }
-
- public BindingInput getBindingInput(Input input, Binding binding)
- {
- BindingOperation bindingOperation = getBindingOperation((Operation) input.eContainer(), binding);
- return bindingOperation != null ? bindingOperation.getEBindingInput() : null;
- }
-
- public BindingOutput getBindingOutput(Output output, Binding binding)
- {
- BindingOperation bindingOperation = getBindingOperation((Operation) output.eContainer(), binding);
- return bindingOperation != null ? bindingOperation.getEBindingOutput() : null;
- }
-
- public BindingFault getBindingFault(Fault fault, Binding binding)
- {
- BindingFault result = null;
- String faultName = fault.getName();
- if (faultName != null)
- {
- BindingOperation bindingOperation = getBindingOperation((Operation) fault.eContainer(), binding);
- if (bindingOperation != null)
- {
- result = (BindingFault) bindingOperation.getBindingFault(faultName);
- }
- }
- return result;
- }
-
- public EObject getBindingObject(EObject interfaceObject, Binding binding)
- {
- EObject result = null;
- if (interfaceObject instanceof Input)
- {
- result = getBindingInput((Input) interfaceObject, binding);
- }
- else if (interfaceObject instanceof Output)
- {
- result = getBindingOutput((Output) interfaceObject, binding);
- }
- else if (interfaceObject instanceof Fault)
- {
- result = getBindingFault((Fault) interfaceObject, binding);
- }
- else if (interfaceObject instanceof Operation)
- {
- result = getBindingOperation((Operation) interfaceObject, binding);
- }
- else if (interfaceObject instanceof PortType)
- {
- result = binding;
- }
- return result;
- }
-
- public List getBindingInputs(Input input)
- {
- List list = new ArrayList();
- List operations = getBindingOperations((Operation) input.eContainer());
- for (Iterator i = operations.iterator(); i.hasNext();)
- {
- BindingOperation bindingOperation = (BindingOperation) i.next();
- if (bindingOperation.getBindingInput() != null)
- {
- list.add(bindingOperation.getBindingInput());
- }
- }
- return list;
- }
-
- public List getBindingOutputs(Output output)
- {
- List list = new ArrayList();
- Operation operation = (Operation) output.eContainer();
- if (operation != null)
- {
- List operations = getBindingOperations(operation);
- for (Iterator i = operations.iterator(); i.hasNext();)
- {
- BindingOperation bindingOperation = (BindingOperation) i.next();
- if (bindingOperation.getBindingOutput() != null)
- {
- list.add(bindingOperation.getBindingOutput());
- }
- }
- }
- return list;
- }
-
- public List getBindingFaults(Fault fault)
- {
- List list = new ArrayList();
- String faultName = fault.getName();
- if (faultName != null)
- {
- Operation operation = (Operation) fault.eContainer();
- if (operation != null)
- {
- List operations = getBindingOperations(operation);
- for (Iterator i = operations.iterator(); i.hasNext();)
- {
- BindingOperation bindingOperation = (BindingOperation) i.next();
- BindingFault bindingFault = (BindingFault) bindingOperation.getBindingFault(faultName);
- if (bindingFault != null)
- {
- list.add(bindingFault);
- }
- }
- }
- }
- return list;
- }
-
- protected PortType getEnclosingPortType(Operation operation)
- {
- return (PortType) operation.eContainer();
- }
-
- public List getBindings(Operation operation)
- {
- return getBindings(getEnclosingPortType(operation));
- }
-
- public List getBindings(PortType portType)
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- for (Iterator j = definition.getBindings().values().iterator(); j.hasNext();)
- {
- Binding binding = (Binding) j.next();
- if (portType == null || binding.getPortType() == portType)
- {
- list.add(binding);
- }
- }
- }
- return list;
- }
-
- public List getBindingsWithoutOperation(PortType portType, String operationName)
- {
- List result = new ArrayList();
- if (operationName != null)
- {
- List bindings = getBindings(portType);
- for (Iterator i = bindings.iterator(); i.hasNext();)
- {
- Binding binding = (Binding) i.next();
- boolean hasName = false;
- for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
- {
- BindingOperation bindingOperation = (BindingOperation) j.next();
- if (operationName.equals(bindingOperation.getName()))
- {
- hasName = true;
- break;
- }
- }
- if (!hasName)
- {
- result.add(binding);
- }
- }
- }
- return result;
- }
-
- public List getBindings()
- {
- return getBindings((PortType) null);
- }
-
- public List getBindingNames()
- {
- List list = new ArrayList();
- for (Iterator i = getBindings().iterator(); i.hasNext();)
- {
- Binding binding = (Binding) i.next();
- list.addAll(getPrefixedNames(binding.getQName()));
- }
- return list;
- }
-
- public List getPortTypeNames()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- for (Iterator j = definition.getPortTypes().values().iterator(); j.hasNext();)
- {
- PortType portType = (PortType) j.next();
- list.addAll(getPrefixedNames(portType.getQName()));
- }
- }
- return list;
- }
-
- public List getServices()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- list.addAll(definition.getEServices());
- }
- return list;
- }
-
- public List getPortTypes()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- list.addAll(definition.getEPortTypes());
- }
- return list;
- }
-
- public List getMessages()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- list.addAll(definition.getEMessages());
- }
- return list;
- }
-
- public List getTypes()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- if (definition.getETypes() != null)
- {
- list.add(definition.getETypes());
- }
- }
- return list;
- }
-
- public List getMessageNames()
- {
- List list = new ArrayList();
- for (Iterator i = getDefinitions().iterator(); i.hasNext();)
- {
- Definition definition = (Definition) i.next();
- for (Iterator j = definition.getMessages().values().iterator(); j.hasNext();)
- {
- Message message = (Message) j.next();
- list.addAll(getPrefixedNames(message.getQName()));
- }
- }
- return list;
- }
-
- public List getDefinitions()
- {
- List list = new ArrayList();
- addDefinition(rootDefinition, list);
- return list;
- }
-
- /**
- * @deprecated -- we should always use getPrefixedNames
- */
- public String getPrefixedName(QName qname)
- {
- String name = null;
- if (qname != null)
- {
- String prefix = rootDefinition.getPrefix(qname.getNamespaceURI());
- if (prefix != null)
- {
- name = prefix + ":" + qname.getLocalPart();
- }
- }
- return name;
- }
-
- public List getPrefixedNames(QName qname)
- {
- List list = new ArrayList();
- if (qname != null)
- {
- Map map = rootDefinition.getNamespaces();
- for (Iterator i = map.keySet().iterator(); i.hasNext();)
- {
- String prefix = (String) i.next();
- String namespace = (String) map.get(prefix);
- if (namespace != null && namespace.equals(qname.getNamespaceURI()))
- {
- String name = prefix.length() > 0 ? prefix + ":" + qname.getLocalPart() :
- qname.getLocalPart();
- list.add(name);
- }
- }
- }
- return list;
- }
-
- protected void addDefinition(Definition definition, List list)
- {
- if (definition != null)
- {
- list.add(definition);
- for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
- {
- ImportImpl theImport = (ImportImpl) i.next();
- if (theImport.getLocationURI() != null && !theImport.getLocationURI().endsWith("xsd"))
- {
- theImport.importDefinitionOrSchema();
- Definition importedDefinition = (Definition) theImport.getEDefinition();
- if (importedDefinition != null && !list.contains(importedDefinition))
- {
- addDefinition(importedDefinition, list);
- }
- }
- }
- }
- }
-
- public static String getPortTypeReference(Binding binding)
- {
- String result = null;
- Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
- if (element != null)
- {
- result = element.getAttribute("type");
- }
- return result;
- }
-
- public static void setPortTypeReference(Binding binding, String portType)
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
- if (element != null)
- {
- element.setAttribute("type", portType);
- }
- }
-
- public static String getBindingReference(Port port)
- {
- String result = null;
- Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
- if (element != null)
- {
- result = element.getAttribute("binding");
- }
- return result;
- }
-
- public static String getName(Binding binding)
- {
- String result = null;
- Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
- if (element != null)
- {
- result = element.getAttribute("name");
- }
- return result;
- }
-
- public static QName getPortTypeReferenceQName(Binding binding)
- {
- QName result = null;
- Definition definition = binding.getEnclosingDefinition();
- String prefixedName = getPortTypeReference(binding);
- if (prefixedName != null)
- {
- result = WSDLEditorUtil.createQName(definition, prefixedName);
- }
- return result;
- }
-
- public static QName getBindingReferenceQName(Port port)
- {
- QName result = null;
- Definition definition = port.getEnclosingDefinition();
- String prefixedName = getBindingReference(port);
- if (prefixedName != null)
- {
- result = WSDLEditorUtil.createQName(definition, prefixedName);
- }
- return result;
- }
-
- public static String getMessageReference(Input input)
- {
- return getMessageReferenceHelper(input);
- }
-
- public static String getMessageReference(Output output)
- {
- return getMessageReferenceHelper(output);
- }
-
- public static String getMessageReference(Fault fault)
- {
- return getMessageReferenceHelper(fault);
- }
-
- public static QName getMessageReferenceQName(Input input)
- {
- return getMessageReferenceQNameHelper(input);
- }
-
- public static QName getMessageReferenceQName(Output output)
- {
- return getMessageReferenceQNameHelper(output);
- }
-
- public static QName getMessageReferenceQName(Fault fault)
- {
- return getMessageReferenceQNameHelper(fault);
- }
-
- protected static String getMessageReferenceHelper(WSDLElement o)
- {
- String result = null;
- Element element = WSDLEditorUtil.getInstance().getElementForObject(o);
- if (element != null)
- {
- result = element.getAttribute("message");
- }
- return result;
- }
-
- public static QName getMessageReferenceQNameHelper(WSDLElement o)
- {
- QName result = null;
- Definition definition = o.getEnclosingDefinition();
- String prefixedName = getMessageReferenceHelper(o);
- if (prefixedName != null)
- {
- result = WSDLEditorUtil.createQName(definition, prefixedName);
- }
- return result;
- }
-
- public static void updatePortTypeReferences(Definition definition)
- {
- for (Iterator i = definition.getBindings().values().iterator(); i.hasNext();)
- {
- Binding binding = (Binding) i.next();
- QName qname = ComponentReferenceUtil.getPortTypeReferenceQName(binding);
-
- PortType portType = (qname != null) ? (PortType) definition.getPortType(qname) : null;
-
- if (binding.getPortType() != portType)
- {
- binding.setPortType(portType);
- }
- }
- }
-
- public static void updateBindingReferences(Definition definition)
- {
- for (Iterator i = definition.getServices().values().iterator(); i.hasNext();)
- {
- Service service = (Service) i.next();
- for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
- {
- Port port = (Port) j.next();
- QName qname = ComponentReferenceUtil.getBindingReferenceQName(port);
-
- Binding binding = (qname != null) ? (Binding) definition.getBinding(qname) : null;
-
- if (port.getBinding() != binding)
- {
- port.setBinding(binding);
- }
- }
- }
- }
-
- public static void updateMessageReferences(Definition definition)
- {
- // for each port type
- //
- for (Iterator i = definition.getPortTypes().values().iterator(); i.hasNext();)
- {
- PortType portType = (PortType) i.next();
-
- // for each operation
- //
- for (Iterator j = portType.getEOperations().iterator(); j.hasNext();)
- {
- Operation operation = (Operation) j.next();
-
- // handle Input
- //
- Input input = (Input) operation.getInput();
- if (input != null)
- {
- QName qname = ComponentReferenceUtil.getMessageReferenceQName(input);
- Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
- if (input.getMessage() != message)
- {
- input.setMessage(message);
- }
- }
-
- // handle Output
- //
- Output output = (Output) operation.getOutput();
- if (output != null)
- {
- QName qname = ComponentReferenceUtil.getMessageReferenceQName(output);
- Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
- if (output.getMessage() != message)
- {
- output.setMessage(message);
- }
- }
-
- // handle Faults
- //
- for (Iterator k = operation.getEFaults().iterator(); k.hasNext();)
- {
- Fault fault = (Fault) k.next();
-
- QName qname = ComponentReferenceUtil.getMessageReferenceQName(fault);
- Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
- if (fault.getMessage() != message)
- {
- fault.setMessage(message);
- }
- }
- }
- }
- }
-
- public static void updateSchemaReferences(Definition definition)
- {
- for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
- {
- Message message = (Message) i.next();
- for (Iterator j = message.getEParts().iterator(); j.hasNext();)
- {
- Part part = (Part) j.next();
- Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
- if (element != null)
- {
- ((WSDLElementImpl)part).elementChanged(element);
- }
- }
- }
- }
-
- public static Operation getOperation(PortType portType, BindingOperation bindingOperation)
- {
- Operation result = null;
- for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
- {
- Operation operation = (Operation) i.next();
- if (isMatchingBinding(operation, bindingOperation))
- {
- result = operation;
- break;
- }
- }
- return result;
- }
-
- public static void updateOperationReference(BindingOperation bindingOperation)
- {
- Operation operation = computeOperation(bindingOperation);
- if (operation != bindingOperation.getOperation())
- {
- bindingOperation.setOperation(operation);
- }
- }
-
- public List getComponentNameList(boolean isType)
- {
- List result = Collections.EMPTY_LIST;
- ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(rootDefinition);
- if (typeSystemProvider != null)
- {
- result = isType ? typeSystemProvider.getAvailableTypeNames(rootDefinition, 0) : typeSystemProvider.getAvailableElementNames(rootDefinition);
- }
- return result;
- }
-
- public static List getComponentNameList(Part part, boolean isType)
- {
- List result = Collections.EMPTY_LIST;
- Definition definition = part.getEnclosingDefinition();
- ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
- if (typeSystemProvider != null)
- {
- result = isType ? typeSystemProvider.getAvailableTypeNames(definition, 0) : typeSystemProvider.getAvailableElementNames(definition);
- }
- return result;
- }
-
- public static boolean isType(Part part)
- {
- //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
- Element element = part.getElement();
- return !element.hasAttribute("element");
- }
-
- public static String getPartComponentReference(Part part)
- {
- //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
- Element element = part.getElement();
- String result = null;
- if (element.hasAttribute("type"))
- {
- result = element.getAttribute("type");
- }
- else if (element.hasAttribute("element"))
- {
- result = element.getAttribute("element");
- }
- return result;
- }
-
- public static void setComponentReference(Part part, boolean isType, String componentName)
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
- String newAttribute = isType ? "type" : "element";
- String oldAttribute = isType ? "element" : "type";
- element.removeAttribute(oldAttribute);
-
- String value = componentName != null ? componentName : element.getAttribute(newAttribute);
-
- if (value == null)
- {
- if (isType)
- {
- String xsdPrefix = part.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
- value = "string";
- if (xsdPrefix != null && xsdPrefix.length() > 0)
- {
- value = xsdPrefix + ":" + value;
- }
- }
- else
- {
- List list = getComponentNameList(part, isType);
- value = list.size() > 0 ? (String) list.get(0) : "some-element-name";
- }
- }
- element.setAttribute(newAttribute, value);
- }
-
- public static Operation computeOperation(BindingOperation bindingOperation)
- {
- Operation result = null;
- Binding binding = (Binding) bindingOperation.eContainer();
- PortType portType = (PortType) binding.getPortType();
- if (portType != null)
- {
- result = getOperation(portType, bindingOperation);
- }
- return result;
- }
-
- public static Input computeInput(BindingInput bindingInput)
- {
- Operation operation = computeOperation((BindingOperation) bindingInput.eContainer());
- return operation != null ? operation.getEInput() : null;
- }
-
- public static Output computeOutput(BindingOutput bindingOutput)
- {
- Operation operation = computeOperation((BindingOperation) bindingOutput.eContainer());
- return operation != null ? operation.getEOutput() : null;
- }
-
- public static Fault computeFault(BindingFault bindingFault)
- {
- Fault result = null;
- Operation operation = computeOperation((BindingOperation) bindingFault.eContainer());
- if (operation != null)
- {
- for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
- {
- Fault fault = (Fault) i.next();
- String faultName = fault.getName();
- if (faultName != null && faultName.equals(bindingFault.getName()))
- {
- result = fault;
- break;
- }
- }
- }
- return result;
- }
-
- public static String getPartReferenceValue(Part part)
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
- String value = null;
- if (element != null)
- {
- if (element.hasAttribute("type"))
- {
- value = element.getAttribute("type");
- }
- else if (element.hasAttribute("element"))
- {
- value = element.getAttribute("element");
- }
- }
- return value != null ? value : "";
- }
-
- public Operation getBindingOperation(Element bindingOperationContent)
- {
- Operation operation = null;
- Node parent = bindingOperationContent.getParentNode();
- if (parent instanceof Element)
- {
- Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(rootDefinition, (Element) parent);
- if (object instanceof BindingOperation)
- {
- operation = ComponentReferenceUtil.computeOperation((BindingOperation) object);
- }
- }
- return operation;
- }
-
- public Message getBindingOperationInputMessage(Element bindingOperationContent)
- {
- Message message = null;
- Operation operation = getBindingOperation(bindingOperationContent);
- if (operation != null)
- {
- Input input = operation.getEInput();
- if (input != null)
- {
- message = input.getEMessage();
- }
- }
- return message;
- }
-
- public Message getBindingOperationOutputMessage(Element bindingOperationContent)
- {
- Message message = null;
- Operation operation = getBindingOperation(bindingOperationContent);
- if (operation != null)
- {
- Output output = operation.getEOutput();
- if (output != null)
- {
- message = output.getEMessage();
- }
- }
- return message;
- }
-
- public static String computeRelativeURI(IFile referencedLocation, IFile baseLocation, boolean enableIEStyleReferences)
- {
- // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
- // TODO... consider using URI class in EMF
- return URIHelper.getRelativeURI(referencedLocation.getLocation(), baseLocation.getLocation());
- }
-
- public static String computeRelativeURI(String referencedLocation, String baseLocation, boolean enableIEStyleReferences)
- {
- // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
- // TODO... consider using URI class in EMF
- return URIHelper.getRelativeURI(referencedLocation, baseLocation);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
deleted file mode 100644
index 5e4eb0218..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddBindingCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddFaultCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPartCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortTypeCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddServiceCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-
-public class CreateWSDLElementHelper {
- // Constants used for getting Part information
- public static final String PART_INFO_ELEMENT_DECLARATION = "ELEMENT_DECLARATION";
- public static final String PART_INFO_TYPE_DEFINITION = "TYPE_DEFINITION";
-
- // The following variables should be set if a name other than the computed name is to be used.
- public static String serviceName = null;
- public static String portName = null;
- public static String bindingName = null;
- public static String portTypeName = null;
- public static String operationName = null;
- public static String inputName = null;
- public static String outputName = null;
- public static String faultName = null;
- public static String messageName = null;
- public static String partName = null;
-
- public static String PART_TYPE_OR_DEFINITION = PART_INFO_TYPE_DEFINITION;
- public static boolean CREATE_DOWN_TO_PART = true;
-
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the PortType level.
- */
- public static Service createService(Definition definition) {
- if (serviceName == null || serviceName.trim().equals(""))
- serviceName = NameUtil.buildUniqueServiceName(definition);
-
- CreateWSDLElementHelper.portTypeName = serviceName;
-
- AddServiceCommand addService = new AddServiceCommand(definition, serviceName, false);
- addService.run();
- Service service = (Service) addService.getWSDLElement();
- CreateWSDLElementHelper.createPort(service);
-
- return service;
- }
-
- public static Port createPort(Service service) {
- if (portName == null || portName.trim().equals(""))
- portName = NameUtil.buildUniquePortName(service, null);
-
- AddPortCommand addPort = new AddPortCommand(service, portName);
- addPort.run();
- Port port = (Port) addPort.getWSDLElement();
- Binding binding = CreateWSDLElementHelper.createBinding(port.getEnclosingDefinition(), port);
-
- port.setBinding(binding);
-
- return port;
- }
-
- public static Binding createBinding(Definition definition, Port port) {
- bindingName = port.getName();
- if (bindingName == null || bindingName.trim().equals(""))
- bindingName = NameUtil.buildUniqueBindingName(definition, null);
-
- AddBindingCommand addBinding = new AddBindingCommand(definition, bindingName);
- addBinding.run();
- Binding binding = (Binding) addBinding.getWSDLElement();
- PortType portType = CreateWSDLElementHelper.createPortType(binding.getEnclosingDefinition());
-
- binding.setPortType(portType);
-
- return binding;
- }
-
- public static PortType createPortType(Definition definition) {
- if (portTypeName == null || portTypeName.trim().equals(""))
- portTypeName = NameUtil.buildUniquePortTypeName(definition, "PortType");
-
- AddPortTypeCommand addPortTypeCommand = new AddPortTypeCommand(definition, portTypeName);
- addPortTypeCommand.run();
- PortType portType = (PortType) addPortTypeCommand.getWSDLElement();
-
- if (CREATE_DOWN_TO_PART) {
- CreateWSDLElementHelper.createOperation(portType);
- }
-
- return portType;
- }
-
-
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the Part level.
- */
- public static Operation createOperation(PortType portType) {
- if (operationName == null || operationName.trim().equals(""))
- operationName = NameUtil.buildUniqueOperationName(portType);
-
- AddOperationCommand action = new AddOperationCommand(portType, operationName);
- action.run();
- Operation operation = (Operation) action.getWSDLElement();
- CreateWSDLElementHelper.createOutput(portType, operation);
- CreateWSDLElementHelper.createInput(portType, operation, null);
-
-// ((PortTypeImpl) portType).updateElement(false);
- return operation;
- }
-
- public static Input createInput(PortType portType, Operation operation, String inputName) {
- if (inputName == null || inputName.trim().equals(""))
- inputName = NameUtil.buildUniqueInputName(portType, operation.getName(), "");
-
- AddInputCommand action = new AddInputCommand(operation, inputName);
- action.run();
- Input input = (Input) action.getWSDLElement();
- Message mess = CreateWSDLElementHelper.createMessage(input);
- input.setMessage(mess);
-
- return input;
- }
-
- public static Output createOutput(PortType portType, Operation operation) {
- if (outputName == null || outputName.trim().equals(""))
- outputName = NameUtil.buildUniqueOutputName(portType, operation.getName(), "");
-
- AddOutputCommand action = new AddOutputCommand(operation, outputName);
- action.run();
- Output output = (Output) action.getWSDLElement();
- Message mess = CreateWSDLElementHelper.createMessage(output);
- output.setMessage(mess);
-
- return output;
- }
-
- public static Fault createFault(Operation operation) {
- if (faultName == null || faultName.trim().equals(""))
- faultName = NameUtil.buildUniqueFaultName(operation);
-
- AddFaultCommand action = new AddFaultCommand(operation, faultName);
- action.run();
- Fault fault = (Fault) action.getWSDLElement();
- Message mess = CreateWSDLElementHelper.createMessage(fault);
- fault.setMessage(mess);
-
- return fault;
- }
-
- public static Message createMessage(MessageReference iof) {
- if (messageName == null || messageName.trim().equals(""))
- messageName = NameUtil.buildUniqueMessageName(iof.getEnclosingDefinition(), iof);
-// messageName = NameUtil.buildMessageName(iof.getName());
-
- Definition def = iof.getEnclosingDefinition();
- AddMessageCommand action = new AddMessageCommand(def, messageName);
- action.run();
- Message message = (Message) action.getWSDLElement();
- CreateWSDLElementHelper.createPart(message);
- Element parentNode = message.getElement();
- if (parentNode instanceof IDOMNode)
- {
- // format selected node
- FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
- formatProcessorXML.formatNode((IDOMNode)parentNode);
- }
-
- messageName = null;
- return message;
- }
-
- public static Part createPart(Message message) {
- Definition def = message.getEnclosingDefinition();
- String name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
- AddPartCommand action = null;
-
- if (PART_TYPE_OR_DEFINITION == PART_INFO_TYPE_DEFINITION) {
- action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
- }
- else if (PART_TYPE_OR_DEFINITION == PART_INFO_ELEMENT_DECLARATION) {
- //action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
- String elementName = getNewNameHelper(name, def, false);
- AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(def, elementName);
- elementAction.run();
- action = new AddPartCommand(message, name, def.getTargetNamespace(), elementName, false);
- }
-
- action.run();
-
- return (Part) action.getWSDLElement();
- }
-
- /*
- * Used to determine a name for an Element
- */
- private static String getNewNameHelper(String base, Definition def, boolean isType)
- {
- String name = base;
- int count = 0;
-
- // Ugly.... Redo this...
- // Get a list of Elements...
- List elementList = null;
- if (def.getETypes() != null) {
- List xsdsList = def.getETypes().getEExtensibilityElements();
- if (xsdsList != null) {
- Iterator xsdsIterator = xsdsList.iterator();
- XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
- XSDSchema schema = xsdElement.getSchema();
- if (schema != null) {
- elementList = schema.getElementDeclarations();
- }
- }
- }
-
- if (elementList != null) {
- int index = 0;
- while (index < elementList.size()) {
- XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-
- if (name.equals(elementDeclaration.getName())) {
- count++;
- name = name + count;
- index = 0;
- }
- else {
- index++;
- }
- }
- }
-
- return name;
- }
-
- /*
- * Return the type of Part this WSDLElement should have (Element vs Type). To determine this, we filter up to the 'parent' PortType
- * and go down to the first Part we encounter and check the type it has. If this fails, default to Type.
- */
- public static String getPartInfo(WSDLElement element) {
- String partInfo = null;
-
- if (element instanceof PortType) {
- partInfo = getPartInfo((PortType) element);
- }
- else if (element instanceof Operation) {
- partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
- }
- else if (element instanceof MessageReferenceImpl) {
- partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
- }
-
- if (partInfo == null) {
- partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
- }
-
- return partInfo;
- }
-
- private static String getPartInfo(PortType portType) {
- String partInfo = null;
-
- if (portType.getOperations() != null) {
- Iterator operationIt = portType.getOperations().iterator();
- while (operationIt.hasNext()) {
- Operation op = (Operation) operationIt.next();
-
- if (op.getEInput() != null) {
- partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEInput());
- }
-
- if (partInfo == null && op.getEOutput() != null) {
- partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEOutput());
- }
-
- if (op.getEFaults() != null) {
- Iterator faultIt = op.getEFaults().iterator();
- while (partInfo == null && faultIt.hasNext()) {
- Fault fault = (Fault) faultIt.next();
- partInfo = getMessageRefPartInfo((MessageReferenceImpl) fault);
- }
- }
-
- if (partInfo != null)
- break;
- }
- }
-
- return partInfo;
- }
-
- private static String getMessageRefPartInfo(MessageReferenceImpl iof) {
- String partInfo = null;
-
- if (iof.getEMessage() != null && iof.getEMessage().getEParts() != null) {
- Iterator partIt = iof.getEMessage().getEParts().iterator();
-
- while (partInfo == null && partIt.hasNext()) {
- Part part = (Part) partIt.next();
-
- if (part.getTypeDefinition() != null) {
- partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
- }
- else if (part.getElementDeclaration() != null) {
- partInfo = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
- }
- }
- }
-
- return partInfo;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
deleted file mode 100644
index 1778c8c9d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class NameUtil
-{
- /**
- * Return a name which is not used by any other fault in the operation.
- * @return String
- */
- public static String buildUniqueFaultName(Operation operation)
- {
- return buildUniqueFaultName(operation, "NewFault");
- }
-
- public static String buildUniqueFaultName(Operation operation, String baseName) {
- if (baseName == null)
- baseName = "NewFault";
-
- List names = getUsedFaultNames(operation);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper(baseName, names);
- }
-
- /**
- * Return a name which is not used by any other input in the portType. Returned name will be of the form:
- * <operationName> + <ending> [+ unique Integer]
- * @return String
- */
- public static String buildUniqueInputName(PortType portType, String operationName, String ending)
- {
- String name = null;
- String candidate = operationName + ending;
-
- int i = 0;
-
- // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
- while (name == null)
- {
- boolean unique = true;
-
- // determine if this combination is unique within the current porttype
- for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
- {
- Operation current = (Operation) it.next();
- // TODO : port check
- // old if(current.isSetEInput() && current.getEInput().isSetName()) {
- if (current.getEInput() != null && current.getEInput().getName() != null)
- {
- if (current.getEInput().getName().equals(candidate))
- unique = false;
- }
- }
- if (unique)
- name = candidate;
- else
- candidate = operationName + ending + i;
- i++;
- }
- return name;
- }
-
- /**
- * Return a name which is not used by any other message in the definition.
- * @return String
- */
- public static String buildUniqueMessageName(Definition definition, String baseName)
- {
- if (baseName == null)
- {
- baseName = "NewMessage";
- }
-
- List names = getUsedMessageNames(definition);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper(baseName, names);
- }
-
- /**
- * Return a name which is not used by any other operation in the port type.
- * @return String
- */
- public static String buildUniqueOperationName(PortType portType)
- {
- return buildUniqueOperationName(portType, "NewOperation");
- }
-
- public static String buildUniqueOperationName(PortType portType, String baseName)
- {
- if (baseName == null) {
- baseName = "NewOperation";
- }
-
- List names = getUsedOperationNames(portType);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper(baseName, names);
- }
-
- /**
- * Return a name which is not used by any other output in the portType. Returned name will be of the form:
- * <operationName> + <ending> [+ unique Integer]
- * @return String
- */
- public static String buildUniqueOutputName(PortType portType, String operationName, String ending)
- {
- String name = null;
- String candidate = operationName + ending;
-
- int i = 0;
-
- // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
- while (name == null)
- {
- boolean unique = true;
-
- // determine if this combination is unique within the current porttype
- for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
- {
- Operation current = (Operation) it.next();
- // TODO: port check
- // old if(current.isSetEOutput() && current.getEOutput().isSetName()) {
- if (current.getEOutput() != null && current.getEOutput().getName() != null)
- {
- if (current.getEOutput().getName().equals(candidate))
- unique = false;
- }
- }
- if (unique)
- name = candidate;
- else
- candidate = operationName + ending + i;
- i++;
- }
- return name;
- }
-
- /**
- * Return a name which is not used by any other part in the message.
- * @return String
- */
- public static String buildUniquePartName(Message message)
- {
- List names = getUsedPartNames(message);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper("NewPart", names);
- }
-
- public static String buildUniquePartName(Message message, String baseName)
- {
- if (baseName == null)
- {
- baseName = "NewPart";
- }
-
- List names = getUsedPartNames(message);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper(baseName, names);
- }
-
- /**
- * Return a name which is not used by any other port type in the definition.
- * @return String
- */
- public static String buildUniquePortTypeName(Definition definition, String baseName)
- {
- if (baseName == null)
- {
- baseName = "NewPortType";
- }
-
- List names = getUsedPortTypeNames(definition);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper(baseName, names);
- }
-
- public static String getUniqueNameHelper(String baseName, List names)
- {
- int i = 0;
-
- String name = baseName;
- while (true)
- {
- if (!names.contains(name))
- {
- break;
- }
- i++;
- name = baseName + i;
- }
-
- return name;
- }
-
- /**
- * Return a name which is not used by any other service in the definition.
- * @return String
- */
- public static String buildUniqueServiceName(Definition definition)
- {
- List names = getUsedServiceNames(definition);
-
- // Now search the list until we find an unused name
- return getUniqueNameHelper("NewService", names);
- }
-
- /**
- * Return a name which is not used by any other binding in the definition.
- * @return String
- */
- public static String buildUniqueBindingName(Definition definition, String baseName)
- {
- if (baseName == null)
- {
- baseName = "NewBinding";
- }
-
- List names = getUsedBindingNames(definition);
-
- return getUniqueNameHelper(baseName, names);
- }
-
- public static String buildUniquePrefix(Definition definition, String basePrefix)
- {
- String prefix = basePrefix;
- for (int i = 1; definition.getNamespace(prefix) != null; i++)
- {
- prefix = basePrefix + i;
- }
- return prefix;
- }
-
- public static String buildUniquePortName(Service service, String baseName)
- {
- if (baseName == null)
- {
- baseName = "NewPort";
- }
-
- List names = getUsedPortNames(service);
-
- return getUniqueNameHelper(baseName, names);
- }
-
- public static String buildUniqueMessageName(Definition definition, MessageReference messRef)
- {
- String name = null;
- if (messRef instanceof Input)
- {
- name = createOperationName(messRef, "Request");
- }
- else if (messRef instanceof Output)
- {
- name = createOperationName(messRef, "Response");
- }
- else if (messRef instanceof Fault)
- {
- String faultName = ((Fault) messRef).getName();
- if (faultName == null || faultName.length() == 0)
- {
- faultName = "Fault";
- }
- name = createOperationName(messRef, faultName);
- }
-
- return NameUtil.buildUniqueMessageName(definition, name);
- }
-
-
- public static List getUsedFaultNames(Operation operation) {
- ArrayList names = new ArrayList();
- for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
- {
- Fault fault = (Fault) i.next();
- names.add(fault.getName());
- }
-
- return names;
- }
-
- public static List getUsedOperationNames(PortType portType) {
- ArrayList names = new ArrayList();
- for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
- {
- Operation op = (Operation) i.next();
- names.add(op.getName());
- }
-
- return names;
- }
-
- public static List getUsedPartNames(Message message) {
- ArrayList names = new ArrayList();
- for (Iterator i = message.getEParts().iterator(); i.hasNext();)
- {
- Part part = (Part) i.next();
- names.add(part.getName());
- }
- return names;
- }
-
- public static List getUsedPortTypeNames(Definition definition) {
- ArrayList names = new ArrayList();
- for (Iterator i = definition.getEPortTypes().iterator(); i.hasNext();)
- {
- PortType portType = (PortType) i.next();
- // TODO: port check
- // if (portType.isSetQName())
- if (portType.getQName() != null)
- {
- names.add(portType.getQName().getLocalPart());
- }
- }
-
- return names;
-
- }
- public static List getUsedServiceNames(Definition definition) {
- // First build a list of names already used
- ArrayList names = new ArrayList();
- for (Iterator i = definition.getEServices().iterator(); i.hasNext();)
- {
- Service service = (Service) i.next();
- // TODO: port check
- // if(service.isSetQName())
- if (service.getQName() != null)
- names.add(service.getQName().getLocalPart());
- }
-
- return names;
- }
-
- public static List getUsedMessageNames(Definition definition) {
- ArrayList names = new ArrayList();
- for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
- {
- Message msg = (Message) i.next();
- // TODO: port check
- if (msg.getQName() != null)
- // if(msg.isSetQName())
- names.add(msg.getQName().getLocalPart());
- }
-
- return names;
- }
-
- public static List getUsedBindingNames(Definition definition) {
- ArrayList names = new ArrayList();
- for (Iterator i = definition.getEBindings().iterator(); i.hasNext();)
- {
- Binding binding = (Binding) i.next();
- // TODO: port check
- // if (binding.isSetQName())
- if (binding.getQName() != null)
- {
- names.add(binding.getQName().getLocalPart());
- }
- }
-
- return names;
- }
-
- public static List getUsedPortNames(Service service) {
- // First build a list of names already used
- ArrayList names = new ArrayList();
- for (Iterator i = service.getEPorts().iterator(); i.hasNext();)
- {
- Port port = (Port) i.next();
-
- if (port.getName() != null)
- {
- names.add(port.getName());
- }
- }
-
- return names;
- }
-
- private static String createOperationName(Object object, String suffix)
- {
- String result = null;
- if (object instanceof EObject)
- {
- EObject parent = ((EObject)object).eContainer();
- if (parent instanceof Operation)
- {
- result = ((Operation)parent).getName();
- }
- }
- if (result != null)
- {
- result += suffix;
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
deleted file mode 100644
index 144c9ad3d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class NodeAssociationManager
-{
- protected WSDLEditorExtension[] extensions;
- protected INodeAssociationProvider[] providers;
-
- public NodeAssociationManager()
- {
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
- extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER);
- providers = new INodeAssociationProvider[extensions.length];
- for (int i = 0; i < extensions.length; i++)
- {
- providers[i] = (INodeAssociationProvider)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER, null);
- }
- }
-
- protected INodeAssociationProvider getAppicableProvider(Object object)
- {
- INodeAssociationProvider provider = null;
- for (int i = 0; i < extensions.length; i++)
- {
- if (extensions[i].isApplicable(object))
- {
- provider = providers[i];
- if (provider != null)
- {
- break;
- }
- }
- }
- return provider;
- }
-
-
- public Object getModelObjectForNode(Object rootObject, Element targetNode)
- {
- int currentIndex = 0;
-
- Element[] elementChain = getParentElementChain((Element)targetNode);
-
- INodeAssociationProvider p = getAppicableProvider(rootObject);
- if (p != null)
- {
- Node rootObjectNode = p.getNode(rootObject);
-
- while (currentIndex < elementChain.length)
- {
- Element e = elementChain[currentIndex];
- if (e == rootObjectNode)
- {
- currentIndex++;
- break;
- }
- currentIndex++;
- }
- }
-
- Object currentObject = rootObject;
- int end[] = new int[1];
-
- while (currentIndex < elementChain.length)
- {
- p = getAppicableProvider(currentObject);
- if (p != null)
- {
- end[0] = elementChain.length;
- currentObject = p.getModelObject(currentObject, elementChain, currentIndex, end);
-
- if (currentObject == null)
- {
- // failure
- break;
- }
- else
- {
- currentIndex = Math.max(end[0], currentIndex + 1);
- }
- }
- else
- {
- break;
- }
- }
-
- return (currentIndex == elementChain.length) ? currentObject : null;
- }
-
-
- public Node getNode(Object modelObject)
- {
- Node result = null;
- if (modelObject instanceof Node)
- {
- result = (Node)modelObject;
- }
- else
- {
- INodeAssociationProvider p = getAppicableProvider(modelObject);
- if (p != null)
- {
- result = p.getNode(modelObject);
- }
- }
- return result;
- }
-
- protected Element[] getParentElementChain(Element element)
- {
- List list = new ArrayList();
- while (element != null)
- {
- list.add(0, element);
- Node node = element.getParentNode();
- element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;
- }
-
- int listSize = list.size();
- Element[] result = new Element[listSize];
- for (int i = 0; i < listSize; i++)
- {
- result[i] = (Element)list.get(i);
- }
- return result;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
deleted file mode 100644
index 8a0256c20..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class OpenOnSelectionHelper extends WSDLSwitch
-{
- Definition definition;
- Attr attr = null;
- Element element = null;
-
- public OpenOnSelectionHelper(Definition definition)
- {
- this.definition = definition;
- }
-
- public void openEditor(EObject eObject)
- {
- String[] array = computeSpecification(eObject);
- if (array != null)
- {
- openEditor(array[0], array[1]);
- }
- }
-
- public void openEditor(Node node)
- {
- String[] array = computeSpecification(node);
- if (array != null)
- {
- openEditor(array[0], array[1]);
- }
- }
-
- protected void openEditor(String resource, String spec)
- {
- String pattern = "platform:/resource";
- if (resource != null && resource.startsWith(pattern))
- {
- try
- {
- Path path = new Path(resource.substring(pattern.length()));
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
- IWorkbenchPage workbenchPage = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart editorPart = workbenchPage.getActiveEditor();
-
- if (editorPart.getEditorInput() instanceof IFileEditorInput &&
- ((IFileEditorInput)editorPart.getEditorInput()).getFile().equals(file))
- {
- workbenchPage.getNavigationHistory().markLocation(editorPart);
- }
- else
- {
- try
- {
- if (resource.endsWith("xsd"))
- {
- editorPart = workbenchPage.openEditor(new FileEditorInput(file), WSDLEditorPlugin.XSD_EDITOR_ID);
- }
- else
- {
- // Since we are already in the wsdleditor
- editorPart = workbenchPage.openEditor(new FileEditorInput(file), editorPart.getEditorSite().getId());
- }
- }
- catch (PartInitException initEx)
- {
- }
- }
-
- Class theClass = editorPart.getClass();
- Class[] methodArgs = { String.class };
- Method method = theClass.getMethod("openOnSelection", methodArgs);
- Object args[] = { spec };
- method.invoke(editorPart, args);
- workbenchPage.getNavigationHistory().markLocation(editorPart);
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public String[] computeSpecification(EObject eObject)
- {
- String[] result = null;
- Object referencedObject = doSwitch(eObject);
- if (referencedObject instanceof EObject)
- {
- EObject referencedEObject = (EObject)referencedObject;
- if (referencedEObject != eObject ||
- referencedEObject.eResource() != definition.eResource())
- {
-
- Resource resource = referencedEObject.eResource();
- if (resource != null)
- {
- result = new String[2];
- result[0] = resource.getURI().toString();
- result[1] = resource.getURIFragment(referencedEObject);
- }
- }
- }
- return result;
- }
-
- public String[] computeSpecification(Node node)
- {
- String[] result = null;
- switch (node.getNodeType())
- {
- case Node.ELEMENT_NODE :
- {
- element = (Element)node;
- break;
- }
- case Node.ATTRIBUTE_NODE :
- {
- attr = (Attr)node;
- element = attr.getOwnerElement();
- break;
- }
- case Node.TEXT_NODE :
- {
- Node parent = node.getParentNode();
- element = (parent instanceof Element) ? (Element)parent : null;
- break;
- }
- }
- if (element != null)
- {
- Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
- if (object instanceof EObject)
- {
- result = computeSpecification((EObject)object);
- }
- }
- return result;
- }
-
- public Object caseBinding(Binding binding)
- {
- Object result = binding;
- if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
- {
- result = binding.getEPortType();
- }
- return result;
- }
-
- public Object caseDefinition(Definition definition)
- {
- return definition;
- }
-
- public Object casePart(Part part)
- {
- Object result = part;
- if (attr != null)
- {
- if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
- {
- result = part.getTypeDefinition();
- }
- else if (isMatchingAttribute(WSDLConstants.ELEMENT_ATTRIBUTE))
- {
- result = part.getElement();
- }
- }
- else if (part.getEnclosingDefinition() == definition)
- {
- result = part.getTypeDefinition() != null ? (Object)part.getTypeDefinition() : (Object)part.getElement();
- }
- return result;
- }
-
- public Object casePort(Port port)
- {
- Object result = port;
- if (isMatchingAttribute(WSDLConstants.BINDING_ATTRIBUTE))
- {
- result = port.getEBinding();
-
- }
- return result;
- }
-
- public Object caseFault(Fault fault)
- {
- Object result = fault;
- if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
- {
- result = fault.getMessage();
- }
- return result;
- }
-
- public Object caseInput(Input input)
- {
- Object result = input;
- if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
- {
- result = input.getMessage();
- }
- return result;
- }
-
- public Object caseOutput(Output output)
- {
- Object result = output;
-
- if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
- {
- result = output.getMessage();
- }
- return result;
- }
-
- public Object caseImport(Import theImport)
- {
- Object result = theImport.getEDefinition();
- if (result == null)
- {
- result = theImport.getESchema();
- if (result == null)
- {
- // Need to resolve imports because the model doesn't automatically
- // do it for us
- ((ImportImpl)theImport).importDefinitionOrSchema();
- result = theImport.getESchema();
- }
- }
- return result;
- }
-
- public Object caseWSDLElement(WSDLElement wsdlElement)
- {
- return wsdlElement;
- }
-
- private boolean isMatchingAttribute(String value)
- {
- return attr != null && value.equals(attr.getName());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
deleted file mode 100644
index 8f4153964..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-
-
-public class ReferenceManager
-{
- protected static InternalAdapterFactory internalAdapterFactory = new InternalAdapterFactory();
-
-
- public interface Listener
- {
- public void bindingsChanged( Operation operation);
- }
-
-
- public static void adaptDefinition(Definition definition)
- {
- internalAdapterFactory.adapt(definition);
- for (Iterator i = definition.getEBindings().iterator(); i.hasNext(); )
- {
- Binding binding = (Binding)i.next();
- internalAdapterFactory.adaptBinding(binding);
- }
- }
-
-
- public static void addBindingListener(Operation operation, Listener listener)
- {
- OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
- if (adapter != null)
- {
- adapter.addListener(listener);
- }
- }
-
-
- public static void removeBindingListener(Operation operation, Listener listener)
- {
- OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
- if (adapter != null)
- {
- adapter.removeListener(listener);
- }
- }
-
- protected static void fireNotificationForPortType(PortType portType)
- {
- // get the adapter for each operation and notify listeners
- if (portType != null)
- {
- for (Iterator i = portType.getEOperations().iterator(); i.hasNext(); )
- {
- fireNotificationForOperation((Operation)i.next());
- }
- }
- }
-
-
- protected static void fireNotificationForOperation(Operation operation)
- {
- if (operation != null)
- {
- OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
- adapter.fireBindingsChanged();
- }
- }
-
-
- public static class InternalAdapterFactory extends AdapterFactoryImpl
- {
- public Adapter createAdapter(Notifier target)
- {
- WSDLSwitch wsdlSwitch = new WSDLSwitch()
- {
- public Object caseBinding(Binding binding)
- {
- return createBindingAdapter();
- }
-
- public Object caseBindingFault(BindingFault bindingFault)
- {
- return createBindingFaultAdapter();
- }
-
- public Object caseBindingOperation(BindingOperation bindingOperation)
- {
- return createBindingOperationAdapter();
- }
-
- public Object caseDefinition(Definition definition)
- {
- return createDefinitionAdapter();
- }
-
- public Object caseOperation(Operation operation)
- {
- return createOperationAdapter();
- }
- };
-
- Object o = wsdlSwitch.doSwitch((EObject)target);
-
- Adapter result = null;
- if (o instanceof Adapter)
- {
- result = (Adapter)o;
- }
- else
- {
- System.out.println("did not create adapter for target : " + target);
- Thread.dumpStack();
- }
- //System.out.println("createAdapter(" + target + ") " + result);
- return result;
- }
-
-
- public Adapter createBindingAdapter()
- {
- return new BindingAdapter();
- }
-
- public Adapter createBindingFaultAdapter()
- {
- return new BindingFaultAdapter();
- }
-
- public Adapter createBindingOperationAdapter()
- {
- return new BindingOperationAdapter();
- }
-
- public Adapter createDefinitionAdapter()
- {
- return new DefinitionAdapter();
- }
-
- public Adapter createOperationAdapter()
- {
- return new OperationAdapter();
- }
-
- public Adapter adapt(Notifier target)
- {
- return target != null ? adapt(target, internalAdapterFactory) : null;
- }
-
- protected void adaptBinding(Binding binding)
- {
- adapt(binding);
- for (Iterator i = binding.getEBindingOperations().iterator(); i.hasNext(); )
- {
- BindingOperation bindingOperation = (BindingOperation)i.next();
- adapt(bindingOperation);
- for (Iterator j = bindingOperation.getEBindingFaults().iterator(); j.hasNext(); )
- {
- BindingFault bindingFault = (BindingFault)j.next();
- adapt(bindingFault);
- }
- }
- }
- }
-
-
- protected static abstract class BaseAdapter extends AdapterImpl
- {
- public boolean isAdapterForType(Object type)
- {
- return type == internalAdapterFactory;
- }
-
- public WSDLPackage getPackage()
- {
- return WSDLPackage.eINSTANCE;
- }
- }
-
-
- // DefinitionAdapter
- //
- protected static class DefinitionAdapter extends BaseAdapter
- {
- public void notifyChanged(Notification msg)
- {
- if ((EStructuralFeature)msg.getFeature() == getPackage().getDefinition_EBindings())
- {
- Object newValue = msg.getNewValue();
- switch (msg.getEventType())
- {
- case Notification.ADD:
- {
- handleAdd((Binding)newValue);
- break;
- }
- case Notification.ADD_MANY:
- {
- for (Iterator newValues = ((Collection)newValue).iterator(); newValues.hasNext(); )
- {
- handleAdd((Binding)newValues.next());
- }
- break;
- }
- }
- }
- }
-
- protected void handleAdd(Binding binding)
- {
- internalAdapterFactory.adaptBinding(binding);
- PortType portType = binding.getEPortType();
- if (portType != null)
- {
- fireNotificationForPortType(portType);
- }
- }
- }
-
-
- protected static class BindingAdapter extends BaseAdapter
- {
- public void notifyChanged(Notification msg)
- {
- if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EPortType())
- {
- // fireNotifcation for all of the operation of the old and new portType
- fireNotificationForPortType((PortType)msg.getNewValue());
- fireNotificationForPortType((PortType)msg.getOldValue());
- }
- else if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EBindingOperations())
- {
- // fireNotifcation for all operations that were added or removed
- Object newValue = msg.getNewValue();
- Object oldValue = msg.getNewValue();
- switch (msg.getEventType())
- {
- case Notification.ADD:
- {
- handleAdd((BindingOperation)newValue);
- break;
- }
- case Notification.ADD_MANY:
- {
- for (Iterator newValues = ((Collection)newValue).iterator(); newValues.hasNext(); )
- {
- handleAdd((BindingOperation)newValues.next());
- }
- break;
- }
- case Notification.REMOVE:
- {
- handleRemove((BindingOperation)oldValue);
- break;
- }
- case Notification.REMOVE_MANY:
- {
- for (Iterator oldValues = ((Collection)oldValue).iterator(); oldValues.hasNext(); )
- {
- handleRemove((BindingOperation)oldValues.next());
- }
- break;
- }
- }
- }
- }
-
- protected void handleAdd(BindingOperation bindingOperation)
- {
- internalAdapterFactory.adapt(bindingOperation);
- Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);
- fireNotificationForOperation(operation);
- }
-
- protected void handleRemove(BindingOperation bindingOperation)
- {
- if (bindingOperation != null)
- {
- Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);
- fireNotificationForOperation(operation);
- }
- }
- }
-
-
-
- protected static class BindingOperationAdapter extends BaseAdapter
- {
- public void notifyChanged(Notification msg)
- {
- BindingOperation bindingOperation = (BindingOperation)getTarget();
- Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);
- fireNotificationForOperation(operation);
- }
- }
-
-
- protected static class BindingFaultAdapter extends BaseAdapter
- {
- public void notifyChanged(Notification msg)
- {
- BindingFault bindingFault = (BindingFault)getTarget();
- BindingOperation bindingOperation = (BindingOperation)bindingFault.eContainer();
- Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);
- fireNotificationForOperation(operation);
- }
- }
-
-
- protected static class OperationAdapter extends BaseAdapter
- {
- protected Definition definition;
- protected List listeners = new ArrayList();
-
- public void addListener(Listener listener)
- {
- listeners.add(listener);
- }
-
- public void removeListener(Listener listener)
- {
- listeners.remove(listener);
- }
-
- public void fireBindingsChanged()
- {
- Operation operation = (Operation)getTarget();
- for (Iterator i = listeners.iterator(); i.hasNext(); )
- {
- Listener listener = (Listener)i.next();
- listener.bindingsChanged(operation);
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
deleted file mode 100644
index 9f1fda475..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-// This class is used to help syncronize selections between two models.
-//
-public abstract class SelectionAdapter implements ISelectionProvider
-{
- protected List listenerList = new ArrayList();
- protected ISelection selection = new StructuredSelection();
- protected ISelectionProvider eventSource;
-
- public void setEventSource(ISelectionProvider eventSource)
- {
- this.eventSource = eventSource;
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener)
- {
- listenerList.add(listener);
- }
-
- public void removeSelectionChangedListener(ISelectionChangedListener listener)
- {
- listenerList.remove(listener);
- }
-
- public ISelection getSelection()
- {
- return selection;
- }
-
- /**
- * This method should be specialized to return the correct object that corresponds to the 'other' model
- */
- abstract protected Object getObjectForOtherModel(Object object);
-
-
- public void setSelection(ISelection modelSelection)
- {
- List otherModelObjectList = new ArrayList();
- if (modelSelection instanceof IStructuredSelection)
- {
- for (Iterator i = ((IStructuredSelection)modelSelection).iterator(); i.hasNext(); )
- {
- Object modelObject = i.next();
- Object otherModelObject = getObjectForOtherModel(modelObject);
- if (otherModelObject != null)
- {
- otherModelObjectList.add(otherModelObject);
- }
- }
- }
-
- StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
- selection = nodeSelection;
- SelectionChangedEvent event = new SelectionChangedEvent(eventSource != null ? eventSource : this, nodeSelection);
-
- for (Iterator i = listenerList.iterator(); i.hasNext(); )
- {
- ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
- listener.selectionChanged(event);
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
deleted file mode 100644
index 677932219..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ValidateHelper
-{
- // XML Lang can have many different valid formats
- // 1) xx ie. en, fr, de
- // 2) xx-xx ie. en-US, en-FR
- // 3) I-xx ie. I-en
- // 4) X-xx ie. X-en
- public static String checkXMLLang(String lang)
- {
- if (lang.length() == 0)
- return null;
-
- if (lang.length() == 1)
- {
- char ch0 = lang.charAt(0);
- if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
- return UIPlugin.getResourceString("_WARN_LANG_TOO_SHORT");
- else
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
- }
-
- int offset;
-
- char ch0 = lang.charAt(0);
- if (lang.charAt(1) == '-')
- {
- if (ch0 == 'i' || ch0 == 'I' || ch0 == 'x' || ch0 == 'X')
- offset = 1;
- else
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
- }
- else
- {
- char ch1 = lang.charAt(1);
- if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
- if ((ch1 >= 'a' && ch1 <= 'z') || (ch1 >= 'A' && ch1 <= 'Z'))
- offset = 2;
- else
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch1 +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
- else
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
- }
-
- if (lang.length() > offset)
- {
- char ch = lang.charAt(offset++);
- if (ch != '-')
- return UIPlugin.getResourceString("_WARN_HYPHEN_NEEDED") + Integer.toString(offset-1);
- else
- {
- while (true)
- {
- if (ch == '-')
- {
- if (lang.length() == offset)
- return UIPlugin.getResourceString("_WARN_HYPHEN_ENDING");
-
- ch = lang.charAt(offset++);
- if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z'))
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-
- if (lang.length() == offset)
- return null;
- }
- else if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z'))
- return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch +
- UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
- else if (lang.length() == offset)
- return null;
- ch = lang.charAt(offset++);
- }
- }
- }
-
- return null;
- }
-
- /**
- * Check to see if the min value is correct.
- * A minimum value must be non-negative and < maxValue
- */
- public static String isValidMinValue(String minValue, String maxValue)
- {
- int min;
-
- if (minValue == null || minValue.equals(""))
- {
- // Nothing to check
- return null;
- }
-
- try
- {
- min = Integer.parseInt(minValue);
- }
- catch (NumberFormatException ex)
- {
- return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
- }
-
- if (min < 0)
- {
- return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
- }
-
- try
- {
- int max = Integer.parseInt(maxValue);
- if (min > max)
- {
- return UIPlugin.getResourceString("_ERROR_MIN_VALUE");
- }
- }
- catch (NumberFormatException ex)
- {
- // Max is not accurate. Don't compare it.
- }
- return null;
- }
-
- /**
- * Check to see if the max value is correct.
- * A maximum value must be non-negative and > minValue
- *
- * It can also be set the string "unbounded"
- */
- public static String isValidMaxValue(String maxValue, String minValue)
- {
- int max;
-
- if (maxValue == null || maxValue.equals(""))
- {
- // Nothing to check
- return null;
- }
-
- if (maxValue.equals("unbounded"))
- {
- return null;
- }
-
- try
- {
- max = Integer.parseInt(maxValue);
- }
- catch (NumberFormatException ex)
- {
- return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
- }
-
- if (max < 0)
- {
- return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
- }
-
- try
- {
- int min = Integer.parseInt(minValue);
- if (max < min)
- {
- return UIPlugin.getResourceString("_ERROR_MAX_VALUE");
- }
- }
- catch (NumberFormatException ex)
- {
- // Min is not accurate. Don't compare it.
- }
- return null;
- }
-
- /**
- * Validate the name conforms to the XML spec
- */
- public static String checkXMLName(String name, boolean allowEntityRef)
- {
- int length = name.length();
- char character;
-
- if (length == 0)
- {
- return WSDLEditorPlugin.getWSDLString("_WARN_NAME_MUST_CONTAIN_AT_LEAST_ONE_CHAR");
- }
-
- if (name.indexOf(" ") >= 0)
- {
- return(WSDLEditorPlugin.getWSDLString("_WARN_NAME_HAS_SPACE"));
- }
-
- int index = 0;
- if (length > 0 &&
- name.charAt(0) == '%')
- {
- if (allowEntityRef)
- {
- // skip over the first character
- index++;
- } // end of if ()
- else
- {
- return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
- } // end of else
- }
-
- for(; index < length; index++)
- {
- character = name.charAt(index);
-
- if(index == 0)
- {
- if( !isXMLNameStart(character) )
- {
- return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
- }
- }
- else
- {
- if(!isXMLNameChar(character))
- {
- if ((index == length - 1) && //check if the last character is a ';'
- allowEntityRef &&
- character == ';')
- {
- // we're still ok then
- continue;
- } // end of if ()
- else
- {
- return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_CHAR") + character +
- WSDLEditorPlugin.getWSDLString("_UI_NAME_INVALID_CHAR_END");
- } // end of else
- }
- }
- }
- return null;
- }
-
- /**
- * Validate the name conforms to the XML spec
- */
- public static String checkXMLName(String name)
- {
- return checkXMLName(name, false);
- }
-
- /**
- * isXMLNameStart
- **/
- private static boolean isXMLNameStart(char ch)
- {
- return (ch == '_' || ch == ':' || Character.isLetter(ch) );
- }
-
- /**
- * isXMLNameChar
- **/
- private static boolean isXMLNameChar(char ch)
- {
- return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':');
- }
-
- /**
- * isXMLPrefixStart
- **/
-// private static boolean isXMLPrefixStart(char ch)
-// {
-// return (ch == '_' || Character.isLetter(ch) );
-// }
-
- /**
- * isXMLPrefixChar
- **/
- private static boolean isXMLPrefixChar(char ch)
- {
- return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_');
- }
-
- /**
- * parseElementText
- */
- public static String parseElementText(String text)
- {
- if (text.indexOf('<') != -1 || text.indexOf('>') != -1)
- {
- return UIPlugin.getResourceString("_WARN_ELEMENT_INVALID_CHAR");
- }
- return null;
- }
-
- /**
- * parseAttributeValue
- */
- public static String parseAttributeValue(String value)
- {
- if (value.indexOf('"') != -1 || value.indexOf('<') != -1 || value.indexOf('>') != -1)
- {
- return UIPlugin.getResourceString("_WARN_ATTRIBUTE_INVALID_CHAR");
-
- }
- return null;
- }
-
- /**
- * parseADATASection
- */
- public static String parseCDATASection(String section)
- {
- if (section.indexOf("]]>") != -1)
- {
- return UIPlugin.getResourceString("_WARN_CDATA_INVALID_STRING");
-
- }
- return null;
- }
-
- /**
- * parseProcessiingInstruction
- */
- public static String parseProcessingInstructionData(String data)
- {
- if (data.indexOf("?>") != -1)
- {
- return UIPlugin.getResourceString("_WARN_PROCESSING_INVALID_STRING");
-
- }
- return null;
- }
-
- /**
- * parseProcessingInstructionTarget
- */
- public static String parseProcessingInstructionTarget(String target)
- {
- if (target.length() == 3 && (target.indexOf("XML") != -1 || target.indexOf("XMl") != -1 || target.indexOf("XmL") != -1 ||
- target.indexOf("xML") != -1 || target.indexOf("Xml") != -1 || target.indexOf("xMl") != -1 ||
- target.indexOf("xmL") != -1 || target.indexOf("xml") != -1))
- {
- return UIPlugin.getResourceString("_WARN_PROCESSING_TARGET_INVALID_STRING");
-
- }
- return checkXMLName(target);
- }
-
- /**
- * parsComment
- */
- public static String parseComment(String comment)
- {
- if (comment.indexOf("--") != -1)
- {
- return UIPlugin.getResourceString("_WARN_COMMENT_INVALID_STRING");
- }
- return null;
- }
-
- /**
- * Validate the prefix conforms to the XML spec
- */
- public static String checkXMLPrefix(String prefix)
- {
- int length = prefix.length();
- if (length == 0)
- {
- return null;
- }
- char character;
-
- if (prefix.indexOf(" ") >= 0)
- {
- return(UIPlugin.getResourceString("_WARN_PREFIX_HAS_SPACE"));
- }
-
- for(int index = 0; index < length; index++)
- {
- character = prefix.charAt(index);
-
- if(!isXMLPrefixChar(character))
- {
- return UIPlugin.getString("_WARN_PREFIX_INVALID_CHAR", String.valueOf(character));
- }
- }
- return null;
- }
-
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
deleted file mode 100644
index e821b9547..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLEditorUtil extends WSDLConstants
-{
- protected static WSDLEditorUtil instance;
- protected NodeAssociationManager nodeAssociationManager = new NodeAssociationManager();
-
- protected HashMap elementNameToTypeMap = new HashMap();
-
- public static WSDLEditorUtil getInstance()
- {
- if (instance == null)
- {
- instance = new WSDLEditorUtil();
- }
- return instance;
- }
-
- public WSDLEditorUtil()
- {
- elementNameToTypeMap.put(BINDING_ELEMENT_TAG, new Integer(BINDING));
- elementNameToTypeMap.put(DEFINITION_ELEMENT_TAG, new Integer(DEFINITION));
- elementNameToTypeMap.put(DOCUMENTATION_ELEMENT_TAG, new Integer(DOCUMENTATION));
- elementNameToTypeMap.put(FAULT_ELEMENT_TAG, new Integer(FAULT));
- elementNameToTypeMap.put(IMPORT_ELEMENT_TAG, new Integer(IMPORT));
- elementNameToTypeMap.put(INPUT_ELEMENT_TAG, new Integer(INPUT));
- elementNameToTypeMap.put(MESSAGE_ELEMENT_TAG, new Integer(MESSAGE));
- elementNameToTypeMap.put(OPERATION_ELEMENT_TAG, new Integer(OPERATION));
- elementNameToTypeMap.put(OUTPUT_ELEMENT_TAG, new Integer(OUTPUT));
- elementNameToTypeMap.put(PART_ELEMENT_TAG, new Integer(PART));
- elementNameToTypeMap.put(PORT_ELEMENT_TAG, new Integer(PORT));
- elementNameToTypeMap.put(PORT_TYPE_ELEMENT_TAG, new Integer(PORT_TYPE));
- elementNameToTypeMap.put(SERVICE_ELEMENT_TAG, new Integer(SERVICE));
- elementNameToTypeMap.put(TYPES_ELEMENT_TAG, new Integer(TYPES));
- }
-
- public int getWSDLType(Element element)
- {
- int result = -1;
-
- Integer integer = (Integer)elementNameToTypeMap.get(element.getLocalName());
- if (integer != null)
- {
- result = integer.intValue();
- }
- return result;
- }
-
- protected List getParentElementChain(Element element)
- {
- List list = new ArrayList();
- while (element != null)
- {
- list.add(0, element);
- Node node = element.getParentNode();
- element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;
- }
- return list;
- }
-
- public Object findModelObjectForElement(Definition definition, Element targetElement)
- {
- Object o = nodeAssociationManager.getModelObjectForNode(definition, targetElement);
- return o;
- }
-
- public Element getElementForObject(Object o)
- {
- return ((org.eclipse.wst.wsdl.WSDLElement)o).getElement();
- }
-
- public Node getNodeForObject(Object o)
- {
- return nodeAssociationManager.getNode(o);
- }
-
- // Provide a mapping between Definitions and ITypeSystemProviders
- private Hashtable typeSystemProviders = new Hashtable();
-
- public ITypeSystemProvider getTypeSystemProvider(Definition definition)
- {
- return (ITypeSystemProvider)typeSystemProviders.get(definition);
- }
-
- public void setTypeSystemProvider(Definition definition, ITypeSystemProvider typeSystemProvider)
- {
- typeSystemProviders.put(definition,typeSystemProvider);
- }
-
- public static QName createQName(Definition definition, String prefixedName)
- {
- QName qname = null;
- if (prefixedName != null)
- {
- int index = prefixedName.indexOf(":");
- String prefix = (index == -1) ? null : prefixedName.substring(0, index);
- if (prefix != null)
- {
- String namespace = definition.getNamespace(prefix);
- if (namespace != null)
- {
- String localPart = prefixedName.substring(index + 1);
- qname = new QName(namespace, localPart);
- }
- }
- }
- return qname;
- }
-
- public List getExtensibilityElementNodes(ExtensibleElement extensibleElement)
- {
- // For Types, I need to get all the schemas
- if (extensibleElement instanceof Types)
- {
- Types xsdEE = (Types)extensibleElement;
- return xsdEE.getSchemas();
- }
- /*
- List childList = new ArrayList();
-
- Element parentElement = getElementForObject(extensibleElement);
- if (parentElement != null)
- {
-
- NodeList nodeList = parentElement.getChildNodes();
- int nodeListLength = nodeList.getLength();
- for (int i = 0; i < nodeListLength; i++)
- {
- childList.add(nodeList.item(i));
- }
- HashMap extensibleElementTable = new HashMap();
- for (Iterator i = extensibleElement.getEExtensibilityElements().iterator(); i.hasNext();)
- {
- ExtensibilityElement extensibilityElement = (ExtensibilityElement)i.next();
- if (extensibilityElement != null)
- {
- Element element = getElementForObject(extensibilityElement);
- if (element != null)
- {
- extensibleElementTable.put(element, element);
- }
- }
- }
-
- for (Iterator i = childList.iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (extensibleElementTable.get(o) == null)
- {
- i.remove();
- }
- }
- }
- return childList;
- */
- return extensibleElement.getEExtensibilityElements();
- }
-
- /*
- * Returns a list of 'children' of the given object model (WSDLElement).
- */
- public static List getModelGraphViewChildren(Object object) {
- List childList = new ArrayList();
-
- if (object instanceof PortType) {
- PortType portType = (PortType) object;
- childList.addAll(portType.getOperations());
- }
- else if (object instanceof Operation) {
- Operation operation = (Operation) object;
-
- if (operation.getEInput() != null) {
- childList.add(operation.getEInput());
- }
- if (operation.getEOutput() != null) {
- childList.add(operation.getEOutput());
- }
- childList.addAll(operation.getFaults().values());
- }
- else if (object instanceof MessageReference) {
- MessageReference messageReference = (MessageReference) object;
- childList.add(messageReference.getEMessage());
- }
-
- return childList;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
deleted file mode 100644
index 60724abad..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-
-public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl
-{
- protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator();
-
- class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator
- {
- public String resolveURI(String baseLocation, String namespace, String location)
- {
- return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location);
- }
-
- public boolean isAdatperForType(Object type)
- {
- return type == WSDLModelLocator.class;
- }
- }
-
- public boolean isFactoryForType(Object type)
- {
- return type == WSDLModelLocator.class;
- }
-
- public Adapter adaptNew(Notifier target, Object type)
- {
- return customWSDLModelLocator;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
deleted file mode 100644
index ddc335303..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.xsd.impl.XSDComponentImpl;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLNodeAssociationProvider implements INodeAssociationProvider
-{
- public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
- {
- Object currentObject = parentModelObject;
- for (int i = start; i < elementChain.length; i++)
- {
- Object o = getModelObjectHelper(currentObject, elementChain[i]);
- if (o == null)
- {
- end[0] = i;
- break;
- }
- else
- {
- currentObject = o;
- }
- }
- return currentObject != parentModelObject ? currentObject : null;
- }
-
- public Node getNode(Object modelObject)
- {
- if (modelObject instanceof WSDLElement)
- return ((WSDLElementImpl)modelObject).getElement();
- else
- return null;
- }
-
- protected Object getModelObjectHelper(Object parentObject, Element elementNode)
- {
- Object result = null;
- Collection childComponentList = ((WSDLElementImpl) parentObject).getWSDLContents();
- for (Iterator i = childComponentList.iterator(); i.hasNext();)
- {
- Object o = i.next();
- Element element = null;
-
- if (o != null)
- {
- if (o instanceof WSDLElementImpl)
- {
- element = ((WSDLElementImpl)o).getElement();
- }
- else if (o instanceof XSDComponentImpl)
- {
- element = ((XSDComponentImpl)o).getElement();
- }
- }
-
- if (element == elementNode)
- {
- result = o;
- break;
- }
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
deleted file mode 100644
index a51b5e8a9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-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.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
- public WSDLPreferencePage()
- {
- super(FieldEditorPreferencePage.FLAT);
- setPreferenceStore(WSDLEditorPlugin.getInstance().getPreferenceStore());
- }
-
- public void init(IWorkbench workbench)
- {
- }
-
- protected void createFieldEditors()
- {
- Composite parent = getFieldEditorParent();
- GridLayout parentLayout = new GridLayout();
- parentLayout.marginWidth = 0;
- parent.setLayout(parentLayout);
-
-// WorkbenchHelp.setHelp(getControl(), some context id here);
-
- Group group = new Group(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.numColumns = 2;
- group.setLayout(layout);
- group.setText(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_CREATING_FILES"));
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- group.setLayoutData(data);
-
- Composite composite = new Composite(group, SWT.NULL);
- GridData data1 = new GridData();
- data1.verticalAlignment = GridData.FILL;
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- composite.setLayoutData(data1);
-
- String namespaceLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE");
- StringFieldEditor targetNamespace = new StringFieldEditor(namespaceLabel, namespaceLabel, composite); // Externalize
- GridLayout compositeLayout = (GridLayout)composite.getLayout();
- compositeLayout.marginWidth = 5; // Default value
- compositeLayout.numColumns = 2;
- addField(targetNamespace);
- targetNamespace.setFocus();
-
- String generateLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
- BooleanFieldEditor generateBindingOnSave = new BooleanFieldEditor(generateLabel, generateLabel, parent);
- addField(generateBindingOnSave);
-
- String showGenerateDialogLabel = "Prompt Regenerate Binding on save"; // TODO: Externalize
- BooleanFieldEditor showGenerateDialog = new BooleanFieldEditor(showGenerateDialogLabel, showGenerateDialogLabel, parent);
- addField(showGenerateDialog);
-
- /* Do we need this preference below? If so, change WSDLEditorPlugin.java and use this preference in:
- HttpContentGenerator.java
- SoapContentGenerator.java
- SoapPortOptionsPage.java
- */
-// HttpPortOptionsPage.java StringFieldEditor location = new StringFieldEditor("Defualt Location:", "Default Location:", editorGroup1); // Externalize
-// addField(location);
-
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
deleted file mode 100644
index 8b1dd18db..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.w3c.dom.Element;
-
-
-public class WSDLResourceUtil
-{
- public static void reloadDirectives(Definition definition)
- {
- Resource rootResource = definition.eResource();
- ResourceSet resourceSet = rootResource.getResourceSet();
-
- for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
- {
- Resource resource = (Resource) i.next();
- if (resource != rootResource)
- {
- // TODO... consider unloading the resources
- // resource.unload();
- i.remove();
- }
- }
- ReloadDirectiveVisitor visitor = new ReloadDirectiveVisitor();
- visitor.visitDefinition(definition);
- }
-
- static class ReloadDirectiveVisitor
- {
-
- public void visitImport(Import theImport)
- {
- // force the import to reload
- Element element = WSDLEditorUtil.getInstance().getElementForObject(theImport);
- if (element != null)
- {
- ((WSDLElementImpl)theImport).elementChanged(element);
- }
- }
-
- public void visitXSDSchemaDirective(XSDSchemaDirective directive)
- {
- // force the schema directive to reload
- Element element = directive.getElement();
- if (element != null)
- {
- directive.elementAttributesChanged(element);
- }
- }
-
- public void visitDefinition(Definition definition)
- {
- if (definition != null)
- {
- for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
- {
- visitImport((Import) i.next());
- }
- Types types = definition.getETypes();
- if (types != null)
- {
-
- for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement) o;
- if (e.getSchema() != null)
- {
- visitSchema(e.getSchema());
- }
- }
- }
- }
- }
- }
-
- public void visitSchema(XSDSchema schema)
- {
- for (Iterator i = schema.getContents().iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof XSDSchemaDirective)
- {
- visitXSDSchemaDirective((XSDSchemaDirective) o);
- }
- }
- }
- }
-
-
- public static class InternalURIResolver implements WSDLModelLocator
- {
- //IdResolver idResolver = new IdResolverImpl(null, true);
- org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver resolver = URIResolverPlugin.createResolver();
-
- InternalURIResolver()
- {
- }
-
- public String resolveURI(String baseLocation, String namespace, String location)
- {
- String resolvedLocation = resolver.resolve(baseLocation, namespace, location);
-
- // here's an ugly hack... Platform.resolve() returns Windows files with the pattern "file:D:/hello.xsd"
- // but EMF's URI class expects a pattern like this "file:///D:/hello.xsd"
- //
- if (resolvedLocation != null)
- {
- String fileProtocol = "file:";
- if (resolvedLocation.startsWith(fileProtocol) && !resolvedLocation.startsWith(fileProtocol + "/"))
- {
- resolvedLocation = resolvedLocation.substring(fileProtocol.length());
- }
- resolvedLocation = URIHelper.addImpliedFileProtocol(resolvedLocation);
- }
- // end ugly hack
- return resolvedLocation;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
deleted file mode 100644
index 7f338b73e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.transform.TransformerFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- *
- */
-public class XMLQuickScan
-{
- public static String getTargetNamespaceURIForSchema(String uri)
- {
- String result = null;
- try
- {
- URL url = new URL(uri);
- InputStream inputStream = url.openStream();
- result = XMLQuickScan.getTargetNamespaceURIForSchema(inputStream);
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
- public static String getTargetNamespaceURIForSchema(InputStream input)
- {
- TargetNamespaceURIContentHandler handler = new TargetNamespaceURIContentHandler();
- ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(XMLQuickScan.class.getClassLoader());
- // Line below is a hack to get XMLReader working
- TransformerFactory transformerFactory = TransformerFactory.newInstance();
- try
- {
- XMLReader reader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
- reader.setContentHandler(handler);
- reader.parse(new InputSource(input));
- }
- catch (Exception e)
- {
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(prevClassLoader);
- }
- return handler.targetNamespaceURI;
- }
-
- protected static class TargetNamespaceURIContentHandler extends DefaultHandler
- {
- public String targetNamespaceURI;
-
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
- {
- if (localName.equals("schema") || localName.equals("definitions"))
- {
- int nAttributes = attributes.getLength();
- for (int i = 0; i < nAttributes; i++)
- {
- if (attributes.getLocalName(i).equals("targetNamespace"))
- {
- targetNamespaceURI = attributes.getValue(i);
- break;
- }
- }
- }
- // todo there's a ice way to do this I'm sure
- // here I intentially cause an exception...
- String x = null;
- x.length();
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
deleted file mode 100644
index 64b9ae85c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-
-public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl
-{
- protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl();
-
- public boolean isFactoryForType(Object type)
- {
- return type == XSDSchemaLocationResolver.class;
- }
-
- public Adapter adaptNew(Notifier target, Object type)
- {
- return schemaLocator;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
deleted file mode 100644
index 306a2e80d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver
-{
- public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI)
- {
- String baseLocation = xsdSchema.getSchemaLocation();
- String result = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI);
- if (result == null) {
- result = namespaceURI;
- }
- if (result == null) {
- result = "";
- }
-
- return result;
- }
-
- public boolean isAdatperForType(Object type)
- {
- return type == XSDSchemaLocator.class;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
deleted file mode 100644
index b4793549d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-
-public class FlatPageHeader extends Canvas implements IPropertyChangeListener
-{
- private Image backgroundImage;
- private String text;
- private Image buttonImage;
- private Color imageBackgroundColor;
- private Color textForegroundColor;
- private int textHMargin = 10;
- private int textVMargin = 5;
- private Font headerFont;
-
- private List listeners;
- private int buttonImageX;
- private int buttonImageY;
-
- // Usage:
- // See org.eclipse.wst.common.ui.FlatViewUtility.createFlatPageHeader()
- // methods.
- //
- // Ex)
- // Composite parent = ... ;
- // Image image = ... ;
- // Layout layout = ... ;
- // String title = ... ;
- // WidgetFactory factory = ... ;
- //
- // header = new FlatPageHeader(parent,SWT.NONE);
- // header.setLayout(layout);
- // header.setBackgroundImage(image);
- // header.setText(title);
- // Composite formParent = factory.createComposite(header);
- //
- // GridLayout gl = new GridLayout();
- // gl.numColumns = 1;
- // formParent.setLayout(gl);
- // formParent.setLayoutData(new GridData(GridData.FILL_BOTH));
- //
- public FlatPageHeader(Composite parent, int style)
- {
- super(parent, style);
-
- // The default image background color is white
- // The default text forekground color is black
- imageBackgroundColor = new Color(null, 255, 255, 255);
- textForegroundColor = new Color(null, 0, 0, 0);
- setBackground(imageBackgroundColor);
-
- // The default text font is Header font
- headerFont = JFaceResources.getHeaderFont();
-
- // Need to dispose the Color
- addDisposeListener
- (new DisposeListener()
- {
- public void widgetDisposed(DisposeEvent e)
- {
- FlatPageHeader.this.widgetDisposed(e);
- }
- }
- );
-
- // need to paint
- addPaintListener
- (new PaintListener()
- {
- public void paintControl(PaintEvent e)
- {
- FlatPageHeader.this.paintControl(e);
- }
- }
- );
-
- // create a list of listeners
- listeners = new ArrayList();
-
- // add a mouse listener
- this.addMouseListener
- (new MouseAdapter()
- {
- public void mouseDown(MouseEvent event)
- {
- handleMouseDown(event);
- }
- }
- );
-
- JFaceResources.getFontRegistry().addListener(this);
- }
-
- // Compute size of the widget
- public Point computeSize(int wHint, int hHint, boolean changed)
- {
- int width = getParent().getClientArea().width;
- int height = 0;
- if (backgroundImage != null)
- {
- Rectangle bounds = backgroundImage.getBounds();
- height = bounds.height;
- }
- if (text != null)
- {
- GC gc = new GC(this);
- int textHeight = getTextHeight(gc);
- gc.dispose();
- height = Math.max(height, textHeight);
- }
- if (buttonImage != null)
- {
- Rectangle bounds = buttonImage.getBounds();
- if (height < bounds.height)
- height = bounds.height;
- }
- if (wHint != SWT.DEFAULT) width = wHint;
- if (hHint != SWT.DEFAULT) height = hHint;
- return new Point(width + 2, height + 2);
- }
-
- protected void paintControl(PaintEvent e)
- {
- GC gc = e.gc;
- if (backgroundImage != null)
- {
- Rectangle imageBounds = backgroundImage.getBounds();
- int y = 0;
- int x = 0;
-
- if (imageBackgroundColor != null)
- {
- gc.setBackground(imageBackgroundColor);
- gc.fillRectangle(0, 0, imageBounds.width, imageBounds.height);
- }
-
- if (SWT.getPlatform().equals("motif")==false)
- {
- gc.drawImage(backgroundImage, x, y);
- }
- if (textForegroundColor != null)
- gc.setForeground(textForegroundColor);
- gc.setFont(headerFont);
-// gc.setFont(getFont());
- gc.drawText(text, textHMargin, textVMargin, true);
- if (buttonImage != null)
- {
- Rectangle parentBounds = getParent().getClientArea();
- Rectangle buttonBounds = buttonImage.getBounds();
- int p = parentBounds.x + parentBounds.width;
- buttonImageX = p - buttonBounds.width - 4;
- buttonImageY = 4;
- gc.drawImage(buttonImage, buttonImageX, buttonImageY);
- }
- }
- }
-
- public void addSelectionListener(SelectionListener listener)
- {
- listeners.add(listener);
- }
-
- public void removeSelectionListener(SelectionListener listener)
- {
- listeners.remove(listener);
- }
-
- protected void handleMouseDown(MouseEvent event)
- {
- if (buttonImage == null)
- return;
- // chekc if the Button image is clicked
- int x = event.x;
- int y = event.y;
- if (x < buttonImageX || x > buttonImageX + buttonImage.getBounds().width)
- {
- return;
- }
- if (y < buttonImageY || y > buttonImageY + buttonImage.getBounds().height)
- {
- return;
- }
-
- int size = listeners.size();
- for (int i = 0; i < size; i++)
- {
- SelectionListener listener = (SelectionListener)listeners.get(i);
- listener.widgetSelected(null);
- }
- }
-
- protected void widgetDisposed(DisposeEvent e)
- {
- if (imageBackgroundColor != null) imageBackgroundColor.dispose();
- if (textForegroundColor != null) textForegroundColor.dispose();
- if (backgroundImage != null) backgroundImage.dispose();
- }
-
- // getters and setters
- public Image getBackgroundImage()
- {
- return backgroundImage;
- }
-
- public void setBackgroundImage(Image backgroundImage)
- {
- this.backgroundImage = backgroundImage;
- redraw();
- }
-
- public Image getButtonImage()
- {
- return buttonImage;
- }
-
- public void setButtonImage(Image buttonImage)
- {
- this.buttonImage = buttonImage;
- redraw();
- }
-
- public String getText()
- {
- return text;
- }
-
- public void setText(String text)
- {
- this.text = text;
- redraw();
- }
-
- public int getTextHMargin()
- {
- return textHMargin;
- }
-
- public void setTextHMargin(int textHMargin)
- {
- this.textHMargin = textHMargin;
- }
-
- public int getTextVMargin()
- {
- return textVMargin;
- }
-
- public void setTextVMargin(int textVMargin)
- {
- this.textVMargin = textVMargin;
- }
-
- public Color getImageBackgroundColor()
- {
- return imageBackgroundColor;
- }
-
- public void setImageBackgroundColor(Color imageBackgroundColor)
- {
- if (imageBackgroundColor == null)
- return;
- this.imageBackgroundColor = imageBackgroundColor;
- redraw();
- }
-
- public Color getTextForegroundColor()
- {
- return textForegroundColor;
- }
-
- public void setTextForegroundColor(Color textForegroundColor)
- {
- if (textForegroundColor == null)
- return;
- this.textForegroundColor = textForegroundColor;
- redraw();
- }
-
- private int getTextHeight(GC gc)
- {
- int imageHeight = 0;
- if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false)
- {
- imageHeight = backgroundImage.getBounds().height;
- }
- gc.setFont(headerFont);
-// gc.setFont(getFont());
- FontMetrics fm = gc.getFontMetrics();
- int fontHeight = fm.getHeight();
- int height = fontHeight + textVMargin + textVMargin;
- return Math.max(height, imageHeight);
- }
-
-// private int getTextWidth(GC gc)
-// {
-// int imageWidth = 0;
-// if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false)
-// {
-// imageWidth = backgroundImage.getBounds().width;
-// }
-// gc.setFont(headerFont);
-//// gc.setFont(getFont());
-// FontMetrics fm = gc.getFontMetrics();
-// int fontWidth = fm.getAverageCharWidth() + 5;
-// int width = fontWidth * text.length() + textHMargin + textHMargin;
-// return Math.max(width, imageWidth);
-// }
-
- public void handleEvent(Event e)
- {
-// Widget source = e.widget;
- }
-
- public void propertyChange(PropertyChangeEvent event)
- {
- if(event.getProperty() == JFaceResources.HEADER_FONT && this.isDisposed() == false)
- {
- headerFont = JFaceResources.getFontRegistry().get(JFaceResources.HEADER_FONT);
- this.layout(true);
- this.redraw();
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
deleted file mode 100644
index 7ef2e6ced..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-//public abstract class FormSection implements IPropertyChangeListener, IModelChangedListener {
-public abstract class FlatPageSection extends ViewForm implements IPropertyChangeListener {
- public static final int SELECTION = 1;
-// private PDEFormPage formPage;
- private String headerColorKey = WidgetFactory.DEFAULT_HEADER_COLOR;
- private String headerText;
- private Control client;
- protected Label header;
- protected Control separator;
-// private SectionChangeManager sectionManager;
- private java.lang.String description;
- private boolean dirty;
- protected Label descriptionLabel;
- private ToggleControl toggle;
- private boolean readOnly;
- private boolean titleAsHyperlink;
- private boolean addSeparator=true;
- private boolean descriptionPainted=true;
- private boolean headerPainted=true;
- private boolean collapsable=false;
- private Composite control;
-
-
-/*
- * This is a special layout for the section. Both the
- * header and the description labels will wrap and
- * they will use client's size to calculate needed
- * height. This kind of behaviour is not possible
- * with stock grid layout.
- */
-class SectionLayout extends Layout {
- int vspacing = 3;
- int sepHeight = 2;
-
-
- protected Point computeSize(Composite parent, int wHint, int hHint, boolean flush) {
- int width = 0;
- int height = 0;
- int cwidth = 0;
- int collapsedHeight = 0;
-
- if (wHint != SWT.DEFAULT)
- width = wHint;
- if (hHint != SWT.DEFAULT)
- height = hHint;
-
- cwidth = width;
-
- if (client != null) {
- Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
- if (width == 0) {
- width = csize.x;
- cwidth = width;
- }
- if (height==0) height = csize.y;
- }
-
- Point toggleSize = null;
-
- if (collapsable && toggle!=null)
- toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-
- if (hHint== SWT.DEFAULT && headerPainted && header!=null) {
- int hwidth = cwidth;
- if (toggleSize!=null)
- hwidth = cwidth - toggleSize.x - 5;
- Point hsize = header.computeSize(hwidth, SWT.DEFAULT, flush);
- height += hsize.y;
- collapsedHeight = hsize.y;
- height += vspacing;
- }
-
- if (hHint==SWT.DEFAULT && addSeparator) {
- height += sepHeight;
- height += vspacing;
- collapsedHeight += vspacing + sepHeight;
- }
- if (hHint == SWT.DEFAULT && descriptionPainted && descriptionLabel!=null) {
- Point dsize = descriptionLabel.computeSize(cwidth, SWT.DEFAULT, flush);
- height += dsize.y;
- height += vspacing;
- }
- if (toggle!=null && toggle.getSelection()) {
- // collapsed state
- height = collapsedHeight;
- }
- return new Point(width, height);
- }
- protected void layout(Composite parent, boolean flush) {
- int width = parent.getClientArea().width;
- int height = parent.getClientArea().height;
- int y = 0;
- Point toggleSize=null;
-
- if (collapsable) {
- toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
- }
-
- if (headerPainted && header!=null) {
- Point hsize;
-
- if (titleAsHyperlink) {
- hsize = header.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
- header.setBounds(0, y, hsize.x, hsize.y);
- }
- else {
- int availableWidth = width;
- if (toggleSize!=null)
- availableWidth = width - toggleSize.x - 5;
- hsize = header.computeSize(availableWidth, SWT.DEFAULT, flush);
-
- int hx = 0;
- if (toggle!=null) {
- int ty = y + hsize.y - toggleSize.y; // + vspacing;
- toggle.setBounds(0, ty, toggleSize.x, toggleSize.y);
- hx = toggleSize.x;
- }
- header.setBounds(hx, y, availableWidth, hsize.y);
- }
- y += hsize.y + vspacing;
- }
- if (addSeparator && separator!=null) {
- separator.setBounds(0, y, width, 2);
- y += sepHeight + vspacing;
- }
- if (toggle!=null && toggle.getSelection()) {
- return;
- }
- if (descriptionPainted && descriptionLabel!=null) {
- Point dsize = descriptionLabel.computeSize(width, SWT.DEFAULT, flush);
- descriptionLabel.setBounds(0, y, width, dsize.y);
- y += dsize.y + vspacing;
- }
- if (client!=null) {
- client.setBounds(0, y, width, height - y);
- }
- }
-}
-
-
-public FlatPageSection(Composite parent) {
- // Description causes problems re word wrapping
- // and causes bad layout in schema and
- // component editors when in Motif - turning off
-
- super(parent, SWT.FLAT);
- if (SWT.getPlatform().equals("motif")) {
- descriptionPainted = false;
- }
- JFaceResources.getFontRegistry().addListener(this);
-}
-public void commitChanges(boolean onSave) {
-}
-public abstract Composite createClient(Composite parent, WidgetFactory factory);
-public final Control createControl(
- Composite parent,
- WidgetFactory factory) {
- Composite section = factory.createComposite(parent);
- SectionLayout slayout = new SectionLayout();
- section.setLayout(slayout);
- section.setData(this);
-
- if (headerPainted) {
- Color headerColor = factory.getColor(getHeaderColorKey());
- header = factory.createHeadingLabel(section, getHeaderText(), headerColor, SWT.WRAP);
- if (titleAsHyperlink) {
- factory.turnIntoHyperlink(header, new HyperlinkAdapter() {
- public void linkActivated(Control label) {
- titleActivated();
- }
- });
- }
- if (collapsable) {
- toggle = new ToggleControl(section, SWT.NULL);
- toggle.setBackground(factory.getBackgroundColor());
- toggle.setActiveDecorationColor(factory.getHyperlinkColor());
- toggle.setDecorationColor(factory.getColor(WidgetFactory.COLOR_COMPOSITE_SEPARATOR));
- toggle.setActiveCursor(factory.getHyperlinkCursor());
- toggle.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
-
- boolean collapsed = toggle.getSelection();
- reflow();
- if (descriptionLabel!=null)
- descriptionLabel.setVisible(!collapsed);
- if (client!=null)
- client.setVisible(!collapsed);
- }
- });
- }
- }
-
-
- if (addSeparator) {
- //separator = factory.createSeparator(section, SWT.HORIZONTAL);
- separator = factory.createCompositeSeparator(section);
- }
-
- if (descriptionPainted && description != null) {
- descriptionLabel = factory.createLabel(section, description, SWT.WRAP);
- }
- client = createClient(section, factory);
- section.setData(this);
- control = section;
- return section;
-}
-
-protected void reflow() {
- control.layout(true);
- control.getParent().layout(true);
-
- Widget grandParent = control.getParent().getParent();
- if (grandParent != null && grandParent instanceof Composite)
- ((Composite)grandParent).layout(true);
-/*
- SectionForm form = formPage.getForm();
- if (form instanceof ScrollableSectionForm) {
- ((ScrollableSectionForm)form).updateScrollBars();
- }
-*/
-}
-
-protected Text createText(Composite parent, String label, WidgetFactory factory) {
- return createText(parent, label, factory, 1);
-}
-protected Text createText(Composite parent, String label, WidgetFactory factory, int span) {
- factory.createLabel(parent, label);
- Text text = factory.createText(parent, "");
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
- gd.grabExcessHorizontalSpace = true;
- gd.horizontalSpan=span;
- text.setLayoutData(gd);
- return text;
-}
-protected Text createText(Composite parent, WidgetFactory factory, int span) {
- Text text = factory.createText(parent, "");
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
- gd.grabExcessHorizontalSpace = true;
- gd.horizontalSpan=span;
- text.setLayoutData(gd);
- return text;
-}
-public void dispose() {
- JFaceResources.getFontRegistry().removeListener(this);
- super.dispose();
-}
-public void doGlobalAction(String actionId) {}
-public void expandTo(Object object) {}
-/*
-public final void fireChangeNotification(int changeType, Object changeObject) {
- if (sectionManager == null)
- return;
- sectionManager.dispatchNotification(this, changeType, changeObject);
-}
-public final void fireSelectionNotification(Object changeObject) {
- fireChangeNotification(SELECTION, changeObject);
-}
-*/
-public java.lang.String getDescription() {
- return description;
-}
-/*
-public PDEFormPage getFormPage() {
- return formPage;
-}
-*/
-
-public java.lang.String getHeaderColorKey() {
- return headerColorKey;
-}
-public java.lang.String getHeaderText() {
- return headerText;
-}
-public void initialize(Object input) {}
-
-public boolean isDirty() {
- return dirty;
-}
-
-public boolean isReadOnly() {
- return readOnly;
-}
-public boolean isTitleAsHyperlink() {
- return titleAsHyperlink;
-}
-/*
-public void modelChanged(IModelChangedEvent e) {
-}
-*/
-public void sectionChanged(FlatPageSection source, int changeType, Object changeObject) {}
-public void setAddSeparator(boolean newAddSeparator) {
- addSeparator = newAddSeparator;
-}
-
-
-private String trimNewLines(String text) {
- StringBuffer buff = new StringBuffer();
- for (int i=0; i<text.length(); i++) {
- char c = text.charAt(i);
- if (c=='\n')
- buff.append(' ');
- else
- buff.append(c);
- }
- return buff.toString();
-}
-
-public void setDescription(java.lang.String newDescription) {
- // we will trim the new lines so that we can
- // use layout-based word wrapping instead
- // of hard-coded one
- description = trimNewLines(newDescription);
- //description = newDescription;
- if (descriptionLabel!=null) descriptionLabel.setText(newDescription);
-}
-public void setDescriptionPainted(boolean newDescriptionPainted) {
- descriptionPainted = newDescriptionPainted;
-}
-public void setDirty(boolean newDirty) {
- dirty = newDirty;
-}
-/*
-public void setFocus() {
-}
-*/
-public void setHeaderColorKey(java.lang.String newHeaderColorKey) {
- headerColorKey = newHeaderColorKey;
-}
-public void setHeaderPainted(boolean newHeaderPainted) {
- headerPainted = newHeaderPainted;
-}
-public void setHeaderText(java.lang.String newHeaderText) {
- headerText = newHeaderText;
- if (header!=null) header.setText(headerText);
-}
-/*
-void setManager(SectionChangeManager manager) {
- this.sectionManager = manager;
-}
-*/
-public void setReadOnly(boolean newReadOnly) {
- readOnly = newReadOnly;
-}
-public void setTitleAsHyperlink(boolean newTitleAsHyperlink) {
- titleAsHyperlink = newTitleAsHyperlink;
-}
-public void titleActivated() {
-}
-/*
-public void update() {}
-*/
-
-public void propertyChange(PropertyChangeEvent arg0) {
- if (control!=null && header!=null) {
- if (!header.isDisposed())
- header.setFont(JFaceResources.getBannerFont());
- if (!control.isDisposed())
- control.layout(true);
- }
-}
-
-
- /**
- * Gets the collapsable.
- * @return Returns a boolean
- */
- public boolean getCollapsable() {
- return collapsable;
- }
-
- /**
- * Sets the collapsable.
- * @param collapsable The collapsable to set
- */
- public void setCollapsable(boolean collapsable) {
- this.collapsable = collapsable;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
deleted file mode 100644
index 4e52bb988..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-public class HyperlinkAdapter implements IHyperlinkListener{
-
-public HyperlinkAdapter() {
- super();
-}
-public void linkActivated(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkEntered(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkExited(org.eclipse.swt.widgets.Control linkLabel) {}
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
deleted file mode 100644
index bcd3c338d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class HyperlinkHandler implements MouseListener, MouseTrackListener, PaintListener {
-
- public static final int UNDERLINE_NEVER = 1;
- public static final int UNDERLINE_ROLLOVER = 2;
- public static final int UNDERLINE_ALWAYS = 3;
-
- private static Cursor hyperlinkCursor;
- private static Cursor busyCursor;
- private boolean hyperlinkCursorUsed=true;
- private int hyperlinkUnderlineMode=UNDERLINE_ALWAYS;
- private Color background;
- private Color foreground;
- private Color activeBackground;
- private Color activeForeground;
- private Hashtable hyperlinkListeners;
- private Control lastLink;
-
-public HyperlinkHandler() {
- hyperlinkListeners = new Hashtable();
- if (hyperlinkCursor == null)
- {
- hyperlinkCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
- busyCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_WAIT);
- }
-}
-public void dispose() {
- hyperlinkCursor.dispose();
- busyCursor.dispose();
-}
-public org.eclipse.swt.graphics.Color getActiveBackground() {
- return activeBackground;
-}
-public org.eclipse.swt.graphics.Color getActiveForeground() {
- return activeForeground;
-}
-public org.eclipse.swt.graphics.Color getBackground() {
- return background;
-}
-public org.eclipse.swt.graphics.Cursor getBusyCursor() {
- return busyCursor;
-}
-public org.eclipse.swt.graphics.Color getForeground() {
- return foreground;
-}
-public org.eclipse.swt.graphics.Cursor getHyperlinkCursor() {
- return hyperlinkCursor;
-}
-public int getHyperlinkUnderlineMode() {
- return hyperlinkUnderlineMode;
-}
-public org.eclipse.swt.widgets.Control getLastLink() {
- return lastLink;
-}
-public boolean isHyperlinkCursorUsed() {
- return hyperlinkCursorUsed;
-}
- public void mouseDoubleClick(MouseEvent e) {
- }
-public void mouseDown(MouseEvent e) {
- if (e.button == 1)
- return;
- lastLink = (Control)e.widget;
-}
-public void mouseEnter(MouseEvent e) {
- Control control = (Control) e.widget;
- if (isHyperlinkCursorUsed())
- control.setCursor(hyperlinkCursor);
- if (activeBackground != null)
- control.setBackground(activeBackground);
- if (activeForeground != null)
- control.setForeground(activeForeground);
- if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER) underline(control, true);
-
- IHyperlinkListener action =
- (IHyperlinkListener) hyperlinkListeners.get(control);
- if (action != null)
- action.linkEntered(control);
-}
-public void mouseExit(MouseEvent e) {
- Control control = (Control) e.widget;
- if (isHyperlinkCursorUsed())
- control.setCursor(null);
- if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER)
- underline(control, false);
- if (background != null)
- control.setBackground(background);
- if (foreground != null)
- control.setForeground(foreground);
- IHyperlinkListener action =
- (IHyperlinkListener) hyperlinkListeners.get(control);
- if (action != null)
- action.linkExited(control);
-}
- public void mouseHover(MouseEvent e) {
- }
-public void mouseUp(MouseEvent e) {
- if (e.button != 1)
- return;
- IHyperlinkListener action =
- (IHyperlinkListener) hyperlinkListeners.get(e.widget);
- if (action != null) {
- Control c = (Control) e.widget;
- c.setCursor(busyCursor);
- action.linkActivated(c);
- if (!c.isDisposed())
- c.setCursor(isHyperlinkCursorUsed()?hyperlinkCursor:null);
- }
-}
-public void paintControl(PaintEvent e) {
- Control label = (Control) e.widget;
- if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
- HyperlinkHandler.underline(label, true);
-}
-public void registerHyperlink(Control control, IHyperlinkListener listener) {
- if (background != null)
- control.setBackground(background);
- if (foreground != null)
- control.setForeground(foreground);
- control.addMouseListener(this);
- control.addMouseTrackListener(this);
- if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
- control.addPaintListener(this);
- hyperlinkListeners.put(control, listener);
- removeDisposedLinks();
-}
-private void removeDisposedLinks() {
- for (Enumeration keys = hyperlinkListeners.keys(); keys.hasMoreElements();) {
- Control control = (Control)keys.nextElement();
- if (control.isDisposed()) {
- hyperlinkListeners.remove(control);
- }
- }
-}
-public void reset() {
- hyperlinkListeners.clear();
-}
-public void setActiveBackground(org.eclipse.swt.graphics.Color newActiveBackground) {
- activeBackground = newActiveBackground;
-}
-public void setActiveForeground(org.eclipse.swt.graphics.Color newActiveForeground) {
- activeForeground = newActiveForeground;
-}
-public void setBackground(org.eclipse.swt.graphics.Color newBackground) {
- background = newBackground;
-}
-public void setForeground(org.eclipse.swt.graphics.Color newForeground) {
- foreground = newForeground;
-}
-public void setHyperlinkCursorUsed(boolean newHyperlinkCursorUsed) {
- hyperlinkCursorUsed = newHyperlinkCursorUsed;
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
- hyperlinkUnderlineMode = newHyperlinkUnderlineMode;
-}
-public static void underline(Control control, boolean inside) {
- if (!(control instanceof Label))
- return;
- Composite parent = control.getParent();
- Rectangle bounds = control.getBounds();
- GC gc = new GC(parent);
- Color color = inside? control.getForeground() : control.getBackground();
- gc.setForeground(color);
- int y = bounds.y + bounds.height;
- gc.drawLine(bounds.x, y, bounds.x+bounds.width, y);
- gc.dispose();
-}
-}
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
deleted file mode 100644
index 03dfbadcf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.widgets.Control;
-
-public interface IHyperlinkListener {
-
- public void linkActivated(Control linkLabel);
- public void linkEntered(Control linkLabel);
- public void linkExited(Control linkLabel);
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
deleted file mode 100644
index 3149fef88..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-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.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TypedListener;
-
-public class ToggleControl extends Canvas {
- private boolean fCollapsed;
- private Color fDecorationColor;
- private Color fActiveColor;
- private Cursor fActiveCursor;
- private boolean fHasFocus;
- private boolean fHover = false;
- private static final int MARGIN_WIDTH = 2;
- private static final int MARGIN_HEIGHT = 2;
-
- private static final int DEFAULT_HEIGHT = 8;
- private static final int[] EXPANDED_POINTS = { 0, 2, 8, 2, 4, 6 };
- private static final int[] COLLAPSED_POINTS = { 2, 0, 2, 8, 6, 4 };
- private int fHeight = DEFAULT_HEIGHT;
-
- /* accessibility */
- private String fName;
- private String fDescription;
-
- public ToggleControl(Composite parent, int style) {
- super(parent, style);
- initAccessible();
-
- addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- paint(e);
- }
- });
- addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- notifyListeners(SWT.Selection);
- }
- });
- addKeyListener(new KeyAdapter() {
- public void keyPressed(KeyEvent e) {
- if (e.character == '\r' || e.character == ' ') {
- // Activation
- notifyListeners(SWT.Selection);
- }
- }
- });
- addListener(SWT.Traverse, new Listener() {
- public void handleEvent(Event e) {
- if (e.detail != SWT.TRAVERSE_RETURN)
- e.doit = true;
- }
- });
- addFocusListener(new FocusListener() {
- public void focusGained(FocusEvent e) {
- if (!fHasFocus) {
- fHasFocus = true;
- redraw();
- }
- }
- public void focusLost(FocusEvent e) {
- if (fHasFocus) {
- fHasFocus = false;
- redraw();
- }
- }
- });
-
- addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- fCollapsed = !fCollapsed;
- redraw();
- }
- });
-
- addMouseTrackListener(new MouseTrackAdapter() {
- public void mouseEnter(MouseEvent e) {
- fHover = true;
- if (fActiveCursor != null)
- setCursor(fActiveCursor);
- redraw();
- }
- public void mouseExit(MouseEvent e) {
- fHover = false;
- if (fActiveCursor != null)
- setCursor(null);
- redraw();
- }
- });
- }
-
- public void addSelectionListener(SelectionListener listener) {
- checkWidget();
- if (listener != null)
- addListener(SWT.Selection, new TypedListener(listener));
- }
-
- public void setDecorationColor(Color decorationColor) {
- this.fDecorationColor = decorationColor;
- }
-
- public Color getDecorationColor() {
- return fDecorationColor;
- }
-
- public void setActiveDecorationColor(Color activeColor) {
- this.fActiveColor = activeColor;
- }
-
- public void removeSelectionListener(SelectionListener listener) {
- checkWidget();
- if (listener != null)
- removeListener(SWT.Selection, listener);
- }
-
- public void setActiveCursor(Cursor activeCursor) {
- this.fActiveCursor = activeCursor;
- }
-
- public Color getActiveDecorationColor() {
- return fActiveColor;
- }
-
- public Point computeSize(int wHint, int hHint, boolean changed) {
-
- return new Point((wHint != SWT.DEFAULT ? wHint : fHeight + 2 * MARGIN_WIDTH), (hHint != SWT.DEFAULT ? hHint : fHeight + 2 * MARGIN_HEIGHT));
- }
-
- protected void paint(PaintEvent e) {
- GC gc = e.gc;
- Point size = getSize();
- gc.setFont(getFont());
- paint(gc);
- if (fHasFocus) {
- gc.setForeground(getForeground());
- gc.drawFocus(0, 0, size.x, size.y);
- }
- }
-
- /*
- * @see SelectableControl#paint(GC)
- */
- protected void paint(GC gc) {
- if (fHover && fActiveColor != null)
- gc.setBackground(fActiveColor);
- else if (fDecorationColor != null)
- gc.setBackground(fDecorationColor);
- else
- gc.setBackground(getForeground());
- Point size = getSize();
- gc.fillPolygon(translate((fCollapsed ? COLLAPSED_POINTS : EXPANDED_POINTS), ((size.x - fHeight) / 2), ((size.y - fHeight) / 2)));
- gc.setBackground(getBackground());
- }
-
- private int[] translate(int[] data, int x, int y) {
- int[] target = new int[data.length];
- for (int i = 0; i < data.length; i += 2) {
- target[i] = data[i]*fHeight/DEFAULT_HEIGHT + x;
- }
- for (int i = 1; i < data.length; i += 2) {
- target[i] = data[i]*fHeight/DEFAULT_HEIGHT + y;
- }
- return target;
- }
-
- public void setHeight(int y) {
- fHeight = y;
- }
-
- private void notifyListeners(int eventType) {
- Event event = new Event();
- event.type = eventType;
- event.widget = this;
- notifyListeners(eventType, event);
- }
-
- public boolean getSelection() {
- return fCollapsed;
- }
-
- public void setSelection(boolean selection) {
- this.fCollapsed = selection;
- }
-
- public void setName(String name) {
- fName = name;
- }
-
- public void setDescription(String description) {
- fDescription = description;
- }
-
- private void initAccessible() {
- getAccessible().addAccessibleListener(new AccessibleAdapter() {
-
- public void getName(AccessibleEvent e) {
- e.result = fName;
- }
-
- public void getDescription(AccessibleEvent e) {
- e.result = fDescription;
- }
- });
-
- getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
-
- public void getLocation(AccessibleControlEvent e) {
- Rectangle location = getBounds();
- Point pt = toDisplay(new Point(location.x, location.y));
- e.x = pt.x;
- e.y = pt.y;
- e.width = location.width;
- e.height = location.height;
- }
-
- public void getChildCount(AccessibleControlEvent e) {
- e.detail = 0;
- }
-
- public void getRole(AccessibleControlEvent e) {
- e.detail = ACC.ROLE_TREE;
- }
-
- public void getState(AccessibleControlEvent e) {
- e.detail = fCollapsed ? ACC.STATE_COLLAPSED : ACC.STATE_EXPANDED;
- }
-
- });
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
deleted file mode 100644
index c09998212..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-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.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class WidgetFactory {
- public static final String DEFAULT_HEADER_COLOR = "__default__header__";
- public static final String COLOR_BACKGROUND = "__bg";
- public static final String COLOR_BORDER = "__border";
- public static final String COLOR_COMPOSITE_SEPARATOR = "__compSep";
- public static final String COLOR_HYPERLINK="__hyperlink";
-
- private Hashtable colorRegistry = new Hashtable();
- private Color backgroundColor;
- private Color clientAreaColor;
- private Color foregroundColor;
- private Color fReadOnlyColor;
- private Display fDisplay;
- public static final int BORDER_STYLE = SWT.NONE;
- private BorderPainter borderPainter;
- private Color borderColor;
- private HyperlinkHandler hyperlinkHandler;
- private static Image fBanner;
-
-
- class BorderPainter implements PaintListener {
- public void paintControl(PaintEvent event) {
- Composite composite = (Composite) event.widget;
- Control[] children = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- Control c = children[i];
- //if (c.isEnabled()==false) continue;
- if (c instanceof Text
- || c instanceof Canvas
- || c instanceof CCombo) {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(c.getBackground());
- gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
- gc.setForeground(foregroundColor);
- gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- }
- else if (c instanceof Table
- || c instanceof Tree
- || c instanceof TableTree) {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(borderColor);
- //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
- }
- }
- }
- }
-
-
-public WidgetFactory() {
- fDisplay = Display.getDefault();
- initialize();
-}
-
-public Button createButton(Composite parent, String text, int style) {
- int flatStyle = BORDER_STYLE == SWT.BORDER ? SWT.NULL : SWT.FLAT;
- //int flatStyle = SWT.NULL;
- Button button = new Button(parent, style | flatStyle);
- button.setBackground(backgroundColor);
- button.setForeground(foregroundColor);
- if (text!=null) button.setText(text);
- return button;
-}
-public Composite createComposite(Composite parent) {
- return createComposite(parent, SWT.NULL);
-}
-public Composite createComposite(Composite parent, int style) {
- Composite composite = new Composite(parent, style);
- composite.setBackground(backgroundColor);
- return composite;
-}
-public Composite createCompositeSeparator(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getColor(COLOR_COMPOSITE_SEPARATOR));
- return composite;
-}
-public Group createGroup(Composite parent, String text) {
- Group group = new Group(parent, SWT.SHADOW_NONE);
- group.setText(text);
- group.setBackground(backgroundColor);
- group.setForeground(foregroundColor);
- return group;
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg) {
- return createHeadingLabel(parent, text, bg, SWT.NONE);
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
- Label label = new Label(parent, style);
- label.setText(text);
- label.setBackground(backgroundColor);
- label.setForeground(foregroundColor);
- label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
- return label;
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener) {
- return createHyperlinkLabel(parent, text, listener, SWT.NULL);
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener, int style) {
- Label label = createLabel(parent, text, style);
- turnIntoHyperlink(label, listener);
- return label;
-}
-public Label createLabel(Composite parent, String text) {
- return createLabel(parent, text, SWT.NONE);
-}
-public Label createLabel(Composite parent, String text, int style) {
- Label label = new Label(parent, style);
- if (text!=null) label.setText(text);
- label.setBackground(backgroundColor);
- label.setForeground(foregroundColor);
- return label;
-}
-public Label createSeparator(Composite parent, int style) {
- Label label = new Label(parent, SWT.SEPARATOR | style);
- label.setBackground(backgroundColor);
- label.setForeground(borderColor);
- return label;
-}
-public ScrolledComposite createScrolledComposite (Composite parent) {
- ScrolledComposite scrolledcomposite = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
- scrolledcomposite.setBackground(backgroundColor);
- scrolledcomposite.setForeground(foregroundColor);
- return scrolledcomposite;
-}
-public Table createTable(Composite parent, int style) {
- Table table = new Table(parent, BORDER_STYLE | style);
- table.setBackground(backgroundColor);
- table.setForeground(foregroundColor);
- //hookDeleteListener(table);
- return table;
-}
-public Text createText(Composite parent, String value) {
- return createText(parent, value, BORDER_STYLE | SWT.SINGLE);
-}
-public Text createText(Composite parent, String value, int style) {
- Text text = new Text(parent, style);
- text.setText(value);
- text.setBackground(clientAreaColor);
- text.setForeground(foregroundColor);
- if ((style & SWT.READ_ONLY) != 0)
- text.setForeground(fReadOnlyColor);
- return text;
-}
-public Tree createTree(Composite parent, int style) {
- Tree tree = new Tree(parent, BORDER_STYLE | style);
- tree.setBackground(backgroundColor);
- tree.setForeground(foregroundColor);
- //hookDeleteListener(tree);
- return tree;
-}
-/*
-private void deleteKeyPressed(Widget widget) {
- if (!(widget instanceof Control)) return;
- Control control = (Control)widget;
- for (Control parent = control.getParent();
- parent != null;
- parent = parent.getParent()) {
- if (parent.getData() instanceof FormSection) {
- FormSection section = (FormSection) parent.getData();
- section.doGlobalAction(IWorkbenchActionConstants.DELETE);
- break;
- }
- }
-}
-*/
-public ViewForm createViewForm(Composite parent) {
- ViewForm viewForm = new ViewForm(parent, SWT.NULL);
- viewForm.setBackground(clientAreaColor);
- viewForm.setForeground(foregroundColor);
- return viewForm;
-}
-public void dispose() {
- Enumeration colors= colorRegistry.elements();
- while (colors.hasMoreElements()) {
- Color c = (Color)colors.nextElement();
- c.dispose();
- }
- hyperlinkHandler.dispose();
- colorRegistry=null;
- if (fBanner != null)
- {
- fBanner.dispose();
- fBanner = null;
- }
-}
-public Color getBackgroundColor() {
- return backgroundColor;
-}
-public Image getBanner() {
- if (fBanner == null)
- {
- try {
- fBanner = (ImageDescriptor.createFromURL(new URL((WSDLEditorPlugin.getInstance().getDescriptor().getInstallURL()), "icons\form_banner.gif"))).createImage();
- System.out.println("Created Image!!!! ");
- } catch (MalformedURLException e) {
- System.out.println("Exception!!!! " + e);
- }
- }
- return fBanner;
-}
-public Color getBorderColor() {
- return borderColor;
-}
-public Cursor getBusyCursor() {
- return hyperlinkHandler.getBusyCursor();
-}
-public Color getClientAreaColor() {
- return clientAreaColor;
-}
-public Color getColor(String key) {
- return (Color)colorRegistry.get(key);
-}
-public Color getForegroundColor() {
- return foregroundColor;
-}
-public Color getHyperlinkColor() {
- return hyperlinkHandler.getForeground();
-}
-public Cursor getHyperlinkCursor() {
- return hyperlinkHandler.getHyperlinkCursor();
-}
-public Color getHyperlinkHoverColor() {
- return hyperlinkHandler.getActiveForeground();
-}
-public int getHyperlinkUnderlineMode() {
- return hyperlinkHandler.getHyperlinkUnderlineMode();
-}
-/*
-public void hookDeleteListener(Control control) {
- if (deleteListener == null) {
- deleteListener = new KeyAdapter() {
- public void keyPressed(KeyEvent event) {
- if (event.character == SWT.DEL && event.stateMask == 0) {
- deleteKeyPressed(event.widget);
- }
- }
- };
- }
- control.addKeyListener(deleteListener);
-}
-*/
- private void initStaticColors()
- {
- if (colorRegistry == null)
- {
- colorRegistry = new Hashtable();
- registerColor(COLOR_BACKGROUND, 0xff, 0xfe, 0xf9);
- registerColor(COLOR_BORDER, 195, 191, 179);
- registerColor(COLOR_COMPOSITE_SEPARATOR, 152, 170, 203);
- registerColor(DEFAULT_HEADER_COLOR, 0x48, 0x70, 0x98);
- registerColor(COLOR_HYPERLINK, 0, 0, 153);
- }
- }
-
-private void initialize() {
- clientAreaColor = fDisplay.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- fReadOnlyColor = fDisplay.getSystemColor(SWT.COLOR_DARK_GRAY);
- initStaticColors();
- backgroundColor = clientAreaColor;
- borderColor = getColor(COLOR_BORDER);
- foregroundColor = fDisplay.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
- hyperlinkHandler = new HyperlinkHandler();
- hyperlinkHandler.setForeground(getColor(COLOR_HYPERLINK));
- hyperlinkHandler.setBackground(backgroundColor);
-}
-public void paintBordersFor(Composite parent) {
- if (BORDER_STYLE == SWT.BORDER) return;
- if (borderPainter==null) borderPainter = new BorderPainter();
- parent.addPaintListener(borderPainter);
-}
-public Color registerColor(String key, int r, int g, int b) {
- Color c = new Color(fDisplay, r, g, b);
- colorRegistry.put(key, c);
- return c;
-}
-
-public void setClientAreaColor(Color color)
-{
- clientAreaColor = color;
- backgroundColor = clientAreaColor;
-}
-
-public void setHyperlinkColor(Color color) {
- hyperlinkHandler.setForeground(color);
-}
-public void setHyperlinkHoverColor(org.eclipse.swt.graphics.Color hoverColor) {
- hyperlinkHandler.setActiveForeground(hoverColor);
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
- hyperlinkHandler.setHyperlinkUnderlineMode(newHyperlinkUnderlineMode);
-}
-public void turnIntoHyperlink(Control control, IHyperlinkListener listener) {
- hyperlinkHandler.registerHyperlink(control, listener);
-}
-
-}
-
-
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
deleted file mode 100644
index 4d30cf1ca..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-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.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-
-abstract public class BaseDesignWindow extends Viewer
-{
- protected ScrolledComposite mainUIComponent;
- protected Composite controlsContainer;
-
- protected boolean pageComplete = true;
- protected Object input;
-
- private IStatusLineManager statusLine;
-
- public BaseDesignWindow(IStatusLineManager statusLine)
- {
- this.statusLine = statusLine;
- }
-
- protected void setStatusLine(IStatusLineManager statusLine)
- {
- this.statusLine = statusLine;
- }
-
- protected IStatusLineManager getStatusLine()
- {
- if (statusLine == null)
- {
- //statusLine = WorkbenchUtility.getStatusLineManager();
-
- IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
- try
- {
- EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
- statusLine = contributor.getActionBars().getStatusLineManager();
- }
- catch (Exception e)
- {
- }
- }
- return statusLine;
- }
-
- public Object getInput()
- {
- return input;
- }
-
- public void setInput(Object input)
- {
- if (this.input != input)
- {
- setErrorMessage("");
- }
-
- this.input = input;
- }
-
- public ISelection getSelection()
- {
- return null;
- }
-
- public void setSelection(ISelection selection, boolean reveal)
- {
- }
-
- public void refresh()
- {
- }
-
- /**
- * A design view that has a main area for controls, and a message line at
- * the bottom
- */
- protected Control createDesignPane(Composite parent, int numColumns)
- {
- // Create the main UI container
- mainUIComponent= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL)
- {
- public void setVisible(boolean visible)
- {
- super.setVisible(visible);
- if (visible == false && !currentMessage.equals(""))
- {
- showMessageInStatusLine(visible == true);
- }
- }
- };
-
-// mainUIComponent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- controlsContainer = new Composite(mainUIComponent, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- controlsContainer.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- controlsContainer.setLayoutData(data);
-
- // TODO: Remove above line and uncomment the following two when XSDEditor views
- // are rewritten. Also refer do related TODO in DTDEditor's BaseWindow.
- // FlatViewUtility flatViewUtility = new FlatViewUtility();
- // controlsContainer = flatViewUtility.createComposite(mainUIComponent, numColumns);
-
- mainUIComponent.setContent(controlsContainer);
-
- return mainUIComponent;
- }
-
- public void setScrollComposite()
- {
- Point p = controlsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- mainUIComponent.setExpandHorizontal(true);
- mainUIComponent.setExpandVertical(true);
- mainUIComponent.setMinSize(p);
- }
-
- public Composite getControlsContainer()
- {
- return controlsContainer;
- }
-
- /**
- * Sets the complete state of the page.
- * If false, then client is not allowed to move to next page
- */
- public void setPageComplete(boolean complete)
- {
- pageComplete= complete;
- }
-
- /**
- * Returns whether the page is complete or not.
- */
- public boolean isPageComplete()
- {
- return pageComplete;
- }
-
- private String currentMessage = "";
- protected void showMessageInStatusLine(boolean show)
- {
- if (getStatusLine() == null)
- return;
-
- if (show)
- {
- getStatusLine().setErrorMessage(currentMessage);
- }
- else
- {
- getStatusLine().setErrorMessage("");
- }
-
-
- getStatusLine().update(false);
- }
-
- /**
- * Sets the message line
- */
- public void setMessage(String message)
- {
- currentMessage = message;
- if (getStatusLine() != null)
- {
- getStatusLine().setErrorMessage(currentMessage);
- getStatusLine().update(false);
- }
- }
-
- /**
- * Clears a message.
- */
- public void clearMessage()
- {
- currentMessage = "";
- if (getStatusLine() != null)
- {
- getStatusLine().setErrorMessage(currentMessage);
- getStatusLine().update(false);
- }
- }
-
- public void setErrorMessage(String message)
- {
- setMessage(message);
- setPageComplete(false);
- }
-
- public void clearErrorMessage()
- {
- clearMessage();
- setPageComplete(true);
- }
-
- public String getErrorMessage()
- {
- return currentMessage;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
deleted file mode 100644
index 47bdeb5f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-
-public class BorderPainter implements PaintListener
-{
- Color backgroundColor, foregroundColor;
- static Color borderColor;
-
- public BorderPainter()
- {
- Display display = Display.getCurrent();
- if (borderColor == null)
- {
- borderColor = new Color(Display.getCurrent(), 195, 191, 179);
- }
- backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
- }
-
- public void paintControl(PaintEvent event)
- {
- Composite composite = (Composite) event.widget;
- Control[] children = composite.getChildren();
- for (int i = 0; i < children.length; i++)
- {
- Control c = children[i];
- if (c.isEnabled()==false)
- {
- if (c instanceof Text
- || c instanceof Canvas
- || c instanceof List
- || c instanceof CCombo)
- {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(backgroundColor);
-// gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
- gc.setForeground(borderColor);
- gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- }
- continue;
- }
- if (c instanceof Text
-// || c instanceof Canvas
- || c instanceof List
- || c instanceof CCombo)
- {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(backgroundColor);
- gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
- gc.setForeground(foregroundColor);
- gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- }
- else if (c instanceof Table
- || c instanceof Tree
- || c instanceof TableTree) {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(foregroundColor);
- //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
- }
- }
- }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
deleted file mode 100644
index f0b9fb552..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
+++ /dev/null
@@ -1,902 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-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.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageHeader;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-
-public class FlatViewUtility implements PaintListener
-{
- Color backgroundColor, foregroundColor;
- Color comboBackgroundColor, comboDisabledColor;
- static Color borderColor;
-
- // Added for createFlatPageHeader()
- private boolean headingVisible=true;
- private Image headingImage = null;
- private Composite headerControl = null;
- private int TITLE_VMARGIN = 5;
-
- private KeyboardHandler keyboardHandler;
-
- public static final int H_SCROLL_INCREMENT = 5;
- public static final int V_SCROLL_INCREMENT = 64;
-
- // this defaults to the flat style, but users can change it if they wish
- private int flatStyle = SWT.FLAT;
- private int border = 0;
-
- public FlatViewUtility()
- {
- Display display = Display.getCurrent();
- if (borderColor == null)
- {
- borderColor = new Color(Display.getCurrent(), 195, 191, 179);
- }
- backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
- comboBackgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- comboDisabledColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- keyboardHandler = new KeyboardHandler();
- }
-
- public FlatViewUtility(boolean isFlat)
- {
- this();
-
- setFlat(isFlat);
- }
-
- public void setFlat(boolean flat)
- {
- Display display = Display.getCurrent();
- if (flat)
- {
- flatStyle = SWT.FLAT;
- backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
- }
- else
- {
- flatStyle = 0;
- border = SWT.BORDER;
- backgroundColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- foregroundColor = display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
- }
- }
-
- public void setColor(Control c)
- {
- if (flatStyle == SWT.FLAT)
- {
- c.setBackground(backgroundColor);
- }
- }
-
- public void paintControl(PaintEvent event)
- {
- Control c = (Control) event.widget;
- if (c.isEnabled()==false)
- {
- if (c instanceof Text
-// || c instanceof Canvas
- || c instanceof List
- || c instanceof CCombo)
- {
- GC gc = event.gc;
- gc.setForeground(backgroundColor);
-// gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
- gc.setForeground(borderColor);
-// gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- }
- }
-
- // Defect 252891 : this causes some major problems on Linux GTK
- // This looks rather dodgy in any case since an cyclic painting behaviour
- // is likely occuring here
- //if (c.getParent() != null)
- //{
- // c.getParent().redraw();
- //}
- }
-
- private static Font font;
-
- public static Font getFont()
- {
- if (font == null)
- {
- font = new Font(Display.getCurrent(), "ms sans serif", 8, SWT.NORMAL);
- }
- return font;
- }
-
- public static void setFont(Font newFont)
- {
- font = newFont;
- }
-
- public static void setComposite(Composite comp)
- {
- // deprecated. Remove later
- }
-
- public Composite createSimpleComposite(Composite parent, int style)
- {
- Composite composite = new Composite(parent, style | flatStyle);
- composite.setFont(getFont());
- setColor(composite);
-
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- return composite;
- }
-
- public Composite createComposite(Composite parent, int numColumns)
- {
- Composite composite = new Composite(parent, SWT.NONE | flatStyle);
- composite.setFont(getFont());
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- composite.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- composite.setLayoutData(data);
- setColor(composite);
- if (flatStyle == SWT.FLAT)
- {
- composite.addPaintListener(new BorderPainter());
- }
- return composite;
- }
-
- public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill)
- {
- if (!horizontalFill)
- {
- createComposite(parent, numColumns);
- }
-
- Composite composite = new Composite(parent, SWT.NONE | flatStyle);
- composite.setFont(getFont());
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- composite.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- composite.setLayoutData(data);
- setColor(composite);
- if (flatStyle == SWT.FLAT)
- {
- composite.addPaintListener(new BorderPainter());
- }
- return composite;
- }
-
- public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill, boolean verticalFill)
- {
- if (!horizontalFill && !verticalFill)
- {
- createComposite(parent, numColumns);
- }
-
- Composite composite = new Composite(parent, SWT.NONE | flatStyle);
- composite.setFont(getFont());
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- composite.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = true;
- composite.setLayoutData(data);
- setColor(composite);
- if (flatStyle == SWT.FLAT)
- {
- composite.addPaintListener(new BorderPainter());
- }
- return composite;
- }
-
- public SashForm createSashForm(Composite parent, int style)
- {
- SashForm sashForm = new SashForm(parent, style | flatStyle);
- setColor(sashForm);
- return sashForm;
- }
-
- public PageBook createPageBook(Composite parent, int style)
- {
- PageBook pageBook = new PageBook(parent, style | flatStyle);
- setColor(pageBook);
- if (flatStyle == SWT.FLAT)
- {
- pageBook.addPaintListener(new BorderPainter());
- }
- return pageBook;
- }
-
- public Label createHeadingLabel(Composite parent, String text, Color bg) {
- return createHeadingLabel(parent, text, bg, SWT.NONE);
- }
- public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
- Label label = new Label(parent, style);
- label.setText(text);
- setColor(label);
- if (flatStyle == SWT.FLAT)
- {
- label.setForeground(foregroundColor);
- }
- label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
- return label;
- }
-
- public Label createHorizontalFiller(Composite parent, int horizontalSpan)
- {
- Label label = new Label(parent, SWT.LEFT | flatStyle);
- setColor(label);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.horizontalSpan = horizontalSpan;
- label.setLayoutData(data);
- return label;
- }
-
- /**
- * Helper method for creating labels.
- */
- public Label createLabel(Composite parent, int style, String text)
- {
- Label label = new Label(parent, style | flatStyle);
- setColor(label);
- label.setText(text);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- return label;
- }
-
- public Label createLabel(Composite parent, String text)
- {
- Label label = new Label(parent, SWT.LEFT | flatStyle);
- setColor(label);
- label.setText(text);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- return label;
- }
-
- public Label createLabel(Composite parent, String text, int alignment)
- {
- Label label = new Label(parent, SWT.LEFT | flatStyle);
- label.setText(text);
- setColor(label);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = alignment;
- label.setLayoutData(data);
- return label;
- }
-
- /**
- * Helper method for creating buttons.
- */
- public Button createPushButton(Composite parent, String label)
- {
- Button button = new Button(parent, SWT.PUSH | flatStyle);
- button.setText(label);
- setColor(button);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- button.setLayoutData(data);
- button.addKeyListener(keyboardHandler);
-
- return button;
- }
-
- public Table createTable(Composite parent)
- {
- Table table = new Table(parent, SWT.SINGLE | SWT.BORDER | flatStyle);
- setColor(table);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- table.setLayoutData(data);
- return table;
- }
-
- /**
- * Create radio button
- */
- public Button createRadioButton(Composite parent, String label)
- {
- Button button = new Button(parent, SWT.RADIO | flatStyle);
- button.setText(label);
- setColor(button);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- button.setLayoutData(data);
- button.addKeyListener(keyboardHandler);
-
- return button;
- }
-
- /**
- * Helper method for creating check box
- */
- public Button createCheckBox(Composite parent, String label)
- {
- Button button = new Button(parent, SWT.CHECK | flatStyle);
- button.setText(label);
- setColor(button);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- button.setLayoutData(data);
- return button;
- }
-
- public Combo createComboBox(Composite parent)
- {
- return createComboBox(parent, true);
- }
-
- public Combo createComboBox(Composite parent, boolean isReadOnly)
- {
- int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
- Combo combo = new Combo(parent, style | flatStyle | border);
- setColor(combo);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- combo.setLayoutData(data);
- return combo;
- }
-
- public CCombo createCComboBox(Composite parent)
- {
- return createCComboBox(parent, true);
- }
-
- public CCombo createCComboBox(Composite parent, boolean isReadOnly)
- {
- int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
- CCombo combo = new CCombo(parent, style | flatStyle | border);
- // setColor(combo);
- // Always use List Background
- combo.setBackground(comboBackgroundColor);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- combo.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- combo.addPaintListener(this);
- }
- else
- {
- /*
- // Defect 252891 : I'm not sure if this code will also cause problems on Linux GTK
- // But since its potentially cyclic ... I'm commenting it out for now
- combo.addPaintListener(new PaintListener()
- {
- public void paintControl(PaintEvent event)
- {
- Control c = (Control) event.widget;
- if (c.isEnabled()==true)
- {
- c.setBackground(comboBackgroundColor);
- }
- else
- {
- c.setBackground(comboDisabledColor);
- }
- final Control con = c;
- Runnable delayedUpdate = new Runnable()
- {
- public void run()
- {
- if (con != null)
- {
- if (!con.isDisposed()) // it gets disposed
- {
- con.redraw();
- }
- }
- }
- };
- Display.getCurrent().asyncExec(delayedUpdate);
- }
- });*/
- }
- return combo;
- }
-
- public List createListBox(Composite parent, int width, boolean isMultiSelect)
- {
- int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
- List list = new List(parent, style | flatStyle | border);
- setColor(list);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.widthHint = width;
- list.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- list.addPaintListener(this);
- }
- return list;
- }
-
- public List createListBox(Composite parent, int width, boolean isMultiSelect, boolean verticalFill)
- {
- int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
- List list = new List(parent, style | flatStyle | border);
- setColor(list);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = verticalFill;
- data.widthHint = width;
- list.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- list.addPaintListener(this);
- }
- return list;
- }
-
- public List createListBox(Composite parent, int style)
- {
- List list = new List(parent, style | flatStyle | border);
- setColor(list);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = true;
- list.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- list.addPaintListener(this);
- }
- return list;
- }
-
- public Text createTextField(Composite parent)
- {
- Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- text.addKeyListener(keyboardHandler);
- return text;
- }
-
- public Text createTextField(Composite parent, int width)
- {
- Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.widthHint = width;
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- text.addKeyListener(keyboardHandler);
- return text;
- }
-
- public Text createTextField(Composite parent, int width, int style)
- {
- Text text = new Text(parent, style | SWT.SINGLE | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.widthHint = width;
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- return text;
- }
-
- /**
- * <code>createWrappedMultiTextField</code> creates a wrapped multitext field
- *
- * @param parent a <code>Composite</code> value
- * @param width an <code>int</code> value
- * @param numLines an <code>int</code> value representing number of characters in height
- * @param verticalFill a <code>boolean</code> value
- * @return a <code>Text</code> value
- */
- public Text createWrappedMultiTextField(Composite parent, int width, int numLines, boolean verticalFill)
- {
- Text text = new Text(parent, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- if (verticalFill)
- {
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- }
- data.widthHint = width;
- FontData[] fontData = getFont().getFontData();
- // hack for now where on Windows, only 1 fontdata exists
- data.heightHint = numLines * fontData[0].getHeight();
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- return text;
- }
-
- public Text createMultiTextField(Composite parent, int width, int height, boolean verticalFill)
- {
- Text text = new Text(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- if (verticalFill)
- {
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- }
- data.widthHint = width;
- data.heightHint = height;
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- return text;
- }
-
- public Text createMultiTextField(Composite parent, boolean verticalFill)
- {
- Text text = new Text(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
- setColor(text);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- if (verticalFill)
- {
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- }
- text.setLayoutData(data);
- if (flatStyle == SWT.FLAT)
- {
- text.addPaintListener(this);
- }
- return text;
- }
-
- public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill)
- {
- Group group = new Group(parent, SWT.SHADOW_ETCHED_IN | flatStyle);
- group.setText(text);
- setColor(group);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- if (verticalFill)
- {
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- }
- group.setLayoutData(data);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- group.setLayout(layout);
- if (flatStyle == SWT.FLAT)
- {
- group.addPaintListener(new BorderPainter());
- }
- return group;
- }
-
- public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill, int alignment)
- {
- Group group = new Group(parent, SWT.SHADOW_ETCHED_IN | flatStyle);
- group.setText(text);
- setColor(group);
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = alignment;
- if (verticalFill)
- {
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- }
- group.setLayoutData(data);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- group.setLayout(layout);
- if (flatStyle == SWT.FLAT)
- {
- group.addPaintListener(new BorderPainter());
- }
- return group;
- }
-
- public Label createVerticalFiller(Composite parent, int verticalSpan)
- {
- Label label = new Label(parent, SWT.LEFT | flatStyle);
- label.setFont(getFont());
- setColor(label);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.verticalSpan = verticalSpan;
- label.setLayoutData(data);
-
- return label;
- }
-
- //
- // FlatPageHeader
- //
-
- // This will use the default background image.
- public Composite createFlatPageHeader
- (Composite parent,
- String title)
- {
- Image bgImage = createDefaultImage();
- return createFlatPageHeader(parent,bgImage,title);
- }
-
- // Provide your own background image.
- public Composite createFlatPageHeader
- (Composite parent,
- Image bgImage,
- String title)
- {
- FlatPageHeader header = new FlatPageHeader(parent,SWT.NONE);
- header.setLayout(new PageLayout());
- header.setBackgroundImage(bgImage);
- header.setText(title);
- WidgetFactory factory = new WidgetFactory();
- Composite formParent = factory.createComposite(header);
- //Composite formParent = createComposite(header,1);
- createPageContent(formParent);
- headerControl = header; // this is used in getTitleHeight()
- return formParent;
- }
-
- public void updateFlatPageHeaderTitle(String title)
- {
- ((FlatPageHeader)headerControl).setText(title);
- }
-
- private void createPageContent(Composite parent)
- {
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- }
-
- class PageLayout extends Layout
- {
- protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache)
- {
- if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
- return new Point(wHint, hHint);
-
- Control client = composite.getChildren()[0];
- Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache);
- if (headingVisible) csize.y += getTitleHeight();
-
- return csize;
- }
-
- protected void layout(Composite composite, boolean flushCache)
- {
- Rectangle clientArea = composite.getClientArea();
- Control client = composite.getChildren()[0];
- int theight = headingVisible ? getTitleHeight() : 0;
- client.setBounds(clientArea.x, clientArea.y + theight, clientArea.width, clientArea.height - theight);
- }
- }
-
- private int getTitleHeight()
- {
- int imageHeight = 0;
- // Note - Find out why headingImage is always null.
- if (headingImage != null && SWT.getPlatform().equals("motif") == false)
- imageHeight = headingImage.getBounds().height;
-
- GC gc = new GC(headerControl);
- gc.setFont(JFaceResources.getHeaderFont());
- FontMetrics fm = gc.getFontMetrics();
- int fontHeight = fm.getHeight();
- gc.dispose();
-
- int height = fontHeight + TITLE_VMARGIN + TITLE_VMARGIN;
- return Math.max(height,imageHeight);
- }
-
-
- private Image createDefaultImage()
- {
- return ImageDescriptor.createFromFile
- (WSDLEditorPlugin.class,
- "icons/page_banner.gif").createImage();
- }
- /**
- * Returns the backgroundColor.
- * @return Color
- */
- public Color getBackgroundColor()
- {
- return backgroundColor;
- }
-
- public class KeyboardHandler extends KeyAdapter
- {
- public void keyPressed(KeyEvent e)
- {
- Widget w = e.widget;
- if (w instanceof Control)
- {
- processKey(e.keyCode, (Control) w);
- }
- }
-
- private void scrollVertical(ScrolledComposite scomp, boolean up)
- {
- scroll(scomp, 0, up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT);
- }
-
- private void scrollHorizontal(ScrolledComposite scomp, boolean left)
- {
- scroll(scomp, left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT, 0);
- }
-
- private void scrollPage(ScrolledComposite scomp, boolean up)
- {
- Rectangle clientArea = scomp.getClientArea();
- int increment = up ? -clientArea.height : clientArea.height;
- scroll(scomp, 0, increment);
- }
-
- private void scroll(ScrolledComposite scomp, int xoffset, int yoffset)
- {
- Point origin = scomp.getOrigin();
- Point contentSize = scomp.getContent().getSize();
- int xorigin = origin.x + xoffset;
- int yorigin = origin.y + yoffset;
- xorigin = Math.max(xorigin, 0);
- xorigin = Math.min(xorigin, contentSize.x - 1);
- yorigin = Math.max(yorigin, 0);
- yorigin = Math.min(yorigin, contentSize.y - 1);
- scomp.setOrigin(xorigin, yorigin);
- }
-
- protected ScrolledComposite getScrolledComposite(Control c)
- {
- Composite parent = c.getParent();
-
- while (parent != null)
- {
- if (parent instanceof ScrolledComposite)
- {
- return (ScrolledComposite) parent;
- }
- parent = parent.getParent();
- }
- return null;
- }
-
- protected void processKey(int keyCode, Control c)
- {
- ScrolledComposite scomp = getScrolledComposite(c);
- if (scomp != null)
- {
- switch (keyCode)
- {
- case SWT.ARROW_DOWN :
- scrollVertical(scomp, false);
- break;
- case SWT.ARROW_UP :
- scrollVertical(scomp, true);
- break;
- case SWT.ARROW_LEFT :
- scrollHorizontal(scomp, true);
- break;
- case SWT.ARROW_RIGHT :
- scrollHorizontal(scomp, false);
- break;
- case SWT.PAGE_UP :
- scrollPage(scomp, true);
- break;
- case SWT.PAGE_DOWN :
- scrollPage(scomp, false);
- break;
- }
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
deleted file mode 100644
index 83a118bbf..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BaseDesignWindow;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BorderPainter;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class BaseViewer extends BaseDesignWindow implements Listener, SelectionListener
-{
-// protected Object input;
-
- // for use in subclasses
- protected FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
- public BaseViewer(IStatusLineManager statusLine)
- {
- super(statusLine);
- }
-
- public Object getInput()
- {
- return input;
- }
-
- // gets called only if we currently are not handling an event
- abstract public void doSetInput(Object input);
-
- /**
- * @see org.eclipse.jface.viewers.Viewer#setInput(Object)
- */
- static Object oldInput = null;
- ModelAdapterListener oldModelAdapterListener = null;
-
- public void setInput(Object input)
- {
- super.setInput(input);
-
- doSetInput(input);
-/*
- if (!isInDoHandle() && !getControl().isDisposed())
- {
- final Object obj = input;
- getControl().getDisplay().asyncExec(new Runnable()
- {
- public void run()
- {
- doSetInput(obj);
- }
- });
- }
-*/
- }
-
-
- boolean listenerEnabled = true;
- /**
- * Get the value of listenerEnabled.
- * @return value of listenerEnabled.
- */
- public boolean isListenerEnabled()
- {
- return listenerEnabled;
- }
-
- /**
- * Set the value of listenerEnabled.
- * @param v Value to assign to listenerEnabled.
- */
- public void setListenerEnabled(boolean v)
- {
- this.listenerEnabled = v;
- }
-
-
- public void handleEvent(Event event)
- {
- if (isListenerEnabled() &&
- getInput() != null &&
- !isInDoHandle)
- {
- isInDoHandle = true;
- startDelayedEvent(event);
- isInDoHandle = false;
- } // end of if ()
- }
-
- abstract public void doHandleEvent(Event event);
- abstract public void createControl(Composite parent);
-
- protected DelayedEvent delayedTask;
-
- protected void startDelayedEvent(Event e)
- {
- if (delayedTask == null ||
- delayedTask.getEvent() == null)
- {
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500,delayedTask);
- }
- else
- {
- Event delayedEvent = delayedTask.getEvent();
-
- if (e.widget == delayedEvent.widget &&
- e.type == delayedEvent.type)
- {
- // same event, just different data, delay new event
- delayedTask.setEvent(null);
- }
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500,delayedTask);
- }
- }
-
- class DelayedEvent implements Runnable
- {
- protected Event event;
-
- /*
- * @see Runnable#run()
- */
- public void run()
- {
- if (event != null)
- {
- isInDoHandle = true;
- doHandleEvent(event);
- isInDoHandle = false;
- event = null;
- }
- }
-
- /**
- * Gets the event.
- * @return Returns a Event
- */
- public Event getEvent()
- {
- return event;
- }
-
- /**
- * Sets the event.
- * @param event The event to set
- */
- public void setEvent(Event event)
- {
- this.event = event;
- }
-
- }
-
-
- boolean isInDoHandle;
- /**
- * Get the value of isInDoHandle.
- * @return value of isInDoHandle.
- */
- public boolean isInDoHandle()
- {
- return isInDoHandle;
- }
-
- /*
- * @see Viewer#getControl()
- */
- public Control getControl()
- {
- return mainUIComponent;
- }
-
-
- /*
- * @see BaseDesignWindow#createDesignPane(Composite, int)
- */
- protected Control createDesignPane(Composite arg0, int arg1)
- {
- Control control = super.createDesignPane(arg0, arg1);
-
- Composite client = super.getControlsContainer();
-
- client.addPaintListener(new BorderPainter());
-
- client.setBackground(new Color(Display.getCurrent(),255,255,255));
-
- return control;
- }
-
-
- public ISelection getSelection()
- {
- return null;
- }
-
- public void refresh()
- {
- }
-
- public void setSelection(ISelection selection, boolean reveal)
- {
- }
-
-
-// public abstract Control getControl();
-
-
- public Node getNode()
- {
- return (Node) getInput();
- }
-
-
- public void doWidgetDefaultSelected(SelectionEvent e)
- {}
-
- public void doWidgetSelected(SelectionEvent e)
- {}
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e)
- {
- if (isListenerEnabled() &&
- getInput() != null &&
- !isInDoHandle)
- {
- isInDoHandle = true;
- doWidgetDefaultSelected(e);
- isInDoHandle = false;
- }
-
- }
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e)
- {
- if (isListenerEnabled() &&
- getInput() != null &&
- !isInDoHandle)
- {
- isInDoHandle = true;
- doWidgetSelected(e);
- isInDoHandle = false;
- }
-
- }
-
- public Node getChildNode(Element parent, String childName)
- {
- NodeList list = null;
- if (parent != null)
- {
- list = parent.getChildNodes();
- }
-
- if (list != null)
- {
- // Performance issue perhaps?
- for (int i = 0; i < list.getLength(); i++)
- {
- if (list.item(i) instanceof Element)
- {
- if (list.item(i).getLocalName().equals(childName))
- {
- return list.item(i);
- }
- }
- }
- }
- return null;
- }
-
-
- protected Element performAddElement(Node parentNode, String namespaceName, String localName)
- {
- if (parentNode != null)
- {
- Element newElement = createElement(parentNode, namespaceName, localName);
- parentNode.appendChild(newElement);
- format(parentNode);
- return newElement;
- }
- return null;
- }
-
- protected Element createElement(Node parentNode, String namespaceName, String localName)
- {
- Document document = parentNode.getOwnerDocument();
- Element element = document.createElement(localName);
- return element;
- }
-
- protected void addAttributes(Element newElement, String attr, String value)
- {
- newElement.setAttribute(attr, value);
- }
-
- protected void format(Node parentNode)
- {
- if (parentNode instanceof IDOMNode)
- {
- // format selected node
- FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
- formatProcessorXML.formatNode((IDOMNode)parentNode);
- }
- }
-
- static protected IEditorPart getActiveEditor()
- {
- IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
- return editorPart;
- }
-
- static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
- {
- IStatusLineManager result = null;
- try
- {
- EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
- result = contributor.getActionBars().getStatusLineManager();
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
deleted file mode 100644
index 5c7d396a0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingInputOutputFaultViewer extends NamedComponentViewer
-{
- public BindingInputOutputFaultViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- String result = "";
- if (input instanceof BindingInput)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_INPUT");
- }
- else if (input instanceof BindingOutput)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OUTPUT");
- }
- else if (input instanceof BindingFault)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_FAULT");
- }
- return result;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
deleted file mode 100644
index f10337bca..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingOperationViewer extends NamedComponentViewer
-{
- public BindingOperationViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"); //$NON-NLS-1$
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
deleted file mode 100644
index 79d8bce9f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class BindingViewer extends NamedComponentViewer
-{
- protected CCombo componentNameCombo;
- protected ComponentNameComboHelper componentNameComboHelper;
- InvokeDialogButton button;
-
- public BindingViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING"); //$NON-NLS-1$
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
-
- componentNameCombo = flatViewUtility.createCComboBox(composite);
- componentNameCombo.addListener(SWT.Modify, this);
-
-
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getPortTypeNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.TYPE_ATTRIBUTE;
- }
- };
-
- button = new InvokeDialogButton(composite, getInput());
- button.setEditor(editorPart);
-
- return composite;
- }
-
- protected void update()
- {
- super.update();
- componentNameComboHelper.update(input);
- button.setInput(input);
- }
-
- protected void handleEventHelper(Element element, Event event)
- {
- super.handleEventHelper(element, event);
- componentNameComboHelper.handleEventHelper(element, event);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
deleted file mode 100644
index 5384c1d32..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-
-public class DefinitionViewer extends NamedComponentViewer
-{
- public DefinitionViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_DEFINITION"); //$NON-NLS-1$
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_NAMESPACES")); //$NON-NLS-1$
- Button button = flatViewUtility.createPushButton(composite, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
- SelectionListener listener = new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- EditNamespacesAction action = new EditNamespacesAction((Definition)getInput());
- action.run();
- }
- };
- button.addSelectionListener(listener);
- return composite;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
deleted file mode 100644
index e4e254189..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-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.Event;
-
-public class EmptyViewer extends BaseViewer
-{
- protected Composite control;
-
- public EmptyViewer(Composite parent, int style)
- {
- super(getStatusLineManager(getActiveEditor()));
- createControl(parent);
- }
-
- public void createControl(Composite parent)
- {
- control = new Composite(parent, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- control.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- control.setLayoutData(data);
- }
-
- public Control getControl()
- {
- return control;
- }
-
- public void doSetInput(Object input)
- {
-
- }
-
- /*
- * @see BaseWindow#doHandleEvent(Event)
- */
- public void doHandleEvent(Event event)
- {
- if (event.type == SWT.Modify)
- {
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
deleted file mode 100644
index 0f3a17017..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-import org.w3c.dom.Node;
-
-public class ExtensibilityElementViewer extends BaseViewer implements ModelAdapterListener
-{
- protected Composite control;
- protected IEditorPart editorPart;
- protected AttributesTable attributesTable;
- boolean isForTabbedProperties = false;
-
- public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart)
- {
- super(getStatusLineManager(editorPart));
- this.editorPart = editorPart;
-
- createControl(parent);
- }
-
- public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart, boolean isForTabbedProperties)
- {
- super(getStatusLineManager(editorPart));
- this.editorPart = editorPart;
- this.isForTabbedProperties = isForTabbedProperties;
- if (isForTabbedProperties)
- {
- createControlForTabbedPropertySheet(parent);
- }
- else
- {
- createControl(parent);
- }
- }
-
- protected String getHeadingText()
- {
- String result = "";
- if (input != null)
- {
- Node node = ((WSDLElement)input).getElement();
- result = node.getNodeName();
- if (result == null || result.length() == 0)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_EXTENSIBILITY_ELEMENT"); //$NON-NLS-1$
- }
- }
- return result;
- }
-
- // TODO... move this method down to BaseViewer!
- public void doHandleEvent(Event event)
- {
- }
-
- public void createControlForTabbedPropertySheet(Composite parent)
- {
- attributesTable = new AttributesTable(editorPart, parent);
- }
-
- public void createControl(Composite parent)
- {
- control = flatViewUtility.createComposite(parent, 1, true);
- control.setBackground (new Color(null,255,0,0));
- GridData gd= new GridData();
- gd.horizontalAlignment= GridData.FILL;
- gd.grabExcessHorizontalSpace= true;
- gd.verticalAlignment= GridData.FILL;
- gd.grabExcessVerticalSpace= true;
-
- control.setLayoutData(gd);
-
-
- GridLayout layout = (GridLayout)control.getLayout();
- layout.verticalSpacing = 0;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
-
- flatViewUtility.createFlatPageHeader(control, "");
-
- Composite c = flatViewUtility.createComposite(control, 1, true);
- GridData cGD= new GridData();
- cGD.horizontalAlignment= GridData.FILL;
- cGD.grabExcessHorizontalSpace= true;
- cGD.verticalAlignment= GridData.FILL;
- cGD.grabExcessVerticalSpace= true;
-
- c.setLayoutData(cGD);
- attributesTable = new AttributesTable(editorPart, c);
-
- GridData attributesTableGD= new GridData();
- attributesTableGD.horizontalAlignment= GridData.FILL;
- attributesTableGD.grabExcessHorizontalSpace= true;
- attributesTableGD.verticalAlignment= GridData.FILL;
- attributesTableGD.grabExcessVerticalSpace= true;
-
- attributesTable.getControl().setLayoutData(attributesTableGD);
- }
-
- public Control getControl()
- {
- return control;
- }
-
-
- public void doSetInput(Object input)
- {
- if (!isForTabbedProperties)
- {
- flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
- }
- setListenerEnabled(false);
-
- attributesTable.setInput(((WSDLElement)input).getElement());
-
- setListenerEnabled(true);
-
- if (oldInput != null)
- {
- WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
- }
- WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-
- oldInput = input;
- }
-
- public void propertyChanged(Object object, String property)
- {
- if (isListenerEnabled())
- {
- setListenerEnabled(false);
- update();
- setListenerEnabled(true);
- }
- }
-
- protected void update()
- {
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- if (!attributesTable.getControl().isDisposed())
- {
- attributesTable.refresh();
- }
- }
- };
- Display.getCurrent().asyncExec(runnable);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
deleted file mode 100644
index 2c6057f44..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class ExtensibleDetailsViewerProvider implements IDetailsViewerProvider
-{
- protected WSDLEditorExtension[] extensions;
- protected IDetailsViewerProvider[] detailsViewerProviders;
-
- protected final static Object[] EMPTY_ARRAY = {};
-
- public ExtensibleDetailsViewerProvider(WSDLEditor wsdlEditor)
- {
- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-
- extensions = registry.getRegisteredExtensions(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER);
- detailsViewerProviders = new IDetailsViewerProvider[extensions.length];
- for (int i = 0; i < extensions.length; i++)
- {
- detailsViewerProviders[i] = (IDetailsViewerProvider)extensions[i].createExtensionObject(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER, wsdlEditor);
- }
- }
-
-
- protected IDetailsViewerProvider getApplicableDetailsProvider(Object object)
- {
- IDetailsViewerProvider provider = null;
- for (int i = 0; i < extensions.length; i++)
- {
- if (extensions[i].isApplicable(object))
- {
- provider = detailsViewerProviders[i];
- if (provider != null)
- {
- break;
- }
- }
- }
- return provider;
- }
-
-
- public Object getViewerKey(Object object)
- {
- IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
- return provider != null ? provider.getViewerKey(object) : null;
- }
-
-
- public Viewer createViewer(Object object, Composite parent, IEditorPart editorPart)
- {
- IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
- return provider != null ? provider.createViewer(object, parent, editorPart) : null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
deleted file mode 100644
index 1419425ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-
-public class ImportViewer extends BaseViewer implements ModelAdapterListener
-{
- protected Composite control;
- protected IEditorPart editorPart;
-
- protected Text namespaceText;
- protected Text prefixText;
- protected Text locationText;
- Button selectButton;
-
- /**
- * Constructor for ImportViewer.
- * @param parent
- * @param editorPart
- */
- public ImportViewer(Composite parent, IEditorPart editorPart)
- {
- super(getStatusLineManager(editorPart));
- this.editorPart = editorPart;
- createControl(parent);
- }
- /**
- * @see org.eclipse.wst.wsdl.ui.internal.viewers.NamedComponentViewer#getHeadingText()
- */
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_IMPORT"); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent)
- {
- control = flatViewUtility.createComposite(parent, 1, true);
- GridLayout layout = (GridLayout)control.getLayout();
- layout.verticalSpacing = 0;
-
- flatViewUtility.createFlatPageHeader(control, getHeadingText());
-
- Composite c = flatViewUtility.createComposite(control, 1, true);
-
- Label bogus = flatViewUtility.createLabel(c, 0, "");
- GridData gd= new GridData();
- gd.horizontalAlignment= GridData.FILL;
- gd.grabExcessHorizontalSpace= true;
-
- bogus.setLayoutData(gd);
-
- Composite composite = flatViewUtility.createComposite(c, 2, true);
- GridLayout layout2 = new GridLayout();
- layout2.makeColumnsEqualWidth = false;
- layout2.numColumns = 3;
- layout2.marginHeight = 3;
- composite.setLayout(layout2);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
- namespaceText = flatViewUtility.createTextField(composite);
- namespaceText.setEnabled(false);
-
- // place holder
- Control con= flatViewUtility.createLabel(composite, 0, "");
- gd = new GridData();
- gd.grabExcessHorizontalSpace = false;
- con.setLayoutData(gd);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
- prefixText = flatViewUtility.createTextField(composite);
- prefixText.addListener(SWT.Modify,this);
- prefixText.setEnabled(false);
-
- // place holder
- Control con2= flatViewUtility.createLabel(composite, 0, "");
- gd = new GridData();
- gd.grabExcessHorizontalSpace = false;
- con2.setLayoutData(gd);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
- locationText = flatViewUtility.createTextField(composite);
- locationText.setEnabled(false);
-
- selectButton = flatViewUtility.createPushButton(composite, "...");
- gd = new GridData();
- gd.horizontalAlignment = GridData.BEGINNING;
- gd.grabExcessHorizontalSpace = false;
- selectButton.setLayoutData(gd);
- selectButton.addSelectionListener(this);
- }
-
- public void doSetInput(Object input)
- {
- setListenerEnabled(false);
- try
- {
-// Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
- update();
- }
- finally
- {
- setListenerEnabled(true);
- }
-
- if (oldInput != null)
- {
- WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
- }
-
- WSDLModelAdapterFactory.addModelAdapterListener(input, this);
- oldInput = input;
- }
-
- protected void handleEventHelper(Element element, Event event)
- {
- if (event.type == SWT.Modify)
- {
- }
- }
-
- protected void update()
- {
- Element element = ((WSDLElement)input).getElement();
- flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
- prefixText.setText("");
- locationText.setText("");
- namespaceText.setText(" ");
- namespaceText.getParent().layout();
- namespaceText.setText("");
- String locationValue = element.getAttribute("location");
- locationText.setText(locationValue != null ? locationValue : "");
-
- String namespaceValue = element.getAttribute("namespace");
- namespaceText.setText(namespaceValue != null ? namespaceValue : "");
-
- String prefix = ((Import)input).getEnclosingDefinition().getPrefix(namespaceValue);
- prefixText.setText(prefix != null ? prefix : "");
- }
-
- public Control getControl()
- {
- return control;
- }
-
- /*
- * @see BaseWindow#doHandleEvent(Event)
- */
- public void doHandleEvent(Event event)
- {
-// if (event.widget == prefixText)
-// {
-// String newPrefix = prefixText.getText();
-// String errorMessage = ValidateHelper.checkXMLPrefix(newPrefix);
-//
-// if (errorMessage == null || errorMessage.length() == 0)
-// {
-// Import importObj = (Import)input;
-// org.w3c.dom.Element importElement = WSDLUtil.getInstance().getElementForObject(importObj);
-//
-// Definition definition = importObj.getEnclosingDefinition();
-// org.w3c.dom.Element definitionElement = WSDLUtil.getInstance().getElementForObject(definition);
-//
-// String nsFromModel = importObj.getNamespaceURI();
-// String nsFromDOM = importElement.getAttribute("namespace");
-// System.out.println(nsFromModel);
-// System.out.println(nsFromDOM);
-//
-// String oldPrefix = definition.getPrefix(nsFromModel);
-// definitionElement.removeAttribute("xmlns:" + oldPrefix);
-// definitionElement.setAttribute("xmlns:" + newPrefix, nsFromModel);
-// }
-// }
- }
-
- public void propertyChanged(Object object, String property)
- {
- if (isListenerEnabled())
- {
- setListenerEnabled(false);
- update();
- setListenerEnabled(true);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
-
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == selectButton)
- {
-// TODO: port check
- WSDLEditor editor = (WSDLEditor)editorPart;
- IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-
- SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
- String [] filters = { "xsd", "wsdl" };
- IFile [] excludedFiles = { currentWSDLFile };
-
- dialog.addFilterExtensions(filters, excludedFiles);
- dialog.create();
- dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
- dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
- dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
- int rc = dialog.open();
- if (rc == IDialogConstants.OK_ID)
- {
- IFile selectedFile = dialog.getFile();
-
- //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
- //{
- // System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
- //}
-
- String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-
- Import importObj = (Import)input;
- org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
- Definition definition = importObj.getEnclosingDefinition();
- org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
- String importTargetNamespace = "";
- String prefix = prefixText.getText();
- String uniquePrefix = "";
-
- URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());
-
- // note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
- // I should change the name of this convenience method
- importTargetNamespace = XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-
- if (prefix.trim().equals(""))
- {
- uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
- }
- else
- {
- uniquePrefix = prefix;
- }
-
-
- if (importTargetNamespace == null ||
- (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
- {
- return; // what to do with no namespace docs?
- }
-
- importElement.setAttribute("location", location);
- importElement.setAttribute("namespace", importTargetNamespace);
-
- definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace);
-
- namespaceText.setText(importTargetNamespace);
- locationText.setText(location);
- prefixText.setText(uniquePrefix);
- }
- }
- }
-
- private String getUniquePrefix(Definition definition, String initPrefix)
- {
- String uniquePrefix;
- Map map = definition.getNamespaces();
-
- if (definition.getNamespace(initPrefix) == null)
- {
- uniquePrefix = initPrefix;
- }
- else // if used, then try to create a unique one
- {
- String tempPrefix = initPrefix;
- int i = 1;
- while(map.containsKey(tempPrefix + i))
- {
- i++;
- }
- uniquePrefix = tempPrefix + i;
- }
- return uniquePrefix;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
deleted file mode 100644
index bcd529b4a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class InputOutputFaultViewer extends NamedComponentViewer
-{
- protected CCombo componentNameCombo;
- protected ComponentNameComboHelper componentNameComboHelper;
- InvokeDialogButton button;
-
- public InputOutputFaultViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- String result = "";
-
- if (input instanceof Input)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_INPUT"); //$NON-NLS-1$
- }
- else if (input instanceof Output)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_OUTPUT"); //$NON-NLS-1$
- }
- else if (input instanceof Fault)
- {
- result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_FAULT"); //$NON-NLS-1$
- }
-
- return result;
- }
-
- public boolean isObjectExtensible()
- {
- return false;
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-
- componentNameCombo = flatViewUtility.createCComboBox(composite);
- componentNameCombo.addListener(SWT.Modify, this);
-
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getMessageNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.MESSAGE_ATTRIBUTE;
- }
- };
-
- button = new InvokeDialogButton(composite, getInput());
- button.setEditor(editorPart);
-
- return composite;
- }
-
-
- protected void update()
- {
- super.update();
- componentNameComboHelper.update(input);
- button.setInput(input);
- }
-
- protected void handleEventHelper(Element element, Event event)
- {
- super.handleEventHelper(element, event);
- componentNameComboHelper.handleEventHelper(element, event);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
deleted file mode 100644
index 3a8e0c858..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class MessageViewer extends NamedComponentViewer
-{
- public MessageViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE"); //$NON-NLS-1$
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
deleted file mode 100644
index 80a506561..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public abstract class NamedComponentViewer extends BaseViewer implements ModelAdapterListener
-{
- protected Composite control;
- protected Text nameField;
- protected IEditorPart editorPart;
-
- public NamedComponentViewer(Composite parent, IEditorPart editorPart)
- {
- super(getStatusLineManager(editorPart));
- this.editorPart = editorPart;
-
- createControl(parent);
- }
-
- protected abstract String getHeadingText();
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite group = flatViewUtility.createComposite(parent, 2, true);
-
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Composite nameFieldComposite = flatViewUtility.createComposite(group, 2, true);
- ((GridLayout)nameFieldComposite.getLayout()).marginWidth = 0;
- ((GridLayout)nameFieldComposite.getLayout()).marginHeight = 0;
-
- GridLayout layout = new GridLayout();
- layout.makeColumnsEqualWidth = false;
- layout.numColumns = 3;
- layout.marginHeight = 4;
- layout.marginWidth = 0;
-
- nameFieldComposite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.verticalAlignment = GridData.BEGINNING;
- nameFieldComposite.setLayoutData(gd);
-
-
- flatViewUtility.createLabel(nameFieldComposite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
- nameField = flatViewUtility.createTextField(nameFieldComposite);
- nameField.addListener(SWT.Modify, this);
-
- // place holder
- Control c = flatViewUtility.createLabel(nameFieldComposite, 0, "");
- c.setBackground(new Color(null, 0, 255, 100));
- gd = new GridData();
- gd.grabExcessHorizontalSpace = false;
- gd.heightHint = 0;
- gd.widthHint = 0;
- c.setLayoutData(gd);
-
- return nameFieldComposite;
- }
-
- public void createControl(Composite parent)
- {
- SashForm sashForm = new SashForm(parent, SWT.BORDER);
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
- control = sashForm;
- sashForm.setOrientation(SWT.HORIZONTAL);
-
- Composite composite = flatViewUtility.createComposite(sashForm, 1, true);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- GridLayout layout = (GridLayout)composite.getLayout();
- layout.verticalSpacing = 0;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
-
- flatViewUtility.createFlatPageHeader(composite, getHeadingText());
-
- populatePrimaryDetailsSection(composite);
-
- TabbedViewer tabbedViewer = new TabbedViewer((WSDLEditor)editorPart);
-
- Control c = tabbedViewer.createControl(sashForm);
- c.setLayoutData(new GridData(GridData.FILL_BOTH));
- }
-
- public void doSetInput(Object input)
- {
- setListenerEnabled(false);
- try
- {
-// Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
- update();
- }
- finally
- {
- setListenerEnabled(true);
- }
-
- if (oldInput != null)
- {
- WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
- }
-
- WSDLModelAdapterFactory.addModelAdapterListener(input, this);
- oldInput = input;
- }
-
- protected void update()
- {
- Element element = ((WSDLElement)input).getElement();
- flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-
- nameField.setText("");
- String nameValue = element.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
- nameField.setText(nameValue != null ? nameValue : "");
- }
-
- public Control getControl()
- {
- return control;
- }
-
- /*
- * @see BaseWindow#doHandleEvent(Event)
- */
- public void doHandleEvent(Event event)
- {
- setListenerEnabled(false);
- Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
- handleEventHelper(element, event);
- setListenerEnabled(true);
- }
-
- protected void handleEventHelper(Element element, Event event)
- {
- if (event.type == SWT.Modify)
- {
- if (event.widget == nameField)
- {
- new SmartRenameAction(input, nameField.getText()).run();
- }
- }
- }
-
- public void propertyChanged(Object object, String property)
- {
- if (isListenerEnabled())
- {
- setListenerEnabled(false);
- if (!control.isDisposed())
- {
- update();
- }
- setListenerEnabled(true);
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
deleted file mode 100644
index c0c326e11..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class OperationViewer extends NamedComponentViewer
-{
- public OperationViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION"); //$NON-NLS-1$
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PARAMETER_ORDER")); //$NON-NLS-1$
- Text parameterOrderField = flatViewUtility.createTextField(composite);
- parameterOrderField.addListener(SWT.Modify, this);
-
- //Button button = new Button(composite, SWT.FLAT);
- //button.setText("...");
-
- return composite;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
deleted file mode 100644
index f509a79c4..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.w3c.dom.Element;
-
-public class PartViewer extends NamedComponentViewer
-{
- protected CCombo componentNameCombo;
- protected CCombo referenceKindCombo;
- protected Label componentNameLabel;
- InvokeDialogButton button;
-// Button importButton;
-
-
- public PartViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART"); //$NON-NLS-1$
- }
-
- public boolean isObjectExtensible()
- {
- return false;
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
-
- flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
- referenceKindCombo = flatViewUtility.createCComboBox(composite);
- referenceKindCombo.add("element");
- referenceKindCombo.add("type");
- referenceKindCombo.setText("type");
- referenceKindCombo.addListener(SWT.Modify, this);
-
- flatViewUtility.createLabel(composite, "");
-
- componentNameLabel = flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
-
- componentNameCombo = flatViewUtility.createCComboBox(composite);
- componentNameCombo.addListener(SWT.Modify, this);
- componentNameCombo.addSelectionListener(this);
-
- button = new InvokeDialogButton(composite, getInput());
-
- return composite;
- }
-
- protected void update()
- {
- try
- {
- Part part = (Part)input;
- boolean isType = ComponentReferenceUtil.isType(part);
- String value = ComponentReferenceUtil.getPartComponentReference(part);
-
- // update the combo-box content
- //
- componentNameCombo.removeAll();
- List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
- if (compList != null)
- {
- for (Iterator iterator = compList.iterator(); iterator.hasNext();)
- {
- componentNameCombo.add((String)iterator.next());
- }
- }
-
- if (isType)
- {
- referenceKindCombo.setText("type");
- componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
- componentNameCombo.setText(value != null ? value : "");
- button.setReferenceKind("type");
- }
- else
- {
- referenceKindCombo.setText("element");
- componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
- componentNameCombo.setText(value != null ? value : "");
- button.setReferenceKind("element");
- }
- button.setInput(input);
- button.setEditor(editorPart);
- super.update();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
-
- protected void handleEventHelper(Element element, Event event)
- {
- super.handleEventHelper(element, event);
- if (event.type == SWT.Modify)
- {
- if (event.widget == referenceKindCombo)
- {
- // TODO... I have no idea why we need to use a delayed runnable to get
- // updating working properly .... this is something we need to revisit
- DelayedRenameRunnable runnable = new DelayedRenameRunnable((Part)input);
- Display.getCurrent().asyncExec(runnable);
- }
- }
- }
-
- protected class DelayedRenameRunnable implements Runnable
- {
- Part part;
-
- DelayedRenameRunnable(Part part)
- {
- this.part = part;
- }
-
- public void run()
- {
- boolean isType = referenceKindCombo.getText().equals("type");
- ComponentReferenceUtil.setComponentReference(part, isType, null);
- }
- }
-
- public void doWidgetSelected(SelectionEvent e)
- {
- if (e.widget == componentNameCombo)
- {
- Part part = (Part)input;
- boolean isType = referenceKindCombo.getText().equals("type");
- ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
deleted file mode 100644
index d85fdfc9d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class PortTypeViewer extends NamedComponentViewer
-{
- public PortTypeViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE"); //$NON-NLS-1$
- }
-
- public boolean isObjectExtensible()
- {
- return false;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
deleted file mode 100644
index 8e5f3d087..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class PortViewer extends NamedComponentViewer
-{
- protected CCombo componentNameCombo;
- protected ComponentNameComboHelper componentNameComboHelper;
- InvokeDialogButton button;
-
- public PortViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORT"); //$NON-NLS-1$
- }
-
- protected Composite populatePrimaryDetailsSection(Composite parent)
- {
- Composite composite = super.populatePrimaryDetailsSection(parent);
-
- flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
-
- componentNameCombo = flatViewUtility.createCComboBox(composite);
- componentNameCombo.addListener(SWT.Modify, this);
-
- componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
- {
- protected List getComponentNameList(ComponentReferenceUtil util)
- {
- return util.getBindingNames();
- }
-
- protected String getAttributeName()
- {
- return WSDLConstants.BINDING_ATTRIBUTE;
- }
- };
-
- button = new InvokeDialogButton(composite, getInput());
- button.setEditor(editorPart);
-
- return composite;
- }
-
- protected void update()
- {
- super.update();
- componentNameComboHelper.update(input);
- button.setInput(input);
- }
-
- protected void handleEventHelper(Element element, Event event)
- {
- super.handleEventHelper(element, event);
- componentNameComboHelper.handleEventHelper(element, event);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
deleted file mode 100644
index 01b23cce0..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ServiceViewer extends NamedComponentViewer
-{
- public ServiceViewer(Composite parent, IEditorPart editorPart)
- {
- super(parent, editorPart);
- }
-
- protected String getHeadingText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_SERVICE"); //$NON-NLS-1$
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
deleted file mode 100644
index c44135e7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDComponent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class TabbedViewer implements ISelectionChangedListener
-{
- protected WSDLEditor editor;
- protected CTabFolder tabFolder;
- protected Text documentationField;
- protected DocumentationListener documentationListener;
- protected boolean listenerEnabled;
-
- public TabbedViewer(WSDLEditor editor)
- {
- this.editor = editor;
- }
-
- public Control createControl(Composite parent)
- {
- tabFolder = new CTabFolder(parent, 0);
-
- CTabItem tab = new CTabItem(tabFolder, SWT.NONE);
- tab.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_DOCUMENTION")); //$NON-NLS-1$
- documentationField = new Text(tabFolder, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
- tab.setControl(documentationField);
- tabFolder.setSelection(tab);
-
- documentationListener = new DocumentationListener();
- listenerEnabled = true;
- documentationField.addModifyListener(documentationListener);
-
- editor.getSelectionManager().addSelectionChangedListener(this);
-
- return tabFolder;
- }
-
- public void setInput(Object object)
- {
- listenerEnabled = false;
- documentationListener.setInput(object);
- documentationField.setEnabled(true);
- documentationField.setText("");
-
- if (object instanceof XSDComponent || !(object instanceof WSDLElement))
- {
- documentationField.setEnabled(false);
- listenerEnabled = true;
- return;
- }
-
- Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
- if (element != null)
- {
- if (element.getLocalName().equals("documentation"))
- {
- documentationField.setEnabled(false);
- listenerEnabled = true;
- return;
- }
-
- Node docNode = getChildNode(element, element.getPrefix(), "documentation");
- if (docNode != null)
- {
- Node textNode = docNode.getFirstChild();
- if (textNode != null)
- {
- String textNodeValue = textNode.getNodeValue();
- documentationField.setText(textNodeValue != null ? textNodeValue : "");
- }
- }
- }
- listenerEnabled = true;
-// There appears to be a defect in the model...it doesn't return
-// the documentationElement even though it exists
-// if (object instanceof WSDLElement)
-// {
-// WSDLElement elem = (WSDLElement)object;
-// System.out.println("elem = " + elem);
-//
-// if (elem != null)
-// {
-// Element doc = elem.getDocumentationElement();
-// System.out.println("docNode = " + doc);
-// if (doc != null)
-// {
-// Node textNode = doc.getFirstChild();
-// if (textNode != null)
-// {
-// documentationField.setText(textNode.getNodeValue());
-// }
-// }
-// }
-// }
- }
-
- public void selectionChanged(SelectionChangedEvent event)
- {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- Object o = ((IStructuredSelection)selection).getFirstElement();
- if (o != null)
- {
- setInput(o);
- }
- }
- }
-
- public Node getChildNode(Element parent, String prefix, String childName)
- {
- NodeList list = null;
- if (parent != null)
- {
- list = parent.getChildNodes();
- }
- String targetName;
- if (prefix != null && prefix.length() > 0)
- {
- targetName = prefix + ":" + childName;
- }
- else
- {
- targetName = childName;
- }
-
- if (list != null)
- {
- // Performance issue perhaps?
- for (int i = 0; i < list.getLength(); i++)
- {
- if (list.item(i) instanceof Element)
- {
- if (list.item(i).getNodeName().equals(targetName))
- {
- return list.item(i);
- }
- }
- }
- }
- return null;
- }
-
-
-
- class DocumentationListener implements ModifyListener
- {
- Object object;
-
- public void setInput(Object object)
- {
- this.object = object;
- }
-
- /**
- * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
- */
- public void modifyText(ModifyEvent e)
- {
- if (listenerEnabled)
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
- if (element != null)
- {
- Node docNode = getChildNode(element, element.getPrefix(), "documentation");
- if (docNode != null)
- {
- Node textNode = docNode.getFirstChild();
- if (textNode != null)
- {
- textNode.setNodeValue(documentationField.getText());
- }
- else
- {
- if (documentationField.getText() != null && documentationField.getText().length() > 0)
- {
- Document document = docNode.getOwnerDocument();
- org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
- docNode.appendChild(newTextNode);
- }
- }
- }
- else
- {
- AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild());
- action.run();
- Element newDocumentation = action.getNewElement();
-
- Document document = newDocumentation.getOwnerDocument();
- org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
- newDocumentation.appendChild(newTextNode);
- }
- }
- }
- }
- }
-}
- \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
deleted file mode 100644
index 35c8d23af..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class WSDLDetailsViewer implements ISelectionChangedListener
-{
- protected WSDLEditor editor;
- protected Composite client;
- protected PageBook pageBook;
- protected ExtensibleDetailsViewerProvider detailsViewerProvider;
- protected HashMap viewerMap = new HashMap();
-
- protected final static String EMPTY_VIEWER_KEY = "EMPTY_VIEWER_KEY";
- protected Viewer emptyViewer;
-
- public WSDLDetailsViewer(WSDLEditor editor)
- {
- this.editor = editor;
- detailsViewerProvider = new ExtensibleDetailsViewerProvider(editor);
- editor.getSelectionManager().addSelectionChangedListener(this);
- }
-
- public Control createControl(Composite parent)
- {
- client = pageBook = new PageBook(parent, 0);
- pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
- emptyViewer = new EmptyViewer(pageBook, SWT.NONE);
- viewerMap.put(EMPTY_VIEWER_KEY, emptyViewer);
- pageBook.showPage(emptyViewer.getControl());
- return client;
- }
-
- public void setInput(Object object)
- {
- try
- {
- Object key = detailsViewerProvider.getViewerKey(object);
-
- if (key == null)
- {
- key = EMPTY_VIEWER_KEY;
- }
- Viewer viewer = (Viewer)viewerMap.get(key);
- if (viewer == null)
- {
- viewer = detailsViewerProvider.createViewer(object, pageBook, editor);
- if (viewer != null)
- {
- viewerMap.put(key, viewer);
- if (viewer instanceof OperationViewer)
- {
-
- }
- }
- }
-
- if (viewer != null)
- {
- if (object instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
- XSDSchema xsdSchema = schema.getSchema();
- if (xsdSchema != null)
- {
- viewer.setInput(xsdSchema.getElement());
- }
- }
- else
- {
- viewer.setInput(object);
- }
- pageBook.showPage(viewer.getControl());
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- public void selectionChanged(SelectionChangedEvent event)
- {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- Object o = ((IStructuredSelection)selection).getFirstElement();
- if (o instanceof WSDLGroupObject)
- {
- o = ((WSDLGroupObject)o).getDefinition();
- }
- setInput(o);
- }
- }
-}
- \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
deleted file mode 100644
index 216af1e37..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-
-public class WSDLDetailsViewerProvider implements IDetailsViewerProvider
-{
- public Object getViewerKey(Object modelObject)
- {
- Object result = null;
-
- // todo.... use a switch
- if (modelObject instanceof Message)
- {
- result = "message";
- }
- else if (modelObject instanceof Binding)
- {
- result = "binding";
- }
- else if (modelObject instanceof BindingOperation)
- {
- result = "bindingOperation";
- }
- else if (modelObject instanceof Operation)
- {
- result = "operation";
- }
- else if (modelObject instanceof Definition)
- {
- result = "definition";
- }
- else if (modelObject instanceof Part)
- {
- result = "part";
- }
- else if (modelObject instanceof Port)
- {
- result = "port";
- }
- else if (modelObject instanceof Input ||
- modelObject instanceof Output ||
- modelObject instanceof Fault)
- {
- result = "inputOutputFault";
- }
- else if (modelObject instanceof BindingInput ||
- modelObject instanceof BindingOutput ||
- modelObject instanceof BindingFault)
- {
- result = "bindingInputOutputFault";
- }
- else if (modelObject instanceof PortType)
- {
- result = "portType";
- }
- else if (modelObject instanceof Service)
- {
- result = "service";
- }
- else if (modelObject instanceof ExtensibilityElement)
- {
- result = "extensibilityElement";
- }
- else if (modelObject instanceof Import)
- {
- result = "import";
- }
- else
- {
- result = "empty";
- }
- return result;
- }
-
-
- public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
- {
- Viewer viewer = null;
- Object key = getViewerKey(modelObject);
- if (key != null)
- {
- if (key.equals("message"))
- {
- viewer = new MessageViewer(parent, editorPart);
- }
- else if (key.equals("binding"))
- {
- viewer = new BindingViewer(parent, editorPart);
- }
- else if (key.equals("definition"))
- {
- viewer = new DefinitionViewer(parent, editorPart);
- }
- else if (key.equals("bindingOperation"))
- {
- viewer = new BindingOperationViewer(parent, editorPart);
- }
- else if (key.equals("operation"))
- {
- viewer = new OperationViewer(parent, editorPart);
- }
- else if (key.equals("part"))
- {
- viewer = new PartViewer(parent, editorPart);
- }
- else if (key.equals("port"))
- {
- viewer = new PortViewer(parent, editorPart);
- }
- else if (key.equals("inputOutputFault"))
- {
- viewer = new InputOutputFaultViewer(parent, editorPart);
- }
- else if (key.equals("bindingInputOutputFault"))
- {
- viewer = new BindingInputOutputFaultViewer(parent, editorPart);
- }
- else if (key.equals("service"))
- {
- viewer = new ServiceViewer(parent, editorPart);
- }
- else if (key.equals("extensibilityElement"))
- {
- viewer = new ExtensibilityElementViewer(parent, editorPart);
- }
- else if (key.equals("portType"))
- {
- viewer = new PortTypeViewer(parent, editorPart);
- }
- else if (key.equals("import"))
- {
- viewer = new ImportViewer(parent, editorPart);
- }
- else
- {
- viewer = new EmptyViewer(parent, 0);
- }
- }
- return viewer;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
deleted file mode 100644
index 26b04cc6b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-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.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-public class AttributesTable extends TableViewer implements ICellModifier
-{
- protected static final String PROPERTY = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PROPERTY"); //$NON-NLS-1$
- protected static final String VALUE = WSDLEditorPlugin.getWSDLString("_UI_LABEL_VALUE"); //$NON-NLS-1$
-
- protected IEditorPart editorPart;
- protected String[] columnProperties = {PROPERTY, VALUE};
- protected PropertyTableProvider tableProvider = new PropertyTableProvider(this);
- protected CellEditor textCellEditor;
- //protected StringComboBoxCellEditor comboCellEditor;
- protected IPropertySource propertySource;
-
-
- public AttributesTable(IEditorPart editorPart, Composite parent)
- {
- super(new Table(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.FLAT));
- this.editorPart = editorPart;
- getTable().setLinesVisible(true);
- getTable().setHeaderVisible(true);
-
- setContentProvider(tableProvider);
- setLabelProvider(tableProvider);
- setColumnProperties(columnProperties);
-
- for (int i = 0; i < columnProperties.length; i++)
- {
- TableColumn column = new TableColumn(getTable(), SWT.NONE, i);
- column.setText(columnProperties[i]);
- column.setAlignment(SWT.LEFT);
- }
-
- TableLayout layout = new TableLayout();
- ColumnWeightData data = new ColumnWeightData(40, 40, true);
- layout.addColumnData(data);
-
- ColumnWeightData data2 = new ColumnWeightData(80, 80, true);
- layout.addColumnData(data2);
-
- getTable().setLayout(layout);
-
- textCellEditor = new TextCellEditor(getTable());
- resetCellEditors();
-
- setCellModifier(this);
- }
-
- protected void hookControl(Control control) {
- // we need to hook up our own mouse listener first
- // so that we can update the cellEditors before
- // the 'internal' listener tries to get hold of them
- Table tableControl = (Table)control;
- tableControl.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- updateCellEditors();
- }
- });
- super.hookControl(control);
- }
-
- // ICellModifier
- public boolean canModify(Object element, String property)
- {
- return property.equals(VALUE);
- }
-
- public Object getValue(Object element, String property)
- {
- int column = 0;
- if (property.equals(columnProperties[0]))
- {
- column = 0;
- }
- else if (property.equals(columnProperties[1]))
- {
- column = 1;
- }
- return tableProvider.getColumnText(element, column);
- }
-
- public void modify(Object element, String property, Object value)
- {
- TableItem item = (TableItem)element;
- IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)item.getData();
-
- // if the new value is the same as the old value, the user has only clicked
- // on the cell in the course of 'browsing' ... so don't edit the value
- Object oldValue = getValue(propertyDescriptor, property);
- if (value != null && !value.equals(oldValue))
- {
- // we assume the value is empty that the attribute should be removed
- // todo... we probably need to look at this in more detail
- if (value instanceof String && ((String)value).length() == 0)
- {
- value = null;
- }
- propertySource.setPropertyValue(propertyDescriptor.getId(), value);
- refresh(item.getData());
- }
- }
-
-
- protected void updateCellEditors()
- {
- CellEditor[] cellEditors = new CellEditor[2];
- cellEditors[0] = textCellEditor;
- cellEditors[1] = textCellEditor;
-
- IPropertyDescriptor[] propertyDescriptors = propertySource.getPropertyDescriptors();
- int index = getTable().getSelectionIndex();
- if (index >= 0 && index < propertyDescriptors.length)
- {
- CellEditor[] oldCellEditors = getCellEditors();
- CellEditor oldCellEditor = (oldCellEditors.length > 1) ? oldCellEditors[1] : null;
- if (oldCellEditor != null && oldCellEditor != textCellEditor)
- {
- oldCellEditor.deactivate();
- oldCellEditor.dispose();
- }
- cellEditors[1] = propertyDescriptors[index].createPropertyEditor(getTable());
- }
- setCellEditors(cellEditors);
- }
-
-
- public String[] getStringArray(List list)
- {
- String[] result = new String[list.size()];
- for (int i = 0; i < result.length; i++)
- {
- result[i] = (String)list.get(i);
- }
- return result;
- }
-
- protected void resetCellEditors()
- {
- CellEditor[] cellEditors = new CellEditor[2];
- cellEditors[0] = textCellEditor;
- cellEditors[1] = textCellEditor;
- setCellEditors(cellEditors);
- }
-
-
- class PropertyTableProvider extends LabelProvider implements ITableLabelProvider, IStructuredContentProvider
- {
- protected TableViewer viewer;
-
- PropertyTableProvider(TableViewer viewer)
- {
- this.viewer = viewer;
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- resetCellEditors();
- if (newInput instanceof IDOMElement)
- {
- propertySource = new ExtensiblePropertySource(editorPart, (IDOMElement)newInput);
- }
- else if (newInput instanceof Element)
- {
- propertySource = new ReadOnlyPropertySource(editorPart, (Element)newInput);
- }
- else
- {
- propertySource = null;
- }
- }
-
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object o, int columnIndex)
- {
- IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)o;
- return (columnIndex == 0) ? propertyDescriptor.getId().toString() : propertySource.getPropertyValue(propertyDescriptor.getId()).toString();
- }
-
- public Object[] getElements(Object o)
- {
- Object[] result = propertySource.getPropertyDescriptors();
- // For some strange reson the ViewerSorter doesn't seem to be working for this table
- // As a workaround we sort them in this method before returning them to the viewer
- if (result.length > 0)
- {
- Arrays.sort(result, new InternalComparator());
- }
- return result;
- }
- }
-
- class InternalComparator implements Comparator
- {
- public int compare(Object e1, Object e2)
- {
- IPropertyDescriptor p1 = (IPropertyDescriptor)e1;
- IPropertyDescriptor p2 = (IPropertyDescriptor)e2;
- return Collator.getInstance().compare(p1.getDisplayName(), p2.getDisplayName());
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
deleted file mode 100644
index 224ce561a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.w3c.dom.Element;
-
-
-// A convenience class
-//
-public abstract class ComponentNameComboHelper
-{
- protected CCombo componentNameCombo;
-
- public ComponentNameComboHelper(CCombo componentNameCombo)
- {
- this.componentNameCombo = componentNameCombo;
- }
-
- public void update(Object input)
- {
- Element element = ((WSDLElement)input).getElement();
- componentNameCombo.removeAll();
- String value = element.getAttribute(getAttributeName());
- componentNameCombo.setText(value != null ? value : "");
-
- if (input instanceof WSDLElement)
- {
- Definition definition = ((WSDLElement)input).getEnclosingDefinition();
- ComponentReferenceUtil componentReferenceUtil = new ComponentReferenceUtil(definition);
- java.util.List list = getComponentNameList(componentReferenceUtil);
- for (Iterator iter = list.iterator(); iter.hasNext();)
- {
- componentNameCombo.add((String)iter.next());
- }
- }
- }
-
- public void handleEventHelper(Element element, Event event)
- {
- if (event.type == SWT.Modify)
- {
- if (event.widget == componentNameCombo)
- {
- element.setAttribute(getAttributeName(), componentNameCombo.getText());
- }
- }
- }
-
- protected abstract List getComponentNameList(ComponentReferenceUtil util);
-
- protected abstract String getAttributeName();
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
deleted file mode 100644
index 57225bee9..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.custom.CCombo;
-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.Label;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageSection;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-
-public class ComponentsSection extends FlatPageSection
-{
- protected CCombo namesCombo;
- protected Button newButton;
- protected Button importButton;
- protected String title;
-
- public ComponentsSection(Composite parent, FlatViewUtility flatViewUtility, String title)
- {
- this(parent, title);
-
- WidgetFactory factory = new WidgetFactory();
- factory.setClientAreaColor(flatViewUtility.getBackgroundColor());
-
- Control section = createControl(this, factory);
- setContent(section);
-
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.FILL;
- gridData.grabExcessHorizontalSpace = true;
- setLayoutData(gridData);
- }
-
-
- public ComponentsSection(Composite parent, String title)
- {
- super(parent);
- setCollapsable(true);
- setHeaderText(title);
- setAddSeparator(true);
- }
-
- public CCombo getNamesCombo()
- {
- return namesCombo;
- }
-
- public Button getNewMessageButton()
- {
- return newButton;
- }
-
- public Button getImportMessageButton()
- {
- return importButton;
- }
-
- /*
- * @see FlatPageSection#createClient(Composite, WidgetFactory)
- */
- public Composite createClient(Composite parent, WidgetFactory factory)
- {
- FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
- Composite client = flatViewUtility.createComposite(parent, 1);
-
- namesCombo = flatViewUtility.createCComboBox(client);
-
- Composite buttonComposite = flatViewUtility.createComposite(client, 3, true);
- GridLayout gridLayout = (GridLayout)buttonComposite.getLayout();
- gridLayout.marginWidth = 3;
- gridLayout.marginHeight = 3;
- gridLayout.makeColumnsEqualWidth = true;
-
- Label filler = flatViewUtility.createHorizontalFiller(buttonComposite, 1);
- GridData gd = (GridData)filler.getLayoutData();
- gd.grabExcessHorizontalSpace = true;
- newButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_NEW")); //$NON-NLS-1$
- importButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_IMPORT")); //$NON-NLS-1$
-
- return client;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
deleted file mode 100644
index b6e6f3017..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.IPropertyDescriptorProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.ui.internal.properties.XMLPropertySource;
-import org.w3c.dom.Element;
-
-public class ExtensiblePropertySource extends XMLPropertySource
-{
- protected IEditorPart editorPart;
- private INodeNotifier nodeNotifier;
-
- public ExtensiblePropertySource(IEditorPart editorPart, INodeNotifier target)
- {
- super(target);
- this.editorPart = editorPart;
- this.nodeNotifier = target;
- }
-
-
-
- protected IPropertyDescriptor createPropertyDescriptor(CMAttributeDeclaration attrDecl)
- {
- IPropertyDescriptor result = null;
- CMDocument cmDocument = (CMDocument)attrDecl.getProperty("CMDocument");
- if (cmDocument != null)
- {
- String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");
- if (namespaceURI != null)
- {
- IPropertyDescriptorProvider provider = (IPropertyDescriptorProvider)WSDLEditorPlugin.getInstance().getPropertyDescriptorProviderRegistry().getProperty(namespaceURI, "");
- if (provider != null)
- {
- result = provider.getPropertyDescriptor(editorPart, (Element) nodeNotifier, namespaceURI, attrDecl.getNodeName());
- }
- }
- }
- if (result == null)
- {
- result = super.createPropertyDescriptor(attrDecl);
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
deleted file mode 100644
index 5b1906b1e..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-
-// instead of using a Button directly (which causes sizing/layout problems)
-// we use this class
-public class InvokeDialogButton extends Composite implements SelectionListener
-{
- protected Button button;
- protected Object input;
- protected Composite parent;
- protected IEditorPart editorPart;
- protected String kind;
-
- public InvokeDialogButton(Composite parent, Object input)
- {
- super(parent, SWT.NONE);
- this.parent = parent;
- this.input = input;
- GridData gd = new GridData();
- gd.grabExcessHorizontalSpace = false;
- gd.grabExcessVerticalSpace = false;
- setLayoutData(gd);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- setLayout(layout);
-
- button = new Button(this, SWT.NONE);
- gd = new GridData();
- gd.grabExcessHorizontalSpace = false;
- gd.heightHint = 17;
- gd.widthHint = 24;
- button.setLayoutData(gd);
- button.setText("...");
- button.addSelectionListener(this);
- }
-
- public Button getButton()
- {
- return button;
- }
-
- public void setInput(Object input)
- {
- this.input = input;
- }
-
- public void setEditor(IEditorPart editorPart)
- {
- this.editorPart = editorPart;
- }
-
- public void setReferenceKind(String kind)
- {
- this.kind = kind;
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == button)
- {
- InvokeSetDialog dialog = new InvokeSetDialog();
- if (input instanceof Part)
- {
- dialog.setReferenceKind(kind);
- }
- dialog.run(input, editorPart);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
-
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
deleted file mode 100644
index 7f48c9451..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class ReadOnlyPropertySource implements IPropertySource
-{
- protected Element element;
-
- public ReadOnlyPropertySource(IEditorPart editPart, Element element)
- {
- this.element = element;
- }
-
- public Object getEditableValue()
- {
- return null;
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors()
- {
- List list = new ArrayList();
- NamedNodeMap map = element.getAttributes();
- int mapLength = map.getLength();
- for (int i = 0; i < mapLength; i++)
- {
- Attr attr = (Attr) map.item(i);
- list.add(new PropertyDescriptor(attr.getName(), attr.getName()));
- }
- IPropertyDescriptor[] result = new IPropertyDescriptor[list.size()];
- list.toArray(result);
- return result;
- }
-
- public Object getPropertyValue(Object id)
- {
- Object result = null;
- if (id instanceof String)
- {
- result = element.getAttribute((String) id);
- }
- return result != null ? result : "";
- }
-
- public boolean isPropertySet(Object id)
- {
- return false;
- }
-
- public void resetPropertyValue(Object id)
- {
- }
-
- public void setPropertyValue(Object id, Object value)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
deleted file mode 100644
index f92d94286..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class BaseRenamer extends WSDLVisitor
-{
- protected String newName;
- protected WSDLElement globalComponent;
-
- public BaseRenamer(WSDLElement globalComponent, String newName)
- {
- super(globalComponent.getEnclosingDefinition());
- this.globalComponent = globalComponent;
- this.newName = newName;
- }
-
- public String getNewQName()
- {
- String qName = null;
- if (newName != null)
- {
- Definition definition = globalComponent.getEnclosingDefinition();
- qName = definition.getPrefix(definition.getTargetNamespace());
- qName += ":" + newName;
- }
- else
- {
- qName = newName;
- }
-
- return qName;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
deleted file mode 100644
index b85cf04da..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class BindingRenamer extends BaseRenamer
-{
- /**
- * Constructor for BindingRenamer.
- * @param globalComponent
- * @param newName
- */
- public BindingRenamer(WSDLElement globalComponent, String newName)
- {
- super(globalComponent, newName);
- }
-
- public void visitPort(Port port)
- {
- super.visitPort(port);
- Binding binding = port.getEBinding();
- if (globalComponent.equals(binding))
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
- element.setAttribute("binding", getNewQName());
- }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
deleted file mode 100644
index 75cf21e8a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class MessageRenamer extends BaseRenamer
-{
- /**
- * Constructor for MessageRenamer.
- * @param globalComponent
- * @param newName
- */
- public MessageRenamer(WSDLElement globalComponent, String newName)
- {
- super(globalComponent, newName);
- }
-
- public void visitInput(Input input)
- {
- super.visitInput(input);
- Message message = input.getEMessage();
- if (globalComponent.equals(message))
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
- element.setAttribute("message", getNewQName());
- }
- }
-
- public void visitOutput(Output output)
- {
- super.visitOutput(output);
- if (globalComponent.equals(output))
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(output);
- element.setAttribute("message", getNewQName());
- }
- }
-
- public void visitFault(Fault fault)
- {
- super.visitFault(fault);
- if (globalComponent.equals(fault))
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(fault);
- element.setAttribute("message", getNewQName());
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
deleted file mode 100644
index da4d02935..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class PortTypeRenamer extends BaseRenamer
-{
- /**
- * Constructor for PortTypeRenamer.
- * @param globalComponent
- * @param newName
- */
- public PortTypeRenamer(WSDLElement globalComponent, String newName)
- {
- super(globalComponent, newName);
- }
-
- public void visitBinding(Binding binding)
- {
- super.visitBinding(binding);
- PortType portType = binding.getEPortType();
-
- if (globalComponent.equals(portType))
- {
- Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
- element.setAttribute("type", getNewQName());
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
deleted file mode 100644
index 8100d4e0a..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class WSDLVisitor
-{
- protected Definition definition;
-
-
- public WSDLVisitor(Definition definition)
- {
- this.definition = definition;
- }
-
-
- public void visitDefinition()
- {
- visitBindings();
- visitMessages();
- visitPortTypes();
- visitServices();
- }
-
- public void visitBindings()
- {
- for (Iterator iterator = definition.getEBindings().iterator(); iterator.hasNext(); )
- {
- Binding binding = (Binding)iterator.next();
- visitBinding(binding);
- }
- }
-
- public void visitMessages()
- {
- for (Iterator iterator = definition.getEMessages().iterator(); iterator.hasNext(); )
- {
- Message message = (Message)iterator.next();
- visitMessage(message);
- }
- }
-
- public void visitPortTypes()
- {
- for (Iterator iterator = definition.getEPortTypes().iterator(); iterator.hasNext(); )
- {
- PortType portType = (PortType)iterator.next();
- visitPortType(portType);
- }
- }
-
- public void visitServices()
- {
- for (Iterator iterator = definition.getEServices().iterator(); iterator.hasNext(); )
- {
- Service service = (Service)iterator.next();
- visitService(service);
- }
- }
-
- public void visitBinding(Binding binding)
- {
- PortType portType = binding.getEPortType();
- if (portType != null)
- {
- visitPortType(portType);
- }
-
- for (Iterator iterator = binding.getEBindingOperations().iterator(); iterator.hasNext(); )
- {
- BindingOperation bindingOperation = (BindingOperation)iterator.next();
- visitBindingOperation(bindingOperation);
- }
- }
-
- public void visitPortType(PortType portType)
- {
- for (Iterator iterator = portType.getEOperations().iterator(); iterator.hasNext(); )
- {
- Operation operation = (Operation)iterator.next();
- visitOperation(operation);
- }
- }
-
- public void visitBindingOperation(BindingOperation bindingOperation)
- {
-// BindingInput bindingInput = bindingOperation.getEBindingInput();
-// BindingOutput bindingOutput = bindingOperation.getEBindingOutput();
- }
-
- public void visitOperation(Operation operation)
- {
- Input input = operation.getEInput();
- Output output = operation.getEOutput();
-
- if (input != null)
- {
- visitInput(input);
- }
- if (output != null)
- {
- visitOutput(output);
- }
-
- for (Iterator iterator = operation.getEFaults().iterator(); iterator.hasNext(); )
- {
- Fault fault = (Fault)iterator.next();
- if (fault != null)
- {
- visitFault(fault);
- }
- }
-
- }
-
- public void visitPart(Part part)
- {
-// XSDTypeDefinition type = part.getTypeDefinition();
- }
-
- public void visitMessage(Message message)
- {
- for (Iterator iterator = message.getEParts().iterator(); iterator.hasNext(); )
- {
- Part part = (Part)iterator.next();
- visitPart(part);
- }
- }
-
- public void visitInput(Input input)
- {
- Message message = input.getEMessage();
- if (message != null)
- {
- visitMessage(message);
- }
- }
-
- public void visitOutput(Output output)
- {
- Message message = output.getEMessage();
- if (message != null)
- {
- visitMessage(message);
- }
- }
-
- public void visitFault(Fault fault)
- {
- Message message = fault.getEMessage();
- if (message != null)
- {
- visitMessage(message);
- }
- }
-
- public void visitPort(Port port)
- {
- Binding binding = port.getEBinding();
- if (binding != null)
- {
- visitBinding(binding);
- }
- }
-
- public void visitService(Service service)
- {
- for (Iterator iterator = service.getEPorts().iterator(); iterator.hasNext(); )
- {
- Port port = (Port)iterator.next();
- visitPort(port);
- }
-
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
deleted file mode 100644
index d9595b14c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.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.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class NewComponentDialog extends Dialog implements ModifyListener
-{
- protected Text nameField;
- protected Button okButton;
- protected String name;
- protected String title;
- protected Label errorMessageLabel;
- protected List usedNames;
-
- public NewComponentDialog(Shell parentShell, String title, String defaultName)
- {
- super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- name = defaultName;
- this.title = title;
- }
-
- public NewComponentDialog(Shell parentShell, String title, String defaultName, List usedNames)
- {
- super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
- name = defaultName;
- this.title = title;
- this.usedNames = usedNames;
- }
-
- public int createAndOpen()
- {
- create();
- getShell().setText(title);
- setBlockOnOpen(true);
- return open();
- }
-
- protected Control createContents(Composite parent)
- {
- Control control = super.createContents(parent);
- nameField.forceFocus();
- nameField.selectAll();
- updateErrorMessage();
- return control;
- }
-
-
- protected void createButtonsForButtonBar(Composite parent)
- {
- okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
- createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
- }
-
- protected void createExtendedContent(Composite parent)
- {
- }
-
-
- protected Control createDialogArea(Composite parent)
- {
- Composite dialogArea = (Composite)super.createDialogArea(parent);
-
- Composite composite = new Composite(dialogArea, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = 0;
- composite.setLayout(layout);
-
- GridData gdFill= new GridData();
- gdFill.horizontalAlignment= GridData.FILL;
- gdFill.grabExcessHorizontalSpace= true;
- gdFill.verticalAlignment= GridData.FILL;
- gdFill.grabExcessVerticalSpace= true;
- composite.setLayoutData(gdFill);
-
- Label nameLabel = new Label(composite, SWT.NONE);
- nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
-
- nameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
- GridData gd= new GridData();
- gd.horizontalAlignment= GridData.FILL;
- gd.grabExcessHorizontalSpace= true;
- gd.widthHint = 200;
- nameField.setLayoutData(gd);
- nameField.setText(name);
- nameField.addModifyListener(this);
-
- createExtendedContent(dialogArea);
-
- // error message
- errorMessageLabel = new Label(dialogArea, SWT.NONE);
- errorMessageLabel.setText("error message goes here");
- GridData gd2 = new GridData();
- gd2.horizontalAlignment= GridData.FILL;
- gd2.grabExcessHorizontalSpace= true;
- gd2.widthHint = 200;
- errorMessageLabel.setLayoutData(gd2);
-// Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-// errorMessageLabel.setForeground(color);
-
- return dialogArea;
- }
-
- public void modifyText(ModifyEvent e)
- {
- updateErrorMessage();
- }
-
- protected String computeErrorMessage(String name)
- {
- if (usedNames == null)
- return null;
-
- Iterator iterator = usedNames.iterator();
- while (iterator.hasNext()) {
- if (name.equalsIgnoreCase((String) iterator.next())) {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_WARNING_DUPLICATE_NAME_EXISTS");
- }
- }
-
- return null;
- }
-
- protected void updateErrorMessage()
- {
- String errorMessage = null;
- String name = nameField.getText().trim();
- if (name.length() > 0)
- {
- errorMessage = computeErrorMessage(name);
- }
- else
- {
- errorMessage = "";
- }
- errorMessageLabel.setText(errorMessage != null ? errorMessage : "");
-// okButton.setEnabled(errorMessage == null);
- }
-
- protected void buttonPressed(int buttonId)
- {
- if (buttonId == IDialogConstants.OK_ID)
- {
- name = nameField.getText();
- }
- super.buttonPressed(buttonId);
- }
-
- public String getName()
- {
- return name;
- }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
deleted file mode 100644
index 4c5091970..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-/*
- * This class extends NewComponentDialog to allow additional widgets. More
- * specifically, the 'create sub-components' checkbox
- */
-public class NewComponentWithChildDialog extends NewComponentDialog {
- protected Button createMessageCheckBox;
- private boolean createMessageBoolean;
-
- public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName) {
- super(parentShell, title, defaultName);
- }
-
- public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName, List usedNames) {
- super(parentShell, title, defaultName, usedNames);
- }
-
- protected void createExtendedContent(Composite parent) {
- Composite child = new Composite (parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- child.setLayout(layout);
-
- createMessageCheckBox = new Button(child, SWT.CHECK);
- createMessageCheckBox.setSelection(true);
- createMessageCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_CREATE_MESSAGE_CHECKBOX_LABEL"));
- }
-
- public boolean createSubComponents() {
- return createMessageBoolean;
- }
-
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.OK_ID) {
- createMessageBoolean = createMessageCheckBox.getSelection();
- }
- super.buttonPressed(buttonId);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
deleted file mode 100644
index 53c990550..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-
-public abstract class ProtocolComponentControl extends Composite implements SelectionListener, ModifyListener
-{
- protected BaseGenerator generator;
-
- protected Text componentNameField;
- protected Combo refNameCombo;
- protected Button refBrowseButton;
- protected Combo protocolCombo;
- protected Button overwriteButton;
- protected PageBook pageBook;
- protected Composite emptySettingsPage;
- protected Map pageMap = new HashMap();
-
- // List of ContentGenerators for each Protocol found in protocolCombo
- protected List contentGenerators;
-
- //protected boolean isBindingComponent = true;
- //protected boolean isNewComponent = true;
- protected String name;
- protected String refName;
-
- protected String UNSPECIFIED = WSDLEditorPlugin.getWSDLString("_UI_UNSPECIFIED");
- //protected BindingGenerator bindingGenerator;
-
- public ProtocolComponentControl(Composite parent, BaseGenerator generator, boolean showOverwriteButton)
- {
- super(parent, SWT.NONE);
- this.generator = generator;
- contentGenerators = new ArrayList();
-
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- setLayout(layout);
- setLayoutData(createGridData(true, 1));
-
- Composite labelValueComposite = new Composite(this, SWT.NONE);
- labelValueComposite.setLayout(new GridLayout(2, false));
- labelValueComposite.setLayoutData(createGridData(false, 1));
-
- // row 1
- //
- Label componentNameLabel = new Label(labelValueComposite, SWT.NONE);
- componentNameLabel.setText(getComponentNameLabelText()); //$NON-NLS-1$
-
- componentNameField = new Text(labelValueComposite, SWT.BORDER);
- GridData gdName= new GridData();
- gdName.horizontalAlignment= GridData.FILL;
- gdName.grabExcessHorizontalSpace= true;
- componentNameField.setLayoutData(gdName);
- componentNameField.addModifyListener(this);
- //createPlaceHolder(labelValueComposite);
-
- // row 2
- //
- Label refNameLabel = new Label(labelValueComposite, SWT.NONE);
- refNameLabel.setText(getRefNameLabelText()); //$NON-NLS-1$
- refNameCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
- GridData gdRefName= new GridData();
- gdRefName.horizontalAlignment= GridData.FILL;
- gdRefName.grabExcessHorizontalSpace= true;
- refNameCombo.setLayoutData(gdRefName);
- refNameCombo.addSelectionListener(this);
-
- //refBrowseButton = new Button(labelValueComposite, SWT.NONE);
- //refBrowseButton.setText(" ... ");
- //GridData gd = new GridData();
- //gd.grabExcessHorizontalSpace = false;
- //gd.heightHint = 17;
- //gd.widthHint = 24;
- //refBrowseButton.setLayoutData(gd);
- //refBrowseButton.addSelectionListener(this);
- //createPlaceHolder(labelValueComposite);
-
- // row 3
- //
- Label protocolLabel = new Label(labelValueComposite, SWT.NONE);
- protocolLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL")); //$NON-NLS-1$
- protocolCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
- GridData gdProtocol= new GridData();
- gdProtocol.horizontalAlignment= GridData.FILL;
- gdProtocol.grabExcessHorizontalSpace= true;
- protocolCombo.setLayoutData(gdProtocol);
- protocolCombo.addSelectionListener(this);
- //createPlaceHolder(labelValueComposite);
-
- // optional overwrite button
- //
- if (showOverwriteButton)
- {
- overwriteButton = new Button(this, SWT.CHECK);
- overwriteButton.setText(WSDLEditorPlugin.getWSDLString("_UI_CHECKBOX_OVERWRITE")); //$NON-NLS-1$
- overwriteButton.addSelectionListener(this);
- }
-
- // protocol specific settings
- //
- pageBook = new PageBook(this, SWT.NONE);
- GridData gdFill= new GridData();
- gdFill.horizontalAlignment= GridData.FILL;
- gdFill.grabExcessHorizontalSpace= true;
- gdFill.verticalAlignment= GridData.FILL;
- gdFill.grabExcessVerticalSpace= true;
- pageBook.setLayoutData(gdFill);
-
- emptySettingsPage = new Composite(pageBook, SWT.NONE);
- for (int i = 0; i < 6; i++)
- {
- new Label(emptySettingsPage, SWT.NONE);
- }
- }
-
- public void initFields()
- {
- // prime the fields
- //
- componentNameField.setText(getDefaultName());
- updateRefNameCombo();
- updateProtocolCombo();
- updatePageBook(generator.getProtocol());
- }
-
- public Text getComponentNameField()
- {
- return componentNameField;
- }
-
- public String getComponentNameLabelText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME");
- }
-
- private GridData createGridData(boolean both, int span)
- {
- GridData gd = new GridData(both ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = span;
- return gd;
- }
-
-// private Control createPlaceHolder(Composite parent)
-// {
-// Label label = new Label(parent, SWT.NONE);
-// return label;
-// }
- public BaseGenerator getGenerator()
- {
- return generator;
- }
-
- // implements SelectionListener
- //
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- if (event.widget == overwriteButton && overwriteButton != null)
- {
- getGenerator().setOverwrite(overwriteButton.getSelection());
- }
- else if (event.widget == refNameCombo)
- {
- int index = refNameCombo.getSelectionIndex();
- String refName = refNameCombo.getItem(index);
- if (refName.equals(UNSPECIFIED)) {
- getGenerator().setRefName("");
- }
- else {
- getGenerator().setRefName(refName);
- }
- }
- else if (event.widget == protocolCombo)
- {
- int index = protocolCombo.getSelectionIndex();
- String protocol = (index != -1) ? protocolCombo.getItem(index) : null;
- getGenerator().setContentGenerator((ContentGenerator) contentGenerators.get(index));
- updatePageBook(protocol);
- }
- }
-
- private static final String IS_OVERWRITE_APPLICABLE = "IS_OVERWRITE_APPLICABLE";
- protected void updatePageBook(String protocol)
- {
- if (protocol != null)
- {
- ContentGeneratorOptionsPage page = (ContentGeneratorOptionsPage) pageMap.get(protocol);
- if (page == null)
- {
- page = createContentGeneratorOptionsPage(protocol);
-
- if (page != null)
- {
- page.init(getGenerator());
- Control control = page.createControl(pageBook);
- control.setData(IS_OVERWRITE_APPLICABLE, new Boolean(page.isOverwriteApplicable()));
- pageMap.put(protocol, page);
- }
-
-// if (page != null)
-// {
-// pageMap.put(protocol, page);
-// }
- }
-
- boolean enableOverwriteButton = true;
- if (page != null)
- {
- if (overwriteButton != null)
- {
- Boolean data = (Boolean) page.getControl().getData(IS_OVERWRITE_APPLICABLE);
- enableOverwriteButton = data == null || data.equals(Boolean.TRUE);
- }
- pageBook.showPage(page.getControl());
- pageBook.layout();
- pageBook.getParent().layout();
-
- page.setOptionsOnGenerator();
- }
- else
- {
- pageBook.showPage(emptySettingsPage);
- }
-
- if (overwriteButton != null)
- {
- if (enableOverwriteButton)
- {
- overwriteButton.setEnabled(true);
- overwriteButton.setSelection(generator.getOverwrite());
- }
- else
- {
- overwriteButton.setEnabled(false);
- overwriteButton.setSelection(true);
- }
- }
- }
- }
-
- protected void updateProtocolCombo()
- {
- protocolCombo.removeAll();
-
- List list = new ArrayList();
- list.add(UNSPECIFIED);
-// list.addAll(WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getBindingExtensionNames());
- list.addAll(ContentGeneratorExtensionFactoryRegistry.getInstance().getBindingExtensionNames());
-
- String protocolText = generator.getProtocol();
-
- for (Iterator i = list.iterator(); i.hasNext();)
- {
- String protocol = (String) i.next();
- protocolCombo.add(protocol);
-
- if (protocol.equals(UNSPECIFIED)) {
- contentGenerators.add(null);
- }
- else {
- ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocol);
- contentGenerators.add(gen);
- }
- }
-
- if (protocolText == null && protocolCombo.getItemCount() > 0)
- {
- protocolText = protocolCombo.getItem(0);
-// generator.setProtocol(!UNSPECIFIED.equals(protocolText) ? protocolText : null);
- }
- protocolCombo.setText(protocolText);
-
- ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocolText);
- generator.setContentGenerator(gen);
- }
-
- protected void updateRefNameCombo()
- {
- refNameCombo.removeAll();
-
- refNameCombo.add(UNSPECIFIED);
- for (Iterator i = getRefNames().iterator(); i.hasNext();)
- {
- refNameCombo.add((String) i.next());
- }
-
- if (refNameCombo.getItemCount() > 0)
- {
- String refText = generator.getRefName();
- refNameCombo.setText(refText != null ? refText : UNSPECIFIED);
- }
- }
-
- public void modifyText(ModifyEvent e)
- {
- generator.setName(componentNameField.getText());
- }
-
- public abstract List getRefNames();
- public abstract String getRefNameLabelText();
- public abstract String getDefaultName();
- public abstract ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
deleted file mode 100644
index 087a051ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class BindingWizard extends Wizard
-{
- protected BindingGenerator bindingGenerator;
- protected BindingWizardOptionsPage specifyBindingPage;
-
- protected Document document;
- protected int kind;
-
- public static final int KIND_NEW_BINDING = 1;
- public static final int KIND_REGENERATE_BINDING = 2;
-
- protected Definition definition;
-
- /*
- * Constructor used when are creating a brand new Binding
- */
- public BindingWizard(Definition definition)
- {
- this(definition, null, KIND_NEW_BINDING);
- }
-
- /*
- * Constructor used when are creating a brand new Binding
- */
- public BindingWizard(Definition definition, Document document)
- {
- this(definition, null, KIND_NEW_BINDING);
- this.document = document;
- }
-
- /*
- * Constructor used when there is an existing Binding we wish to modify/regenerate
- */
- public BindingWizard(Definition definition, Binding binding, int kind)
- {
- super();
- this.definition = definition;
- this.kind = kind;
- bindingGenerator = new BindingGenerator(definition, binding);
-
- setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_BINDING_WIZARD")); //$NON-NLS-1$
- //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
- }
-
- public void setBindingName(String bindingName)
- {
-// QName qname = new QName(definition.getTargetNamespace(), bindingName);
- bindingGenerator.setName(bindingName);
-/*
- // Binding binding = (Binding) definition.getBinding(qname);
- if (binding != null)
- {
- List eeList = binding.getEExtensibilityElements();
- if (eeList.size() > 0)
- {
- ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
- Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
- String namespace = element.getNamespaceURI();
- if (namespace != null)
- {
- ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getExtensionForNamespace(namespace);
-
- if (extension != null)
- {
- bindingGenerator.setProtocol(extension.getName());
- }
- }
- }
- }
- */
- }
-
- public void setPortTypeName(String portTypeName)
- {
- bindingGenerator.setRefName(portTypeName);
- }
-
- public BindingGenerator getBindingGenerator()
- {
- return bindingGenerator;
- }
-
- /**
- * Return true if wizard setup is successful, false otherwise
- */
- public boolean setup()
- {
- return true;
- }
-
- public void addPages()
- {
- specifyBindingPage = new BindingWizardOptionsPage();
- addPage(specifyBindingPage);
- }
-
- public boolean performFinish()
- {
- boolean recordingStarted = false;
- if (definition.getElement() == null || (document != null && document.getChildNodes().getLength() == 0)) {
- recordingStarted = true;
- beginRecording();
-
- // Create the Definitions element with proper namespace
- Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
- String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
- if (charSet == null || charSet.trim().equals(""))
- {
- charSet = "UTF-8";
- }
- document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
- Element root = document.createElement("wsdl:definitions");
- document.appendChild(root);
-
- // Add various namespace attributes here.
- root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
- root.setAttribute("xmlns:tns", getDefaultNamespace(definition));
- root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
- root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
- root.setAttribute("name", getFileName(definition));
- root.setAttribute("targetNamespace", getDefaultNamespace(definition));
-
- definition.setElement(root);
- }
-
- // Generate/re-generate the Binding
- try
- {
- Binding binding = bindingGenerator.generateBinding();
-
- if (binding != null)
- {
- IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
- if (selectionProvider != null)
- {
- selectionProvider.setSelection(new StructuredSelection(binding));
- }
- }
- }
- catch (Exception e)
- {
- }
- finally {
- if (recordingStarted)
- endRecording();
- }
-
- return true;
- }
-
- private String getDefaultNamespace(Definition definition)
- {
- String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
- if (!namespace.endsWith("/")) {
- namespace = namespace.concat("/");
- }
-
- namespace += getFileName(definition) + "/";
-
- return namespace;
- }
-
- private String getFileName(Definition definition) {
- String fileLocation = definition.getLocation();
- IPath filePath = new Path(fileLocation);
- return filePath.removeFileExtension().lastSegment().toString();
- }
-
- private void beginRecording() {
- Node node = document;
- if (node instanceof IDOMNode)
- {
- ((IDOMNode)node).getModel().beginRecording(this, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"));
- }
- }
-
- private void endRecording() {
- Node node = document;
- if (node instanceof IDOMNode)
- {
- ((IDOMNode)node).getModel().endRecording(this);
- }
- }
-
- class BindingWizardOptionsPage extends WizardPage
- {
- protected ProtocolComponentControl protocolComponentControl;
-
- public BindingWizardOptionsPage()
- {
- super("SpecifyBindingPage");
- setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING_DETAILS"));
- setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_BINDING_DETAILS_LABEL"));
- }
-
- protected BindingGenerator getBindingGenerator()
- {
- return ((BindingWizard) getWizard()).getBindingGenerator();
- }
-
- public void createControl(Composite parent)
- {
- ProtocolComponentControl protocolComponentControl = new BindingProtocolComponentControl(parent, bindingGenerator, true);
- protocolComponentControl.initFields();
- setControl(protocolComponentControl);
- }
- }
-
- public static class BindingProtocolComponentControl extends ProtocolComponentControl
- {
- public BindingProtocolComponentControl(Composite parent, BindingGenerator generator)
- {
- this(parent, generator, true);
- }
-
- public BindingProtocolComponentControl(Composite parent, BindingGenerator generator, boolean showOverwriteButton)
- {
- super(parent, generator, showOverwriteButton);
-
- if (generator.getName() != null)
- {
- componentNameField.setEditable(false);
- }
- }
-
- public String getRefNameLabelText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_PORT_TYPE");
- }
-
- public List getRefNames()
- {
- return new ComponentReferenceUtil(generator.getDefinition()).getPortTypeNames();
- }
-
- public String getDefaultName()
- {
- String bindingName = generator.getName();
- return bindingName != null ? bindingName : NameUtil.buildUniqueBindingName(generator.getDefinition(), null);
- }
-
- public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
- {
- ContentGeneratorOptionsPage optionsPage = null;
- String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
- if (protocolSelection.equals("SOAP")) {
- optionsPage = new SoapBindingOptionsPage();
- }
- else if (protocolSelection.equals("HTTP")) {
- optionsPage = new HttpBindingOptionsPage();
- }
-// ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-// if (extension != null)
-// {
-// optionsPage = extension.createBindingContentGeneratorOptionsPage();
-// }
- return optionsPage;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
deleted file mode 100644
index 1ea47f6ed..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
+++ /dev/null
@@ -1,701 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-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.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.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditNamespaceInfoDialog;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
-
-public class NamespaceTable extends Composite
-{
- protected static final String NAMESPACE_URI = XMLCommonResources.getInstance().getString("_UI_LABEL_NAMESPACE_NAME"); //$NON-NLS-1$
- protected static final String PREFIX = XMLCommonResources.getInstance().getString("_UI_LABEL_PREFIX"); //$NON-NLS-1$
- protected static final String INCLUDE = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT"); //$NON-NLS-1$
-
- protected List namespaceInfoList = new Vector();
- protected List checkedList = new Vector();
- protected NamespaceNavigableTableViewer tableViewer;
- protected Button addButton;
-
- protected NamespaceInfoTableLabelProvider provider;
- protected UpdateListener updateListener;
- protected IPath resourceLocation;
- protected int visibleRows = -1;
- protected boolean dummyRowsRemoved = false;
- Table table;
-
- public NamespaceTable(Composite parent)
- {
- this(parent, -1, -1, -1);
- }
-
- public NamespaceTable(Composite parent, int visibleRows)
- {
- this(parent, -1, -1, visibleRows);
- }
-
- public NamespaceTable(Composite parent, int widthHint, int heightHint)
- {
- this(parent, widthHint, heightHint, -1);
- }
-
- public NamespaceTable(Composite parent, int widthHint, int heightHint, int visibleRows)
- {
- super(parent, SWT.NONE);
- setLayout(createGridLayout());
- GridData fillGD= new GridData();
- fillGD.horizontalAlignment= GridData.FILL;
- fillGD.grabExcessHorizontalSpace= true;
- fillGD.verticalAlignment= GridData.FILL;
- fillGD.grabExcessVerticalSpace= true;
-
- setLayoutData(fillGD);
-
- Group namespaceInfoGroup = new Group(this, SWT.NONE);
- namespaceInfoGroup.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE_URIS_TO_BE_INCLUDED")); //$NON-NLS-1$
- namespaceInfoGroup.setLayout(new GridLayout());
- GridData gd = fillGD;
- if (widthHint != -1)
- {
- gd.widthHint = widthHint;
- }
- if (heightHint != -1)
- {
- gd.heightHint = heightHint;
- }
- namespaceInfoGroup.setLayoutData(gd);
- //WorkbenchHelp.setHelp(namespaceInfoGroup, new ControlContextComputer(namespaceInfoGroup, XMLBuilderContextIds.XMLC_NAMESPACE_GROUP));
-
- String[] titleArray = {INCLUDE, PREFIX, NAMESPACE_URI};
-
- table = new Table(namespaceInfoGroup, SWT.FULL_SELECTION);
- table.setHeaderVisible(true);
-
- table.setLayoutData(fillGD);
- table.setLinesVisible(true);
- table.addMouseListener(new MouseAdapter()
- {
- public void mouseDown(MouseEvent e)
- {
- TableItem item = table.getItem(new Point(e.x, e.y));
- if (item != null)
- {
- Object obj = item.getData();
- if (obj != null)
- {
- TableElement holder = (TableElement)obj;
- TableColumn col = table.getColumn(0);
- if (e.x < col.getWidth()) // if the point falls within the Select column then perform check/uncheck
- {
- String currentState = holder.getChecked();
- if (currentState.equals("true")) //$NON-NLS-1$
- {
- holder.setChecked("false"); //$NON-NLS-1$
- checkedList.set(holder.getIndex(), "false"); //$NON-NLS-1$
- }
- else if (currentState.equals("false")) //$NON-NLS-1$
- {
- holder.setChecked("true"); //$NON-NLS-1$
- checkedList.set(holder.getIndex(), "true"); //$NON-NLS-1$
- }
- tableViewer.refresh();
- if (updateListener != null)
- {
- updateListener.updateOccured(this, namespaceInfoList);
- }
- }
- }
- }
- }
- });
-
- tableViewer = new NamespaceNavigableTableViewer(table);
- provider = new NamespaceInfoTableLabelProvider();
- tableViewer.setContentProvider(provider);
- tableViewer.setLabelProvider(provider);
- tableViewer.setColumnProperties(titleArray);
- tableViewer.setCellModifier(new NamespaceInfoCellModifier());
-
-
- int[] widthArray = {10, 20, 50};
- TableLayout layout = new TableLayout();
-
- for (int i = 0; i < titleArray.length; i++)
- {
- TableColumn column = new TableColumn(table, i);
- column.setText(titleArray[i]);
- column.setAlignment(SWT.LEFT);
- layout.addColumnData(new ColumnWeightData(widthArray[i], true));
- }
- this.visibleRows = visibleRows;
- for (int i = 0; i < visibleRows; i++)
- {
- TableItem item = new TableItem(table, SWT.NONE);
- item.setText("#######"); //$NON-NLS-1$
- }
- table.setLayout(layout);
-
- CellEditor[] cellEditors = new CellEditor[titleArray.length];
- cellEditors[0] = new NamespaceInfoCheckboxCellEditor(table);
- cellEditors[1] = new TextCellEditor(table);
- tableViewer.setCellEditors(cellEditors);
-
-// createButtons(namespaceInfoGroup);
-
- initialize();
- }
-
- public void setUpdateListener(UpdateListener updateListener)
- {
- this.updateListener = updateListener;
- }
-
- public void setNamespaceInfoList(List namespaceInfoList)
- {
- this.namespaceInfoList = namespaceInfoList;
- update();
- }
-
- public List getNamespaceInfoList()
- {
- return namespaceInfoList;
- }
-
- public List getNamespaceCheckedList()
- {
- return checkedList;
- }
-
- public String getWSDLPrefix()
- {
- return ((NamespaceInfo)(namespaceInfoList.get(0))).prefix;
- }
-
- public void setResourceLocation(IPath resourceLocation)
- {
- this.resourceLocation = resourceLocation;
- }
-
- public GridLayout createGridLayout()
- {
- GridLayout gridLayout = new GridLayout();
- gridLayout.marginWidth = 0;
- gridLayout.horizontalSpacing = 0;
- return gridLayout;
- }
-
- protected void initialize()
- {
- // better way to do this....
- NamespaceInfo info1 = new NamespaceInfo();
- info1.prefix = "wsdl"; //$NON-NLS-1$
- info1.uri = "http://schemas.xmlsoap.org/wsdl/"; //$NON-NLS-1$
- namespaceInfoList.add(info1);
- checkedList.add("true"); //$NON-NLS-1$
- NamespaceInfo info2 = new NamespaceInfo();
- info2.prefix = "soap"; //$NON-NLS-1$
- info2.uri = "http://schemas.xmlsoap.org/wsdl/soap/"; //$NON-NLS-1$
- namespaceInfoList.add(info2);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info3 = new NamespaceInfo();
- info3.prefix = "http"; //$NON-NLS-1$
- info3.uri = "http://schemas.xmlsoap.org/wsdl/http/"; //$NON-NLS-1$
- namespaceInfoList.add(info3);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info4 = new NamespaceInfo();
- info4.prefix = "mime"; //$NON-NLS-1$
- info4.uri = "http://schemas.xmlsoap.org/wsdl/mime/"; //$NON-NLS-1$
- namespaceInfoList.add(info4);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info5 = new NamespaceInfo();
- info5.prefix = "soapenc"; //$NON-NLS-1$
- info5.uri = "http://schemas.xmlsoap.org/soap/encoding/"; //$NON-NLS-1$
- namespaceInfoList.add(info5);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info6 = new NamespaceInfo();
- info6.prefix = "soapenv"; //$NON-NLS-1$
- info6.uri = "http://schemas.xmlsoap.org/soap/envelope/"; //$NON-NLS-1$
- namespaceInfoList.add(info6);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info7 = new NamespaceInfo();
- info7.prefix = "xsi"; //$NON-NLS-1$
- info7.uri = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
- namespaceInfoList.add(info7);
- checkedList.add("false"); //$NON-NLS-1$
- NamespaceInfo info8 = new NamespaceInfo();
- info8.prefix = "xsd"; //$NON-NLS-1$
- info8.uri = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
- namespaceInfoList.add(info8);
- checkedList.add("true"); //$NON-NLS-1$
- update();
- }
-
- protected void createButtons(Composite parent)
- {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData hFillGD = new GridData();
- hFillGD.horizontalAlignment= GridData.FILL;
- hFillGD.grabExcessHorizontalSpace= true;
-
- composite.setLayoutData(hFillGD);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- composite.setLayout(gridLayout);
-
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace= true;
-
- Button hiddenButton = new Button(composite, SWT.NONE);
- hiddenButton.setLayoutData(gd);
- hiddenButton.setVisible(false);
- hiddenButton.setEnabled(false);
-
- SelectionListener selectionListener = new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- if (e.widget == addButton)
- {
- performNew();
- }
- }
- };
-
- // create a composite to hold the three buttons
- Composite buttonComposite = new Composite(composite, SWT.NONE);
-
- buttonComposite.setLayoutData(hFillGD);
- GridLayout buttonGridLayout = new GridLayout();
- buttonGridLayout.numColumns = 1;
- buttonGridLayout.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(buttonGridLayout);
-
- // add the New button
- //
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
-
- addButton = new Button(buttonComposite, SWT.NONE);
- addButton.setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD")); //$NON-NLS-1$
- addButton.setLayoutData(gd);//ViewUtility.createHorizontalFill());
- addButton.addSelectionListener(selectionListener);
- }
-
- public void performNew()
- {
- NamespaceInfo info = new NamespaceInfo();
- EditNamespaceInfoDialog dialog = invokeDialog(XMLCommonResources.getInstance().getString("_UI_LABEL_NEW_NAMESPACE_INFORMATION"), info); //$NON-NLS-1$
- if (dialog.getReturnCode() == Dialog.OK)
- {
- namespaceInfoList.add(info);
- checkedList.add("true"); //$NON-NLS-1$
- performDelayedUpdate();
- }
- }
-
- protected EditNamespaceInfoDialog invokeDialog(String title, NamespaceInfo info)
- {
- Shell shell = XMLCommonResources.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
- EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
- dialog.create();
- dialog.getShell().setText(title);
- dialog.setBlockOnOpen(true);
- dialog.setResourceLocation(resourceLocation);
- dialog.open();
- return dialog;
- }
-
- protected void performDelayedUpdate()
- {
- Runnable delayedUpdate = new Runnable()
- {
- public void run()
- {
- update();
- }
- };
- Display.getCurrent().asyncExec(delayedUpdate);
-
- if (updateListener != null)
- {
- updateListener.updateOccured(this, namespaceInfoList);
- }
- }
-
- protected NamespaceInfo getTargetNamespaceInfo()
- {
- return (namespaceInfoList != null && namespaceInfoList.size() > 0) ?
- (NamespaceInfo)namespaceInfoList.get(0) :
- null;
- }
-
-
- public void update()
- {
- updateHelper(namespaceInfoList);
- }
-
- public void updateHelper(List namespaceInfoList)
- {
- if (visibleRows != -1 && !dummyRowsRemoved)
- {
-// dummyRowsRemoved = true;
-// tableViewer.getTable().removeAll();
- }
- ISelection selection = tableViewer.getSelection();
- tableViewer.setInput(namespaceInfoList);
- if (selection.isEmpty())
- {
- if (namespaceInfoList.size() > 0)
- {
- tableViewer.setSelection(new StructuredSelection(namespaceInfoList.get(0)));
- }
- }
- else
- {
- tableViewer.setSelection(selection);
- }
- }
-
- protected class NamespaceInfoCheckboxCellEditor extends CheckboxCellEditor implements MouseListener
- {
- public NamespaceInfoCheckboxCellEditor(Composite parent)
- {
- super(parent);
- }
-
- protected void doSetValue(Object value)
- {
- }
-
- public void activate()
- {
- super.activate();
- deactivate();
- Display.getCurrent().getFocusControl().redraw();
- }
-
- public void mouseDown(MouseEvent e)
- {
- if (tableViewer.getTable().getItem(new Point(e.x, e.y)) != null)
- {
- }
- }
- public void mouseDoubleClick(MouseEvent e) {}
- public void mouseUp(MouseEvent e) {}
-
-
- }
-
-
- protected class NamespaceInfoCellModifier implements ICellModifier
- {
- public NamespaceInfoCellModifier()
- {
-
- }
-
- public boolean canModify(Object element, String property)
- {
- if (property.equals(INCLUDE))
- {
- return true;
- }
- else if (property.equals(PREFIX))
- {
- return true;
- }
- return false;
- }
-
- public Object getValue(Object element, String property)
- {
- int column = 0;
- if (property.equals(INCLUDE))
- {
- column = 0;
- }
- else if (property.equals(PREFIX))
- {
- column = 1;
- }
- else if (property.equals(NAMESPACE_URI))
- {
- column = 2;
- }
-
- if (element instanceof TableElement)
- {
- return provider.getColumnText(element, column);
- }
- else
- {
- return null;
- }
- }
-
- public void modify(Object element, String property, Object value)
- {
- TableItem item = (TableItem)element;
- if (item != null)
- {
- Object obj = item.getData();
- if (obj != null)
- {
- TableElement holder = (TableElement)obj;
- NamespaceInfo info = holder.getNamespaceInfo();
- if (property.equals(INCLUDE))
- {
- if (value instanceof Boolean)
- {
- if (((Boolean)value).booleanValue())
- {
- holder.setChecked("true");
- checkedList.set(holder.getIndex(), "true");
- }
- else
- {
- holder.setChecked("false");
- checkedList.set(holder.getIndex(), "false");
- }
- }
- }
- else if (property.equals(PREFIX))
- {
- info.prefix = ((String)value).trim();
- }
-
- Runnable delayedUpdate = new Runnable()
- {
- public void run()
- {
- tableViewer.refresh();
- }
- };
- Display.getCurrent().asyncExec(delayedUpdate);
- if (updateListener != null)
- {
- updateListener.updateOccured(this, namespaceInfoList);
- }
-
-// performDelayedUpdate();
- }
- }
- }
- }
-
- protected class TableElement
- {
- NamespaceInfo info;
- int index;
- String checked = "true";
-
- TableElement(NamespaceInfo info, int index)
- {
- this.info = info;
- this.index = index;
- }
-
- public NamespaceInfo getNamespaceInfo()
- {
- return info;
- }
-
- public int getIndex()
- {
- return index;
- }
-
- public String getChecked()
- {
- return checked;
- }
-
- public void setChecked(String checked)
- {
- this.checked = checked;
- }
- }
-
- /**
- * NamespaceInfoTableLabelProvider
- */
- protected class NamespaceInfoTableLabelProvider implements ITableLabelProvider, IStructuredContentProvider
- {
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- public boolean isDeleted(Object element)
- {
- return false;
- }
-
- public Object[] getElements(Object inputElement)
- {
- Vector v = new Vector();
- for (int i = 0; i < namespaceInfoList.size(); i++)
- {
- NamespaceInfo info = (NamespaceInfo)namespaceInfoList.get(i);
- TableElement holder = new TableElement(info, i);
- holder.setChecked((String)checkedList.get(i));
- v.add(holder);
- }
- return v.toArray();
- }
-
- public String getColumnText(Object object, int column)
- {
- TableElement holder = (TableElement)object;
- NamespaceInfo info = holder.getNamespaceInfo();
- String result = null;
- switch (column)
- {
- case 1: { result = info.prefix; break; }
- case 2: { result = info.uri; break; }
- }
- result = result != null ? result.trim() : "";
- if (result.equals(""))
- {
- switch (column)
- {
- case 2:
- {
- result = XMLCommonResources.getInstance().getString("_UI_NO_NAMESPACE_NAME"); //$NON-NLS-1$
- break;
- }
- }
- }
- return result;
- }
-
-// private String getDefaultPrefix()
-// {
-// String defaultPrefix = "p";
-// if (namespaceInfoList == null)
-// return defaultPrefix;
-//
-// Vector v = new Vector();
-// for (int i=0; i<namespaceInfoList.size(); i++)
-// {
-// NamespaceInfo nsinfo = (NamespaceInfo)namespaceInfoList.get(i);
-// if (nsinfo.prefix != null)
-// v.addElement(nsinfo.prefix);
-// }
-//
-// if (v.contains(defaultPrefix))
-// {
-// String s = defaultPrefix;
-// for (int j=0; v.contains(s); j++)
-// {
-// s = defaultPrefix + Integer.toString(j);
-// }
-// return s;
-// }
-// else
-// return defaultPrefix;
-// }
-
- public Image getColumnImage(Object object, int columnIndex)
- {
- if (columnIndex == 0) // Output Column
- {
- if (object instanceof TableElement)
- {
- TableElement holder = (TableElement) object;
- String result = holder.getChecked();
- if (result.equals("true")) //$NON-NLS-1$
- {
- return WSDLEditorPlugin.getInstance().getImage("icons/output_yes.gif"); //$NON-NLS-1$
- }
- else
- {
- return WSDLEditorPlugin.getInstance().getImage("icons/output_no.gif"); //$NON-NLS-1$
- }
- }
- }
- return null;
- }
-
- public boolean isLabelProperty(Object object, Object property)
- {
- return false;
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public void dispose()
- {
- }
- }
-
- class NamespaceNavigableTableViewer extends NavigableTableViewer
- {
- public NamespaceNavigableTableViewer(Table parent)
- {
- super(parent);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
deleted file mode 100644
index 8c73cbe5c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.DOMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-public class NewWSDLWizard extends Wizard implements INewWizard {
- private WSDLNewFilePage newFilePage;
- private WSDLNewFileOptionsPage optionsPage;
- private IStructuredSelection selection;
-
- /**
- * Constructor for NewWSDLWizard.
- */
- public NewWSDLWizard() {
- super();
- }
-
- /**
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish() {
- IFile file = newFilePage.createNewFile();
-
- Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
- String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
- if (charSet == null || charSet.trim().equals("")) {
- charSet = "UTF-8";
- }
-
- String wsdlPrefix = "wsdl";
- Vector namespaces = optionsPage.getNamespaceInfo();
-
- String prefix = optionsPage.getPrefix();
- String definitionName = optionsPage.getDefinitionName();
-
- URI uri2 = URI.createPlatformResourceURI(file.getFullPath().toOSString());
- ResourceSet resourceSet = new ResourceSetImpl();
- WSDLResourceImpl resource = (WSDLResourceImpl) resourceSet.createResource(URI.createURI("*.wsdl"));
- resource.setURI(uri2);
-
- WSDLFactoryImpl factory = new WSDLFactoryImpl();
- DefinitionImpl definition = (DefinitionImpl) factory.createDefinition();
- resource.getContents().add(definition);
-
- definition.setTargetNamespace(optionsPage.getTargetNamespace());
- definition.setLocation(file.getLocation().toString());
- definition.setEncoding(charSet);
- definition.setQName(new QName(wsdlPrefix, definitionName));
- definition.addNamespace(prefix, optionsPage.getTargetNamespace());
-
- for (int i = 0; i < namespaces.size(); i++) {
- NamespaceInfo info = (NamespaceInfo) namespaces.get(i);
-
- if (info.prefix.length() > 0) {
- definition.addNamespace(info.prefix, info.uri);
- }
- else {
- definition.addNamespace(null, info.uri);
- }
- }
- // TODO : cs... why do we need this? these calls are evil!
- definition.updateElement(true);
- try {
- if (optionsPage.getCreateSkeletonBoolean()) {
- if (optionsPage.isSoapDocLiteralProtocol()) {
- CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
- }
- else {
- CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
- }
-
- CreateWSDLElementHelper.serviceName = definitionName;
- CreateWSDLElementHelper.portName = definitionName + optionsPage.getProtocol();
- Service service = CreateWSDLElementHelper.createService(definition);
-
-
- // Generate Binding
- Iterator bindingIt = definition.getEBindings().iterator();
- Binding binding = null;
- if (bindingIt.hasNext()) {
- binding = (Binding) bindingIt.next();
- }
- BindingGenerator bindingGenerator = new BindingGenerator(definition, binding, SOAPConstants.SOAP_NAMESPACE_URI);
- Port port = (Port) service.getEPorts().iterator().next();
- bindingGenerator.setName(ComponentReferenceUtil.getName(port.getEBinding()));
- bindingGenerator.setRefName(ComponentReferenceUtil.getPortTypeReference(port.getEBinding()));
- bindingGenerator.setOverwrite(true);
-
- if (optionsPage.getProtocol().equals("SOAP")) {
- String namespace = SOAPConstants.SOAP_NAMESPACE_URI;
- bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
- SOAPContentGenerator soapGen = (SOAPContentGenerator) bindingGenerator.getContentGenerator();
- Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
- Boolean booleanValue2 = (Boolean) optionsPage.getProtocolOptions()[2];
- if (booleanValue.booleanValue()) {
- // Document Literal
- soapGen.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
- soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
- }
- else if (booleanValue2.booleanValue()){
- // RPC Literal
- soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
- soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
- }
- else {
- // RPC Encoded
- soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
- soapGen.setUse(SOAPContentGenerator.USE_ENCODED);
- }
- }
- else if (optionsPage.getProtocol().equals("HTTP")) {
- String namespace = HTTPConstants.HTTP_NAMESPACE_URI;
- bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
- Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
- if (booleanValue.booleanValue()) {
- // Post
- ((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_POST);
- }
- else {
- // Get
- ((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_GET);
- }
- }
-
- bindingGenerator.generateBinding();
- bindingGenerator.generatePortContent();
- }
- resource.save(null);
- }
- catch (Exception e) {
- System.out.println("\nCould not write new WSDL file in WSDL Wizard: " + e);
- }
-
- /*
- * if (file != null) { final ISelection selection = new
- * StructuredSelection(file); if (selection != null) { IWorkbench
- * workbench = UIPlugin.getDefault().getWorkbench(); final
- * IWorkbenchWindow workbenchWindow =
- * workbench.getActiveWorkbenchWindow(); final IWorkbenchPart
- * focusPart = workbenchWindow.getActivePage().getActivePart(); if
- * (focusPart instanceof ISetSelectionTarget) {
- * Display.getCurrent().asyncExec (new Runnable() { public void run() {
- * ((ISetSelectionTarget)focusPart).selectReveal(selection); } }); } } }
- */
- openEditor(file);
-
- return true;
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
- * IStructuredSelection)
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- this.selection = selection;
-
- // Need new icon
- this.setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditor.class, "icons/new_wsdl_wiz.gif"));
- this.setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
- }
-
- public void addPages() {
- newFilePage = new WSDLNewFilePage(selection);
- optionsPage = new WSDLNewFileOptionsPage(WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), null); //$NON-NLS-1$ //$NON-NLS-2$
- addPage(newFilePage);
- addPage(optionsPage);
- }
-
- public IPath getNewFilePath() {
- String fileName = newFilePage.getFileName();
- return fileName != null ? new Path(fileName) : null;
- }
-
- public boolean canFinish() {
- if (newFilePage.isPageComplete() && optionsPage.isPageComplete()) {
- return true;
- }
- return false;
- }
-
- static public void openEditor(final IFile iFile) {
- if (iFile != null) {
- IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
- final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- try {
- workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), "org.eclipse.wst.wsdl.ui.internal.WSDLEditor");
- }
- catch (PartInitException ex) {
- // B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception
- // encountered when attempting to open file: " + iFile
- // + "\n\n" + ex);
- }
- }
- });
- }
- }
-
- public class AvailableContentCMVisitor extends CMVisitor {
- public static final int INCLUDE_ATTRIBUTES = ModelQuery.INCLUDE_ATTRIBUTES;
- public static final int INCLUDE_CHILD_NODES = ModelQuery.INCLUDE_CHILD_NODES;
- public static final int INCLUDE_SEQUENCE_GROUPS = ModelQuery.INCLUDE_SEQUENCE_GROUPS;
-
- public Hashtable childNodeTable = new Hashtable();
- public Hashtable attributeTable = new Hashtable();
- public Element rootElement;
- public CMElementDeclaration rootElementDeclaration;
- public boolean isRootVisited;
- protected boolean includeSequenceGroups;
- public DOMValidator validator;
-
- public AvailableContentCMVisitor(Element rootElement, CMElementDeclaration rootElementDeclaration) {
- this.rootElement = rootElement;
- this.rootElementDeclaration = rootElementDeclaration;
- validator = new DOMValidator();
- }
-
- protected String getKey(CMNode cmNode) {
- String key = cmNode.getNodeName();
- CMDocument cmDocument = (CMDocument) cmNode.getProperty("CMDocument");
- if (cmDocument != null) {
- String namespaceURI = (String) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");
- if (namespaceURI != null) {
- key = "[" + namespaceURI + "]" + key;
- }
- }
- return key;
- }
-
- public List computeAvailableContent(int includeOptions) {
- Vector v = new Vector();
-
- int contentType = rootElementDeclaration.getContentType();
- includeSequenceGroups = ((includeOptions & INCLUDE_SEQUENCE_GROUPS) != 0);
- visitCMNode(rootElementDeclaration);
-
- if ((includeOptions & INCLUDE_ATTRIBUTES) != 0) {
- v.addAll(attributeTable.values());
- CMAttributeDeclaration nillableAttribute = (CMAttributeDeclaration) rootElementDeclaration.getProperty("http://org.eclipse.wst/cm/properties/nillable");
- if (nillableAttribute != null) {
- v.add(nillableAttribute);
- }
- }
-
- if ((includeOptions & INCLUDE_CHILD_NODES) != 0) {
- if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.ELEMENT) {
- v.addAll(childNodeTable.values());
- }
- else if (contentType == CMElementDeclaration.ANY) {
- CMDocument cmDocument = (CMDocument) rootElementDeclaration.getProperty("CMDocument");
- if (cmDocument != null) {
- CMNamedNodeMap elements = cmDocument.getElements();
- for (Iterator i = elements.iterator(); i.hasNext();) {
- v.add((CMElementDeclaration) i.next());
- }
- }
- }
-
- if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.PCDATA || contentType == CMElementDeclaration.ANY) {
- CMDataType dataType = rootElementDeclaration.getDataType();
- if (dataType != null) {
- v.add(dataType);
- }
- }
- }
- return v;
- }
-
- /*
- * public void visitCMAnyElement(CMAnyElement anyElement) { String uri =
- * anyElement.getNamespaceURI(); List list =
- * getCMDocumentList(rootElement, rootElementDeclaration, uri); for
- * (Iterator iterator = list.iterator(); iterator.hasNext(); ) {
- * CMDocument cmdocument = (CMDocument)iterator.next(); if (cmdocument !=
- * null) { CMNamedNodeMap map = cmdocument.getElements(); int size =
- * map.getLength(); for (int i = 0; i < size; i++) { CMNode ed =
- * map.item(i);
- *
- * childNodeTable.put(getKey(ed), ed); } } } }
- */
- public void visitCMAttributeDeclaration(CMAttributeDeclaration ad) {
- super.visitCMAttributeDeclaration(ad);
- attributeTable.put(ad.getNodeName(), ad);
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration ed) {
- if (ed == rootElementDeclaration && !isRootVisited) {
- isRootVisited = true;
- super.visitCMElementDeclaration(ed);
- }
- else {
- if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
- childNodeTable.put(getKey(ed), ed);
- }
-
- CMNodeList substitutionGroup = (CMNodeList) ed.getProperty("SubstitutionGroup");
- if (substitutionGroup != null) {
- handleSubstitutionGroup(substitutionGroup);
- }
- }
- }
-
- protected void handleSubstitutionGroup(CMNodeList substitutionGroup) {
- int substitutionGroupLength = substitutionGroup.getLength();
- if (substitutionGroupLength > 1) {
- for (int i = 0; i < substitutionGroupLength; i++) {
- CMNode ed = substitutionGroup.item(i);
- if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
- childNodeTable.put(getKey(ed), ed);
- }
- }
- }
- }
-
- public void visitCMGroup(CMGroup group) {
- if (includeSequenceGroups) {
- if (group.getOperator() == CMGroup.SEQUENCE && group.getChildNodes().getLength() > 1 && includesRequiredContent(group)) {
- childNodeTable.put(group, group);
- }
- }
- super.visitCMGroup(group);
- }
-
- public boolean includesRequiredContent(CMGroup group) {
- List list = getValidator().createContentSpecificationList(group);
- return list.size() > 1;
- }
-
- public DOMValidator getValidator() {
- return validator;
- }
- } // ///////////////////////// here
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
deleted file mode 100644
index 4ccf3c664..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.generator.PortGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-
-public class PortWizard extends Wizard
-{
- protected final static int STYLE_NEW_BINDING = 1;
- protected final static int STYLE_EXISTING_BINDING = 1 << 1;
- protected final static int STYLE_DEFAULT = STYLE_NEW_BINDING | STYLE_EXISTING_BINDING;
-
- protected PortGenerator portGenerator;
- protected PortWizardOptionsPage specifyBindingPage;
- protected int style;
-
- /**
- * Constructor for PortWizard.
- */
- public PortWizard(Service service)
- {
- this(service, 0);
- }
-
- public PortWizard(Service service, int style)
- {
- super();
- portGenerator = new PortGenerator(service);
- setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_PORT_WIZARD")); //$NON-NLS-1$
- //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
- }
-
- /**
- * Return true if wizard setup is successful, false otherwise
- */
- public boolean setup()
- {
- return true;
- }
-
- public void addPages()
- {
- specifyBindingPage = new PortWizardOptionsPage(style);
- addPage(specifyBindingPage);
- }
-
- public boolean performFinish()
- {
- Object object = portGenerator.generatePort();
-
- try
- {
- if (object != null)
- {
- IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
- if (selectionProvider != null)
- {
- selectionProvider.setSelection(new StructuredSelection(object));
- }
- }
- }
- catch (Exception e)
- {
- }
- return true;
- }
-
- class PortWizardOptionsPage extends WizardPage
- {
-
- protected ProtocolComponentControl protocolComponentControl;
-
- public PortWizardOptionsPage(int style)
- {
- super("SpecifyPortPage");
- setTitle(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS"));
- setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS_TO_BE_CREATED"));
- }
-
- public PortGenerator getGenerator()
- {
- return portGenerator;
- }
-
- public void createControl(Composite parent)
- {
- ProtocolComponentControl protocolComponentControl = new PortProtocolComponentControl(parent, portGenerator);
- protocolComponentControl.initFields();
- setControl(protocolComponentControl);
- }
- }
-
- class PortProtocolComponentControl extends ProtocolComponentControl
- {
-
- public PortProtocolComponentControl(Composite parent, PortGenerator generator)
- {
- super(parent, generator, false);
- }
-
- public String getRefNameLabelText()
- {
- return WSDLEditorPlugin.getWSDLString("_UI_BINDING");
- }
-
- public List getRefNames()
- {
- return new ComponentReferenceUtil(portGenerator.getDefinition()).getBindingNames();
- }
-
- public String getDefaultName()
- {
- Service service = portGenerator.getService();
- return NameUtil.buildUniquePortName(service, null);
- }
-
- public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
- {
- ContentGeneratorOptionsPage optionsPage = null;
- String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
- if (protocolSelection.equals("SOAP")) {
- optionsPage = new SoapBindingOptionsPage();
- }
- else if (protocolSelection.equals("HTTP")) {
- optionsPage = new SoapBindingOptionsPage();
- }
-// ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-// if (extension != null)
-// {
-// optionsPage = extension.createPortContentGeneratorOptionsPage();
-// }
- return optionsPage;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
deleted file mode 100644
index ba906c039..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ValidateHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-
-public class WSDLNewFileOptionsPage extends WizardPage implements ModifyListener, UpdateListener, SelectionListener
-{
- protected Text targetNamespaceText;
- protected Text prefixText;
- protected boolean updatePortOpFieldBoolean = true;
-
- protected PageBook protocolPageBook;
- protected Combo protocolCombo;
- protected Composite soapPage;
- protected Composite httpPage;
- protected Button docLitRadio;
- protected Button rpcLitRadio;
- protected Button rpcEncRadio;
- protected Button httpGetRadio;
- protected Button httpPostRadio;
-
-// private BindingGenerator generator;
-
- /**
- * Constructor for WSDLNewFileOptionsPage.
- * @param pageName
- */
- public WSDLNewFileOptionsPage(String pageName)
- {
- super(pageName);
- }
- /**
- * Constructor for WSDLNewFileOptionsPage.
- * @param pageName
- * @param title
- * @param titleImage
- */
- public WSDLNewFileOptionsPage(String pageName, String title, ImageDescriptor titleImage)
- {
- super(pageName, title, titleImage);
- setDescription(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_NEW_WSDL_FILE")); //$NON-NLS-1$
- }
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
- */
- public void createControl(Composite parent)
- {
- Composite base = new Composite(parent, SWT.NONE);
- WorkbenchHelp.setHelp(base, WSDLEditorPlugin.getWSDLString("_UI_HELP")); //$NON-NLS-1$
- base.setLayout(new GridLayout());
-
- // Group wsdlGroup = ViewUtility.createGroup(base, 2, "WSDL", false);
- Composite wsdlGroup = new Composite(base, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- wsdlGroup.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- wsdlGroup.setLayoutData(data);
-
- GridData gd = (GridData)wsdlGroup.getLayoutData();
- gd.grabExcessHorizontalSpace = true;
-
- Label targetNamespace = new Label(wsdlGroup, SWT.LEFT);
- targetNamespace.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE")); //$NON-NLS-1$
- GridData nsData = new GridData();
- nsData.horizontalAlignment = GridData.FILL;
- targetNamespace.setLayoutData(nsData);
-
- targetNamespaceText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
- GridData textData = new GridData();
- textData.horizontalAlignment = GridData.FILL;
- textData.grabExcessHorizontalSpace = true;
- textData.widthHint = 10;
- targetNamespaceText.setLayoutData(textData);
-
- targetNamespaceText.addModifyListener(this);
-
- Label prefix = new Label(wsdlGroup, SWT.LEFT);
- prefix.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX_WITH_COLON")); //$NON-NLS-1$\
-
- GridData prefixData = new GridData();
- prefixData.horizontalAlignment = GridData.FILL;
- prefix.setLayoutData(prefixData);
-
- prefixText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
- GridData prefixTextData = new GridData();
- prefixTextData.horizontalAlignment = GridData.FILL;
- prefixTextData.grabExcessHorizontalSpace = true;
- prefixTextData.widthHint = 10;
- prefixText.setLayoutData(prefixTextData);
-
- prefixText.addModifyListener(this);
-
- // XMLCatalog xmlCatalog = XMLCatalogRegistry.getInstance().lookupOrCreateXMLCatalog("default");
- // SelectXMLCatalogIdPanel catalog = new SelectXMLCatalogIdPanel(base, xmlCatalog);
-
-// Determine if the user wishes to create a skeleton WSDL. If yes, present the user with input fields.
- createSkeletonCheckBox = new Button(base, SWT.CHECK);
- createSkeletonCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_WSDL_SKELETON"));
- createSkeletonCheckBox.setSelection(true);
-
- wsdlSkeletonGroup = new Composite(base, SWT.NONE);
- GridLayout layout2 = new GridLayout();
- layout2.numColumns = 2;
- wsdlSkeletonGroup.setLayout(layout2);
-
- GridData data2 = new GridData();
- data2.verticalAlignment = GridData.FILL;
- data2.horizontalAlignment = GridData.FILL;
- wsdlSkeletonGroup.setLayoutData(data2);
-
- createLabel(wsdlSkeletonGroup, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL"));
- protocolCombo = new Combo(wsdlSkeletonGroup, SWT.READ_ONLY);
- GridData dataC = new GridData();
- dataC.horizontalAlignment = GridData.FILL;
- dataC.grabExcessHorizontalSpace = true;
- protocolCombo.setLayoutData(dataC);
- protocolCombo.add(SOAP_PROTOCOL);
- protocolCombo.add(HTTP_PROTOCOL);
- protocolCombo.select(0);
- protocolCombo.addModifyListener(this);
-
- sepLabel = new Label(base, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData sepData = new GridData();
- sepData.horizontalAlignment = GridData.FILL;
- sepData.grabExcessHorizontalSpace = true;
- sepLabel.setLayoutData(sepData);
-
-
- // Create PageBook and pages/controls for the PageBook
- protocolPageBook = new PageBook(base, SWT.NONE);
-
- ///////////////////////// Soap Page
- soapPage = new Composite(protocolPageBook, SWT.NONE);
- GridLayout pbLayout = new GridLayout();
- soapPage.setLayout(pbLayout);
-
- GridData pbData = new GridData();
- pbData.verticalAlignment = GridData.FILL;
- pbData.horizontalAlignment = GridData.FILL;
- soapPage.setLayoutData(pbData);
-
- createLabel(soapPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
- docLitRadio = new Button(soapPage, SWT.RADIO);
- rpcLitRadio = new Button(soapPage, SWT.RADIO);
- rpcEncRadio = new Button(soapPage, SWT.RADIO);
- docLitRadio.setText(SOAP_DOCUMENT_LITERAL);
- rpcLitRadio.setText(SOAP_RPC_LITERAL);
- rpcEncRadio.setText(SOAP_RPC_ENCODED);
- docLitRadio.setSelection(true);
-
- ///////////////////////// Http Page
- httpPage = new Composite(protocolPageBook, SWT.NONE);
- pbLayout = new GridLayout();
- httpPage.setLayout(pbLayout);
-
- pbData = new GridData();
- pbData.verticalAlignment = GridData.FILL;
- pbData.horizontalAlignment = GridData.FILL;
- httpPage.setLayoutData(pbData);
-
- createLabel(httpPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS")); // Already Externalized
- httpGetRadio = new Button(httpPage, SWT.RADIO);
- httpPostRadio = new Button(httpPage, SWT.RADIO);
- httpGetRadio.setText(HTTP_GET);
- httpPostRadio.setText(HTTP_POST);
- httpGetRadio.setSelection(true);
-
- wsdlSkeletonGroup.setVisible(true);
- sepLabel.setVisible(true);
- protocolPageBook.showPage(soapPage);
- protocolPageBook.setVisible(true);
-
- ////////////////////////// Add Selection Listeners
- createSkeletonCheckBox.addSelectionListener(this);
-
-// BindingProtocolComponentControl component = new BindingProtocolComponentControl(base, generator, false);
-// component.initFields();
-
- setControl(base);
- }
-
- private NewWSDLWizard getNewWSDLWizard()
- {
- return (NewWSDLWizard)getWizard();
- }
-
- private String computeDefaultDefinitionName()
- {
- String name = "DefaultName";
- IPath path = getNewWSDLWizard().getNewFilePath();
- if (path != null)
- {
- name = path.removeFileExtension().lastSegment().toString();
- }
- return name;
- }
-
- private String computeDefaultNamespaceName()
- {
- String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
- if (!namespace.endsWith("/")) {
- namespace = namespace.concat("/");
- }
-
- IPath path = getNewWSDLWizard().getNewFilePath();
- if (path != null)
- {
- namespace += path.removeFileExtension().toString() + "/";
- }
- return namespace;
- }
-
- public void setVisible(boolean visible)
- {
- super.setVisible(visible);
-
- if (visible)
- {
- // prime the fields
- targetNamespaceText.setText(computeDefaultNamespaceName());
- prefixText.setText("tns");
- }
- }
-
- public String getTargetNamespace()
- {
- return targetNamespaceText.getText();
- }
-
- public String getPrefix()
- {
- return prefixText.getText().trim();
- }
-
- public String getDefinitionName()
- {
- return computeDefaultDefinitionName();
- }
-
- public void modifyText(ModifyEvent e)
- {
- if (e.widget == targetNamespaceText)
- {
- startDelayedEvent(e);
- }
- else if (e.widget == prefixText)
- {
- setPageComplete(isPageComplete());
- }
- else if (e.widget == protocolCombo) {
- // Update what page/control we show in the PageBook
- if (protocolCombo.getText().equals("SOAP")) {
- protocolPageBook.showPage(soapPage);
- }
- else if (protocolCombo.getText().equals("HTTP")) {
- protocolPageBook.showPage(httpPage);
- }
- }
- }
-
- public void updateOccured(Object arg1, Object arg2)
- {
- setPageComplete(isPageComplete());
- }
-
- public boolean isPageComplete()
- {
- boolean ready = true;
-
- setErrorMessage(null);
-
- // so that the page doesn't immediately show up with an error
- if (targetNamespaceText.getText().trim().equals(""))
- {
- if (ready)
- {
- setErrorMessage(null);
- }
- return false;
- }
-
- if (!validateTargetNamespace(targetNamespaceText.getText()))
- {
- ready = false;
- }
-
- return ready;
- }
-
- protected boolean validatePrefix(String prefix)
- {
- String errorMessage = ValidateHelper.checkXMLPrefix(prefix);
-
- if (errorMessage == null || errorMessage.length() == 0)
- {
- return true;
- }
- return false;
- }
-
- protected boolean validateXMLName(String xmlName)
- {
- String errorMessage = ValidateHelper.checkXMLName(xmlName);
-
- if (errorMessage == null || errorMessage.length() == 0)
- {
- return true;
- }
- setErrorMessage(errorMessage);
- return false;
- }
-
- protected boolean validateTargetNamespace(String ns)
- {
- boolean test = true;
- try
- {
- new URI(ns);
-// URI testURI = new URI(ns);
- // if (!testURI.isGenericURI())
- // {
- // setErrorMessage(WSDLEditorPlugin.getInstance().getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
- // test = false;
- // }
- }
- catch (URISyntaxException e)
- {
- // String errorMessage = ValidateHelper.checkXMLName(ns);
- // if (errorMessage == null || errorMessage.length() == 0)
- // {
- // test = true;
- // }
- // else
- // {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
- test = false;
- // }
- }
-
- return test;
- }
-
- /*
- private boolean arePrefixesUniqueAndValid()
- {
- java.util.List infoList = namespaceInfo.getNamespaceInfoList();
- java.util.List checkedList = namespaceInfo.getNamespaceCheckedList();
-
- Vector prefixList = new Vector();
- boolean test = true;
- boolean isOneBlank = false;
-
- String currentPrefix = prefixText.getText().trim();
- if (currentPrefix.length() == 0)
- {
- isOneBlank = true;
- }
- else
- {
- if (validatePrefix(currentPrefix))
- {
- prefixList.add(currentPrefix);
- }
- else
- {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", currentPrefix)); //$NON-NLS-1$
- return false;
- }
- }
-
- for (int i = 0; i < infoList.size(); i++)
- {
- NamespaceInfo info = (NamespaceInfo)infoList.get(i);
- if (((String)checkedList.get(i)).equals("true")) //$NON-NLS-1$
- {
- String aPrefix = info.prefix.trim();
- if (aPrefix.length() > 0)
- {
- if (!prefixList.contains(aPrefix))
- {
- if (validatePrefix(aPrefix))
- {
- prefixList.add(aPrefix);
- }
- else
- {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", info.prefix)); //$NON-NLS-1$
- test = false;
- break;
- }
- }
- else
- {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_A_DUPLICATE", info.prefix)); //$NON-NLS-1$
- test = false;
- break;
- }
- }
- else
- {
- if (!isOneBlank)
- {
- isOneBlank = true;
- }
- else
- {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_MORE_THAN_ONE_PREFIX_IS_BLANK")); //$NON-NLS-1$
- test = false;
- break;
- }
- }
- }
- }
- return test;
- }
- */
-
- protected DelayedEvent delayedTask;
- protected void startDelayedEvent(ModifyEvent e)
- {
- if (delayedTask == null || delayedTask.getEvent() == null)
- {
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500, delayedTask);
- }
- else
- {
- ModifyEvent delayedEvent = delayedTask.getEvent();
-
- if (e.widget == delayedEvent.widget)
- {
- // same event, just different data, delay new event
- delayedTask.setEvent(null);
- }
- delayedTask = new DelayedEvent();
- delayedTask.setEvent(e);
- Display.getDefault().timerExec(500, delayedTask);
- }
- }
-
- class DelayedEvent implements Runnable
- {
- protected ModifyEvent event;
-
- /*
- * @see Runnable#run()
- */
- public void run()
- {
- if (event != null)
- {
- setPageComplete(isPageComplete());
- event = null;
- }
- }
-
- public ModifyEvent getEvent()
- {
- return event;
- }
-
- public void setEvent(ModifyEvent event)
- {
- this.event = event;
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == createSkeletonCheckBox) {
- if (createSkeletonCheckBox.getSelection()) {
- wsdlSkeletonGroup.setVisible(true);
- sepLabel.setVisible(true);
- protocolPageBook.setVisible(true);
- }
- else {
- wsdlSkeletonGroup.setVisible(false);
- sepLabel.setVisible(false);
- protocolPageBook.setVisible(false);
- }
- }
- }
-
- private static final String SOAP_PROTOCOL = "SOAP";
- private static final String HTTP_PROTOCOL = "HTTP";
- private static final String SOAP_RPC_ENCODED = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED");
- private static final String SOAP_RPC_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL");
- private static final String SOAP_DOCUMENT_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL");
- private static final String HTTP_POST = "HTTP POST";
- private static final String HTTP_GET = "HTTP GET";
-
- Composite wsdlSkeletonGroup;
- Button createSkeletonCheckBox;
-
- Label sepLabel;
-
- private Label createLabel(Composite comp, String labelString) {
- Label label = new Label(comp, SWT.LEFT);
- label.setText(labelString);
- GridData nsData = new GridData();
- nsData.horizontalAlignment = GridData.FILL;
- label.setLayoutData(nsData);
-
- return label;
- }
-
- public Vector getNamespaceInfo() {
- Vector namespaces = new Vector();
-
- // Add Default Namespaces
- NamespaceInfo info1 = new NamespaceInfo();
- info1.prefix = "wsdl";
- info1.uri = "http://schemas.xmlsoap.org/wsdl/";
- namespaces.addElement(info1);
-
- NamespaceInfo info8 = new NamespaceInfo();
- info8.prefix = "xsd";
- info8.uri = "http://www.w3.org/2001/XMLSchema";
- namespaces.addElement(info8);
-
- return namespaces;
- }
-
- public boolean getCreateSkeletonBoolean() {
- return createSkeletonCheckBox.getSelection();
- }
-
- public String getProtocol() {
- return protocolCombo.getText();
- }
-
- public Object[] getProtocolOptions() {
- Object bool[] = new Boolean[3];
- if (protocolCombo.getText().equals(SOAP_PROTOCOL)) {
- if (docLitRadio.getSelection()) {
- bool[0] = new Boolean(true);
- }
- else {
- bool[0] = new Boolean(false);
- }
-
- if (rpcLitRadio.getSelection()) {
- bool[2] = new Boolean(true);
- }
- else {
- bool[2] = new Boolean(false);
- }
- }
- else if (protocolCombo.getText().equals(HTTP_PROTOCOL)){
- if (httpGetRadio.getSelection()) {
- bool[0] = new Boolean(false);
- }
- else {
- bool[0] = new Boolean(true);
- }
- }
-
- return bool;
- }
-
- public boolean isSoapDocLiteralProtocol() {
- if (getProtocol().equals(SOAP_PROTOCOL) && docLitRadio.getSelection()) {
- return true;
- }
- else {
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
deleted file mode 100644
index c50644770..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import org.eclipse.core.resources.IContainer;
-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.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLNewFilePage extends WizardNewFileCreationPage
-{
- public WSDLNewFilePage(IStructuredSelection selection)
- {
- super(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE"), selection); //$NON-NLS-1$
- setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
- setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_NEW_WSDL_FILE")); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent)
- {
- // inherit default container and name specification widgets
- super.createControl(parent);
- this.setFileName(computeDefaultFileName());
-
- setPageComplete(validatePage());
- }
-
- protected boolean validatePage()
- {
- Path newName = new Path(getFileName());
- String fullFileName = getFileName();
- String extension = newName.getFileExtension();
- if (extension == null || !extension.equalsIgnoreCase("wsdl")) //$NON-NLS-1$
- {
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_MUST_END_WITH_WSDL")); //$NON-NLS-1$
- return false;
- }
- else
- {
- setErrorMessage(null);
- }
-
- // check for file should be case insensitive
- String sameName = existsFileAnyCase(fullFileName);
- if (sameName != null)
- {
-// String qualifiedFileName = getContainerFullPath().toString() + '/' + fullFileName;
- setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_ALREADY_EXISTS", sameName)); //$NON-NLS-1$
- return false;
- }
-
-
- return super.validatePage();
- }
-
- public String defaultName = "NewWSDLFile"; //$NON-NLS-1$
- public String defaultFileExtension = ".wsdl"; //$NON-NLS-1$
- public String[] filterExtensions = { "*.wsdl"}; //$NON-NLS-1$
-
-
- protected String computeDefaultFileName()
- {
- int count = 0;
- String fileName = defaultName + defaultFileExtension;
- IPath containerFullPath = getContainerFullPath();
- if (containerFullPath != null)
- {
- while (true)
- {
- IPath path = containerFullPath.append(fileName);
- // if (WorkbenchUtility.getWorkspace().getRoot().exists(path))
- if (ResourcesPlugin.getWorkspace().getRoot().exists(path))
- {
- count++;
- fileName = defaultName + count + defaultFileExtension;
- }
- else
- {
- break;
- }
- }
- }
- return fileName;
- }
-
- // returns true if file of specified name exists in any case for selected container
- protected String existsFileAnyCase(String fileName)
- {
- if ( (getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false)
- && (fileName.compareTo("") != 0))
- {
- //look through all resources at the specified container - compare in upper case
- IResource parent = ResourcesPlugin.getWorkspace().getRoot().findMember(getContainerFullPath());
- if (parent instanceof IContainer)
- {
- IContainer container = (IContainer) parent;
- try
- {
- IResource[] members = container.members();
- String enteredFileUpper = fileName.toUpperCase();
- for (int i=0; i<members.length; i++)
- {
- String resourceUpperName = members[i].getName().toUpperCase();
- if (resourceUpperName.equals(enteredFileUpper))
- {
- return members[i].getName();
- }
- }
- }
- catch (CoreException e)
- {
- }
- }
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
deleted file mode 100644
index 073604d63..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-
-
-public class XSDDetailsViewerProvider // implements IDetailsViewerProvider
-{
-// public Object getViewerKey(Object modelObject)
-// {
-// Object result = null;
-//
-// if (modelObject instanceof XSDConcreteComponent)
-// {
-// Element input = ((XSDConcreteComponent)modelObject).getElement();
-//
-// if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
-// {
-// result = "element";
-// }
-// else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
-// {
-// result = "elementRef";
-// }
-// else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-// inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-// inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
-// {
-// result = "sequenceChoiceAll";
-// }
-// else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
-// {
-// result = "attribute";
-// }
-// else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-// {
-// result = "attributeRef";
-// }
-// else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
-// {
-// result = "attributeGroup";
-// }
-// else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
-// {
-// result = "attributeGroupRef";
-// }
-// else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
-// {
-// result = "notation";
-// }
-// else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
-// {
-// result = "group";
-// }
-// else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
-// {
-// result = "groupRef";
-// }
-// else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-// {
-// result = "schema";
-// }
-// else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
-// {
-// result = "complexType";
-// }
-// else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
-// {
-// result = "documentation";
-// }
-// else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
-// {
-// result = "appInfo";
-// }
-// else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-// {
-// if (input != null && input instanceof Element)
-// {
-// Element parentElement = (Element)input;
-// XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-// Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-// if (derivedByNode != null)
-// {
-// if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-// {
-// result = "simpleContent";
-// }
-// else if (inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-// {
-// result = "simpleContent";
-// }
-// }
-// else
-// {
-// result = "xsd";
-// }
-// }
-// }
-// else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-// {
-// if (input != null && input instanceof Element)
-// {
-// Element parentElement = (Element)input;
-// XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-// Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-// if (derivedByNode != null)
-// {
-// result = "simpleContent";
-// }
-// else
-// {
-// result = "xsd";
-// }
-// }
-// }
-// else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
-// {
-// result = "includeXSD";
-// }
-// else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
-// {
-// result = "importXSD";
-// }
-// else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
-// {
-// result = "redefine";
-// }
-// else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
-// {
-// result = "simpleBase";
-// }
-// else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
-// {
-// result = "simpleBase";
-// }
-// else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-// {
-// result = getKeyForRestrictWindow(input);
-// }
-// else if (XSDDOMHelper.isFacet(input))
-// {
-// if (input != null && input instanceof Element)
-// {
-// Node parentElement = ((Element)input).getParentNode();
-// if (inputEquals(parentElement, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-// {
-// result = getKeyForRestrictWindow(input);
-// }
-// }
-// }
-// else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-// {
-// if (input != null && input instanceof Element)
-// {
-// Node parentElement = ((Element)input).getParentNode();
-// if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-// {
-// result = "simpleContent";
-// }
-// else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-// {
-// result = "simpleContent";
-// }
-// else
-// {
-// result = "xsd";
-// }
-// }
-// }
-// else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
-// {
-// result = "pattern";
-// }
-// else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
-// {
-// result = "enum";
-// }
-// else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
-// {
-// result = "anyElement";
-// }
-// else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
-// {
-// result = "anyAttribute";
-// }
-// else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
-// {
-// result = "unique";
-// }
-// else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
-// {
-// result = "keyRef";
-// }
-// else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
-// {
-// result = "selector";
-// }
-// else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
-// {
-// result = "field";
-// }
-// else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
-// {
-// result = "key";
-// }
-// else
-// {
-// result = "xsd";
-// }
-// }
-// else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-// {
-// result = "schema";
-// }
-//
-// return result;
-// }
-//
-//
-// public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
-// {
-// Viewer viewer = null;
-//
-//
-// DesignViewer designViewer = new DesignViewer(editorPart);
-// designViewer.setControl(parent);
-// if (modelObject instanceof XSDConcreteComponent)
-// {
-// Element elem = ((XSDConcreteComponent)modelObject).getElement();
-// viewer = designViewer.createViewer(elem);
-////TODO port
-//// ((BaseWindow)viewer).setModelObject(modelObject);
-//// viewer.setInput(elem);
-// }
-// else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-// {
-// XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)modelObject;
-// XSDSchema xsdSchema = schema.getSchema();
-// Element elem = xsdSchema.getElement();
-// viewer = designViewer.createViewer(elem);
-////TODO port
-//// ((BaseWindow)viewer).setModelObject(modelObject);
-//// viewer.setInput(elem);
-// }
-// return viewer;
-// }
-//
-// protected boolean inputEquals(Object input, String tagname, boolean isRef)
-// {
-// return XSDDOMHelper.inputEquals(input, tagname, isRef);
-// }
-//
-// protected String getKeyForRestrictWindow(Object input)
-// {
-// // special case where SimpleType restriction is different than SimpleContent restriction
-//
-// if (input != null && input instanceof Element)
-// {
-// Node parentElement = ((Element)input).getParentNode();
-// if (inputEquals(parentElement, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-// {
-// return "simpleRestrict";
-// }
-// else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-// {
-// return "simpleRestrict";
-// }
-// else if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-// {
-// return "simpleContent";
-// }
-// }
-// return "xsd";
-// }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
deleted file mode 100644
index fa840f539..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-
-// import org.eclipse.emf.edit.provider.ItemProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-//
-//
-public class XSDExtension implements WSDLEditorExtension
-{
- XSDModelAdapterFactoryImpl xsdModelAdapterFactory;
- XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-
- public XSDExtension()
- {
- xsdModelAdapterFactory = new XSDModelAdapterFactoryImpl();
- adapterFactoryLabelProvider = new XSDAdapterFactoryLabelProvider(xsdModelAdapterFactory);
- }
-
- public boolean isExtensionTypeSupported(int type)
- {
- return
- //CS comment these out until the port is complete
- type == OUTLINE_TREE_CONTENT_PROVIDER ||
- type == OUTLINE_LABEL_PROVIDER ||
- type == PROPERTY_SOURCE_PROVIDER ||
- type == PROPERTY_SECTION_DESCRIPTOR_PROVIDER ||
- type == MENU_ACTION_CONTRIBUTOR ||
- type == DETAILS_VIEWER_PROVIDER ||
- type == EDIT_PART_FACTORY ||
- type == TYPE_SYSTEM_PROVIDER ||
- type == NODE_RECONCILER ||
- type == NODE_ASSOCIATION_PROVIDER ||
- type == MODEL_QUERY_CONTRIBUTOR;
- }
-
- public boolean isApplicable(Object object)
- {
- return (object instanceof XSDSchemaExtensibilityElement ||
- object instanceof XSDConcreteComponent ||
- object instanceof CategoryAdapter ||
- object instanceof Category);
- // || object instanceof ItemProvider);
- }
-
- public Object createExtensionObject(int type, WSDLEditor wsdlEditor)
- {
- Object result = null;
- switch (type)
- {
- case OUTLINE_TREE_CONTENT_PROVIDER :
- {
- result = new XSDModelAdapterContentProvider(xsdModelAdapterFactory);
-// result = new XSDModelAdapterContentProvider();
- // result = new AdapterFactoryContentProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
- break;
- }
- case OUTLINE_LABEL_PROVIDER :
- {
- result = new XSDLabelProvider(adapterFactoryLabelProvider);
- // result = new AdapterFactoryLabelProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
- break;
- }
- case DETAILS_VIEWER_PROVIDER :
- {
- // result = new XSDDetailsViewerProvider();
- result = null;
- break;
- }
- case MENU_ACTION_CONTRIBUTOR :
- {
- result = new XSDMenuActionContributor(wsdlEditor);
- break;
- }
- case TYPE_SYSTEM_PROVIDER :
- {
- result = new XSDTypeSystemProvider();
- break;
- }
- case EDIT_PART_FACTORY :
- {
- result = new XSDExtensionEditPartFactory();
- break;
- }
- case NODE_RECONCILER :
- {
- result = new XSDNodeReconciler();
- break;
- }
- case NODE_ASSOCIATION_PROVIDER :
- {
- result = new XSDNodeAssociationProvider();
- break;
- }
- case MODEL_QUERY_CONTRIBUTOR :
- {
- //result = new XSDModelQueryContributor(wsdlEditor);
- break;
- }
- case PROPERTY_SOURCE_PROVIDER:
- {
- result = new XSDPropertySourceProvider();
- break;
- }
- case PROPERTY_SECTION_DESCRIPTOR_PROVIDER:
- {
- result = new XSDSectionDescriptorProvider();
- break;
- }
- case XSD_DELETE_ACTION:
- {
- result = new DeleteAction(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
- break;
- }
- }
- return result;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
deleted file mode 100644
index 43c50c1ce..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts.XSDSchemaDrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.XSDEditPartFactory;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDExtensionEditPartFactory extends XSDEditPartFactory
-{
- public EditPart createEditPart(EditPart parent, Object model)
- {
- EditPart editPart = null;
-
- if (model instanceof XSDSchema && parent.getModel() instanceof WSDLGroupObject)
- {
- editPart = new XSDSchemaDrillDownEditPart();
- editPart.setModel(model);
- editPart.setParent(parent);
- }
- else
- {
- editPart = super.createEditPart(parent, model);
- }
-
- return editPart;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
deleted file mode 100644
index 66474aa53..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-/**
- * This version of the XSDLabelProvider is a modified version of the one in XSDEditor.
- * This provider only needs to handle nodes in the XML Schema namespace.
- * Other XML nodes (including comments, PIs etc) get handled by the 'main' provider.
- */
-public class XSDLabelProvider extends LabelProvider
-{
- XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-
- /**
- * Constructor for XSDLabelProvider.
- */
- public XSDLabelProvider(XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider)
- {
- super();
- this.adapterFactoryLabelProvider = adapterFactoryLabelProvider;
- }
-
- /*
- * @see ILabelProvider#getImage(Object)
- */
- public Image getImage(Object element)
- {
- if (element instanceof XSDSchemaExtensibilityElement)
- {
- element = ((XSDSchemaExtensibilityElement)element).getSchema().getElement();
- }
- return adapterFactoryLabelProvider.getImage(element);
- }
-
- /*
- * @see ILabelProvider#getText(Object)
- */
- public String getText(Object element)
- {
- // override text for xsd schema
- if (element instanceof XSDSchema)
- {
- return ((XSDSchema)element).getTargetNamespace();
- }
- else
- {
- // We don't call "adapterFactoryLabelProvider.getText(element)" because it will return a object.toString() if
- // there is no labelProvider.... but we don't want to display this 'garbage' info to the user.
- AdapterFactory adapterFactory = adapterFactoryLabelProvider.getAdapterFactory();
- ILabelProvider labelProvider = (ILabelProvider)adapterFactory.adapt(element, ILabelProvider.class);
- String text = "";
- if (labelProvider != null) {
- text = labelProvider.getText(element);
- }
-
- return text;
- }
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
deleted file mode 100644
index 444acb575..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.AddSchemaAction;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.BackAction;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.XSDMenuListener;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateElementAction;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateGroupAction;
-import org.eclipse.wst.xsd.ui.internal.actions.DOMAttribute;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.TopLevelComponentEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDMenuActionContributor implements IMenuActionContributor
-{
- Element currElement;
- Document currDocument;
-// XSDSchema xsdSchema;
-// protected ISelectionProvider iSelectionProvider;
- WSDLEditor wsdlEditor;
-
- public XSDMenuActionContributor(WSDLEditor wsdlEditor)
- {
- this.wsdlEditor = wsdlEditor;
- }
-
- public void contributeMenuActions(IMenuManager manager, Node node, Object object)
- {
- XSDMenuExtensionListener xsdMenuListener = new XSDMenuExtensionListener(wsdlEditor.getSelectionManager());
- xsdMenuListener.contributeMenuActions(manager, node, object);
- }
-
- class XSDMenuExtensionListener extends XSDMenuListener
- {
- public XSDMenuExtensionListener(ISelectionProvider selectionProvider)
- {
- super(selectionProvider);
- }
-
- protected boolean isSchemaReadOnly()
- {
- Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
- while (eeIt.hasNext()) {
- XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
- XSDSchema schema = ee.getSchema();
- if (schema == xsdSchema) {
- return false;
- }
- }
-
-
- return true;
- }
-
- /*
- * TODO: For now, just return the first inline schema we have.
- */
- protected XSDSchema getCurrentSchemaInEditor()
- {
- Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
- while (eeIt.hasNext()) {
- XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
- return ee.getSchema();
- }
-
- return null;
- }
-
- public void contributeMenuActions(IMenuManager manager, Node node, Object object)
- {
- updateXSDSchema();
- AbstractComponentViewerRootEditPart editPart = (AbstractComponentViewerRootEditPart)wsdlEditor.getGraphViewer().getComponentViewer().getRootEditPart().getContents();
-// iSelectionProvider = ((WSDLContentOutlinePage)(wsdlEditor.getWSDLTextEditor().getContentOutlinePage())).getTreeViewer();
- EditPart focusEditPart = wsdlEditor.getGraphViewer().getComponentViewer().getFocusEditPart();
-
- if (object instanceof WSDLGroupObject)
- {
- WSDLGroupObject group = (WSDLGroupObject)object;
- if (group.getType() == WSDLGroupObject.TYPES_GROUP)
- {
- boolean typesExist = group.getParent().getTypes() != null;
-
- Element typesElement = null;
- if (typesExist)
- {
- Types types = group.getParent().getETypes();
- typesElement = types.getElement();
- }
- if (manager != null)
- {
- Document document = null;
- if (editPart.getViewer() instanceof WSDLComponentViewer) {
- WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer) editPart.getViewer();
- document = wsdlComponentViewer.getWSDLEditor().getXMLDocument();
- }
-
- manager.add(new AddSchemaAction(group.getDefinition(), (Element)node, typesElement, document));
- }
- }
- }
- else if (object instanceof Types)
- {
- // IMenuManager menu = manager.findMenuUsingPath("addchild");
-
- if (manager != null)
- {
- Types types = (Types)object;
- manager.add(new AddSchemaAction(types.getEnclosingDefinition(), (Element)node));
- }
- }
-
- if (xsdSchema == null)
- {
- return;
- }
-
- ArrayList attributes = null;
- Node relativeNode = null;
-
- BackAction backAction;
-
- if (object instanceof XSDSchema || focusEditPart instanceof TopLevelComponentEditPart || object instanceof Category)
- {
- backAction = new BackAction(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO_DEFINITION"));
- backAction.setDefinition(wsdlEditor.getDefinition());
- backAction.setSelectionProvider(selectionProvider);
- backAction.setRootEditPart(editPart);
- backAction.setGraphViewer(wsdlEditor.getGraphViewer());
- manager.add(backAction);
- manager.add(new Separator());
- }
- else if (object instanceof XSDConcreteComponent)
- {
- backAction = new BackAction(XSDEditorPlugin.getXSDString("_UI_ACTION_BACK_TO_SCHEMA_VIEW"));
- // backAction.setXSDSchema(((XSDConcreteComponent)object).getSchema());
- backAction.setXSDSchema(xsdSchema);
- backAction.setSelectionProvider(selectionProvider);
- backAction.setRootEditPart(editPart);
- backAction.setGraphViewer(wsdlEditor.getGraphViewer());
- manager.add(backAction);
- manager.add(new Separator());
- }
-
- // CS: I'm removing the 'object instanceof Element' case from this test
- // for now the menu actions are driven from 'model' objects
- if (object instanceof XSDConcreteComponent || (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement))
- {
- Element parent;
- if (object instanceof XSDConcreteComponent)
- {
- parent = ((XSDConcreteComponent)object).getElement();
- xsdSchema = ((XSDConcreteComponent)object).getSchema();
- }
- else if (object instanceof Element)
- {
- manager.add(new Separator());
- parent = (Element)object;
- }
- else if (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
- xsdSchema = schema.getSchema();
- manager.add(new Separator());
- parent = xsdSchema.getElement();
- }
- else
- {
- return;
- }
-
- currElement = parent;
- currDocument = parent.getOwnerDocument();
-
-// if (!(currDocument instanceof DocumentImpl))
-// {
-// return;
-// }
-
- addContextItems(manager, currElement, null);
-
- if (!(object instanceof XSDSchema) ||
- (object instanceof XSDSchema && !(wsdlEditor.getGraphViewer().getComponentViewer().getInput() instanceof XSDSchema))) {
- IStructuredSelection selections = (IStructuredSelection) wsdlEditor.getSelectionManager().getSelection();
- manager.add(new Separator());
- org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction deleteWSDLAndXSDAction = new org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction(selections.toList(), currElement, wsdlEditor);
- deleteWSDLAndXSDAction.setEnabled(!isReadOnly);
- manager.add(deleteWSDLAndXSDAction);
- }
- }
- else if (object instanceof Category
- || object instanceof CategoryAdapter)
- {
- int groupType = -1;
-
- if (object instanceof Category)
- {
- Category cg = (Category)object;
- xsdSchema = cg.getXSDSchema();
- groupType = cg.getGroupType();
- }
- else // CategoryAdapter
- {
- CategoryAdapter category = (CategoryAdapter)object;
- groupType = category.getGroupType();
- xsdSchema = category.getXSDSchema();
- }
- Element parent = xsdSchema.getElement();
- currElement = parent;
- currDocument = parent.getOwnerDocument();
- switch (groupType)
- {
- case Category.TYPES:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("ComplexType")));
- Action action = addCreateElementAction(manager, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_COMPLEX_TYPE"), attributes, parent, relativeNode);
- ((CreateElementAction)action).setIsGlobal(true);
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("SimpleType")));
- Action action2 = addCreateSimpleTypeAction(manager, XSDConstants.SIMPLETYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_SIMPLE_TYPE"), attributes, parent, relativeNode);
- ((CreateElementAction)action2).setIsGlobal(true);
- break;
- }
- case Category.ELEMENTS:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
- getNewGlobalName(XSDConstants.ELEMENT_ELEMENT_TAG, "GlobalElement")));
- attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
- Action action = addCreateElementAction(manager, XSDConstants.ELEMENT_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ELEMENT"), attributes, parent, relativeNode);
- ((CreateElementAction)action).setIsGlobal(true);
- break;
- }
- case Category.GROUPS:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
- getNewGlobalName(XSDConstants.GROUP_ELEMENT_TAG, "Group")));
- CreateGroupAction groupAction = addCreateGroupAction(manager, XSDConstants.GROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GROUP"), attributes, parent, relativeNode);
- groupAction.setIsGlobal(true);
- break;
- }
- case Category.ATTRIBUTES:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
- getNewGlobalName(XSDConstants.ATTRIBUTE_ELEMENT_TAG, "GlobalAttribute")));
- attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
- Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GLOBAL_ATTRIBUTE"), attributes, parent, relativeNode);
- ((CreateElementAction)action).setIsGlobal(true);
- break;
- }
- case Category.ATTRIBUTE_GROUPS:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
- getNewGlobalName(XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, "AttributeGroup")));
- Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ATTRIBUTE_GROUP"), attributes, parent, relativeNode);
- ((CreateElementAction)action).setIsGlobal(true);
- break;
- }
- case Category.NOTATIONS:
- {
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
- getNewGlobalName(XSDConstants.NOTATION_ELEMENT_TAG, "Notation")));
- attributes.add(new DOMAttribute(XSDConstants.PUBLIC_ATTRIBUTE, ""));
- Action action = addCreateElementAction(manager, XSDConstants.NOTATION_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_NOTATION"), attributes, parent, relativeNode);
- ((CreateElementAction)action).setIsGlobal(true);
- break;
- }
- case Category.DIRECTIVES:
- {
- boolean b = true;
- NodeList children = parent.getChildNodes();
- Node effectiveRelativeNode = parent.getFirstChild();
- for (int i=0; i < children.getLength() && b; i++)
- {
- Node child = children.item(i);
- if (child != null && child instanceof Element)
- {
- if (XSDDOMHelper.inputEquals((Element)child, XSDConstants.INCLUDE_ELEMENT_TAG, false) ||
- XSDDOMHelper.inputEquals((Element)child, XSDConstants.IMPORT_ELEMENT_TAG, false) ||
- XSDDOMHelper.inputEquals((Element)child, XSDConstants.REDEFINE_ELEMENT_TAG, false) ||
- XSDDOMHelper.inputEquals((Element)child, XSDConstants.ANNOTATION_ELEMENT_TAG, false))
- {
- effectiveRelativeNode = child;
- }
- else
- {
- b = false;
- }
- }
- }
- relativeNode = effectiveRelativeNode != null ? effectiveRelativeNode.getNextSibling() : null;
- attributes = new ArrayList();
- attributes.add(new DOMAttribute(XSDConstants.SCHEMALOCATION_ATTRIBUTE, ""));
-
- addCreateElementAction(manager, XSDConstants.INCLUDE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_INCLUDE"), attributes, parent, relativeNode);
- addCreateElementAction(manager, XSDConstants.IMPORT_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_IMPORT"), null, parent, relativeNode);
- addCreateElementAction(manager, XSDConstants.REDEFINE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_REDEFINE"), attributes, parent, relativeNode);
-
-
- break;
- }
- }
- }
- }
-
- protected IFile getFileResource()
- {
- ///// WSDL TODO
- // if (getEditor() != null)
- // return getEditor().getFileResource();
- return null;
- }
-
-// protected Object getSelectedElement()
-// {
-// return currElement;
-// }
-
- protected XSDSchema getXSDSchema()
- {
- return xsdSchema;
- }
-
- protected IDOMModel getXMLModel()
- {
- if (currElement != null)
- {
- Object obj = currElement.getOwnerDocument();
- if (obj instanceof DocumentImpl)
- {
- DocumentImpl xmlDoc = (DocumentImpl) currElement.getOwnerDocument();
- return xmlDoc.getModel();
- }
- }
- return null;
- }
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
deleted file mode 100644
index 4271d7802..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDContentProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-public class XSDModelAdapterContentProvider extends XSDContentProvider
-{
- public XSDModelAdapterContentProvider(XSDModelAdapterFactoryImpl xsdModelAdapterFactory)
- {
- super(xsdModelAdapterFactory);
- }
-
- public Object[] getChildren(Object parentObject)
- {
- XSDConcreteComponent xsdComp = null;
- if (parentObject instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement xsdSchemaExtensibilityElement = (XSDSchemaExtensibilityElement)parentObject;
- xsdComp = xsdSchemaExtensibilityElement.getSchema();
- return super.getChildren(xsdComp);
- }
- return super.getChildren(parentObject);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
deleted file mode 100644
index 81367fd4d..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-class XSDNodeAssociationProvider implements INodeAssociationProvider
-{
- public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
- {
- Object result = null;
- if (parentModelObject instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)parentModelObject;
- XSDSchema schema = extensibilityElement.getSchema();
- if (schema != null)
- {
- Element targetElement = elementChain[elementChain.length - 1];
- result = schema.getCorrespondingComponent(targetElement);
- }
- }
- else if (parentModelObject instanceof CategoryAdapter)
- {
- result = ((CategoryAdapter)parentModelObject).getXSDSchema();
- }
- else if (parentModelObject instanceof Category)
- {
- result = ((Category)parentModelObject).getXSDSchema();
- }
-
- return result;
- }
-
- public Node getNode(Object modelObject)
- {
- Node node = null;
- if (modelObject instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
- XSDSchema schema = extensibilityElement.getSchema();
- if (schema != null)
- {
- node = schema.getElement();
- }
- }
- else if (modelObject instanceof XSDConcreteComponent)
- {
- node = ((XSDConcreteComponent)modelObject).getElement();
- }
- else if (modelObject instanceof CategoryAdapter)
- {
- node = ((CategoryAdapter)modelObject).getXSDSchema().getElement();
- }
- else if (modelObject instanceof Category)
- {
- node = ((Category)modelObject).getXSDSchema().getElement();
- }
-
- return node;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
deleted file mode 100644
index d4a77c6f6..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-
-public class XSDNodeReconciler implements INodeReconciler
-{
- public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
- {
- XSDConcreteComponent component = null;
- if (modelObject instanceof XSDConcreteComponent)
- {
- component = (XSDConcreteComponent)modelObject;
- }
- else if (modelObject instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
- component = extensibilityElement.getSchema();
- }
-
- if (component != null)
- {
- switch (eventType)
- {
- case INodeNotifier.CHANGE:
- {
- component.elementAttributesChanged(element);
- break;
- }
- case INodeNotifier.STRUCTURE_CHANGED:
- {
- component.elementContentsChanged(element);
- break;
- }
- case INodeNotifier.CONTENT_CHANGED:
- {
- component.elementChanged(element);
- break;
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
deleted file mode 100644
index 95ff36ebc..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyAttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AppInfoPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributeGroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.BasePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ComplexTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.DocumentationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.EnumerationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.GroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ImportPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.IncludePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.KeyrefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ModelGroupPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NamePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NotationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.PatternPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SchemaPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleContentPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleRestrictPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeListPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeUnionPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.XPathPropertySource;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDPropertySourceProvider implements IPropertySourceProvider
-{
- /* (non-Javadoc)
- * @see org.eclipse.ui.views.properties.IPropertySourceProvider#getPropertySource(java.lang.Object)
- */
- public IPropertySource getPropertySource(Object object)
- {
-// Using XSD's item providers
-// XSDItemProviderAdapterFactory adapterFactory = XSDExtensionPlugin.getXSDItemProviderAdapterFactory();
-//
-// IItemPropertySource itemPropertySource =
-// (IItemPropertySource)
-// (object instanceof EObject && ((EObject)object).eClass() == null ?
-// null :
-// adapterFactory.adapt(object, IItemPropertySource.class));
-// return
-// itemPropertySource != null ? createPropertySource(object, itemPropertySource) : null;
-
- if (object == null) return null;
-
- if (object instanceof XSDSchemaExtensibilityElement)
- {
- object = ((XSDSchemaExtensibilityElement)object).getSchema();
- }
- if (object instanceof XSDConcreteComponent)
- {
- BasePropertySource bps = (BasePropertySource)getXSDPropertySource(object);
- Element input = ((XSDConcreteComponent)object).getElement();
- bps.setInput(input);
- return bps;
- }
- return null;
- }
-
- protected IPropertySource createPropertySource(Object object, IItemPropertySource itemPropertySource)
- {
- return new PropertySource(object, itemPropertySource);
- }
-
- protected boolean inputEquals(Object input, String tagname, boolean isRef)
- {
- return XSDDOMHelper.inputEquals(input, tagname, isRef);
- }
-
- boolean showParent = false;
-
- // TODO: We should use adapters to do this. Do as we complete 'model'-based port
- public IPropertySource getXSDPropertySource(Object object)
- {
- XSDSchema xsdSchema = ((XSDConcreteComponent)object).getSchema();
- Element input = ((XSDConcreteComponent)object).getElement();
-
- if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
- {
- return new ElementPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
- {
- return new GroupRefPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
- inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
- inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
- {
- return new ModelGroupPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
- {
- return new AttributePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
- {
- return new AttributeGroupRefPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
- {
- return new NamePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
- {
- return new AttributeGroupRefPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
- {
- return new NotationPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
- {
- return new SimpleTypePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
- {
- return new NamePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
- {
- return new GroupRefPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
- {
- return new SchemaPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
- {
- return new ComplexTypePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
- {
- return new DocumentationPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
- {
- return new AppInfoPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
- {
- if (input != null && input instanceof Element)
- {
- Element parent = (Element)input;
- XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
- Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
- if (derivedByNode != null)
- {
- if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false) ||
- inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
- {
- return new SimpleContentPropertySource(xsdSchema);
- }
- }
- else
- {
- return null;
- }
- }
- }
- else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
- {
- if (input != null && input instanceof Element)
- {
- Element parent = (Element)input;
- XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
- Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
- if (derivedByNode != null)
- {
- return new SimpleContentPropertySource(xsdSchema);
- }
- else
- {
- return null;
- }
- }
- }
- else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
- {
-// if (editor instanceof XSDEditor)
-// {
-// IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
- IFile inputFile = null;
- return new IncludePropertySource(xsdSchema, inputFile);
-// }
-// return null;
- }
- else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
- {
-// if (editor instanceof XSDEditor)
-// {
-// IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
- IFile inputFile = null;
- return new ImportPropertySource(xsdSchema, inputFile);
-// }
-// return null;
- }
- else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
- {
-// if (editor instanceof XSDEditor)
-// {
-// IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
- IFile inputFile = null;
- return new IncludePropertySource(xsdSchema, inputFile);
-// }
-// return null;
- }
- else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
- {
- return new SimpleTypeListPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
- {
- return new SimpleTypeUnionPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
- {
- return createRestrictWindow(input, xsdSchema);
- }
- else if (XSDDOMHelper.isFacet(input))
- {
- if (input != null && input instanceof Element)
- {
- Node parent = ((Element)input).getParentNode();
- if (inputEquals(parent, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
- {
- return createRestrictWindow(input, xsdSchema);
- }
- }
- }
- else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
- {
- if (input != null && input instanceof Element)
- {
- Node parent = ((Element)input).getParentNode();
- if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false)
- || inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
- {
- showParent = true;
- return new SimpleContentPropertySource(xsdSchema);
- }
- }
- }
- else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
- {
- return new PatternPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
- {
- return new EnumerationPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
- {
- return new AnyElementPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
- {
- return new AnyAttributePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
- {
- return new NamePropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
- {
- return new KeyrefPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
- {
- return new XPathPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
- {
- return new XPathPropertySource(xsdSchema);
- }
- else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
- {
- return new NamePropertySource(xsdSchema);
- }
- else
- {
- return null;
- }
- return null;
- }
-
- protected IPropertySource createRestrictWindow(Object input, XSDSchema xsdSchema)
- {
- // special case where SimpleType restriction is different than SimpleContent restriction
-
- if (input != null && input instanceof Element)
- {
- Node parent = ((Element)input).getParentNode();
- if (inputEquals(parent, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
- {
- return new SimpleRestrictPropertySource(xsdSchema);
- }
- else if (inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
- {
- return new SimpleRestrictPropertySource(xsdSchema);
- }
- else if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
- {
- showParent = true;
- return new SimpleContentPropertySource(xsdSchema);
- }
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
deleted file mode 100644
index 9b5f5a1d5..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-
-public class XSDSectionDescriptorProvider implements ISectionDescriptorProvider
-{
- org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider descriptor;
- /**
- *
- */
- public XSDSectionDescriptorProvider()
- {
- super();
- descriptor = new org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
- */
- public ISectionDescriptor[] getSectionDescriptors()
- {
- return descriptor.getSectionDescriptors();
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
deleted file mode 100644
index 1b01ef690..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.ui.internal.viewers.BaseViewer;
-
-
-public class XSDTempDetailsViewer extends BaseViewer
-{
- protected Composite control;
-
- public XSDTempDetailsViewer(Composite parent)
- {
- super(null);
- createControl(parent);
- }
-
- public void doSetInput(Object input)
- {
- }
-
- public void createControl(Composite parent)
- {
- control = flatViewUtility.createComposite(parent, 1, true);
-
- flatViewUtility.createFlatPageHeader(control, "XSDViewer");
- }
-
- protected void update()
- {
- }
-
- public Control getControl()
- {
- return control;
- }
-
- public void doHandleEvent(Event event)
- {
-
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
deleted file mode 100644
index 2d8fadfad..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-
-//
-//
-public class XSDTypeSystemProvider implements ITypeSystemProvider
-{
- public List getPrefixes(Definition definition, String namespace)
- {
- List list = new ArrayList();
- Map map = definition.getNamespaces();
- for (Iterator i = map.keySet().iterator(); i.hasNext();)
- {
- String prefix = (String) i.next();
- String theNamespace = (String) map.get(prefix);
- if (theNamespace != null && theNamespace.equals(namespace))
- {
- list.add(prefix);
- }
- }
- return list;
- }
-
- public List getPrefixedNames(Definition definition, String namespace, String localName)
- {
- List list = new ArrayList();
- for (Iterator i = getPrefixes(definition, namespace).iterator(); i.hasNext();)
- {
- String prefix = (String) i.next();
- String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
- list.add(name);
- }
- return list;
- }
-
- protected void addNamedComponents(Definition definition, List list, List namedComponents)
- {
- for (Iterator i = namedComponents.iterator(); i.hasNext();)
- {
- XSDNamedComponent component = (XSDNamedComponent) i.next();
- list.addAll(getPrefixedNames(definition, component.getTargetNamespace(), component.getName()));
- }
- }
-
- public void initWSIStyleImports(XSDSchema xsdSchema)
- {
- if (xsdSchema.getTargetNamespace() == null)
- {
- for (Iterator i = xsdSchema.getContents().iterator(); i.hasNext();)
- {
- XSDSchemaContent content = (XSDSchemaContent) i.next();
- if (content instanceof XSDImportImpl)
- {
- XSDImportImpl xsdImport = (XSDImportImpl) content;
- XSDSchema schema = (XSDSchema)xsdImport.getResolvedSchema();
- if (schema == null)
- {
- schema = xsdImport.importSchema();
- }
- }
- }
- }
- }
-
- public List getAvailableTypeNames(Definition definition, int typeNameCategory)
- {
- List list = new ArrayList();
-
- if (typeNameCategory == ITypeSystemProvider.BUILT_IN_TYPE) {
- list = getBuiltInTypeNamesList(definition);
- }
- else {
- Types types = definition.getETypes();
- if (types != null)
- {
- for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
- if (schema != null)
- {
- initWSIStyleImports(schema);
- addNamedComponents(definition, list, schema.getTypeDefinitions());
- }
- }
- }
- }
-
- for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
- {
- Import theImport = (Import) i.next();
- XSDSchema schema = theImport.getESchema();
- if (schema != null)
- {
- addNamedComponents(definition, list, schema.getTypeDefinitions());
- }
- }
- list.addAll(getBuiltInTypeNamesList(definition));
- }
-
- return list;
- }
-
- public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
- {
- List keepTypes = new ArrayList();
- Iterator typeIterator = schema.getTypeDefinitions().iterator();
- // Filter out unwanted Types
- if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_COMPLEX_TYPE) {
- while (typeIterator.hasNext()) {
- Object type = typeIterator.next();
- if (type instanceof XSDComplexTypeDefinition) {
- keepTypes.add(type);
- }
- }
- }
- else if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_SIMPLE_TYPE) {
- while (typeIterator.hasNext()) {
- Object type = typeIterator.next();
- if (type instanceof XSDSimpleTypeDefinition) {
- keepTypes.add(type);
- }
- }
- }
-
- //addNamedComponents(definition, list, keepTypes);
- //return list;
- return keepTypes;
- }
-
- public java.util.List getBuiltInTypeNamesList(Definition definition)
- {
- List items = new ArrayList();
- if (definition != null)
- {
- List prefixes = getPrefixes(definition, WSDLConstants.XSD_NAMESPACE_URI);
- for (Iterator i = prefixes.iterator(); i.hasNext();)
- {
- String prefix = (String) i.next();
- for (int j = 0; j < XSDDOMHelper.dataType.length; j++)
- {
- String localName = XSDDOMHelper.dataType[j][0];
- String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
- items.add(name);
- }
- }
- }
- return items;
- }
- public List getAvailableElementNames(Definition definition)
- {
- List list = new ArrayList();
- Types types = definition.getETypes();
- if (types != null)
- {
- for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof XSDSchemaExtensibilityElement)
- {
- XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
- if (schema != null)
- {
- initWSIStyleImports(schema);
- addNamedComponents(definition, list, schema.getElementDeclarations());
- }
- }
- }
- }
-
- for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
- {
- Import theImport = (Import) i.next();
- XSDSchema schema = theImport.getESchema();
- if (schema != null)
- {
- addNamedComponents(definition, list, schema.getElementDeclarations());
- }
- }
- return list;
- }
- public int getCategoryForTypeName(Definition definition, String typeName)
- {
- return 0;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
deleted file mode 100644
index 9037b3c7f..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddSchemaAction extends AddElementAction
-{
- protected String targetNamespace;
- protected boolean createTypesElement = false;
-
- public AddSchemaAction(Definition definition, Element definitionElement)
- {
- this(definition, definitionElement, false);
- }
-
- public AddSchemaAction(Definition definition, Element definitionElement, boolean createTypesElement)
- {
- super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");
- this.createTypesElement = createTypesElement;
- targetNamespace = definition.getTargetNamespace();
- }
-
- public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement)
- {
- super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");
- if (typesElement != null)
- {
- parentNode = typesElement;
- this.createTypesElement = false;
- }
- else
- {
- this.createTypesElement = true;
- }
- targetNamespace = definition.getTargetNamespace();
- }
-
- public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement, Document document)
- {
- this(definition, definitionElement, typesElement);
- this.definition = definition;
- this.document = document;
- }
-
- protected boolean showDialog()
- {
- return true;
- }
-
- protected void addAttributes(Element newElement)
- {
- newElement.setAttribute("xmlns:xsd", XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
- newElement.setAttribute("elementFormDefault", "qualified");
- newElement.setAttribute("targetNamespace", targetNamespace);
- }
-
- public void run()
- {
- beginRecording();
- if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
- createDefinitionStub();
- prefix = null;
- targetNamespace = definition.getTargetNamespace();
- }
-
- if (createTypesElement)
- {
- AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", parentNode, parentNode.getPrefix(), "types");
- addTypesAction.setComputeTopLevelRefChild(true);
- addTypesAction.run();
- parentNode = addTypesAction.getNewElement();
- }
- super.run();
- endRecording();
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
deleted file mode 100644
index 975790466..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.xsd.XSDSchema;
-
-public class BackAction extends Action
-{
- ISelectionProvider selectionProvider;
- XSDSchema xsdSchema;
- Definition definition;
- WSDLGraphViewer graphViewer;
-
- /**
- *
- */
- public BackAction()
- {
- super();
- }
-
- /**
- * @param text
- */
- public BackAction(String text)
- {
- super(text);
- }
-
- /**
- * @param text
- * @param image
- */
- public BackAction(String text, ImageDescriptor image)
- {
- super(text, image);
- }
-
- /**
- * @param text
- * @param style
- */
- public BackAction(String text, int style)
- {
- super(text, style);
- }
-
- public void setSelectionProvider(ISelectionProvider selectionProvider)
- {
- this.selectionProvider = selectionProvider;
- }
-
- AbstractComponentViewerRootEditPart editPart;
- public void setRootEditPart(AbstractComponentViewerRootEditPart editPart)
- {
- this.editPart = editPart;
- }
-
- public void setDefinition(Definition definition)
- {
- this.definition = definition;
- }
-
- public void setXSDSchema(XSDSchema xsdSchema)
- {
- this.xsdSchema = xsdSchema;
- }
-
- public void setGraphViewer(WSDLGraphViewer graphViewer)
- {
- this.graphViewer = graphViewer;
- }
-
- /*
- * @see IAction#run()
- */
- public void run()
- {
- if (xsdSchema != null)
- {
- StructuredSelection selection = new StructuredSelection(xsdSchema);
- selectionProvider.setSelection(selection);
- // editPart.setInput(xsdSchema);
- graphViewer.setInput(xsdSchema);
- }
- else if (definition != null)
- {
- StructuredSelection selection = new StructuredSelection(definition);
- selectionProvider.setSelection(selection);
- // editPart.setInput(definition);
- graphViewer.setInput(definition);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
deleted file mode 100644
index b4e8fcf0b..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.actions.DeleteInterfaceAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-// Should try to use xsdeditor's delete action....
-
-public class DeleteAction extends Action implements DeleteInterfaceAction
-{
- XSDSchema xsdSchema;
- Definition definition;
- List deleteList;
-
- /**
- * Constructor for DeleteAction.
- * @param text
- */
- public DeleteAction(String text)
- {
- super(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
- }
-
- public XSDSchema getSchema()
- {
- return xsdSchema;
- }
-
- public void setSchema(XSDSchema xsdSchema)
- {
- this.xsdSchema = xsdSchema;
- }
-
- public void setDeleteList(List list) {
- deleteList = list;
- }
-
- public List getDeleteList() {
- return deleteList;
- }
-
- /*
- * @see IAction#run()
- */
- public void run()
- {
- List selections = getDeleteList();
-
- if (selections.isEmpty())
- {
- return;
- }
-
- Iterator iter = selections.iterator();
- DocumentImpl doc = null;
- while (iter.hasNext())
- {
- Object obj = iter.next();
- Element node;
- if (obj instanceof Element)
- {
- node = (Element)obj;
- Object elem = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, node);
- if (elem instanceof XSDComponent)
- {
- xsdSchema = ((XSDComponent)elem).getSchema();
- }
- }
- else if (obj instanceof XSDComponent)
- {
- node = ((XSDComponent)obj).getElement();
- xsdSchema = ((XSDComponent)obj).getSchema();
- }
- else if (obj instanceof XSDConcreteComponent) {
- node = ((XSDConcreteComponent)obj).getElement();
- xsdSchema = ((XSDConcreteComponent)obj).getSchema();
- }
- else
- {
- return;
- }
-
- if (!XSDDOMHelper.inputEquals(node, XSDConstants.SCHEMA_ELEMENT_TAG, false))
- {
-
- if (doc == null)
- {
- doc = (DocumentImpl) node.getOwnerDocument();
- doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE_NODES"));
- }
-
- boolean refresh = cleanupReferences(node);
- XSDDOMHelper.removeNodeAndWhitespace(node);
-
- // Workaround to reset included elements in XSD model
- if (refresh)
- {
-// TODO
-// getEditor().reparseSchema();
-// getEditor().getGraphViewer().setSchema(getEditor().getXSDSchema());
- }
- }
- }
- if (doc != null)
- {
- doc.getModel().endRecording(this);
- }
- }
-
- protected boolean cleanupReferences(Node deletedNode)
- {
- boolean refresh = false;
- XSDConcreteComponent comp = getSchema().getCorrespondingComponent(deletedNode);
-
- if (comp instanceof XSDInclude ||
- comp instanceof XSDImport ||
- comp instanceof XSDRedefine)
- {
-// XSDSchema resolvedSchema = ((XSDSchemaDirective)comp).getResolvedSchema();
- XSDSchema referencedSchema = null;
- if (comp instanceof XSDInclude)
- {
- referencedSchema = ((XSDInclude)comp).getIncorporatedSchema();
- refresh = true;
- }
- else if (comp instanceof XSDRedefine)
- {
- referencedSchema = ((XSDRedefine)comp).getIncorporatedSchema();
- refresh = true;
- }
- else if (comp instanceof XSDImport)
- {
- referencedSchema = ((XSDImport)comp).getResolvedSchema();
- }
-
- if (referencedSchema != null)
- {
-// XSDExternalFileCleanup cleanHelper = new XSDExternalFileCleanup(referencedSchema);
-// cleanHelper.visitSchema(getSchema());
-// // populate messages
-//// TODO
-//// getEditor().createTasksInTaskList(cleanHelper.getMessages());
- }
- if (comp instanceof XSDImport)
- {
- TypesHelper typesHelper = new TypesHelper(getSchema());
- typesHelper.updateMapAfterDelete((XSDImport)comp);
- }
- }
- else if (getSchema().equals(comp.getContainer()))
- {
-// BaseGlobalCleanup cleanHelper = null;
- // Only need to clean up references if the component being deleted is global scoped
-// if (comp instanceof XSDElementDeclaration)
-// {
-// cleanHelper = new GlobalElementCleanup(comp);
-// }
-// else if (comp instanceof XSDModelGroupDefinition)
-// {
-// cleanHelper = new GlobalGroupCleanup(comp);
-// }
-// else if (comp instanceof XSDTypeDefinition)
-// {
-// cleanHelper = new GlobalSimpleOrComplexTypeCleanup(comp);
-// }
-// else if (comp instanceof XSDAttributeDeclaration)
-// {
-// cleanHelper = new GlobalAttributeCleanup(comp);
-// }
-// else if (comp instanceof XSDAttributeGroupDefinition)
-// {
-// cleanHelper = new GlobalAttributeGroupCleanup(comp);
-// }
-//
-//
-// if (cleanHelper != null)
-// {
-// cleanHelper.visitSchema(getSchema());
-// // populate messages
-//// TODO
-//// getEditor().createTasksInTaskList(cleanHelper.getMessages());
-// }
- }
- return refresh;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
deleted file mode 100644
index 9a6acfca2..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.DrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class XSDSchemaDrillDownEditPart extends DrillDownEditPart
-{
- protected IFigure createFigure()
- {
- IFigure figure = super.createFigure();
- label.setIcon(XSDEditorPlugin.getXSDImage("icons/XSDFile.gif"));
- return figure;
- }
-
- protected void refreshVisuals()
- {
- XSDSchema schema = (XSDSchema)getModel();
- String ns = schema.getTargetNamespace() != null ? schema.getTargetNamespace() : "";
- label.setText(ns);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
deleted file mode 100644
index c10245b7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-
-public class XSDSchemaExtensibilityElementEditPart extends AbstractGraphicalEditPart
-{
- protected EditPartFactory factory;
-
- public XSDSchemaExtensibilityElementEditPart(EditPartFactory factory)
- {
- this.factory = factory;
- }
-
- protected IFigure createFigure()
- {
- ContainerFigure figure = new ContainerFigure();
- return figure;
- }
-
- protected EditPart createChild(Object model)
- {
- return factory.createEditPart(this, model);
- }
-
- protected List getModelChildren()
- {
- XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)getModel();
- List result = new ArrayList();
- result.add(e.getSchema());
- return result;
- }
-
- protected void createEditPolicies()
- {
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.classpath b/bundles/org.eclipse.wst.wsdl.validation/.classpath
deleted file mode 100644
index 908fab111..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/wsdlvalidateui"/>
- <classpathentry kind="src" path="src/wsdlvalidate"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore b/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
deleted file mode 100644
index 02b1ce48b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdlvalidate.jar
-wsdlvalidateui.jar
diff --git a/bundles/org.eclipse.wst.wsdl.validation/.project b/bundles/org.eclipse.wst.wsdl.validation/.project
deleted file mode 100644
index 9190c3717..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.wsdl.validation</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.wst.wsdl.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index c115add2e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsdl.validation; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsdlvalidateui.jar,
- wsdlvalidate.jar
-Bundle-Activator: org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLPlugin
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.wst.wsdl.validation.internal,
- org.eclipse.wst.wsdl.validation.internal.exception,
- org.eclipse.wst.wsdl.validation.internal.resolver,
- org.eclipse.wst.wsdl.validation.internal.ui,
- org.eclipse.wst.wsdl.validation.internal.ui.ant,
- org.eclipse.wst.wsdl.validation.internal.ui.eclipse,
- org.eclipse.wst.wsdl.validation.internal.ui.text,
- org.eclipse.wst.wsdl.validation.internal.util,
- org.eclipse.wst.wsdl.validation.internal.wsdl11,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.http,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.mime,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.soap,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd,
- org.eclipse.wst.wsdl.validation.internal.wsdl20,
- org.eclipse.wst.wsdl.validation.internal.xml
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.ui,
- org.apache.ant,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.validation,
- org.wsdl4j,
- org.apache.xerces;visibility:=reexport,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLPlugin
diff --git a/bundles/org.eclipse.wst.wsdl.validation/about.html b/bundles/org.eclipse.wst.wsdl.validation/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/build.properties b/bundles/org.eclipse.wst.wsdl.validation/build.properties
deleted file mode 100644
index 1a9437c24..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = META-INF/,\
- plugin.properties,\
- plugin.xml,\
- wsdlvalidateui.jar,\
- wsdlvalidate.jar,\
- about.html
-src.includes = exsd/,\
- build.properties
-source.wsdlvalidateui.jar = src/wsdlvalidateui/
-jars.compile.order = wsdlvalidate.jar,\
- wsdlvalidateui.jar
-source.wsdlvalidate.jar = src/wsdlvalidate/
diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd
deleted file mode 100644
index 75dd04813..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="extvalidator" name="WSDL Extension Validator"/>
- </appInfo>
- <documentation>
- An extension point to allow pluggin in extension validators to run post WSDL validation.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extvalidator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="extvalidator">
- <complexType>
- <attribute name="namespace" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="resourcebundle" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd
deleted file mode 100644
index 5b864dcd6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="uriresolver" name="WSDL URI Resolver"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="uriresolver"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="uriresolver">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd
deleted file mode 100644
index 337bb8cc0..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="wsdl11validator" name="WSDL 1.1 Extension Validator"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="wsdl11validator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="wsdl11validator">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="namespace" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="resourcebundle" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd
deleted file mode 100644
index 5ce49b31f..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="xmlcatalog" name="WSDL XML Catalog"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <choice>
- <element ref="entity"/>
- <element ref="schemadir"/>
- </choice>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="entity">
- <complexType>
- <attribute name="publicId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="location" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="schemadir">
- <complexType>
- <attribute name="location" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore b/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore
deleted file mode 100644
index d392f0e82..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/bundles/org.eclipse.wst.wsdl.validation/plugin.properties b/bundles/org.eclipse.wst.wsdl.validation/plugin.properties
deleted file mode 100644
index 383ed8a25..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.properties
+++ /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
-###############################################################################
-!-- properties file for org.eclipse.wst.wsdl.validation
-!-- Tool Name
-
-_PLUGIN_NAME = WSDL Validator
-_PROVIDER_NAME = Eclipse.org
-
-!-- UI Menu Item
-_UI_MENU_VALIDATE_WSDL = Validate WSDL File
-_UI_WSDL_VALIDATOR = WSDL Validator
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml b/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
deleted file mode 100644
index dbdd0c5ce..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <!-- WSDL extension validator. This is an extension that will run
- after WSDL validation if WSDL validation is successful. -->
- <extension-point id="extvalidator" name="WSDL Extension Validator" schema="exsd/extvalidator.exsd"/>
-
- <!-- WSDL 1.1 validator extension. To provide a namespace specific WSDL 1.1
- validator. -->
- <extension-point id="wsdl11validator" name="WSDL 1.1 Extension Validator" schema="exsd/wsdl11validator.exsd"/>
-
- <!-- An extension to add XML catalog entries to the WSDL validator.
- Many entires can be added as seen below. -->
- <extension-point name="WSDL XML Catalog" id="xmlcatalog" schema="exsd/xmlcatalog.exsd"/>
-
- <!-- An extension to add a URI resolver to the WSDL validator. URI resolvers
- are used to resolve the location of imported documents such as WSDL and
- XSD through the WSDL and schema import mechanisms.
- This is how this extension point is used.
- <extension point="org.eclipse.wsdl.validate.uriresolver">
- <uriresolver class="full name of your class"/>
- </extension> -->
- <extension-point name="WSDL URI Resolver" id="uriresolver" schema="exsd/uriresolver.exsd"/>
-
- <!-- ====================================================== -->
- <!-- Set the Validate WSDL File context menu item. This -->
- <!-- menu item should be removed once the validation -->
- <!-- framework is modified to create the item. -->
- <!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.wst.wsdl.validation.wsdlaction">
- <action
- label="%_UI_MENU_VALIDATE_WSDL"
- class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLActionDelegate"
- enablesFor="1"
- id="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLActionDelegate">
- </action>
- </objectContribution>
- </extension>
-
- <!-- ====================================================== -->
- <!-- Set the XML Catalog entries. -->
- <!-- These entries are commented out until such time as -->
- <!-- permission is granted to include them in this plugin. -->
- <!-- ====================================================== -->
- <!--extension point="org.eclipse.wst.wsdl.validation.xmlcatalog"-->
- <!--entity
- publicId="http://schemas.xmlsoap.org/wsdl/"
- location="xsd/wsdl.xsd" /-->
- <!--entity
- publicId="http://schemas.xmlsoap.org/wsdl/http/"
- location="xsd/http.xsd" /-->
- <!--entity
- publicId="http://schemas.xmlsoap.org/wsdl/soap/"
- location="xsd/soap.xsd" /-->
- <!--entity
- publicId="http://schemas.xmlsoap.org/wsdl/mime/"
- location="xsd/wsdl-mime.xsd" /-->
- <!--entity
- publicId="http://schemas.xmlsoap.org/soap/encoding/"
- location="xsd/soapenc.xsd" /-->
- <!-- The xml-soap does not exist but is used in certain documents.
- It is included here so the validator will recognize it. -->
- <!--entity
- publicId="http://xml.apache.org/xml-soap"
- location="xsd/xml-soap.xsd" /-->
- <!--/extension-->
-
- <!-- ====================================================== -->
- <!-- An extension for adding the URI resolver from -->
- <!-- org.eclipse.wst.common.uriresolver to the WSDL -->
- <!-- validator. -->
- <!-- ====================================================== -->
- <extension point="org.eclipse.wst.wsdl.validation.uriresolver">
- <uriresolver class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.URIResolverWrapper"/>
- </extension>
-
- <!-- ====================================================== -->
- <!-- An extension for adding the WSDL validator to the -->
- <!-- validation framework. --> -->
- <!-- ====================================================== -->
- <extension
- id="wsdlValidator"
- name="%_UI_WSDL_VALIDATOR"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- caseSensitive="false"
- nameFilter="*.wsdl">
- </filter>
- <helper
- class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
- </helper>
- <run
- class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator">
- </run>
- </validator>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java
deleted file mode 100644
index 0c2ca7ec6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-/**
- * Set constants that the validator makes use of.
- */
-public interface Constants
-{
- /**
- * The name of the validator properties file.
- */
- public final static String WSDL_VALIDATOR_PROPERTIES_FILE = "validatewsdl";
-
- /**
- * The SOAP 1.1 namespace.
- */
- public final static String NS_SOAP11 = "http://schemas.xmlsoap.org/wsdl/soap/";
-
- /**
- * The HTTP namespace.
- */
- public final static String NS_HTTP = "http://schemas.xmlsoap.org/wsdl/http/";
-
- /**
- * The MIME namespace.
- */
- public final static String NS_MIME = "http://schemas.xmlsoap.org/wsdl/mime/";
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java
deleted file mode 100644
index 34f4d51cf..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-
-/**
- * An interface for the validation info that allows for starting and
- * completing WSDL and WS-I validation.
- */
-public interface ControllerValidationInfo extends IValidationInfo
-{
-
- /**
- * Perform the necessary steps to complete WSDL validation.
- */
- public void completeWSDLValidation();
-
-// /**
-// * Perform the necessary steps to complete WS-I WSDL validation.
-// */
-// public void completeWSIValidation();
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
deleted file mode 100644
index 34e1581a0..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-
-/**
- * An interface representing the current validation information.
- * This interface is not meant to be implemented by clients.
- */
-public interface IValidationInfo extends IValidationReport
-{
-
- /**
- * Add an error message for this file. (Uses the URI from this validation info object.)
- *
- * @param message The message for the error.
- * @param line The line location of the error in the file.
- * @param column The column location of the error in the file.
- * @deprecated
- */
- public void addError(String message, int line, int column);
-
- /**
- * Add an error message.
- *
- * @param message The message for the error.
- * @param line The line location of the error in the file.
- * @param column The column location of the error in the file.
- * @param uri The URI of the file that contains the error.
- */
- public void addError(String message, int line, int column, String uri);
-
- /**
- * Add a warning message for this file. (Uses the URI from this validation info object.)
- *
- * @param message The message for the warning.
- * @param line The line location of the warning in the file.
- * @param column The column location of the warning in the file.
- * @deprecated
- */
- public void addWarning(String message, int line, int column);
-
- /**
- * Add a warning message.
- *
- * @param message The message for the warning.
- * @param line The line location of the warning in the file.
- * @param column The column location of the warning in the file.
- * @param uri The URI of the file that contains the error.
- */
- public void addWarning(String message, int line, int column, String uri);
-
- /**
- * Get the URI resolver in use for this validation. The URI resolver
- * returned is actually a URI resolver handler that will
- * iterate through all of the registered URI resolvers.
- *
- * @return The URI resolver handler.
- */
- public URIResolver getURIResolver();
-
- /**
- * Get the attribute with the given name. If the attribute
- * has not been registered, return null.
- *
- * @param name The name of the attribute being requested.
- * @return The attribute value if the attribute has been registered, null otherwise.
- */
- public Object getAttribute(String name);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java
deleted file mode 100644
index 3f5a9af27..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.QualifiedName;
-
-/**
- * An interface for a validation message. A validation message contains information
- * for the message, its severity and where it's located.
- */
-public interface IValidationMessage
-{
- public static final QualifiedName ERROR_MESSAGE_MAP_QUALIFIED_NAME = new QualifiedName("org.eclipse.wsdl.validate", "errorMessageMap");
- /**
- * Severity error.
- */
- public static final int SEV_ERROR = 0;
- /**
- * Severity warning.
- */
- public static final int SEV_WARNING = 1;
-
- /**
- * Returns the URI for the file that contains the validation message.
- *
- * @return The URI for the file that contains the validation message.
- */
- public String getURI();
-
- /**
- * Return the message for this validation message.
- *
- * @return The message for this validation message.
- */
- public String getMessage();
-
- /**
- * Return the severity of this validation message.
- *
- * @return The severity of this validation message.
- */
- public int getSeverity();
-
- /**
- * Return the line where this validation message is located.
- *
- * @return The line where this validation message is located.
- */
- public int getLine();
-
- /**
- * Return the column where this validation message is located.
- *
- * @return The column where this validation message is located.
- */
- public int getColumn();
-
- /**
- * Get the list of nested validation messages.
- *
- * @return The list of nested validation messages.
- */
- public List getNestedMessages();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java
deleted file mode 100644
index ced4bd8cc..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.HashMap;
-
-/**
- * An interface for a WSDL validation report.
- */
-public interface IValidationReport
-{
- /**
- * Returns the URI for the file the report refers to.
- *
- * @return The URI for the file the report refers to.
- */
- public String getFileURI();
-
- /**
- * Returns whether the file is valid according to the WSDL specification.
- *
- * @return True if the file is WSDL valid, false otherwise.
- */
- public boolean isWSDLValid();
-
- /**
- * Returns an array of validation messages.
- *
- * @return An array of validation messages.
- */
- public IValidationMessage[] getValidationMessages();
-
- /**
- * Returns true if there are errors, false otherwise.
- *
- * @return True if there are errors, false otherwise.
- */
- public boolean hasErrors();
-
- public HashMap getNestedMessages();
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java
deleted file mode 100644
index 3278e9d0e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.w3c.dom.Document;
-
-/**
- * An interface for a WSDL validator. This is the interface for a top level validator
- * component such as a WSDL 1.1 validator, WSDL 1.2 validator or WS-I Basic Profile validator.
- */
-public interface IWSDLValidator
-{
- /**
- * Validate the file with the given name.
- *
- * @param domModel A DOM model of the file to be validated.
- * @param valInfo The information for the validation that is being performed.
- * @throws ValidateWSDLException
- */
- public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException;
-
- /**
- * setResourceBundle
- * Set the ResourceBundle for this validator. Allows the use of difference
- * ResourceBundles for different validators.
- *
- * @param rb The resource bundle to set.
- */
- public void setResourceBundle(ResourceBundle rb);
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
deleted file mode 100644
index ddba6aa8e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory;
-import org.eclipse.wst.wsdl.validation.internal.xml.DefaultXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.IXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.LineNumberDOMParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-/**
- * This is the main entrypoint to the WSDL Validator. The controller is
- * responsible for calling the reader, the XML conformance check, the WSDL
- * validation and the WS-I validation if selected. The controller contains any
- * errors and warnings generated as well.
- */
-public class ValidationController
-{
- protected final String _ERROR_PROBLEM_WSDL_VALIDATOR = "_ERROR_PROBLEM_WSDL_VALIDATOR";
- protected final String _ERROR_NO_WSDL_VALIDATOR = "_ERROR_NO_WSDL_VALIDATOR";
- protected final String _ERROR_PROBLEM_EXT_VALIDATOR = "_ERROR_PROBLEM_EXT_VALIDATOR";
-
- protected ValidatorRegistry ver;
- protected ResourceBundle resourcebundle;
- protected MessageGenerator messagegenerator;
- protected URIResolver uriResolver;
- protected Hashtable attributes = new Hashtable();
-
- //protected String wsdlNamespace = null;
-
- /**
- * The ResourceBundle needs to be set so it can be passed to the reader.
- *
- * @param rb
- * The resource bundle for this validator.
- */
- public ValidationController(ResourceBundle rb, URIResolver uriResolver)
- {
- resourcebundle = rb;
- messagegenerator = new MessageGenerator(resourcebundle);
- this.uriResolver = uriResolver;
-
- ver = ValidatorRegistry.getInstance();
- }
-
- /**
- * Add the attributes specified to the validation.
- *
- * @param attributes The attributes to add to the validation.
- */
- public void setAttributes(Hashtable attributes)
- {
- this.attributes.putAll(attributes);
- }
-
- /**
- * Validate the WSDL file. Check the file for XML conformance. If it is XML
- * conformant, read the file and check it for WSDL conformance. If it is WSDL
- * conformant and WS-I conformance is set to suggest or require, check the
- * file for WS-I conformance.
- *
- * @param uri
- * The uri where the WSDL document is located.
- * @param wsiLevel
- * The level of WS-I conformance to use for validation.
- * @return A validation report with the validation info for the file.
- */
-// public IValidationReport validate(String uri)
-// { return validate(uri, null);
-// }
-
- /**
- * Validate the WSDL file with the stream. This method will run the check of the
- * WSDL document. The validation is broken up into three stages: XML conformance,
- * WSDL semantic, and post validation.
- *
- * @param uri The URI of the WSDL document to be validated.
- * @param inputStream The contents of the WSDL document to be validated.
- * @return A validation report with the validation info for the file.
- */
- public IValidationReport validate(String uri, InputStream inputStream)
- {
-
- InputStream xmlValidateStream = null;
- InputStream wsdlValidateStream = null;
- if (inputStream != null)
- { //copy the inputStream so we can use it more than once
- String contents = createStringForInputStream(inputStream);
- xmlValidateStream = new ByteArrayInputStream(contents.getBytes());
- wsdlValidateStream = new ByteArrayInputStream(contents.getBytes());
- }
-
- ControllerValidationInfo valInfo = new ValidationInfoImpl(uri, messagegenerator);
- ((ValidationInfoImpl)valInfo).setURIResolver(uriResolver);
- ((ValidationInfoImpl)valInfo).setAttributes(attributes);
-
- if (validateXML(valInfo, xmlValidateStream))
- {
- Document wsdldoc = getDocument(uri, wsdlValidateStream);
- String wsdlns = getWSDLNamespace(wsdldoc);
- if (validateWSDL(wsdldoc, valInfo, wsdlns))
- {
- validateExtensionValidators(wsdldoc, valInfo, wsdlns);
- }
- }
- return (IValidationReport)valInfo;
- }
-
- /**
- * Validate the file for XML conformance.
- * @param valInfo information about the validation
- * @param inputStream the inputStream to validate
- * @return True if the file is conformant, false otherwise.
- */
- protected boolean validateXML(ControllerValidationInfo valInfo, InputStream inputStream)
- {
- IXMLValidator xmlValidator = AbstractXMLConformanceFactory.getInstance().getXMLValidator();
- xmlValidator.setURIResolver(uriResolver);
- xmlValidator.setFile(valInfo.getFileURI());
- if (xmlValidator instanceof DefaultXMLValidator)
- {
- ((DefaultXMLValidator)xmlValidator).setInputStream(inputStream);
- }
- //xmlValidator.setValidationInfo(valInfo);
- xmlValidator.run();
- // if there are no xml conformance problems go on to check the wsdl stuff
- if (xmlValidator.hasErrors())
- {
- // temp handling of XML errors until validator is updated.
- List errors = xmlValidator.getErrors();
- Iterator errorsIter = errors.iterator();
- while (errorsIter.hasNext())
- {
- IValidationMessage valMes = (IValidationMessage)errorsIter.next();
-
- if (valMes instanceof ValidationMessageImpl && valInfo instanceof ValidationInfoImpl)
- { String errorKey = ((ValidationMessageImpl)valMes).getErrorKey();
- Object[] messageArgs = ((ValidationMessageImpl)valMes).getMessageArguments();
- ((ValidationInfoImpl)valInfo).addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI(), errorKey, messageArgs);
- }
- else
- {
- valInfo.addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI());
- }
- }
- return false;
- }
- //wsdlNamespace = xmlValidator.getWSDLNamespace();
- return true;
- }
-
- /**
- * Validate the file for XML conformance.
- * @param valInfo information about the validation
- * @return True if the file is conformant, false otherwise.
- */
- protected boolean validateXML(ControllerValidationInfo valInfo)
- { return validateXML(valInfo, null);
- }
-
- /**
- * Validate the WSDL file. Set the errors and warning appropriately.
- *
- * @param wsdldoc A W3C document representation of the WSDL document.
- * @param valInfo The current validation information.
- * @param wsdlNamespace The WSDL namespace to validate.
- * @return True if the file is valid, false otherwise.
- */
- protected boolean validateWSDL(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
- {
- WSDLValidatorDelegate[] wsdlVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.WSDL_VALIDATOR);
- if (wsdlVals != null)
- {
- for (int i = 0; i < wsdlVals.length; i++)
- {
- WSDLValidatorDelegate wsdlvaldel = wsdlVals[i];
- IWSDLValidator wsdlVal = wsdlvaldel.getValidator();
-
- // If the wsdl validator isn't null, validate.
- if (wsdlVal != null)
- {
- try
- {
- wsdlVal.validate(wsdldoc, valInfo);
- }
- catch (ValidateWSDLException e)
- {
- valInfo.addError(messagegenerator.getString(_ERROR_PROBLEM_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
- }
- }
- // If the validator is null and the namespace isn't create an error.
- // If the namespace is null the file is empty (and the XML validator
- // has let it go)
- // so it is valid but does not need to be validated.
- else
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace),
- 1,
- 1,
- valInfo.getFileURI());
- }
- }
- }
- // No validators registered.
- else
- {
- valInfo.addError(messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
- }
- valInfo.completeWSDLValidation();
-
- return valInfo.isWSDLValid();
- }
-
- /**
- * Validate the WSDL file with the extension validator. Set the errors and warning appropriately.
- *
- * @param wsdldoc A W3C document representation of the WSDL document.
- * @param valInfo The current validation information.
- * @param wsdlNamespace The WSDL namespace to validate.
- * @return True if the file is valid, false otherwise.
- */
- protected void validateExtensionValidators(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
- {
- WSDLValidatorDelegate[] extVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.EXT_VALIDATOR);
- if(extVals != null)
- {
- int numvals = extVals.length;
- for(int i = 0; i < numvals; i++)
- {
- WSDLValidatorDelegate extvaldel = extVals[i];
- IWSDLValidator extval = extvaldel.getValidator();
- if(extval != null)
- {
- try
- {
- extval.validate(wsdldoc, valInfo);
- }
- catch(Throwable t)
- {
- valInfo.addWarning(messagegenerator.getString(_ERROR_PROBLEM_EXT_VALIDATOR, extvaldel.getValidatorClassName(), wsdlNamespace), 1, 1, valInfo.getFileURI());
- // This error should be logged and not displayed to the user.
- }
- }
- }
- }
- }
-
- /**
- * Set the ResourceBundle for this ValidatorManager.
- *
- * @param rb
- * The resource bundle to set.
- * @see #getResourceBundle
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- resourcebundle = rb;
- }
-
- /**
- * Get the ResourceBundle for this ValidationController.
- *
- * @return The resource bundle set for this ValidationController.
- * @see #setResourceBundle
- */
- public ResourceBundle getResourceBundle()
- {
- return resourcebundle;
- }
-
- /**
- * Get a DOM document representation of the WSDL document.
- *
- * @param uri The uri of the file to read
- * @return The DOM model of the WSDL document or null if the document can't be read.
- */
- private Document getDocument(String uri, InputStream inputStream)
- {
- try
- {
- // Catch a premature EOF error to allow empty WSDL files to be considered valid.
- StandardParserConfiguration configuration = new StandardParserConfiguration()
- {
- protected XMLErrorReporter createErrorReporter()
- {
- return new XMLErrorReporter()
- {
- public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
- {
- boolean reportError = true;
- if (key.equals("PrematureEOF"))
- {
- reportError = false;
- }
-
- if (reportError)
- {
- super.reportError(domain, key, arguments, severity);
- }
- }
- };
- }
- };
-
- InputSource inputSource = null;
- if (inputStream != null)
- { //then we want to create a DOM from the inputstream
- inputSource = new InputSource(inputStream);
- }
- else
- { inputSource = new InputSource(uri);
- }
-
- DOMParser builder = new LineNumberDOMParser(configuration);
- builder.parse(inputSource);
- Document doc = builder.getDocument();
-
- return doc;
- }
- catch (Throwable t)
- {
- // TODO: Log error if the parser fails to read the WSDL document.
- // In this case the validator will fail with an unexplained error message
- // about a null WSDL namespace. This error should be addressed as well.
- System.out.println(t);
- }
- return null;
- }
-
- private String getWSDLNamespace(Document doc)
- {
- String wsdlns = null;
- if(doc != null)
- {
- Element definitions = doc.getDocumentElement();
- if(definitions.getLocalName().equals("definitions"))
- {
- wsdlns = definitions.getNamespaceURI();
- }
- }
- return wsdlns;
- }
-
-
-
- private final String createStringForInputStream(InputStream inputStream)
- {
- // Here we are reading the file and storing to a stringbuffer.
- StringBuffer fileString = new StringBuffer();
- try
- {
- InputStreamReader inputReader = new InputStreamReader(inputStream);
- BufferedReader reader = new BufferedReader(inputReader);
- char[] chars = new char[1024];
- int numberRead = reader.read(chars);
- while (numberRead != -1)
- {
- fileString.append(chars, 0, numberRead);
- numberRead = reader.read(chars);
- }
- }
- catch (Exception e)
- {
- //TODO: log error message
- //e.printStackTrace();
- }
- return fileString.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
deleted file mode 100644
index f21587598..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-
-/**
- * An implementation of the validation info interface.
- */
-public class ValidationInfoImpl implements IValidationReport, ControllerValidationInfo
-{
- private boolean WRAPPER_ERROR_SUPPORT_ENABLED = true;
- private final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
- private final String _REF_FILE_ERROR_MESSAGE = "_REF_FILE_ERROR_MESSAGE";
- private String validating_file_uri = null;
- private URL validating_file_url = null;
- private boolean wsdlValid = false;
- private List messages = new Vector();
- private List schemas = new Vector();
- private List nsNoVals = new Vector();
- private MessageGenerator messagegenerator = null;
- private boolean haserrors = false;
- private HashMap nestedMessages = new HashMap();
- private URIResolver uriResolver = null;
- private Hashtable attributes = new Hashtable();
-
- /**
- * Constructor.
- *
- * @param uri
- * The URI of the file for the validation.
- */
- public ValidationInfoImpl(String uri, MessageGenerator messagegenerator)
- {
- this.validating_file_uri = uri;
- if(uri != null)
- {
- uri = uri.replaceAll("%20"," ");
- this.validating_file_uri = uri;
- try
- {
- this.validating_file_url = new URL(uri);
- } catch (MalformedURLException e)
- {
- }
- }
- this.messagegenerator = messagegenerator;
- }
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getFileURI()
- */
- public String getFileURI()
- {
- return validating_file_uri;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#isWSDLValid()
- */
- public boolean isWSDLValid()
- {
- return wsdlValid;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
- * int, int)
- */
- public void addError(String message, int line, int column)
- {
- addError(message, line, column, validating_file_uri);
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
- * int, int)
- */
- public void addError(String message, int line, int column, String uri)
- {
- if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR))
- {
- haserrors = true;
- }
- }
-
- public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
- {
- if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR, errorKey, messageArguments))
- {
- haserrors = true;
- }
- }
-
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
- * int, int)
- */
- public void addWarning(String message, int line, int column)
- {
- addWarning(message, line, column, validating_file_uri);
- }
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
- * int, int)
- */
- public void addWarning(String message, int line, int column, String uri)
- {
- addMessage(message, line, column, uri, ValidationMessageImpl.SEV_WARNING);
- }
-
- /**
- * Add a message to the list. A message may not be added to the list in
- * certain circumstances such as when the URI is invalid or the message
- * is null.
- *
- * @param message The message to add.
- * @param line The line location of the message.
- * @param column The column location of the message.
- * @param uri The URI of the file that contains the message.
- * @param severity The severity of the message.
- * @return True if the message was able to be added, false otherwise.
- */
- private boolean addMessage(String message, int line, int column, String uri, int severity)
- {
- return this.addMessage(message, line, column, uri, severity, null, null);
- }
-
- /**
- * Add a message to the list. A message may not be added to the list in
- * certain circumstances such as when the URI is invalid or the message
- * is null.
- *
- * @param message The message to add.
- * @param line The line location of the message.
- * @param column The column location of the message.
- * @param uri The URI of the file that contains the message.
- * @param severity The severity of the message.
- * @param errorKey The Xerces Error Key
- * @param messageArguments The Xerces arguments used to create the error message
- * @return True if the message was able to be added, false otherwise.
- */
- private boolean addMessage(String message, int line, int column, String uri, int severity, String errorKey, Object[] messageArguments)
- {
- boolean successfullyAdded = false;
- // If the message is null there is nothing to report.
- if(message == null)
- {
- return successfullyAdded;
- }
- String errorURI = uri;
- URL errorURL = null;
- if (errorURI != null)
- {
- try
- {
- errorURI = errorURI.replaceAll("%20", " ");
- errorURL = new URL(errorURI);
- } catch (MalformedURLException e)
- {
- }
- //errorURI = normalizeURI(errorURI);
- }
-// else
-// {
-// errorURI = validating_file_uri;
-// errorURL = validating_file_url;
-// }
- //boolean doDialog = true;
- if (errorURL != null)
- {
- successfullyAdded = true;
- // Add to the appropriate list if nested error support is off or
- // this message is for the current file.
- if (!WRAPPER_ERROR_SUPPORT_ENABLED || validating_file_url.sameFile(errorURL))
- {
-
- ValidationMessageImpl valmes = new ValidationMessageImpl(message, line,
- column, severity, uri, errorKey, messageArguments);
- messages.add(valmes);
- }
- // If nested error support is enabled create a nested error.
- else if (WRAPPER_ERROR_SUPPORT_ENABLED)
- {
- String nesteduri = errorURL.toExternalForm();
- ValidationMessageImpl nestedmess = new ValidationMessageImpl(message, line,
- column, severity, nesteduri);
-
- ValidationMessageImpl container = (ValidationMessageImpl) nestedMessages.get(nesteduri);
- if(container == null)
- {
- // Initially set the nested error to a warning. This will automatically be changed
- // to an error if a nested message has a severity of error.
- container = new ValidationMessageImpl(messagegenerator.getString(_REF_FILE_ERROR_MESSAGE, nesteduri), 1, 0, IValidationMessage.SEV_WARNING, nesteduri);
- nestedMessages.put(nesteduri, container);
- messages.add(container);
- }
- container.addNestedMessage(nestedmess);
- }
- }
-
- return successfullyAdded;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getValidationMessages()
- */
- public IValidationMessage[] getValidationMessages()
- {
- return (IValidationMessage[])messages.toArray(new IValidationMessage[messages.size()]);
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addNamespaceWithNoValidator(java.lang.String)
- */
- public void addNamespaceWithNoValidator(String namespace)
- {
- // If the list doesn't already contain this namespace, add it to the list
- // and create a warning message.
- if (!nsNoVals.contains(namespace))
- {
- nsNoVals.add(namespace);
- addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), 1, 0);
-
- }
-
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.ControllerValidationInfo#completeWSDLValidation()
- */
- public void completeWSDLValidation()
- {
- if (haserrors)
- {
- wsdlValid = false;
- }
- else
- {
- wsdlValid = true;
- }
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#hasErrors()
- */
- public boolean hasErrors()
- {
- return haserrors;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.ValidationReport#getNestedMessages()
- */
- public HashMap getNestedMessages()
- {
- return nestedMessages;
- }
-
- public void setURIResolver(URIResolver uriResolver)
- {
- this.uriResolver = uriResolver;
- }
-
- public URIResolver getURIResolver()
- {
- return uriResolver;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.ValidationInfo#getAttribute(java.lang.String)
- */
- public Object getAttribute(String name)
- {
- return attributes.get(name);
- }
-
- public void setAttributes(Hashtable attributes)
- {
- this.attributes.putAll(attributes);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java
deleted file mode 100644
index aa7fc1ae2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * A validation message is created when there is information to report from
- * validating a WSDL document.
- */
-public class ValidationMessageImpl implements IValidationMessage
-{
- protected String message;
- protected int lineNumber;
- protected int columnNumber;
- protected String uri;
- protected int severity = SEV_ERROR;
- protected List nestedErrors;
- protected String errorKey = null;
- protected Object[] messageArguments = null;
-
- /**
- * Constructor.
- *
- * @param message The validation message.
- * @param lineNumber The line where the message should be displayed.
- * @param columnNumber The column where the message should be displayed.
- * @deprecated Use contructor with URI parameter.
- */
- public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity)
- {
- this(message, lineNumber, columnNumber, severity, null);
- }
-
- /**
- * Constructor.
- * Allows specifying a uri for the reference that the message refers to.
- *
- * @param message The validation message.
- * @param lineNumber The line where the message should be displayed.
- * @param columnNumber The column where the message should be displayed.
- * @param uri The uri of the reference file for the message.
- */
- public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity, String uri)
- {
- this(message, lineNumber, columnNumber, severity, uri, null, null);
- }
-
- /**
- * Constructor.
- * Allows specifying a uri for the reference that the message refers to.
- *
- * @param message The validation message.
- * @param lineNumber The line where the message should be displayed.
- * @param columnNumber The column where the message should be displayed.
- * @param uri The uri of the reference file for the message.
- * @param errorKey The Xerces Error key
- * @param messageArguments The values used to "fill in the blanks" of a Xerces error Message
- */
- public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity, String uri, String errorKey, Object[] messageArguments)
- {
- this.message = message;
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- this.severity = severity;
- this.uri = uri;
- this.errorKey = errorKey;
- this.messageArguments = messageArguments;
- }
-
- /**
- * Returns the validation message.
- *
- * @return The validation message.
- */
- public String getMessage()
- {
- return message;
- }
-
- /**
- * Returns the column number.
- *
- * @return The column number where the message is located.
- */
- public int getColumn()
- {
- return columnNumber;
- }
-
- /**
- * Returns the line number.
- *
- * @return The line number where the message is located.
- */
- public int getLine()
- {
- return lineNumber;
- }
-
- /**
- * returns the uri of the reference file for the validation message.
- *
- * @return The uri of the resource that the message refers to.
- */
- public String getURI()
- {
- return uri;
- }
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.IValidationMessage#getSeverity()
- */
- public int getSeverity()
- {
- return severity;
- }
-
- /**
- * Set the severity of the message.
- *
- * @param severity The severity of the message.
- */
- public void setSeverity(int severity)
- {
- if(severity == SEV_ERROR || severity == SEV_WARNING)
- {
- this.severity = severity;
- }
- }
-
- /**
- * Add a nested validation message to this validation message.
- *
- * @param validationMessage The validation message to add as a nested message.
- */
- public void addNestedMessage(IValidationMessage validationMessage)
- {
- if (nestedErrors == null)
- {
- nestedErrors = new ArrayList();
- }
- nestedErrors.add(validationMessage);
- int validaitonmessageSeverity = validationMessage.getSeverity();
- if(validaitonmessageSeverity == SEV_ERROR)
- {
- setSeverity(SEV_ERROR);
- }
- }
-
- /**
- * Get the list of nested validation messages.
- *
- * @return The list of nested validation messages.
- */
- public List getNestedMessages()
- {
- return nestedErrors != null ? nestedErrors : Collections.EMPTY_LIST;
- }
- /**
- * @return the error key
- */
- public String getErrorKey()
- {
- return errorKey;
- }
-
- /**
- * @param errorKey the error key to set
- */
- public void setErrorKey(String errorKey)
- {
- this.errorKey = errorKey;
- }
- /**
- * @return the Xerces message arguments used to "fill in the blanks" of the messages
- */
- public Object[] getMessageArguments()
- {
- return messageArguments;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
deleted file mode 100644
index e82ca77fb..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-
-/**
- * A registry of IWSDLValidator validators. This holds the top level WSDL and WS-I validators.
- * Validators are registered by the namespace they validate.
- */
-public class ValidatorRegistry
-{
- /**
- * The WSDL validator type.
- */
- public final static Integer WSDL_VALIDATOR = new Integer(0);
- /**
- * The WS-I validator type.
- */
- public final static Integer EXT_VALIDATOR = new Integer(1);
- protected static ValidatorRegistry verInstance;
- /*
- This is a Map of Maps. The top-level Map is keyed by (Class)parentType,
- and the inner Maps are keyed by (QName)elementType.
- This idea is the same as is done in WSDL4J
- */
- protected Map validatorReg = new Hashtable();
-
- protected Iterator defaultValidatorIterator;
-
- /**
- * Constructor.
- */
- protected ValidatorRegistry()
- {
- }
-
- /**
- * Returns the instance of the registry.
- *
- * @return The instance of the registry.
- */
- public static ValidatorRegistry getInstance()
- {
- if (verInstance == null)
- {
- verInstance = new ValidatorRegistry();
- }
- return verInstance;
- }
- /**
- * Register this validator of the given type with the given namespace.
- *
- * @param namespace The namespace the validator validates.
- * @param valDelegate The validator delegate to register.
- * @param type The type of validator.
- */
- public void registerValidator(String namespace, WSDLValidatorDelegate valDelegate, Integer type)
- {
- // allow the null namespace but make it the empty string
- if (namespace == null)
- {
- namespace = "";
- }
-
- // get the hastable for the type of validator we want
- Hashtable typeValidatorReg = (Hashtable)validatorReg.get(type);
- // if it's null if means we haven't defined this type of validator yet
- if (typeValidatorReg == null)
- {
- typeValidatorReg = new Hashtable();
- validatorReg.put(type, typeValidatorReg);
- }
-
- List namespacevals = (List)typeValidatorReg.get(namespace);
- if(namespacevals == null)
- {
- namespacevals = new Vector();
- typeValidatorReg.put(namespace, namespacevals);
- }
- namespacevals.add(valDelegate);
-
- }
- /**
- * Ask for the validator associated with this namespace. If none is found
- * return null.
- *
- * @param namespace The namespace for the validator that is being requested.
- * @param type The type of validator that is being requested.
- * @return An array of validator delegates if at least one is registered, null otherwise.
- */
- public WSDLValidatorDelegate[] queryValidatorRegistry(String namespace, Integer type)
- {
- IWSDLValidator wsdlval = null;
- // if the namespace is null allow it and treat it as the empty string
- if (namespace == null)
- {
- namespace = "";
- }
- Hashtable typeValidatorReg = (Hashtable)validatorReg.get(type);
- if (typeValidatorReg == null)
- {
- return null;
-
- }
-
- List valdels = (List)typeValidatorReg.get(namespace);
- if(valdels != null)
- {
- return (WSDLValidatorDelegate[])valdels.toArray(new WSDLValidatorDelegate[valdels.size()]);
- }
-
- return null;
- }
-
- /**
- * Returns true if there is a validator registered of the given type with the given namespace.
- *
- * @param namespace The namespace of the validator.
- * @param type The type of the validator.
- * @return True if there is a validator registered for the namespace, false otherwise.
- */
- public boolean hasRegisteredValidator(String namespace, Integer type)
- {
- if (queryValidatorRegistry(namespace, type) != null)
- {
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
deleted file mode 100644
index b3dbf4d6c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11BasicValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorController;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.mime.MIMEValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.soap.SOAPValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * An main WSDL validator class. The WSDL validator validates WSDL documents.
- */
-public class WSDLValidator
-{
- private static String VALIDATOR_RESOURCE_BUNDLE = "validatewsdl";
- private static String VALIDATOR_HTTP_RESOURCE_BUNDLE = "validatewsdlhttp";
- private static String VALIDATOR_SOAP_RESOURCE_BUNDLE = "validatewsdlsoap";
- private static String VALIDATOR_MIME_RESOURCE_BUNDLE = "validatewsdlmime";
- private ValidationController validationController;
- private URIResolver uriResolver;
- private Hashtable attributes = new Hashtable();
-
- /**
- * Constructor.
- */
- public WSDLValidator()
- {
- ResourceBundle rb = ResourceBundle.getBundle(VALIDATOR_RESOURCE_BUNDLE);
- uriResolver = new URIResolver();
- validationController = new ValidationController(rb, uriResolver);
-
- //Register the default validators.
- ValidatorRegistry registry = ValidatorRegistry.getInstance();
- // Register the WSDL 1.1 validator controller and validators.
- WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(WSDL11ValidatorController.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
- registry.registerValidator(Constants.NS_URI_WSDL, delegate, ValidatorRegistry.WSDL_VALIDATOR);
- WSDL11ValidatorDelegate delegate1 = new WSDL11ValidatorDelegate(WSDL11BasicValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
- registerWSDL11Validator(Constants.NS_URI_WSDL, delegate1);
- delegate1 = new WSDL11ValidatorDelegate(HTTPValidator.class.getName(), VALIDATOR_HTTP_RESOURCE_BUNDLE, getClass().getClassLoader());
- registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_HTTP, delegate1);
- delegate1 = new WSDL11ValidatorDelegate(SOAPValidator.class.getName(), VALIDATOR_SOAP_RESOURCE_BUNDLE, getClass().getClassLoader());
- registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_SOAP11, delegate1);
- delegate1 = new WSDL11ValidatorDelegate(MIMEValidator.class.getName(), VALIDATOR_MIME_RESOURCE_BUNDLE, getClass().getClassLoader());
- registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_MIME, delegate1);
-
- // The WSDL 1.1 schema validator is a special case as it is registered for three namespaces.
- delegate1 = new WSDL11ValidatorDelegate(InlineSchemaValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
- registerWSDL11Validator(Constants.NS_URI_XSD_1999, delegate1);
- registerWSDL11Validator(Constants.NS_URI_XSD_2000, delegate1);
- registerWSDL11Validator(Constants.NS_URI_XSD_2001, delegate1);
- }
-
- /**
- * Validate the WSDL file at the given location.
- *
- * @param uri The location of the WSDL file to validate.
- * @return A validation report summarizing the results of the validation.
- */
- public IValidationReport validate(String uri)
- {
- return validate(uri, null);
- }
-
- /**
- *
- * Validate the inputStream
- * @param uri The location of the WSDL file being validated
- * @param inputStream The stream to validate
- * @return A Validation report summarizing the results of the validation
- */
- public IValidationReport validate(String uri, InputStream inputStream)
- {
- if(uri == null)
- return null;
- validationController.setAttributes(attributes);
- return validationController.validate(uri, inputStream);
- }
-
- /**
- * Add a URI resolver to the WSDL validator.
- *
- * @param uriResolver The URI resolver to add to the WSDL validator.
- */
- public void addURIResolver(IExtensibleURIResolver uriResolver)
- {
- this.uriResolver.addURIResolver(uriResolver);
- }
-
- /**
- * Set an attribute on the validator. An attribute is
- * defined by a name and a value pair. An attribute may
- * be defined for any validator, built in or an extension.
- * Extension validators can probe the attributes set on
- * the WSDL validator to customize the way in which they
- * validate.
- *
- * @param name The attribute identifier.
- * @param value The attribute itself.
- */
- public void setAttribute(String name, Object value)
- {
- attributes.put(name, value);
- }
-
- /**
- * Register an extension WSDL validator delegate with this validator.
- *
- * @param namespace The namespace the validator validates for. This is the WSDL namespace.
- * @param delegate The delegate that holds the validator.
- */
- public void registerWSDLExtensionValidator(String namespace, WSDLValidatorDelegate delegate)
- {
- ValidatorRegistry.getInstance().registerValidator(namespace, delegate, ValidatorRegistry.EXT_VALIDATOR);
- }
-
- /**
- * Register a WSDL 1.1 validator delegate with this validator.
- *
- * @param namespace The namespace the validator validates for.
- * @param delegate The delegate that holds the validator.
- */
- public void registerWSDL11Validator(String namespace, WSDL11ValidatorDelegate delegate)
- {
- org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(namespace, delegate);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java
deleted file mode 100644
index ab4075f2c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * A delegate holds a validator's information and can instantiate it
- * when requested to.
- */
-public class WSDLValidatorDelegate
-{
- private String validatorClassname = null;
- private String resourceBundle = null;
- private ClassLoader classLoader = null;
- private IWSDLValidator validator = null;
-
- /**
- * Create a delegate for a validator by its class name and resource bundle name.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- */
- public WSDLValidatorDelegate(String validatorClassname, String resourceBundle)
- {
- this.validatorClassname = validatorClassname;
- this.resourceBundle = resourceBundle;
- }
-
- /**
- * Create a delegate for a validator by its class name, resource bundle name and
- * a class loader to load the validator and bundle.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- * @param classLoader The class loader to use to load the validator and bundle.
- */
- public WSDLValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
- {
- this(validatorClassname, resourceBundle);
- this.classLoader = classLoader;
- }
-
- /**
- * Get the validator specified in this delegate.
- *
- * @return The WSDL validator specified by this delegate.
- */
- public IWSDLValidator getValidator()
- {
- if (validator == null)
- {
- if(classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- try
- {
- Class validatorClass =
- classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
- validator = (IWSDLValidator)validatorClass.newInstance();
-
- if (resourceBundle != null)
- {
- ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
- validator.setResourceBundle(validatorBundle);
- }
- }
- catch (Exception e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- catch(Throwable t)
- {
- System.err.println(t);
- }
- }
- return validator;
- }
-
- /**
- * Return the validator class name.
- * @return The validator class name.
- */
- public String getValidatorClassName()
- {
- return validatorClassname;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java
deleted file mode 100644
index 33d1b48b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.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.wsdl.validation.internal.exception;
-
-/**
- * Custom exception for WSDL validation.
- */
-public class ValidateWSDLException extends Exception
-{
- /**
- * Required serial version uid.
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- * @param message The exception message
- */
- public ValidateWSDLException(String message)
- {
- super(message);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
deleted file mode 100644
index 2030ae7f8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * An interface for the WSDL validator's URI resolver mechanism. The URI resolver
- * is used to find the location of an entity.
- */
-public interface IExtensibleURIResolver
-{
- /**
- * Resolve the location of the entity described by the publicId and systemId.
- *
- * @param baseLocation The location of the resource that contains the uri.
- * @param publicId An optional public identifier (i.e. namespace name), or null if none.
- * @param systemId An absolute or relative URI, or null if none.
- * @param result The result of the resolution.
- */
- public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
deleted file mode 100644
index 236bb1165..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * The representation of a URI resolution result. This interface is not meant to
- * be implemented by clients.
- *
- */
-public interface IURIResolutionResult
-{
- /**
- * Get the logical location of the resolution result.
- *
- * @return The logical location of the resolution result.
- */
- public String getLogicalLocation();
-
- /**
- * Set the logical location of the resolution result.
- *
- * @param logicalLocation The logical location of the resolution result.
- */
- public void setLogicalLocation(String logicalLocation);
-
- /**
- * Get the physical location of the resolution result.
- *
- * @return The physical location of the resolution result.
- */
- public String getPhysicalLocation();
-
- /**
- * Set the physical location of the resolution result.
- *
- * @param physicalLocation The physical location of the resolution result.
- */
- public void setPhysicalLocation(String physicalLocation);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
deleted file mode 100644
index 07df0c6f8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * This class holds the URI resolution results.
- *
- */
-public class URIResolutionResult implements IURIResolutionResult
-{
- private String logicalLocation = null;
- private String physicalLocation = null;
-
- /**
- * Constructor.
- */
- public URIResolutionResult()
- {
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getLogicalLocation()
- */
- public String getLogicalLocation()
- {
- return logicalLocation;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setLogicalLocation(java.lang.String)
- */
- public void setLogicalLocation(String logicalLocation)
- {
- this.logicalLocation = logicalLocation;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getPhysicalLocation()
- */
- public String getPhysicalLocation()
- {
- return physicalLocation;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setPhysicalLocation(java.lang.String)
- */
- public void setPhysicalLocation(String physicalLocation)
- {
- this.physicalLocation = physicalLocation;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
deleted file mode 100644
index 9e4b86f81..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-
-/**
- * This is the main URI resolver that calls out to all of the registered
- * external URI resolvers to locate an entity. If none of the external resolvers
- * can locate the entity the resolver will ask the internal WSDL validator XML
- * catalog to resolve the location.
- */
-public class URIResolver implements IExtensibleURIResolver, XMLEntityResolver
-{
- private List extURIResolversList = new ArrayList();
-
- /**
- * Constructor.
- */
- public URIResolver()
- {
- }
-
-
- /**
- * Add an extension URI resolver.
- *
- * @param uriResolver
- * The extension URI resolver.
- */
- public void addURIResolver(IExtensibleURIResolver uriResolver)
- {
- extURIResolversList.add(uriResolver);
- }
-
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
- */
- public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
- {
- Iterator resolverIter = extURIResolversList.iterator();
- while(resolverIter.hasNext())
- {
- IExtensibleURIResolver resolver = (IExtensibleURIResolver)resolverIter.next();
- if (resolver == null)
- {
- continue;
- }
- resolver.resolve(baseLocation, publicId, systemId, result);
- if (result.getLogicalLocation() != null && !result.getPhysicalLocation().equals(systemId))
- {
- break;
- }
- }
-
- // If we haven't been able to locate the result yet ask the internal XML
- // catalog.
- if (result.getLogicalLocation() == null && (publicId != null || systemId != null))
- {
- String tempresult = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
- if(tempresult != null)
- {
- result.setLogicalLocation(tempresult);
- result.setPhysicalLocation(tempresult);
- }
- }
- if(result.getLogicalLocation() == null)
- {
- result.setLogicalLocation(normalize(baseLocation, systemId));
- result.setPhysicalLocation(result.getLogicalLocation());
- }
- }
-
- public IURIResolutionResult resolve(String baseLocation, String publicId, String systemId)
- {
- IURIResolutionResult result= new URIResolutionResult();
- resolve(baseLocation, publicId, systemId, result);
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
- */
- public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
- {
- String publicId = resourceIdentifier.getPublicId();
- String systemId = resourceIdentifier.getLiteralSystemId();
- if (publicId == null || publicId.equals(""))
- {
- publicId = resourceIdentifier.getNamespace();
- }
- IURIResolutionResult result = resolve(resourceIdentifier.getBaseSystemId(), publicId, systemId);
- XMLInputSource xmlInputSource = null;
- if (result != null)
- {
- LazyURLInputStream is = new LazyURLInputStream(result.getPhysicalLocation());
- xmlInputSource = new XMLInputSource(publicId, result.getLogicalLocation(), result.getLogicalLocation(), is, null);
- }
- return xmlInputSource;
- }
-
- /**
- * Normalize the systemId. Make it absolute with respect to the
- * baseLocation if necessary.
- *
- * @param baseLocation The base location of the file.
- * @param systemId The system id of the file.
- * @return A normalized version of the system id.
- */
- protected String normalize(String baseLocation, String systemId)
- {
- if(systemId == null)
- {
- return systemId;
- }
- // Try to find a scheme in the systemId.
- int schemaLoc = systemId.indexOf(':');
- if(schemaLoc != -1 && systemId.charAt(schemaLoc+1) == '/')
- {
- // A scheme has been found. The systemId is an
- // absolute location so return it.
- return systemId;
- }
- if(baseLocation == null)
- {
- return baseLocation;
- }
-
- String result = "";
-
- // Ensure all slashes in the locations are /.
- baseLocation = baseLocation.replace('\\','/');
- systemId = systemId.replace('\\','/');
-
- // Remove the trailing section of the baseLocation.
- int lastSlash = baseLocation.lastIndexOf('/');
- String tempresult = baseLocation.substring(0, lastSlash+1);
-
- if(systemId.startsWith("/"))
- {
- systemId = systemId.substring(1);
- }
-
- // Join the base location with the systemid
- tempresult = tempresult + systemId;
-
- // While the relative location starts with a ../ or ./ change
- // the result and the relative location.
- int loc;
- while((loc = tempresult.lastIndexOf("./")) != -1)
- {
- result = tempresult.substring(loc + 2) + result;
- if(tempresult.charAt(loc - 1) == '.')
- {
- if(tempresult.charAt(loc - 2) == '/')
- {
- String temp = tempresult.substring(0, loc - 2);
- int loc2 = temp.lastIndexOf('/');
- if(loc2 == -1)
- {
- // If there is no other / before this the URL must start with scheme:/../
- result = "../" + result;
- tempresult = tempresult.substring(0, loc - 1);
- }
- else
- {
- // Remove the section that comes before this one from tempresult unless it's ../.
- tempresult = tempresult.substring(0, loc - 1);
- int numSectsToRemove = 1;
-
- while(tempresult.endsWith("./"))
- {
- int tempreslen = tempresult.length();
- if(tempreslen > 2 && tempresult.charAt(tempreslen -3) == '.')
- {
- if(tempreslen > 3 && tempresult.charAt(tempreslen - 4) == '/')
- {
- numSectsToRemove++;
- tempresult = tempresult.substring(0, tempresult.length() -3);
- }
- else
- {
- break;
- }
- }
- else
- {
- if(tempresult.charAt(tempresult.length() -2) == '/')
- {
- tempresult = tempresult.substring(0, tempresult.length() -2);
- }
- else
- {
- break;
- }
- }
- }
- // Remove the sections.
- for(int i = 0; i < numSectsToRemove; i++)
- {
- String temp2 = tempresult.substring(0,tempresult.length()-1);
- int loc3 = temp2.lastIndexOf('/');
- if(loc3 == -1)
- {
- break;
- }
- tempresult = tempresult.substring(0, loc3+1);
- }
- }
- }
- else
- {
- // The URI is of the form file://somedir../ so copy it as is
- String temp = tempresult.substring(0, loc - 1);
- int loc2 = temp.lastIndexOf('/');
- if(loc2 == -1)
- {
- // The URI must look like file:../ or ../ so copy over the whole tempresult.
- result = tempresult.substring(0,loc+2) + result;
- tempresult = "";
- }
- else
- {
- // Copy over the whole somedir../
- result = tempresult.substring(loc2 + 1, tempresult.length());
- tempresult = tempresult.substring(0, loc2+1);
- }
- }
- }
- else
- {
- if(tempresult.charAt(loc -1 ) == '/')
- {
- // Result is of the form file://something/./something so remove the ./
- tempresult = tempresult.substring(0,loc);
- }
- else
- {
- // Result URI is of form file://somedir./ so copy over the whole section.
- String temp = tempresult.substring(0, loc - 1);
- int loc2 = temp.lastIndexOf('/');
- if(loc2 == -1)
- {
- // The URI must look like file:./ or ./ so copy over the whole tempresult.
- result = tempresult.substring(0, loc) + result;
- tempresult = "";
- }
- else
- {
- // Copy over the whole somedir./
- result = tempresult.substring(loc2 + 1, tempresult.length());
- tempresult = tempresult.substring(0, loc2+1);
- }
- }
- }
- }
- result = tempresult + result;
- return result;
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
deleted file mode 100644
index 80a999297..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-
-/**
- * A delegate to hold information about an extension URI resolver.
- */
-public class URIResolverDelegate
-{
- private String classname;
- private ClassLoader classloader;
- private IExtensibleURIResolver resolver = null;
-
-
- /**
- * Constructor.
- *
- * @param classname The class name of the URI resolver.
- * @param classloader The class loader to use to load the URI resolver.
- */
- public URIResolverDelegate(String classname, ClassLoader classloader)
- {
- this.classname = classname;
- this.classloader = classloader;
- }
-
- /**
- * Get the URI resolver described by this delegate.
- *
- * @return The URI resolver described by this delegate.
- */
- public IExtensibleURIResolver getURIResolver()
- {
- if(resolver == null)
- {
- try
- {
- resolver = (IExtensibleURIResolver)classloader.loadClass(classname).newInstance();
- }
- catch(Exception e)
- {
- try
- {
- resolver = (IExtensibleURIResolver)getClass().getClassLoader().loadClass(classname).newInstance();
- }
- catch(Exception e2)
- {
- }
- }
- }
- return resolver;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java
deleted file mode 100644
index 81bdc0e83..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-
-/**
- * A class to hold validation messages. In this case an error message is a generic
- * term for any kind of validation message.
- */
-public class ErrorMessage
-{
- private int errorLine, errorColumn, severity;
- private String errorString, uri;
- private int startOffset = -1;
- private int endOffset = -1;
-
- /**
- * Constructor.
- */
- public ErrorMessage()
- {
- }
-
- /**
- * Sets the message.
- *
- * @param error The message to set.
- * @see #getErrorMessage
- */
- public void setErrorMessage(String error)
- {
- errorString = error;
- }
-
- /**
- * Sets the severity of the message.
- *
- * @param severity The severity of the message.
- * @see #getSeverity
- */
- public void setSeverity(int severity)
- {
- this.severity = severity;
- }
-
- /**
- * Sets the severity of the message using string names for the severity.
- *
- * @param severity The string representation of the severity.
- * @see #getSeverity
- */
- public void setSeverity(String severity)
- {
- if (severity.equals("warning"))
- {
- this.severity = 0;
- }
- else if (severity.equals("error"))
- {
- this.severity = 1;
- }
- else if (severity.equals("fatal"))
- {
- this.severity = 2;
- }
- }
-
- /**
- * Sets the line where the error is located.
- *
- * @param line The line where the error is located.
- * @see #getErrorLine
- */
- public void setErrorLine(int line)
- {
- errorLine = line;
- }
-
- /**
- * Sets the column where the error is located.
- *
- * @param column The column where the error is located.
- * @see #getErrorColumn
- */
- public void setErrorColumn(int column)
- {
- errorColumn = column;
- }
-
- /**
- * Returns the error message.
- *
- * @return The error message.
- * @see #setErrorMessage
- */
- public String getErrorMessage()
- {
- return errorString;
- }
-
- /**
- * Returns the severity of the error.
- *
- * @return The severity of the error.
- * @see #setSeverity
- */
- public int getSeverity()
- {
- return severity;
- }
-
- /**
- * Returns the line location of the error.
- *
- * @return The line location of the error.
- * @see #setErrorLine
- */
- public int getErrorLine()
- {
- return errorLine;
- }
-
- /**
- * Returns the column location of the error.
- *
- * @return The column location of the error.
- * @see #setErrorColumn
- */
- public int getErrorColumn()
- {
- return errorColumn;
- }
-
- /**
- * Sets the start offset.
- *
- * @param start The start offset.
- * @see #getErrorStartOffset
- */
- public void setErrorStartOffset(int start)
- {
- startOffset = start;
- }
-
- /**
- * Returns the error start offset.
- *
- * @return The error start offset.
- * @see #setErrorStartOffset
- */
- public int getErrorStartOffset()
- {
- return startOffset;
- }
-
- /**
- * Sets the end offset.
- *
- * @param end The end offset.
- * @see #getErrorEndOffset
- */
- public void setErrorEndOffset(int end)
- {
- endOffset = end;
- }
-
- /**
- * Returns the error end offset.
- *
- * @return The error end offset.
- * @see #setErrorEndOffset
- */
- public int getErrorEndOffset()
- {
- return endOffset;
- }
-
- /**
- * Adds a new line ot the error message.
- *
- * @param newLine The new line to add to the error message.
- */
- public void addNewErrorMessageLine(String newLine)
- {
- errorString += "\n" + newLine;
- }
-
- /**
- * Set the URI of the error message.
- *
- * @param uri The URI to set.
- */
-
- public void setURI(String uri)
- {
- this.uri = uri;
- }
-
- /**
- * Get the URI of the error message.
- *
- * @return The URI of the error message.
- */
- public String getURI()
- {
- return uri;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
deleted file mode 100644
index 1bc6ab199..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
+++ /dev/null
@@ -1,162 +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.wsdl.validation.internal.util;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{
- private static int debugTotalOpenStreamCount = 0;
- protected InputStream inner;
- protected String url;
- protected boolean error;
- boolean hasMarks;
- boolean pretendFileIsStillOpen;
-
- public LazyURLInputStream(String url)
- {
- this.url = url;
- inner = null;
- pretendFileIsStillOpen = false;
- }
-
- private void createInnerStreamIfRequired() throws IOException
- {
- if (inner == null && !error)
- {
- debugTotalOpenStreamCount++;
- //System.out.println("Creating stream (" + debugTotalOpenStreamCount + ")-- " + url);
- try
- {
- inner = new URL(url).openStream();
- pretendFileIsStillOpen = false;
- hasMarks = false;
- }
- finally
- {
- if (inner == null)
- {
- error = true;
- }
- }
- }
- }
-
- protected void closeStream() throws IOException {
- if (inner != null && !pretendFileIsStillOpen) {
- inner.close();
- pretendFileIsStillOpen = true;
- }
- }
-
- public int available() throws IOException
- {
- if (pretendFileIsStillOpen) return 0;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- return inner.available();
- }
-
- public void close() throws IOException
- {
- if (pretendFileIsStillOpen) {
- // Stop behaving as if the stream were still open.
- pretendFileIsStillOpen = false;
- } else {
- if (inner != null) {
- debugTotalOpenStreamCount--;
- //System.out.println("Closing stream (" + debugTotalOpenStreamCount + ") -- " + url);
- inner.close();
- }
- }
- }
-
- public void mark(int readlimit)
- {
- if (pretendFileIsStillOpen) return;
- hasMarks = true;
- try {
- createInnerStreamIfRequired();
- inner.mark(readlimit);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- public boolean markSupported()
- {
- if (pretendFileIsStillOpen) return false;
- try {
- createInnerStreamIfRequired();
- if (inner == null) return false;
- return inner.markSupported();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return false;
- }
-
- public int read() throws IOException
- {
- if (pretendFileIsStillOpen) return -1;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- int bytesRead = inner.read();
- if (bytesRead == -1 && !hasMarks) closeStream();
- return bytesRead;
- }
-
-
- public int read(byte[] b) throws IOException {
- if (pretendFileIsStillOpen) return -1;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- int bytesRead = inner.read(b);
- if (bytesRead == -1 && !hasMarks) closeStream();
- return bytesRead;
- }
-
- public int read(byte[] b, int off, int len) throws IOException
- {
- if (pretendFileIsStillOpen) return -1;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- int bytesRead = inner.read(b, off, len);
- if (bytesRead == -1 && !hasMarks) closeStream();
- return bytesRead;
- }
-
- public void reset() throws IOException
- {
- if (pretendFileIsStillOpen) return;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- inner.reset();
- }
-
- public long skip(long n) throws IOException
- {
- if (pretendFileIsStillOpen) return 0;
- createInnerStreamIfRequired();
- if (inner == null) throw new IOException("Stream not available");
- return inner.skip(n);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java
deleted file mode 100644
index 0b78cb9c7..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
-
-/**
- * A convenience class for working with resources in a resource bundle.
- */
-public class MessageGenerator
-{
- protected ResourceBundle resourcebundle;
-
- /**
- * Constructor.
- *
- * @param rb The resource bundle to work with.
- */
- public MessageGenerator(ResourceBundle rb)
- {
- resourcebundle = rb;
- }
-
- /**
- * Set the resourcebundle to the one specified.
- *
- * @param rb The resource bundle to set.
- */
- protected void setResourceBundle(ResourceBundle rb)
- {
- resourcebundle = rb;
- }
-
- /**
- * Gets the string resource for the given key.
- *
- * @param key The key for the resource.
- * @return The string from the resource bundle.
- */
- public String getString(String key)
- {
- return resourcebundle.getString(key);
- }
-
- /**
- * Gets the string resource for the given key and does one substitution.
- *
- * @param key The key for the resource.
- * @param s1 The substitution to perform.
- * @return The string from the resource bundle.
- */
- public String getString(String key, Object s1)
- {
- return MessageFormat.format(getString(key), new Object[] { s1 });
- }
-
- /**
- * Gets the string resource for the given key and does two substitutions.
- *
- * @param key The key for the resource.
- * @param s1 The first substitution to perform.
- * @param s2 The second substitution to perform.
- * @return The string from the resource bundle.
- */
- public String getString(String key, Object s1, Object s2)
- {
- return MessageFormat.format(getString(key), new Object[] { s1, s2 });
- }
-
- /**
- * Gets the string resource for the given key and does three substitutions.
- *
- * @param key The key for the resource.
- * @param s1 The first substitution to perform.
- * @param s2 The second substitution to perform.
- * @param s3 The third substitution to perform.
- * @return The string from the resource bundle.
- */
- public String getString(String key, Object s1, Object s2, Object s3)
- {
- return MessageFormat.format(getString(key), new Object[] { s1, s2, s3 });
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
deleted file mode 100644
index 0c1bc4ff1..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An interface for WSDL 1.1 validation information. Uses an existing
- * validation info object and provides methods to set and retrieve
- * schemas and convenience methods for setting errors with objects.
- */
-public interface IWSDL11ValidationInfo
-{
- /**
- * Returns the URI of the file being validated.
- *
- * @return The URI of the file being validated.
- */
- public String getFileURI();
-
- /**
- * Add a schema to the list of schemas available for this WSDL document.
- *
- * @param xsModel The schema to add to the list.
- */
- public void addSchema(XSModel xsModel);
-
- /**
- * Get an array of all the schemas available for this WSDL document.
- *
- * @return An array of all the schemas available for this WSDL document.
- */
- public XSModel[] getSchemas();
-
- /**
- * Clear all the stored schemas.
- */
- public void clearSchemas();
-
- /**
- * Set the element locations hashtable.
- *
- * @param elementLocations The hashtable to set with the element locations.
- */
- public void setElementLocations(Hashtable elementLocations);
-
- /**
- * Convenience method for extensibly validators to add error messages.
- *
- * @param message The error to add.
- * @param element The object to add the error for.
- */
- public void addError(String message, Object element);
-
- /**
- * Convenience method for extensibly validators to add error messages.
- *
- * @param message The error to add.
- * @param element The object to add the error for.
- * @param errorKey The error key for this message
- * @param messageArguments The strings used to create the message.
- */
- public void addError(String message, Object element, String errorKey, Object[] messageArguments);
-
- /**
- * Add an error message at the given line and column.
- *
- * @param message The error to add.
- * @param line The line location of the error.
- * @param column The column location of the error.
- * @param uri The uri of the file containing the error.
- */
- public void addError(String message, int line, int column, String uri);
-
- /**
- * Convenience method for extensibly validators to add warning messages.
- *
- * @param message The warning to add.
- * @param element The object to add the warning for.
- */
- public void addWarning(String message, Object element);
-
- /**
- * Add a warning message at the given line and column.
- *
- * @param message The warning to add.
- * @param line The line location of the warning.
- * @param column The column location of the warning.
- * @param uri The uri of the file containing the warning.
- */
- public void addWarning(String message, int line, int column, String uri);
-
- /**
- * Get the URI resolver in use for this validation. The URI resolver
- * returned is actually a URI resolver handler that will
- * iterate through all of the registered URI resolvers.
- *
- * @return The URI resolver handler.
- */
- public URIResolver getURIResolver();
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java
deleted file mode 100644
index a6bd2e23d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-/**
- * Interface for a validator plugged into the WSDL 1.1 validator.
- */
-public interface IWSDL11Validator
-{
- /**
- * Validate the given element.
- *
- * @param element The element to validate.
- * @param parents A list of parents of this element.
- * @param valInfo The current validation information.
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo);
-
- /**
- * Set the resource bundle of the validator.
- *
- * @param rb The resource bundle to set.
- */
- public void setResourceBundle(ResourceBundle rb);
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
deleted file mode 100644
index 205bc9b79..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory;
-import org.eclipse.wst.wsdl.validation.internal.xml.IXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogResolver;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-
-/**
- * A class to hold and parse an import element.
- */
-public class ImportHolder implements Comparable
-{
- private MessageGenerator messagegenerator;
-
- private WSDLDocument importingWSDLDoc = null;
- private WSDLDocument wsdlDocument = null;
- private Definition importingDef = null;
- private Element importingDocImportElement = null;
- private String namespace = null;
- private String location = null;
- private String classpathURI = null;
- private String contextURI = null;
- private int depth;
- private Element element = null;
- private List schemas = new ArrayList();
- private boolean isWSDLFileImport = true;
- private boolean importInvalid = false;
- private Import importDef = null;
- private IWSDL11ValidationInfo valinfo;
-
- /**
- * Constructor.
- *
- * @param namespace The namespace of the import.
- * @param location The location of the import.
- * @param contextURI The context URI for resolving the import location.
- * @param wsdlDoc The WSDLDocument that contains the import.
- * @param depth The depth of the import.
- * @param importingDocImportElement The element representing the import in the encapsulating WSDLDocument.
- * @param messagegenerator A messagegenerator for obtaining strings.
- * @param valinfo The WSDL11ValidationInfo for reporting messages.
- */
- public ImportHolder(String namespace, String location, String contextURI, WSDLDocument importingWSDLDoc, int depth, Element importingDocImportElement, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo)
- {
- this.messagegenerator = messagegenerator;
- this.valinfo = valinfo;
- this.importingWSDLDoc = importingWSDLDoc;
- if(importingWSDLDoc != null)
- {
- this.importingDef = importingWSDLDoc.getDefinition();
- }
- this.importingDocImportElement = importingDocImportElement;
- this.depth = depth;
- this.namespace = namespace;
- this.location = location;
-
- // Allow WSDL imports to have no location attribute even though it is required.
- // Schema will normally catch the problem but this allows users to override the
- // schema and have the validator run.
- if (this.location == null)
- {
- this.location = namespace;
- }
- this.contextURI = contextURI;
-
- this.location = this.location.replace('\\','/');
- IURIResolutionResult classpathURI = valinfo.getURIResolver().resolve(this.contextURI, this.namespace, this.location);
- if(classpathURI.getLogicalLocation() != null)
- {
- this.location = classpathURI.getLogicalLocation();
- }
- if(classpathURI.getPhysicalLocation() != null)
- {
- this.classpathURI = classpathURI.getPhysicalLocation();
- this.contextURI = null;
- }
- }
-
- public void initialize()
- {
- Element documentElement = null;
- try
- {
- documentElement = getElement();
- }
- catch(WSDLException e)
- {
- }
- if(documentElement != null)
- {
- // Handle WSDL imports.
- if (QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, documentElement))
- {
- if(isXMLValid(this.classpathURI))
- {
- try
- {
- wsdlDocument = new WSDLDocument(this.location, documentElement, this.depth, this.messagegenerator, this.valinfo);
- createWSDLImport(wsdlDocument);
- }
- catch(WSDLException e)
- {
- valinfo.addError(messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + importDef.getLocationURI() + "'"), importingDocImportElement);
- }
- }
- }
- // Handle schema imports.
- else if (QNameUtils.matches(Constants.Q_ELEM_XSD_2001, documentElement))
- {
- createXSDImport();
- }
- }
- }
-
- protected boolean isXMLValid(String uri)
- {
- IXMLValidator xmlValidator = AbstractXMLConformanceFactory.getInstance().getXMLValidator();
- xmlValidator.setFile(uri);
- //xmlValidator.setValidationInfo(valInfo);
- xmlValidator.run();
- // if there are no xml conformance problems go on to check the wsdl stuff
- if (xmlValidator.hasErrors())
- {
- // temp handling of XML errors until validator is updated.
- List errors = xmlValidator.getErrors();
- Iterator errorsIter = errors.iterator();
- while (errorsIter.hasNext())
- {
- IValidationMessage valMes = (IValidationMessage)errorsIter.next();
- valinfo.addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI());
- }
- importInvalid = true;
- return false;
- }
- return true;
- }
-
- /**
- * Get the importing WSDLDocument.
- *
- * @return The importing WSDLDocument.
- */
- public WSDLDocument getImportingDocument()
- {
- return importingWSDLDoc;
- }
-
- /**
- * Get the WSDL document this import represents.
- *
- * @return The WSDL document this import represents.
- */
- public WSDLDocument getWSDLDocument()
- {
- return wsdlDocument;
- }
-
- /**
- * Get the namespace.
- *
- * @return The namespace.
- */
- public String getNamespace()
- {
- return namespace;
- }
-
- /**
- * Get the location.
- *
- * @return The location.
- */
- public String getLocation()
- {
- return location;
- }
-
- /**
- * Get the context URI.
- *
- * @return The context URI.
- */
- public String getContextURI()
- {
- return contextURI;
- }
-
- /**
- * Get the depth in the WSDL tree.
- *
- * @return The depth in the WSDL tree.
- */
- public int getDepth()
- {
- return depth;
- }
-
- /**
- * Get the containing defintions element.
- *
- * @return The containing definitions element.
- */
- public Definition getImportingDefinition()
- {
- return importingDef;
- }
-
- /**
- * Get the element for this import.
- *
- * @return The element for this import.
- * @throws WSDLException
- */
- public Element getElement() throws WSDLException
- {
- if(element != null)
- {
- return element;
- }
-
- String locationURI = location;
- String namespaceURI = namespace;
- //Import importDef = importingDef.createImport();
-
- // Allow locating WSDL documents using any registered URI resolver.
- //String classpathURI = URIResolver.getInstance().resolve(contextURI, namespaceURI, locationURI);
-// if (!classpathURI.equals(locationURI))
-// {
-// locationURI = classpathURI;
-// contextURI = null;
-// }
- Reader reader = null;
- if (locationURI != null)
- {
- try
- {
- //String contextURI = def.getDocumentBaseURI();
- //Definition importedDef = null;
-
- InputSource inputSource = null;
- URL url = null;
-
-
- URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
-
- url = StringUtils.getURL(contextURL, locationURI);
-
- // Handle file:// urls. The correct format should be file:/// or file:/.
- String urlAuthority = url.getAuthority();
- String urlProtocol = url.getProtocol();
- if(urlAuthority !=null && urlProtocol.equalsIgnoreCase("file") && !urlAuthority.equals(""))
- {
- url = new URL(urlProtocol,"","/" + urlAuthority + url.getFile());
- }
-
- String urlString = url.toString();
- // Test for case sensitivity on local files.
- if(urlString.startsWith("file:"))
- {
- File testfile = new File(url.getFile());
- String testfileString = testfile.getAbsolutePath();
- String canonicalfileString = testfile.getCanonicalPath();
-
- if (!testfileString.equals(canonicalfileString))
- {
- if (!String.valueOf(testfileString.charAt(0)).equalsIgnoreCase
- (String.valueOf(canonicalfileString.charAt(0)))
- || !testfileString.substring(1,testfileString.length()).equals
- (canonicalfileString.substring(1,canonicalfileString.length())))
- {
- urlString = "";
- url = null;
- }
- }
- }
- if(url != null)
- {
- try
- {
- reader = StringUtils.getContentAsReader(url);
- }
- catch(IOException e)
- {
- // No need to do anything here. The error will be handled below.
- }
- }
- if (reader != null)
- {
- inputSource = new InputSource(reader);
- if(classpathURI != null && !classpathURI.equals(location))
- {
- inputSource.setByteStream(new URL(classpathURI).openStream());
- }
- }
-
- if (inputSource == null)
- {
- // Get the actual location from the element.
- String actualLocation = DOMUtils.getAttribute(importingDocImportElement, Constants.ATTR_LOCATION);
- if(actualLocation == null)
- {
- actualLocation = DOMUtils.getAttribute(importingDocImportElement, "schemaLocation");
- }
- if(actualLocation == null)
- {
- actualLocation = namespace;
- }
- importingWSDLDoc.addReaderWarning(
- importingDef,
- importingDocImportElement,
- messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + actualLocation + "'"));
- importInvalid = true;
-
- // TODO: modify the reader error to show in all the correct locations.
- throw new WSDLException(
- WSDLException.OTHER_ERROR,
- "Unable to locate imported document "
- + "at '"
- + locationURI
- + "'"
- + (contextURI == null ? "." : ", relative to '" + contextURI + "'."));
- }
- Document doc = null;
- try
- {
- doc = WSDLReaderImpl.getDocument(inputSource, locationURI);
- }
- catch(WSDLException e)
- {
- // The File is invalid and cannot be read.
- // Perform XML validation.
- isXMLValid(locationURI);
-// importingWSDLDoc.addReaderError(
-// importingDef,
-// importingDocImportElement,
-// messagegenerator.getString("_UNABLE_TO_IMPORT_INVALID", "'" + location + "'"));
- throw e;
- }
- element = doc.getDocumentElement();
- if(!QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, element))
- {
- isWSDLFileImport = false;
- }
- // Ensure that the imported document has the same namespace as the import element states.
- String importTargetNS = element.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
- if(!importTargetNS.equals(namespace))
- {
- importingWSDLDoc.addReaderWarning(
- importingDef,
- importingDocImportElement,
- messagegenerator.getString("_WARN_WRONG_NS_ON_IMPORT", "'" + namespace + "'", "'" + importTargetNS + "'"));
- element = null;
- importInvalid = true;
- }
- }
-
- catch(Exception e)
- {
- }
- finally
- {
- if(reader != null)
- {
- try
- {
- reader.close();
- }
- catch(IOException e)
- {}
- }
- }
-
- }
- return element;
- }
-
- /**
- * Create an import element for a WSDL import of a WSDL document.
- *
- * @param wsdlDocument The document of the import.
- * @return The newly created import element.
- */
- public Import createWSDLImport(WSDLDocument wsdlDocument)
- {
- if(importDef != null)
- {
- return importDef;
- }
- importDef = getNewImport();
-
- if (importDef != null)
- {
- importDef.setDefinition(wsdlDocument.getDefinition());
- schemas.addAll(wsdlDocument.getSchemas());
- importingWSDLDoc.addSchemas(schemas);
- }
-
- return importDef;
- }
-
- /**
- * Create an import element for a WSDL import of a schema import of a schema document.
- *
- * @return The newly created import element.
- */
- public Import createXSDImport()
- {
- if(importDef != null)
- {
- return importDef;
- }
- importDef = getNewImport();
- XSDValidator xsdvalidator = new XSDValidator();
-
- xsdvalidator.validate(location, XMLCatalogResolver.getInstance());
- if (xsdvalidator.isValid())
- {
- XSModel schema = xsdvalidator.getXSModel();
- if (schema != null)
- {
- schemas.add(schema);
- }
- }
- else
- {
- // addReaderWarning(
-// def,
-// importDef,
-// messagegenerator.getString("_UNABLE_TO_IMPORT_INVALID", "'" + importDef.getLocationURI() + "'"));
- Iterator errors = xsdvalidator.getErrors().iterator();
- while (errors.hasNext())
- {
- ErrorMessage err = (ErrorMessage) errors.next();
- String uri = err.getURI();
- int line = err.getErrorLine();
- String errmess = err.getErrorMessage();
- valinfo.addError(errmess, line, err.getErrorColumn(), uri);
- }
- }
- importingWSDLDoc.addSchemas(schemas);
- return importDef;
- }
-
- /**
- * Get the import element if it has been created.
- *
- * @return The import element if it has been created or null.
- */
- public Import getImport()
- {
- return importDef;
- }
-
- /**
- * Get a new import element.
- *
- * @return A new import element.
- */
- private Import getNewImport()
- {
- if(importInvalid)
- {
- return null;
- }
- Import importDef = importingDef.createImport();
-
- if (namespace != null)
- {
- importDef.setNamespaceURI(namespace);
- }
-
- if (location != null)
- {
- importDef.setLocationURI(location);
- }
-
- if(element != null)
- {
- Element tempEl = DOMUtils.getFirstChildElement(element);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- importDef.setDocumentationElement(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
- }
-
- return importDef;
- }
-
- /**
- * Get the schemas corresponding to this import.
- *
- * @return The schemas corresponding to this import.
- */
- public List getSchemas()
- {
- return schemas;
- }
-
- /**
- * Returns true if this import imports a WSDL document, false otherwise.
- *
- * @return True if this import imports a WSDL document, false otherwise.
- */
- public boolean isWSDLFileImport()
- {
- return isWSDLFileImport;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj)
- {
- if(obj.getClass() == ImportHolder.class)
- {
- ImportHolder otherImport = (ImportHolder)obj;
-
- if(getNamespace().equals(otherImport.getNamespace()) && getLocation().equals(otherImport.getLocation()))
- {
- return true;
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(Object obj)
- {
- if(obj == null)
- {
- throw new NullPointerException();
- }
-
- ImportHolder otherImport = (ImportHolder)obj;
-
- return (getNamespace()+getLocation()).compareTo((otherImport.getNamespace()+otherImport.getLocation()));
- }
-
- /**
- * Set the messagegenerator for the import holder.
- *
- * @param mg The message generator to set.
- */
- public void setMessageGenerator(MessageGenerator mg)
- {
- messagegenerator = mg;
- }
-
- /**
- * Return true if the import is invalid, false otherwise.
- *
- * @return True if the import is invalid, false otherwise.
- */
- public boolean isImportInvalid()
- {
- return importInvalid;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java
deleted file mode 100644
index 1def333f9..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-/**
- * Holds the location information for an element in a document.
- */
-public class LocationHolder
-{
- private int line;
- private int column;
- private String uri;
-
- /**
- * Constructor.
- *
- * @param line The line number.
- * @param column The column number.
- * @param uri The URI of the document.
- */
- public LocationHolder(int line, int column, String uri)
- {
- this.line = line;
- this.column = column;
- this.uri = uri;
- }
-
- /**
- * Get the line number.
- *
- * @return The line number.
- */
- public int getLine()
- {
- return line;
- }
-
- /**
- * Get the column number.
- *
- * @return The column number.
- */
- public int getColumn()
- {
- return column;
- }
-
- /**
- * Get the file URI.
- *
- * @return The file URI.
- */
- public String getURI()
- {
- return uri;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java
deleted file mode 100644
index 36b4e44dc..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-/**
- * Holds an error created when reading a WSDL document.
- */
-public class ReaderError
-{
- protected Object parentObject; // the object of the parent of the object with the error
- protected Object object; // the object the error is associated with
- protected String error; // the error associated with the object
-
- /**
- * Constructor.
- *
- * @param parentObject the parent object of the object with the error
- * @param object the object with the error
- * @param error the error
- */
- public ReaderError(Object parentObject, Object object, String error)
- {
- this.parentObject = parentObject;
- this.object = object;
- this.error = error;
- }
-
- /**
- * Returns the parent object of the object with the error.
- *
- * @return the parent object of the object with the error
- */
- public Object getParentObject()
- {
- return parentObject;
- }
-
- /**
- * Returns the object with the error.
- *
- * @return the object with the error
- */
- public Object getObject()
- {
- return object;
- }
-
- /**
- * Returns the error message.
- *
- * @return the error message
- */
- public String getError()
- {
- return error;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
deleted file mode 100644
index 90564f483..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-
-/**
- * A registry to hold all the WSDL 1.1 validators.
- */
-public class ValidatorRegistry
-{
-
- protected static ValidatorRegistry verInstance;
-
- protected Map validatorReg = new Hashtable();
-
- /**
- * Constructor.
- */
- protected ValidatorRegistry()
- {
- }
-
- /**
- * Returns the instance of this registry.
- *
- * @return The instance of this registry.
- */
- public static ValidatorRegistry getInstance()
- {
- if (verInstance == null)
- {
- verInstance = new ValidatorRegistry();
- }
- return verInstance;
- }
-
- /**
- * Register this validator delegate with the given namespace.
- *
- * @param namespace The namespace the validator is associated with.
- * @param valDelegate The validator delegate to register.
- */
- public void registerValidator(String namespace, WSDL11ValidatorDelegate valDelegate)
- {
- // allow the null namespace but make it the empty string
- if (namespace == null)
- {
- namespace = "";
- }
-
- // add the validator to the hashtable
- validatorReg.put(namespace, valDelegate);
- }
-
- /**
- * Ask for the validator associated with this namespace. If none is found
- * return null.
- *
- * @param namespace The namespace of the validator.
- * @return The WSDL 1.1 validator for the given namespace.
- */
- public IWSDL11Validator queryValidatorRegistry(String namespace)
- {
- // if the namespace is null allow it and treat it as the empty string
- if (namespace == null)
- {
- namespace = "";
- }
- WSDL11ValidatorDelegate delegate = (WSDL11ValidatorDelegate)validatorReg.get(namespace);
- if(delegate != null)
- {
- return delegate.getValidator();
- }
- return null;
- }
-
- /**
- * Convenience method that tells whether a validator for a given namespace is registered.
- *
- * @param namespace The namespace to check.
- * @return True if there is a validator registered, false otherwise.
- */
- public boolean hasRegisteredValidator(String namespace)
- {
- if (queryValidatorRegistry(namespace) != null)
- {
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
deleted file mode 100644
index 4d7b0c238..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.SchemaAttributeTable;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
-
-import com.ibm.wsdl.Constants;
-/**
- * Validate the elements defined in a WSDL 1.1 Document.
- */
-public class WSDL11BasicValidator implements IWSDL11Validator
-{
- protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
- protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
- protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
- protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
- "http://apache.org/xml/features/validation/schema-full-checking";
- protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
- protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-
- // Error and Warning Keys
- private final String _PORT_NAME_NOT_UNIQUE = "_PORT_NAME_NOT_UNIQUE";
- private final String _NO_BINDING_FOR_PORT = "_NO_BINDING_FOR_PORT";
- private final String _NO_ADDRESS_PORT = "_NO_ADDRESS_PORT";
- private final String _MORE_THEN_ONE_ADDRESS_PORT = "_MORE_THEN_ONE_ADDRESS_PORT"; //TODO should be _MORE_THAN_ONE_ADDRESS_PORT, not THEN
- private final String _PORTTYPE_UNDEFINED_FOR_BINDING = "_PORTTYPE_UNDEFINED_FOR_BINDING";
- private final String _OPERATION_UNDEFINED_FOR_PORTTYPE = "_OPERATION_UNDEFINED_FOR_PORTTYPE";
- private final String _OPERATION_NO_INPUT_OR_OUTPUT = "_OPERATION_NO_INPUT_OR_OUTPUT";
- private final String _INPUT_NAME_NOT_UNIQUE = "_INPUT_NAME_NOT_UNIQUE";
- private final String _MESSAGE_UNDEFINED_FOR_INPUT = "_MESSAGE_UNDEFINED_FOR_INPUT";
- private final String _OUTPUT_NAME_NOT_UNIQUE = "_OUTPUT_NAME_NOT_UNIQUE";
- private final String _MESSAGE_UNDEFINED_FOR_OUTPUT = "_MESSAGE_UNDEFINED_FOR_OUTPUT";
- private final String _MESSAGE_UNDEFINED_FOR_FAULT = "_MESSAGE_UNDEFINED_FOR_FAULT";
- private final String _PART_NO_ELEMENT_OR_TYPE = "_PART_NO_ELEMENT_OR_TYPE";
- private final String _PART_BOTH_ELEMENT_AND_TYPE = "_PART_BOTH_ELEMENT_AND_TYPE";
- private final String _PART_INVALID_ELEMENT = "_PART_INVALID_ELEMENT";
- private final String _PART_INVALID_TYPE = "_PART_INVALID_TYPE";
- private final String _WARN_SOAPENC_IMPORTED_PART = "_WARN_SOAPENC_IMPORTED_PART";
-
- private final int ELEMENT = 0;
- private final int TYPE = 1;
-
- private final String REQUEST = "Request";
- private final String RESPONSE = "Response";
- private final String QUOTE = "'";
- private final String EMPTY_STRING = "";
-
-
- //protected WSDL11ValidatorController validatorcontroller;
- protected MessageGenerator messagegenerator;
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- //this.validatorcontroller = validatorcontroller;
- //setDefaultResourceBundleIfNeeded(validatorcontroller);
- Definition wsdlDefinition = (Definition)element;
- //validateTypes(wsdlDefinition, valInfo);
- validateServices(wsdlDefinition, valInfo);
- validateBindings(wsdlDefinition, valInfo);
- validatePortTypes(wsdlDefinition, valInfo);
- validateMessages(wsdlDefinition, valInfo);
-
- }
-
- /**
- * Takes a list of ExtensibilityElements and checks if there's a validator
- * associated with each element and if so calls the validator.
- *
- * @param parents The list of parents of the elements.
- * @param extensibilityElements The list of elements to validate.
- * @param validatorcontroller The validator controller.
- * @param wsdlDefinition The defnintions element for this document.
- */
- protected void validateExtensibilityElementList(
- List parents,
- List extensibilityElements,
- IWSDL11ValidationInfo valInfo)
- {
- ValidatorRegistry ver = ValidatorRegistry.getInstance();
- Iterator extElems = extensibilityElements.iterator();
- while (extElems.hasNext())
- {
- ExtensibilityElement element = (ExtensibilityElement)extElems.next();
- String namespace = element.getElementType().getNamespaceURI();
- IWSDL11Validator val = ver.queryValidatorRegistry(namespace);
- if (val != null)
- {
- val.validate(element, parents, valInfo);
- }
-// else
-// {
-// valInfo.addNamespaceWithNoValidator(namespace);
-// }
- }
- }
-
- /**
- * If the resourcebundle hasn't been set, set it to the one registered with the ValidatorController.
- *
- * @param validatorcontroller The validator controller to get the resource bundle from.
- */
- // protected void setDefaultResourceBundleIfNeeded(WSDL11ValidatorController validatorcontroller)
- // {
- // if (messagegenerator == null)
- // {
- // setResourceBundle(validatorcontroller.getResourceBundle());
- // }
- // }
-
- /**
- * Set the resourcebundle to the one specified.
- *
- * @param rb The resource bundle to set.
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- messagegenerator = new MessageGenerator(rb);
- }
-
- /**
- * Ensure that the Types element is correct.
- *
- * @param wsdlDefinition The definitions element from the current document.
- */
-
- protected void validateTypes(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
- {
- Types types = wsdlDefinition.getTypes();
- // ensure that types is defined
- if (types != null)
- {
- List parents = new Vector();
- parents.add(wsdlDefinition);
- Object extensibleElements[] = types.getExtensibilityElements().toArray();
- parents.add(0, types);
- validateExtensibilityElementList(parents, types.getExtensibilityElements(), valInfo);
- parents.remove(0);
- }
- }
-
- /**
- * Validates all of the declared services for the definition.
- *
- * @param wsdlDefinition The WSDL definitions element.
- */
- protected void validateServices(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
- {
- if (wsdlDefinition.getServices() == null)
- return;
- Object services[] = wsdlDefinition.getServices().values().toArray();
- List parents = new Vector();
- parents.add(wsdlDefinition);
- Hashtable allPorts = new Hashtable();
-
- //TODO: check that ports in other imported files don't conflict with ports in this one
- // // register all of the imported ports
- // Iterator imports = wsdlDefinition.getImports().values().iterator();
- // while(imports.hasNext())
- // {
- // Iterator impservices = ((Import)imports.next()).getDefinition().getServices().values().iterator();
- // while(impservices.hasNext())
- // {
- // Iterator impports = ((Service)impservices.next()).getPorts().values().iterator();
- // while(impports.hasNext())
- // {
- // Port tempP = (Port)impports.next();
- // allPorts.put(tempP.getName(),tempP);
- // }
- // }
- // }
- for (int i = 0; i < services.length; i++)
- {
- Service s = (Service)services[i];
- parents.add(0, s);
- Object ports[] = s.getPorts().values().toArray();
- HashSet portInputs = new HashSet();
- HashSet portOutputs = new HashSet();
- for (int j = 0; j < ports.length; j++)
- {
- Port p = (Port)ports[j];
- parents.add(0, p);
- // a Port name must be unique within the entire WDSL document
- if (allPorts.contains(p.getName()))
- { String[] args = {p.getName()};
-
- valInfo.addError(messagegenerator.getString(_PORT_NAME_NOT_UNIQUE, QUOTE + args[0] + QUOTE),
- p, _PORT_NAME_NOT_UNIQUE, args);
- }
- else
- {
- allPorts.put(p.getName(), p);
-
- // get the binding for this port and see if the PortType for the binding
- // is defined
- if (p.getBinding() == null || p.getBinding().isUndefined())
- {
- String bindingName = EMPTY_STRING;
- if (p.getBinding() != null)
- {
- bindingName = p.getBinding().getQName().getLocalPart();
- }
- String args[] = {p.getName()};
- valInfo.addError(
- messagegenerator.getString(_NO_BINDING_FOR_PORT, QUOTE + args[0] + QUOTE, QUOTE + bindingName + QUOTE),
- p, _NO_BINDING_FOR_PORT, args);
- }
- else
- {
- // TODO: Check that the output of one port isn't the input of another and vice versa
- // extensibility elements the port
- // there can only be one and must be one extensibility element defined for a port
- List extelems = p.getExtensibilityElements();
- if (extelems.size() < 1)
- { String args[]= {p.getName()};
- valInfo.addError(messagegenerator.getString(_NO_ADDRESS_PORT, QUOTE + args[0] + QUOTE),
- p, _NO_ADDRESS_PORT, args);
- }
- else if (extelems.size() > 1)
- {
- for (int k = 1; k < extelems.size(); k++)
- {
- String[] args = {p.getName()};
- valInfo.addError(
- messagegenerator.getString(_MORE_THEN_ONE_ADDRESS_PORT, QUOTE + args[0] + QUOTE),
- extelems.get(k), _MORE_THEN_ONE_ADDRESS_PORT, args);
- }
- }
- validateExtensibilityElementList(parents, p.getExtensibilityElements(), valInfo);
- }
- }
-
- parents.remove(0);
- }
- // extensibility elements for the service
- validateExtensibilityElementList(parents, s.getExtensibilityElements(), valInfo);
- parents.remove(0);
- }
- }
-
- /**
- * Checks that the bindings refer to valid PortTypes and all of the operations
- // in a given binding refer to a defined operation within the corresponding
- // PortType.
- *
- * @param wsdlDefinition The WSDL definitions element.
- */
- protected void validateBindings(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
- {
- if (wsdlDefinition.getBindings() == null)
- return;
- Object bindings[] = wsdlDefinition.getBindings().values().toArray();
- List parents = new Vector();
- parents.add(wsdlDefinition);
- for (int i = 0; i < bindings.length; i++)
- {
- Binding b = (Binding)bindings[i];
- parents.add(0, b);
- PortType portType = b.getPortType();
-
- if (portType == null)
- {
- continue;
- }
- // the PortType is not defined so don't bother checking the operations
- if (portType.isUndefined())
- { String[] args = {portType.getQName().getLocalPart(), b.getQName().getLocalPart()};
- valInfo.addError(
- messagegenerator.getString(
- _PORTTYPE_UNDEFINED_FOR_BINDING,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- b, _PORTTYPE_UNDEFINED_FOR_BINDING, args);
- }
- else
- {
- // the PortType is defined so now we have to check that the operations are defined
- Object bindingOperations[] = b.getBindingOperations().toArray();
-
- // check if the operation is defined for each BindingOperation
- for (int k = 0; k < bindingOperations.length; k++)
- {
- BindingOperation bo = (BindingOperation)bindingOperations[k];
- parents.add(0, bo);
- if (bo.getOperation() == null || bo.getOperation().isUndefined())
- {
- String[] args = {b.getQName().getLocalPart(), portType.getQName().getLocalPart()};
- valInfo.addError(
- messagegenerator.getString(
- _OPERATION_UNDEFINED_FOR_PORTTYPE,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- bo, _OPERATION_UNDEFINED_FOR_PORTTYPE, args);
- // nice idea to add suggestions to other elements to fix the error
- // but it doesn't work with multipe files like this
- //addValidationMessage(warningList,portType,portType.getQName().getLocalPart() + "Define an operation here to correspond with the operation in: " + bo.getName());
- }
- // take care of all the extensibility elements in the binding operation, binding inputs, outputs and faults
- else
- {
- BindingInput binput = bo.getBindingInput();
- if (binput != null)
- {
- parents.add(0, binput);
- // extensibility elements for binding operation input
- validateExtensibilityElementList(
- parents,
- bo.getBindingInput().getExtensibilityElements(),
- valInfo);
- parents.remove(0);
- }
- BindingOutput boutput = bo.getBindingOutput();
- if (boutput != null)
- {
- parents.add(0, boutput);
- // extensibility elements for binding operation output
- validateExtensibilityElementList(
- parents,
- bo.getBindingOutput().getExtensibilityElements(),
- valInfo);
- parents.remove(0);
- }
- // no input or output has been defined for the operation
- if (binput == null && boutput == null)
- { String[] args = { bo.getName() };
- valInfo.addError(
- messagegenerator.getString(_OPERATION_NO_INPUT_OR_OUTPUT, QUOTE + args[0] + QUOTE),
- bo, _OPERATION_NO_INPUT_OR_OUTPUT, args);
- }
- // extensibility elements for each binding operation fault
- Iterator faults = bo.getBindingFaults().values().iterator();
- while (faults.hasNext())
- {
- BindingFault bf = (BindingFault)faults.next();
- parents.add(0, bf);
- validateExtensibilityElementList(parents, bf.getExtensibilityElements(), valInfo);
- parents.remove(0);
- }
- }
- // extensibility elements for binding operation
- validateExtensibilityElementList(parents, bo.getExtensibilityElements(), valInfo);
- parents.remove(0);
- }
- }
- // extensibility elements for the binding
- validateExtensibilityElementList(parents, b.getExtensibilityElements(), valInfo);
- parents.remove(0);
- }
-
- }
-
- /**
- * Check that all of the PortTypes have valid messages associated with their
- // operation input, output and fault types.
- *
- * @param wsdlDefinition The WSDL definitions element.
- */
- protected void validatePortTypes(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
- {
- if (wsdlDefinition.getPortTypes() == null)
- return;
- Object porttypes[] = wsdlDefinition.getPortTypes().values().toArray();
-
- for (int i = 0; i < porttypes.length; i++)
- {
- PortType p = (PortType)porttypes[i];
- Object operations[] = p.getOperations().toArray();
- List inAndOutNames = new Vector();
- for (int j = 0; j < operations.length; j++)
- {
- Operation o = (Operation)operations[j];
- if (o == null || o.isUndefined())
- {
- continue;
- }
-
- // check that the messages are defined for the input, output and faults
- Message m;
- Input input = o.getInput();
- if (input != null)
- {
- String inputName = input.getName();
- // if the name isn't defined it defaults to this
- if (inputName == null)
- {
- inputName = o.getName() + REQUEST;
- }
- if (inAndOutNames.contains(inputName))
- { String[] args = {inputName, p.getQName().getLocalPart() };
- valInfo.addError(
- messagegenerator.getString(
- _INPUT_NAME_NOT_UNIQUE,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- input, _INPUT_NAME_NOT_UNIQUE, args);
- }
- else
- {
- inAndOutNames.add(inputName);
- }
-
- m = input.getMessage();
- if (m != null && m.isUndefined())
- {
- String messName = EMPTY_STRING;
- QName messQName = m.getQName();
- if (messQName != null)
- {
- messName = messQName.getLocalPart();
- }
- String[] args = {messName};
- valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_INPUT, QUOTE + args[0] + QUOTE),
- input, _MESSAGE_UNDEFINED_FOR_INPUT, args);
- }
- }
- Output output = o.getOutput();
- if (output != null)
- {
- String outputName = output.getName();
- // if the name isn't defined it defaults to this
- if (outputName == null)
- {
- outputName = o.getName() + RESPONSE;
- }
-
- if (inAndOutNames.contains(outputName))
- {
- String[] args = {outputName, p.getQName().getLocalPart()};
-
- valInfo.addError(
- messagegenerator.getString(
- _OUTPUT_NAME_NOT_UNIQUE,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- output, _OUTPUT_NAME_NOT_UNIQUE, args);
- }
- else
- {
- inAndOutNames.add(outputName);
- }
-
- m = output.getMessage();
- if (m != null && m.isUndefined())
- {
- String messName = EMPTY_STRING;
- QName messQName = m.getQName();
- if (messQName != null)
- {
- messName = messQName.getLocalPart();
- }
- String[] args = {messName};
- valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_OUTPUT, QUOTE + args[0] + QUOTE),
- output, _MESSAGE_UNDEFINED_FOR_OUTPUT, args);
- }
- }
-
- Object faults[] = o.getFaults().values().toArray();
-
- //List faultNames = new Vector();
- for (int k = 0; k < faults.length; k++)
- {
- Fault f = (Fault)faults[k];
- m = f.getMessage();
- if (m != null && m.isUndefined())
- {
- String messName = EMPTY_STRING;
- QName messQName = m.getQName();
- if (messQName != null)
- {
- messName = messQName.getLocalPart();
- }
- String args[] = {messName};
- valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_FAULT, QUOTE + args[0] + QUOTE),
- f, _MESSAGE_UNDEFINED_FOR_FAULT, args);
- }
- }
- }
- }
- }
-
- /**
- * Check that all the messages defined in the WSDL document are valid.
- *
- * @param wsdlDefinition The WSDL definitions element.
- */
- protected void validateMessages(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
- {
- if (wsdlDefinition.getMessages() == null)
- return;
- Iterator messages = wsdlDefinition.getMessages().values().iterator();
-
- while (messages.hasNext())
- {
- Message m = (Message)messages.next();
- if (!m.isUndefined())
- {
- // if the message has a part (and it doesn't have to)
- // ensure each message part has either an element or a type
- if (!m.getParts().isEmpty())
- {
- Iterator parts = m.getParts().values().iterator();
- while (parts.hasNext())
- {
- Part p = (Part)parts.next();
- QName elementName = p.getElementName();
- QName typeName = p.getTypeName();
- Map extAtts = p.getExtensionAttributes();
- // TODO:This will have to be extended as parts can have extensibility elements
- //ensure the part has a type or an element defined
- if (elementName == null && typeName == null && (extAtts == null || extAtts.isEmpty()))
- { String[] args = { p.getName()};
- valInfo.addError(messagegenerator.getString(_PART_NO_ELEMENT_OR_TYPE, QUOTE + args[0] + QUOTE),
- p, _PART_NO_ELEMENT_OR_TYPE, args);
- }
- //here the part has both the element and type defined and it can only have one defined
- else if (elementName != null && typeName != null)
- { String[] args = {p.getName()};
- valInfo.addError(messagegenerator.getString(_PART_BOTH_ELEMENT_AND_TYPE, QUOTE + args[0] + QUOTE),
- p, _PART_BOTH_ELEMENT_AND_TYPE, args);
- }
- else if (elementName != null)
- {
- if (!checkPartConstituent(elementName.getNamespaceURI(),
- elementName.getLocalPart(),
- ELEMENT,
- p,
- valInfo))
- { String[] args = {p.getName(), elementName.getLocalPart()};
- valInfo.addError(
- messagegenerator.getString(
- _PART_INVALID_ELEMENT,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- p, _PART_INVALID_ELEMENT, args);
- }
- }
- else if (typeName != null)
- {
- // check that the type itself is defined properly
- if (!checkPartConstituent(typeName.getNamespaceURI(), typeName.getLocalPart(), TYPE, p, valInfo))
- { String[] args = {p.getName(), typeName.getLocalPart() };
- valInfo.addError(
- messagegenerator.getString(
- _PART_INVALID_TYPE,
- QUOTE + args[0] + QUOTE,
- QUOTE + args[1] + QUOTE),
- p, _PART_INVALID_TYPE, args);
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * Checks whether the given name is defined in the namespace for the part. A part is an
- * ELEMENT or a TYPE.
- *
- * @param namespace The namespace to check.
- * @param name The name to check.
- * @param part The part to check, either ELEMENT or TYPE.
- * @param partObject The object representing the given part.
- * @return True if the part element of type is defined, false otherwise.
- */
- protected boolean checkPartConstituent(
- String namespace,
- String name,
- int part,
- Part partObject,
- IWSDL11ValidationInfo valInfo)
- {
-
- boolean partvalid = false;
- // First take care of the situation where it's from the schema namespace.
- // The 1999, 2000 and 2001 schema namespaces are all accepted.
- if (namespace.equals(Constants.NS_URI_XSD_2001)
- || namespace.equals(Constants.NS_URI_XSD_1999)
- || namespace.equals(Constants.NS_URI_XSD_2000))
- {
- SchemaAttributeTable xsdTable = new SchemaAttributeTable();
- if (xsdTable.containsSymbol(name))
- {
- partvalid = true;
- }
- }
- // check inline and imported schema
- else
- {
- XSModel[] schemas = valInfo.getSchemas();
- int numSchemas = schemas.length;
- //Iterator schemasIter = schemas.iterator();
- for (int i = 0; i < numSchemas; i++)
- {
- XSModel schema = schemas[i];
- if (schema != null)
- {
- if (part == ELEMENT && schema.getElementDeclaration(name, namespace) != null)
- {
- partvalid = true;
- break;
- }
- else if (part == TYPE && schema.getTypeDefinition(name, namespace) != null)
- {
- partvalid = true;
- break;
- }
- }
- }
- }
- // If the SOAP encoding namespace hasn't been explicitly imported do so
- // now.
- // Allow the SOAP encoding namespace to be automatically imported but mark
- // it as a warning.
- if (!partvalid && namespace.equals(SOAP_ENCODING_URI))
- {
- try
- {
- XSDValidator xsdVal = new XSDValidator();
- String soapEnc = valInfo.getURIResolver().resolve(null, SOAP_ENCODING_URI, null).getPhysicalLocation();
- if(soapEnc != null)
- {
- xsdVal.validate(soapEnc, null);
- // sanity check in case something goes wrong
- if (xsdVal.isValid())
- {
- XSModel xsModel = xsdVal.getXSModel();
-
- if (part == ELEMENT && xsModel.getElementDeclaration(name, namespace) != null)
- {
- partvalid = true;
- }
- else if (part == TYPE && xsModel.getTypeDefinition(name, namespace) != null)
- {
- partvalid = true;
- }
- valInfo.addWarning(messagegenerator.getString(_WARN_SOAPENC_IMPORTED_PART, QUOTE + name + QUOTE), partObject);
- }
- }
- }
- catch (Exception e)
- {
- //TODO: log the error message
- //System.out.println(e);
- }
- }
- return partvalid;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
deleted file mode 100644
index 4b30f0953..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An implemenation of WSDL11ValidationInfo.
- */
-public class WSDL11ValidationInfoImpl implements IWSDL11ValidationInfo
-{
- private IValidationInfo valinfo = null;
- private Hashtable elementlocations = null;
- private List schemas = new Vector();
-
- public WSDL11ValidationInfoImpl(IValidationInfo valinfo)
- {
- this.valinfo = valinfo;
- }
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getFileURI()
- */
- public String getFileURI()
- {
- return valinfo.getFileURI();
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addSchema(org.apache.xerces.xs.XSModel)
- */
- public void addSchema(XSModel xsModel)
- {
- if (xsModel != null)
- {
- schemas.add(xsModel);
- }
-
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getSchemas()
- */
- public XSModel[] getSchemas()
- {
- return (XSModel[])schemas.toArray(new XSModel[schemas.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#cleardSchemas()
- */
- public void clearSchemas()
- {
- schemas.clear();
- }
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#setElementLocations(java.util.Hashtable)
- */
- public void setElementLocations(Hashtable elementLocations)
- {
- this.elementlocations = elementLocations;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object)
- */
- public void addError(String message, Object element)
- {
- addError(message, element, null, null);
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object, java.lang.String, java.lang.Object[])
- */
- public void addError(String message, Object element, String errorKey, Object[] messageArguments)
- {
- LocationHolder location;
- if (elementlocations.containsKey(element))
- {
- location = (LocationHolder)elementlocations.get(element);
- addError(message, location.getLine(), location.getColumn(), location.getURI(), errorKey, messageArguments);
- }
- // if we give it an element that hasn't been defined we'll set the location
- // at (0,0) so the error shows up but no line marker in the editor
- else
- {
- addError(message, 0, 1, getFileURI());
- }
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, java.lang.Object)
- */
- public void addWarning(String message, Object element)
- {
- LocationHolder location;
- if (elementlocations.containsKey(element))
- {
- location = (LocationHolder)elementlocations.get(element);
- addWarning(message, location.getLine(), location.getColumn(), location.getURI());
- }
- // if we give it an element that hasn't been defined we'll set the location
- // at (0,0) so the error shows up but no line marker in the editor
- else
- {
- addWarning(message, 0, 1, getFileURI());
- }
-
- }
-
- /**
- * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#addNamespaceWithNoValidator(java.lang.String)
- */
-// public void addNamespaceWithNoValidator(String namespace)
-// {
-// valinfo.addNamespaceWithNoValidator(namespace);
-//
-// }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, int, int)
- */
- public void addError(String message, int line, int column, String uri)
- {
- addError(message, line, column, uri, null, null);
- }
-
- public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
- {
- try
- { ((ValidationInfoImpl)valinfo).addError(message, line, column, uri, errorKey, messageArguments);
- }
- catch (ClassCastException e)
- { System.err.println(e);
- valinfo.addError(message, line, column, uri);
- }
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, int, int)
- */
- public void addWarning(String message, int line, int column, String uri)
- {
- valinfo.addWarning(message, line, column, uri);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#getURIResolver()
- */
- public URIResolver getURIResolver()
- {
- return valinfo.getURIResolver();
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java
deleted file mode 100644
index aa46e81bb..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IWSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.w3c.dom.Document;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * The validator controller is the head of validation.
- */
-public class WSDL11ValidatorController implements IWSDLValidator
-{
- protected final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
-// protected final int ERROR_MESSAGE = 0;
-// protected final int WARNING_MESSAGE = 1;
-// protected String fileURI;
-// protected List schemas = new Vector();
-// protected Definition wsdlDefinition;
- protected MessageGenerator messagegenerator = null;
- //protected ValidationController validationController;
- protected ValidatorRegistry ver = ValidatorRegistry.getInstance();
-
- /**
- * Constructor.
- */
- public WSDL11ValidatorController()
- {
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
- */
- public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
- {
- // reset the variables
-// reset();
-// fileURI = valInfo.getFileURI();
- //this.validationController = validationcontroller;
-
- IWSDL11ValidationInfo wsdlvalinfo = new WSDL11ValidationInfoImpl(valInfo);
- WSDLDocument[] wsdlDocs = readWSDLDocument(domModel, valInfo.getFileURI(), getMessageGenerator(), wsdlvalinfo);
- // Don't validate an null definitions element. Either the file is emtpy and valid or
- // had an error when reading.
- if(wsdlDocs != null)
- {
- int numWSDLDocs = wsdlDocs.length;
- for(int i = 0; i < numWSDLDocs; i++)
- {
- WSDLDocument tempDoc = wsdlDocs[i];
- Definition wsdlDefinition = tempDoc.getDefinition();
- // Register the schemas.
- List xsdList = tempDoc.getSchemas();
- Iterator xsdIter = xsdList.iterator();
- while (xsdIter.hasNext())
- {
- wsdlvalinfo.addSchema((XSModel)xsdIter.next());
- }
- // Set the element locations table.
- wsdlvalinfo.setElementLocations(tempDoc.getElementLocations());
- // Set any reader errors. This needs to be done after the element locations table is set.
- List readerErrors = tempDoc.getReaderErrors();
- if (readerErrors != null)
- {
- Iterator readerErrorsI = readerErrors.iterator();
- while (readerErrorsI.hasNext())
- {
- ReaderError re = (ReaderError)readerErrorsI.next();
- wsdlvalinfo.addError(re.getError(), re.getObject());
- }
- }
- List readerWarnings = tempDoc.getReaderWarnings();
- if (readerWarnings != null)
- {
- Iterator readerWarningsI = readerWarnings.iterator();
- while (readerWarningsI.hasNext())
- {
- ReaderError re = (ReaderError)readerWarningsI.next();
- wsdlvalinfo.addWarning(re.getError(), re.getObject());
- }
- }
- validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), wsdlvalinfo);
- wsdlvalinfo.clearSchemas();
- }
- }
-
- }
-
- /**
- * Validate an imported WSDL document. Allows the calling class to have access to the internal
- * components of the validation.
- *
- * @param wsdlvalinfo The WSDL 1.1 validation info object to use.
- * @return The definitions element for the import.
- * @throws ValidateWSDLException
- */
-// protected Definition validateImport(WSDL11ValidationInfo wsdlvalinfo)
-// {
-// WSDLDocument[] wsdlDocs = null;
-// try
-// {
-// wsdlDocs = readWSDLDocument(null, wsdlvalinfo.getFileURI(), getMessageGenerator(), wsdlvalinfo);
-// }
-// catch(ValidateWSDLException e)
-// {
-// // supress any validation issues with imported documents
-// }
-// // Don't validate an null definitions element. Either the file is emtpy and valid or
-// // had an error when reading.
-// if(wsdlDocs != null)
-// {
-// validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), wsdlvalinfo);
-// }
-// return wsdlDefinition;
-// }
-
- /**
- * Read in the WSDL document and set the model and imported schemas.
- *
- * @param domModel A DOM model of the document to be read.
- * @param file The file to read.
- * @param messagegenerator The messagegenerator the reader should use for any messages produced.
- * @param wsdlvalinfo The validation information for the current validation.
- * @return The definitions element for the WSDL document.
- * @throws ValidateWSDLException
- */
- protected WSDLDocument[] readWSDLDocument(Document domModel, String file, MessageGenerator messagegenerator, IWSDL11ValidationInfo wsdlvalinfo) throws ValidateWSDLException
- {
- WSDLDocument[] wsdlDocs = null;
- try
- {
-
- WSDLReaderImpl wsdlReader = new WSDLReaderImpl(wsdlvalinfo);
- wsdlReader.setMessageGenerator(messagegenerator);
- if(domModel != null)
- {
- wsdlDocs = wsdlReader.readWSDL(file, domModel);
- }
- else
- {
- wsdlDocs = wsdlReader.readWSDL(file);
- }
- //wsdlvalinfo.setElementLocations(wsdlReader.getElementLocationsHashtable());
-// List readerErrors = wsdlReader.getReaderErrors();
-// if (readerErrors != null)
-// {
-// Iterator readerErrorsI = readerErrors.iterator();
-// while (readerErrorsI.hasNext())
-// {
-// ReaderError re = (ReaderError)readerErrorsI.next();
-// wsdlvalinfo.addError(re.getError(), re.getObject());
-// }
-// }
-// if (wsdlReader.hasImportSchemas())
-// {
-// List xsdList = wsdlReader.getImportSchemas();
-// Iterator xsdIter = xsdList.iterator();
-// while (xsdIter.hasNext())
-// {
-// wsdlvalinfo.addSchema((XSModel)xsdIter.next());
-// }
-//
-// }
-
- }
- catch (WSDLException e)
- {
- throw new ValidateWSDLException(e.getMessage() + " " + e.getFaultCode());
- }
-
- catch (Exception e)
- {
- throw new ValidateWSDLException("unable to read file" + e.getMessage() + " " + e.toString());
- }
- return wsdlDocs;
- }
-
- /**
- * Given a WSDL element, call ValidateElement for it.
- *
- * @param namespace The namespace of the element to validate.
- * @param element The element to validate.
- * @param parents The list of parents for this element.
- */
- public void validateWSDLElement(String namespace, Object element, List parents, IWSDL11ValidationInfo wsdlvalinfo)
- {
- IWSDL11Validator val = ver.queryValidatorRegistry(namespace);
- if (val != null)
- {
- val.validate(element, parents, wsdlvalinfo);
- }
- else
- {
- //TODO: Add this as a preference.
- //wsdlvalinfo.addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), element);
- }
- }
-
- /**
- * Add a schema to the list of schemas.
- *
- * @param xsModel The schema to add.
- */
-// public void addSchema(XSModel xsModel)
-// {
-// if (xsModel != null)
-// {
-// schemas.add(xsModel);
-// }
-// }
-
- /**
- * Return the list containing the schemas.
- *
- * @return The list of schemas.
- */
-// public List getSchemas()
-// {
-// return schemas;
-// }
-
- /**
- * Get the ResourceBundle for this ValidatorManager.
- *
- * @return The resource bundle registered for this controller.
- * @see #setResourceBundle
- */
-// public ResourceBundle getResourceBundle()
-// {
-// return resourcebundle;
-// }
-
- /**
- * Set the ResourceBundle for this ValidatorManager.
- *
- * @param rb The resource bundle to set.
- * @see #getResourceBundle
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- if (messagegenerator == null)
- {
- messagegenerator = new MessageGenerator(rb);
- }
-
- }
-
- /**
- * Set the message generator for this controller.
- *
- * @param mesgen The message generator to set for this controller.
- */
- public void setMessageGenerator(MessageGenerator mesgen)
- {
- messagegenerator = mesgen;
- }
-
- /**
- * Get the message generator registered for this controller.
- *
- * @return The message generator registered for this controller.
- */
- public MessageGenerator getMessageGenerator()
- {
- return messagegenerator;
- }
-
- /**
- * Return the filename for the file currently being validated. Some validators require this.
- *
- * @return The filename for the file being validated.
- */
-// public String getFilename()
-// {
-// return fileURI;
-// }
-
- /**
- * Convenience method for extensibly validators to add error messages.
- *
- * @param object The object to add the error for.
- * @param error The error to add.
- */
-// public void addErrorMessage(Object object, String error)
-// {
-// addValidationMessage(ERROR_MESSAGE, object, error);
-// errors = true;
-// }
-
- /**
- * Method for extensibly validators to add error messages when they know
- * line and column numbers.
- *
- * @param line The line where the error message is located.
- * @param column The column where the error message is located.
- * @param error The error message.
- */
-// public void addErrorMessage(int line, int column, String error)
-// {
-// addValidationMessage(ERROR_MESSAGE, line, column, error);
-// errors = true;
-// }
-
- /**
- * Convenience method for extensibly validators to add warning messages.
- *
- * @param object The object to add the warning message.
- * @param warning The warning message.
- */
-// public void addWarningMessage(Object object, String warning)
-// {
-// addValidationMessage(WARNING_MESSAGE, object, warning);
-// }
-
- /**
- * Method for extensibly validators to add warning messages when they know
- * line and column numbers.
- *
- * @param line The line where the error message is located.
- * @param column The column where the error message is located.
- * @param warning The warning message.
- */
-// public void addWarningMessage(int line, int column, String warning)
-// {
-// addValidationMessage(WARNING_MESSAGE, line, column, warning);
-// }
-
- /**
- * If you have an object read in by the reader for this
- * validatorcontroller the object can be passed in here and the line and column
- * information will be abstracted from it.
- *
- * @param type The type of message to add.
- * @param o The object that has the error (used to get the location).
- * @param message The message to add.
- */
-// protected void addValidationMessage(int type, Object o, String message)
-// {
-// int[] location;
-// if (elementLocations.containsKey(o))
-// {
-// location = (int[])elementLocations.get(o);
-// }
-// // if we give it an element that hasn't been defined we'll set the location
-// // at (0,0) so the error shows up but no line marker in the editor
-// else
-// {
-// location = new int[] { 0, 0 };
-// }
-// addValidationMessage(type, location[0], location[1], message);
-// }
-
- /**
- * Creates a validation message of the specified type.
- *
- * @param type The type of validation message to add.
- * @param line The line where the error message is located.
- * @param column The line where the column message is located.
- * @param message The message to add.
- */
-// protected void addValidationMessage(int type, int line, int column, String message)
-// {
-// if (message != null)
-// {
-// if (type == ERROR_MESSAGE)
-// {
-// validationController.addErrorMessage(line, column, message);
-// }
-// else if (type == WARNING_MESSAGE)
-// {
-// validationController.addWarningMessage(line, column, message);
-// }
-// }
-// }
-
- /**
- * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#isValid()
- */
-// public boolean isValid()
-// {
-// return !errors;
-// }
-
- /**
- * Reset the validator controller.
- */
-// protected void reset()
-// {
-// schemas = new Vector();
-// fileURI = "";
-// wsdlDefinition = null;
-// elementLocations = null;
-// resourcebundle = null;
-// //validationController = null;
-// errors = false;
-// }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java
deleted file mode 100644
index e627a7812..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * The WSDL 1.1 validator delegate holds a reference to a validator to be instantiated at
- * a later point.
- */
-public class WSDL11ValidatorDelegate
-{
- private String validatorClassname = null;
- private String resourceBundle = null;
- private ClassLoader classLoader = null;
- private IWSDL11Validator validator = null;
-
- /**
- * Create a delegate for a validator by its class name and resource bundle name.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- */
- public WSDL11ValidatorDelegate(String validatorClassname, String resourceBundle)
- {
- this.validatorClassname = validatorClassname;
- this.resourceBundle = resourceBundle;
- }
-
- /**
- * Create a delegate for a validator by its class name, resource bundle name and
- * a class loader to load the validator and bundle.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- * @param classLoader The class loader to use to load the validator and bundle.
- */
- public WSDL11ValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
- {
- this(validatorClassname, resourceBundle);
- this.classLoader = classLoader;
- }
-
- /**
- * Get the validator specified in this delegate.
- *
- * @return The WSDL 1.1 validator specified by this delegate.
- */
- public IWSDL11Validator getValidator()
- {
- if (validator == null)
- {
- if(classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- try
- {
- Class validatorClass =
- classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
- validator = (IWSDL11Validator)validatorClass.newInstance();
- if (resourceBundle != null)
- {
- ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
- validator.setResourceBundle(validatorBundle);
- }
- }
- catch (ClassNotFoundException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- catch (IllegalAccessException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- catch (InstantiationException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- }
- return validator;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
deleted file mode 100644
index ebb113182..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
+++ /dev/null
@@ -1,2000 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.ExtensionDeserializer;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.dom.ElementNSImpl;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.ElementLocation;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-import com.ibm.wsdl.util.xml.XPathUtils;
-
-/**
- * A WSDL document that knows how to parse itself.
- */
-public class WSDLDocument
-{
- private static final List STYLE_ONE_WAY = Arrays.asList(new String[] { Constants.ELEM_INPUT });
- private static final List STYLE_REQUEST_RESPONSE =
- Arrays.asList(new String[] { Constants.ELEM_INPUT, Constants.ELEM_OUTPUT });
- private static final List STYLE_SOLICIT_RESPONSE =
- Arrays.asList(new String[] { Constants.ELEM_OUTPUT, Constants.ELEM_INPUT });
- private static final List STYLE_NOTIFICATION = Arrays.asList(new String[] { Constants.ELEM_OUTPUT });
-
- private static final String _ERROR_MULTIPLE_TYPES_DEFINED = "_ERROR_MULTIPLE_TYPES_DEFINED";
- private static final String _UNABLE_TO_IMPORT_NO_LOCATION = "_UNABLE_TO_IMPORT_NO_LOCATION";
-
- protected ExtensionRegistry extReg = null;
- protected String factoryImplName = null;
-
- // store the element locations within the file - line and column numbers
- // the location info is stored as an int array of length 2 {linenumber, colnumber}
- protected Hashtable elementLocations = new Hashtable();
-
- // hold the reader errors
- protected List readerErrors = new ArrayList();
- protected List readerWarnings = new ArrayList();
- protected MessageGenerator messagegenerator;
-
- private Definition def = null;
- private Set importedDefs = new TreeSet();
- private Element typesEl = null;
- private List messages = new ArrayList();
- private List porttypes = new ArrayList();
- private List bindings = new ArrayList();
- private List services = new ArrayList();
- private List extelements = new ArrayList();
- private int depth;
- // Hold the schemas that are imported or declared inline in this wsdl document.
- private List schemas = new ArrayList();
- private IWSDL11ValidationInfo valinfo;
-
- /**
- * Constructor. Performs a preparse of the document and handles imports and types.
- *
- * @param documentBaseURI The URI of this WSDL document.
- * @param defEl The definitions element.
- * @param depth The depth of this document in a document tree.
- * @param messagegenerator A messagegenerator used for retrieving strings.
- * @param valinfo A WSDL11ValidationInfo object for reporting messages.
- * @throws WSDLException
- */
- public WSDLDocument(String documentBaseURI, Element defEl, int depth, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo) throws WSDLException
- {
- this.messagegenerator = messagegenerator;
- this.valinfo = valinfo;
- this.depth = depth;
-
- checkElementName(defEl, Constants.Q_ELEM_DEFINITIONS);
-
- WSDLFactory factory =
- (factoryImplName != null) ? WSDLFactory.newInstance(factoryImplName) : WSDLFactory.newInstance();
- def = factory.newDefinition();
-
- if (extReg != null)
- {
- def.setExtensionRegistry(extReg);
- }
-
- String name = DOMUtils.getAttribute(defEl, Constants.ATTR_NAME);
- String targetNamespace = DOMUtils.getAttribute(defEl, Constants.ATTR_TARGET_NAMESPACE);
- NamedNodeMap attrs = defEl.getAttributes();
-
- if (documentBaseURI != null)
- {
- def.setDocumentBaseURI(documentBaseURI);
- }
-
- if (name != null)
- {
- def.setQName(new QName(targetNamespace, name));
- }
-
- if (targetNamespace != null)
- {
- def.setTargetNamespace(targetNamespace);
- }
-
- int size = attrs.getLength();
-
- for (int i = 0; i < size; i++)
- {
- Attr attr = (Attr)attrs.item(i);
- String namespaceURI = attr.getNamespaceURI();
- String localPart = attr.getLocalName();
- String value = attr.getValue();
-
- if (namespaceURI != null && namespaceURI.equals(Constants.NS_URI_XMLNS))
- {
- if (localPart != null && !localPart.equals(Constants.ATTR_XMLNS))
- {
- def.addNamespace(localPart, value);
- }
- else
- {
- def.addNamespace(null, value);
- }
- }
- }
-
- // There are problems when the model is created and the order of elements is not
- // Import - Types - Message - PortType - Binding - Service so we need to read them
- // into the model in that order
- // Performance wise this should be modified as we have to make 5 extra loops through
- // all of the elements as a result
-
- // take care of Imports, Types, Documentation and extensibleelements together - saves a pass for Documentation
- // later and Docs don't effect anything else - Imports and Types are essentially the same thing
- // no preconceived ideas about extensible elements
- Element tempEl = DOMUtils.getFirstChildElement(defEl);
-
- while (tempEl != null)
- {
-
- if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
- {
- String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
- String locationURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_LOCATION);
- if(locationURI == null || locationURI.equals(""))
- {
- addReaderError(def, tempEl, messagegenerator.getString(_UNABLE_TO_IMPORT_NO_LOCATION));
- }
- else
- {
- ImportHolder ih = new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo);
- importedDefs.add(ih);
- }
- setLocation(tempEl, tempEl);
-// if (importedDefs == null)
-// {
-// importedDefs = new Hashtable();
-// }
-// if (documentBaseURI != null)
-// {
-// importedDefs.put(documentBaseURI, def);
-// }
-// def.addImport(parseImport(tempEl, def, importedDefs));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- def.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_TYPES, tempEl))
- {
- if(typesEl != null)
- {
- setLocation(tempEl, tempEl);
- addReaderError(def, tempEl, messagegenerator.getString(_ERROR_MULTIPLE_TYPES_DEFINED));
- }
- else
- {
- typesEl = tempEl;
- parseTypes();
- }
-// def.setTypes(parseTypes(tempEl, def));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_MESSAGE, tempEl))
- {
- messages.add(tempEl);
- //def.addMessage(parseMessage(tempEl, def));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_PORT_TYPE, tempEl))
- {
- porttypes.add(tempEl);
- // PortType pt = parsePortType(tempEl, def);
- // if(pt != null)
- // {
- // def.addPortType(pt);
- // }
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl))
- {
- bindings.add(tempEl);
- //def.addBinding(parseBinding(tempEl, def));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_SERVICE, tempEl))
- {
- services.add(tempEl);
- //def.addService(parseService(tempEl, def));
- }
- else
- {
- extelements.add(tempEl);
- // def.addExtensibilityElement(
- // parseExtensibilityElement(Definition.class, tempEl, def));
- }
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- }
-
- /**
- * Get the definitions element for this document.
- *
- * @return The definitions element for this document.
- */
- public Definition getDefinition()
- {
- return def;
- }
-
- /**
- * Get a set of the imports in this document.
- *
- * @return A set of the imports in this document.
- */
- public Set getImports()
- {
- return importedDefs;
- }
-
- /**
- *
- * @param def
- * @param doc
- * @param namespace
- * @param location
- */
-// public void setImport(Definition def, Element doc, String namespace, String location)
-// {
-// if(location == null || location.equals(""))
-// {
-// valinfo.addError()_UNABLE_TO_IMPORT_NO_LOCATION
-// }
-// Import imp = def.createImport();
-// imp.setDefinition(def);
-// imp.setDocumentationElement(doc);
-// imp.setNamespaceURI(namespace);
-// imp.setLocationURI(location);
-// def.addImport(imp);
-// }
-
- /**
- * Parse the types in the WSDL document. Handles documentation, import and schema
- * elements.
- */
- public void parseTypes()
- {
- Types types = def.createTypes();
-
- Element tempEl = DOMUtils.getFirstChildElement(typesEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- types.setDocumentationElement(tempEl);
- }
- else if (tempEl.getLocalName().equalsIgnoreCase("import"))
- //else if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
- {
- // this shouldn't really be used here but a little hack will make
- // life easier
- //parseImport(tempEl, def, (Map)new Hashtable());
- String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
- String locationURI = DOMUtils.getAttribute(tempEl, "schemaLocation");
- importedDefs.add(new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo));
- try
- {
- types.addExtensibilityElement(parseExtensibilityElement(Types.class, tempEl, def));
- }
- catch(WSDLException e)
- {
-
- }
- }
- else
- {
- try
- {
- ExtensibilityElement extElem = parseExtensibilityElement(Types.class, tempEl, def);
- types.addExtensibilityElement(extElem);
- }
- catch(WSDLException e)
- {
-
- }
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
- def.setTypes(types);
-
- valinfo.setElementLocations(elementLocations);
- List typesElems = types.getExtensibilityElements();
- if(typesElems != null)
- {
- Iterator typesElemsIter = typesElems.iterator();
- while(typesElemsIter.hasNext())
- {
- ExtensibilityElement typeElement = (ExtensibilityElement)typesElemsIter.next();
-
- InlineSchemaValidator xsdVal = new InlineSchemaValidator();
- xsdVal.setMessageGenerator(messagegenerator);
-
- List parents = new ArrayList();
- parents.add(def);
- parents.add(0,types);
- xsdVal.validate(typeElement, parents,valinfo);
- XSModel[] typesSchemas = valinfo.getSchemas();
- List typesSchemaList = new ArrayList();
- for(int i = 0; i < typesSchemas.length; i++)
- {
- typesSchemaList.add(typesSchemas[i]);
- }
- schemas.addAll(typesSchemaList);
- valinfo.clearSchemas();
- }
- }
- valinfo.setElementLocations(null);
- }
-
- /**
- * Parse the messages in this document.
- */
- public void parseMessages()
- {
- for (int i = 0; i < messages.size(); i++)
- {
- try
- {
- def.addMessage(parseMessage((Element)messages.get(i), def));
- }
- catch(WSDLException e)
- {}
- }
- }
-
- /**
- * Parse the portTypes in this document.
- */
- public void parsePorttypes()
- {
- for (int i = 0; i < porttypes.size(); i++)
- {
- try
- {
- PortType pt = parsePortType((Element)porttypes.get(i), def);
- if (pt != null)
- {
- def.addPortType(pt);
- }
- }
- catch(WSDLException e)
- {}
- }
- }
-
- /**
- * Parse the bindings in this document.
- */
- public void parseBindings()
- {
- for (int i = 0; i < bindings.size(); i++)
- {
- try
- {
- def.addBinding(parseBinding((Element)bindings.get(i), def));
- }
- catch(WSDLException e)
- {}
- }
- }
-
- /**
- * Parse the services in this document.
- */
- public void parseServices()
- {
- for (int i = 0; i < services.size(); i++)
- {
- try
- {
- def.addService(parseService((Element)services.get(i), def));
- }
- catch(WSDLException e)
- {}
- }
- }
-
- /**
- * Parse the extensibility elements in this document.
- */
- public void parseExtensibilityElements()
- {
- for (int i = 0; i < extelements.size(); i++)
- {
- try
- {
- def.addExtensibilityElement(parseExtensibilityElement(Definition.class, (Element)extelements.get(i), def));
- }
- catch(WSDLException e)
- {}
- }
- }
-
- /**
- * Add the given list of schemas to the schemas for this document.
- *
- * @param schemas The list of schemas to add to this document's schemas.
- */
- public void addSchemas(List schemas)
- {
- this.schemas.addAll(schemas);
- }
-
- /**
- * Get the schemas associated with this document.
- *
- * @return The schemas associated with this document.
- */
- public List getSchemas()
- {
- return schemas;
- }
-
- /**
- * Parse the specified binding.
- *
- * @param bindingEl The binding element.
- * @param def The definitions element.
- * @return A WSDL binding element.
- * @throws WSDLException
- */
- protected Binding parseBinding(Element bindingEl, Definition def) throws WSDLException
- {
- Binding binding = null;
- String name = DOMUtils.getAttribute(bindingEl, Constants.ATTR_NAME);
- QName portTypeName;
- try
- {
- portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the message name
- portTypeName = new QName(null, DOMUtils.getAttribute(bindingEl, "type"));
- }
-
- PortType portType = null;
-
- if (name != null)
- {
- QName bindingName = new QName(def.getTargetNamespace(), name);
-
- binding = def.getBinding(bindingName);
-
- if (binding == null)
- {
- binding = def.createBinding();
- binding.setQName(bindingName);
- }
- // report an error if a binding with this name has already been defined
- else if (!binding.isUndefined())
- {
- //addReaderError(def,bindingEl, "_BINDING_NAME_ALREADY_DEFINED");
- addReaderError(
- def,
- bindingEl,
- messagegenerator.getString("_BINDING_NAME_ALREADY_DEFINED", "'" + binding.getQName().getLocalPart() + "'"));
- }
- }
- else
- {
- binding = def.createBinding();
- }
-
- // Whether it was retrieved or created, the definition has been found.
- binding.setUndefined(false);
-
- if (portTypeName != null)
- {
- portType = def.getPortType(portTypeName);
-
- if (portType == null)
- {
- portType = def.createPortType();
- portType.setQName(portTypeName);
- def.addPortType(portType);
- }
-
- binding.setPortType(portType);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(bindingEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- binding.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
- {
- binding.addBindingOperation(parseBindingOperation(tempEl, portType, def));
- }
- else
- {
- binding.addExtensibilityElement(parseExtensibilityElement(Binding.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(binding, bindingEl);
-
- return binding;
- }
-
- /**
- * Parse a specific binding operation.
- *
- * @param bindingOperationEl The binding operation element.
- * @param portType The portType the binding references.
- * @param def The definitions element.
- * @return A WSDL binding operation element.
- * @throws WSDLException
- */
- protected BindingOperation parseBindingOperation(Element bindingOperationEl, PortType portType, Definition def)
- throws WSDLException
- {
- BindingOperation bindingOperation = def.createBindingOperation();
- String name = DOMUtils.getAttribute(bindingOperationEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- bindingOperation.setName(name);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(bindingOperationEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- bindingOperation.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
- {
- bindingOperation.setBindingInput(parseBindingInput(tempEl, def));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
- {
- bindingOperation.setBindingOutput(parseBindingOutput(tempEl, def));
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
- {
- bindingOperation.addBindingFault(parseBindingFault(tempEl, def));
- }
- else
- {
- bindingOperation.addExtensibilityElement(parseExtensibilityElement(BindingOperation.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- if (portType != null)
- {
- BindingInput bindingInput = bindingOperation.getBindingInput();
- BindingOutput bindingOutput = bindingOperation.getBindingOutput();
- String inputName = (bindingInput != null ? bindingInput.getName() : null);
- String outputName = (bindingOutput != null ? bindingOutput.getName() : null);
-
- // hack code to get at operations that are defined with the same name but different
- // inputs and outputs
- Operation op = null;
- List operations = portType.getOperations();
- // get a list of all operations with matching names
- List matchingOperations = new Vector();
- Iterator iOperations = operations.iterator();
- while (iOperations.hasNext())
- {
- Operation oper = (Operation)iOperations.next();
- if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
- {
- matchingOperations.add(oper);
- }
- }
-
- if (matchingOperations != null)
- {
- // If there's only one matching operation this is what we're referring to.
- // Only matching if binding operation input name and output name are
- // both null or the same as the portType operation input and output names.
- // the portType operation name
- if (matchingOperations.size() == 1)
- {
- // only say the single operation is the one we're looking for if the names
- // of the binding input and output are not specified
- Operation tempOp = (Operation)matchingOperations.get(0);
- boolean inputOK = false;
- boolean outputOK = false;
- Input tempInput = tempOp.getInput();
- Output tempOutput = tempOp.getOutput();
-
- // order is important in these conditions. condition 2 must fail for 3 to work
- // check the input
- if (tempInput == null && bindingInput == null)
- {
- inputOK = true;
- }
- else if (bindingInput == null || bindingInput.getName() == null)
- {
- inputOK = true;
- }
- else if (tempInput != null && bindingInput.getName().equals(tempInput.getName()))
- {
- inputOK = true;
- }
- // check the output
- if (tempOutput == null && bindingOutput == null)
- {
- outputOK = true;
- }
- else if (bindingOutput == null || bindingOutput.getName() == null)
- {
- outputOK = true;
- }
- else if (tempOutput != null && bindingOutput.getName().equals(tempOutput.getName()))
- {
- outputOK = true;
- }
- if (inputOK && outputOK)
- {
- op = tempOp;
- }
- // op = (Operation) matchingOperations.get(0);
- }
- // otherwise find the operation with the same name, inputname, outputname signature
- if (matchingOperations != null && op == null)
- {
- Iterator iMatchingOperations = matchingOperations.iterator();
- while (iMatchingOperations.hasNext())
- {
-
- boolean inputNamesEqual = false;
- boolean outputNamesEqual = false;
- Operation oper = (Operation)iMatchingOperations.next();
- // if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
- // {
- Input opInput = oper.getInput();
- if (opInput != null && bindingInput != null)
- {
- String opInputName = opInput.getName();
- String bindingInputName = bindingInput.getName();
- if (opInputName != null && opInputName.equalsIgnoreCase(bindingInputName))
- {
- inputNamesEqual = true;
- }
- else if (opInputName == null && bindingInputName == null)
- {
- inputNamesEqual = true;
- }
- }
- else if (opInput == null && bindingInput == null)
- {
- inputNamesEqual = true;
- }
- Output opOutput = oper.getOutput();
- if (opOutput != null && bindingOutput != null)
- {
- String opOutputName = opOutput.getName();
- String bindingOutputName = bindingOutput.getName();
- if (opOutputName != null && opOutputName.equalsIgnoreCase(bindingOutputName))
- {
- outputNamesEqual = true;
- }
- else if (opOutputName == null && bindingOutputName == null)
- {
- outputNamesEqual = true;
- }
- }
- else if (opOutput == null && bindingOutput == null)
- {
- outputNamesEqual = true;
- }
- if (inputNamesEqual && outputNamesEqual)
- {
- op = oper;
- break;
- }
- //}
- }
- }
- }
- //Operation op = portType.getOperation(name, inputName, outputName);
-
- if (op == null)
- {
- op = def.createOperation();
- op.setName(name);
- portType.addOperation(op);
- }
-
- bindingOperation.setOperation(op);
- }
-
- // add the location of this element to elementLocations
- setLocation(bindingOperation, bindingOperationEl);
-
- return bindingOperation;
- }
-
- /**
- * Parse a specific binding input element.
- *
- * @param bindingInputEl The binding input element.
- * @param def The definitions element.
- * @return A WSDL binding input element.
- * @throws WSDLException
- */
- protected BindingInput parseBindingInput(Element bindingInputEl, Definition def) throws WSDLException
- {
- BindingInput bindingInput = def.createBindingInput();
- String name = DOMUtils.getAttribute(bindingInputEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- bindingInput.setName(name);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(bindingInputEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- bindingInput.setDocumentationElement(tempEl);
- }
- else
- {
- bindingInput.addExtensibilityElement(parseExtensibilityElement(BindingInput.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(bindingInput, bindingInputEl);
-
- return bindingInput;
- }
-
- /**
- * Parse a specific binding output element.
- *
- * @param bindingOutputEl The binding output element.
- * @param def The definitions element.
- * @return A WSDL binding output element.
- * @throws WSDLException
- */
- protected BindingOutput parseBindingOutput(Element bindingOutputEl, Definition def) throws WSDLException
- {
- BindingOutput bindingOutput = def.createBindingOutput();
- String name = DOMUtils.getAttribute(bindingOutputEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- bindingOutput.setName(name);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(bindingOutputEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- bindingOutput.setDocumentationElement(tempEl);
- }
- else
- {
- bindingOutput.addExtensibilityElement(parseExtensibilityElement(BindingOutput.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(bindingOutput, bindingOutputEl);
-
- return bindingOutput;
- }
-
- /**
- * Parse a specific binding fault element.
- *
- * @param bindingFaultEl The binding fault element.
- * @param def The definitions element.
- * @return A WSDL binding fault element.
- * @throws WSDLException
- */
- protected BindingFault parseBindingFault(Element bindingFaultEl, Definition def) throws WSDLException
- {
- BindingFault bindingFault = def.createBindingFault();
- String name = DOMUtils.getAttribute(bindingFaultEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- bindingFault.setName(name);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(bindingFaultEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- bindingFault.setDocumentationElement(tempEl);
- }
- else
- {
- bindingFault.addExtensibilityElement(parseExtensibilityElement(BindingFault.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(bindingFault, bindingFaultEl);
-
- return bindingFault;
- }
-
- /**
- * Parse a specific message element.
- *
- * @param msgEl The message element.
- * @param def The definitions element.
- * @return A WSDL message element.
- * @throws WSDLException
- */
- protected Message parseMessage(Element msgEl, Definition def) throws WSDLException
- {
- Message msg = null;
- String name = DOMUtils.getAttribute(msgEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- QName messageName = new QName(def.getTargetNamespace(), name);
-
- msg = def.getMessage(messageName);
-
- if (msg == null)
- {
- msg = def.createMessage();
- msg.setQName(messageName);
- }
- else if (!msg.isUndefined())
- {
- // produce an error message as a message with this name has already been defined
- addReaderError(
- def,
- msgEl,
- messagegenerator.getString("_MESSAGE_NAME_ALREADY_DEFINED", "'" + msg.getQName().getLocalPart() + "'"));
- }
- }
- else
- {
- msg = def.createMessage();
- }
-
- // Whether it was retrieved or created, the definition has been found.
- msg.setUndefined(false);
-
- Element tempEl = DOMUtils.getFirstChildElement(msgEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- msg.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_PART, tempEl))
- {
- msg.addPart(parsePart(tempEl, def));
- }
- else
- {
- // XML Validation will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(msg, msgEl);
-
- return msg;
- }
-
- /**
- * Parse a specific part element.
- *
- * @param partEl The part element.
- * @param def The definitions element.
- * @return A WSDL part element.
- * @throws WSDLException
- */
- protected Part parsePart(Element partEl, Definition def) throws WSDLException
- {
- Part part = def.createPart();
- String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-
- QName elementName;
- try
- {
- elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the element name
- elementName = new QName(null, DOMUtils.getAttribute(partEl, "element"));
- }
-
- QName typeName;
- try
- {
- typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
- // Corrected - was ATTR_ELEMENT
- Constants.ELEM_MESSAGE, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the element attribute
- typeName = new QName(null, DOMUtils.getAttribute(partEl, "name"));
- }
-
- if (name != null)
- {
- part.setName(name);
- }
-
- if (elementName != null)
- {
- part.setElementName(elementName);
- }
-
- if (typeName != null)
- {
- part.setTypeName(typeName);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(partEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- part.setDocumentationElement(tempEl);
- }
- else
- {
- // XML Validation will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- Map extensionAttributes = part.getExtensionAttributes();
-
- extensionAttributes.putAll(getPartAttributes(partEl, def));
-
- // Need to do something here to locate part definition.
-
- // add the location of this element to elementLocations
- setLocation(part, partEl);
-
- return part;
- }
-
- /**
- * Get a map of the part attributes.
- *
- * @param el The part attributes element.
- * @param def The defintions element.
- * @return A map containing the part attributes.
- * @throws WSDLException
- */
- protected Map getPartAttributes(Element el, Definition def) throws WSDLException
- {
- Map attributes = new HashMap();
- NamedNodeMap nodeMap = el.getAttributes();
- int atts = nodeMap.getLength();
-
- for (int a = 0; a < atts; a++)
- {
- Attr attribute = (Attr)nodeMap.item(a);
- String lName = attribute.getLocalName();
- String nSpace = attribute.getNamespaceURI();
- String prefix = attribute.getPrefix();
- QName name = new QName(nSpace, lName);
-
- if (nSpace != null && !nSpace.equals(Constants.NS_URI_WSDL))
- {
- if (!nSpace.equals(Constants.NS_URI_XMLNS))
- {
- String strValue = attribute.getValue();
- QName qValue = null;
-
- try
- {
- qValue = DOMUtils.getQName(strValue, el);
- }
- catch (WSDLException e)
- {
- qValue = new QName(strValue);
- }
-
- attributes.put(name, qValue);
-
- String tempNSUri = def.getNamespace(prefix);
-
- while (tempNSUri != null && !tempNSUri.equals(nSpace))
- {
- prefix += "_";
- tempNSUri = def.getNamespace(prefix);
- }
-
- def.addNamespace(prefix, nSpace);
- }
- }
- else if (
- !lName.equals(Constants.ATTR_NAME)
- && !lName.equals(Constants.ATTR_ELEMENT)
- && !lName.equals(Constants.ATTR_TYPE))
- {
- WSDLException wsdlExc =
- new WSDLException(
- WSDLException.INVALID_WSDL,
- "Encountered illegal "
- + "part extension "
- + "attribute '"
- + name
- + "'. Extension "
- + "attributes must be in "
- + "a namespace other than "
- + "WSDL's.");
-
- wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
- //throw wsdlExc;
- }
- }
-
- // add the location of this element to elementLocations
- setLocation(attributes, el);
-
- return attributes;
- }
-
- /**
- * Parse a specific portType element.
- *
- * @param portTypeEl The portType element.
- * @param def The defintions element.
- * @return A WSDL portType element.
- * @throws WSDLException
- */
- protected PortType parsePortType(Element portTypeEl, Definition def) throws WSDLException
- {
-
- PortType portType = null;
- String name = DOMUtils.getAttribute(portTypeEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- QName portTypeName = new QName(def.getTargetNamespace(), name);
-
- portType = def.getPortType(portTypeName);
-
- if (portType == null)
- {
- portType = def.createPortType();
- portType.setQName(portTypeName);
- }
- else if (!portType.isUndefined())
- {
- // if the PortType has already been defined produce an error and return null
- addReaderError(
- def,
- portTypeEl,
- messagegenerator.getString("_PORTTYPE_NAME_ALREADY_DEFINED", "'" + portType.getQName().getLocalPart() + "'"));
- return null;
- }
- }
- else
- {
- portType = def.createPortType();
- }
-
- // Whether it was retrieved or created, the definition has been found.
- portType.setUndefined(false);
-
- Element tempEl = DOMUtils.getFirstChildElement(portTypeEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- portType.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
- {
- // modified so duplicate operations will not be added to porttype
- Operation op = parseOperation(tempEl, portType, def);
- if (op != null)
- {
- portType.addOperation(op);
- }
- //portType.addOperation(parseOperation(tempEl, portType, def));
- }
- else
- {
- // something else that shouldn't be here
- // NEED TO ADD TO ERROR LIST
- //DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(portType, portTypeEl);
-
- return portType;
- }
-
- /**
- * Parse a specific operation element.
- *
- * @param opEl The operation element.
- * @param portType The portType element.
- * @param def The definitions element.
- * @return A WSDL operation element.
- * @throws WSDLException
- */
- protected Operation parseOperation(Element opEl, PortType portType, Definition def) throws WSDLException
- {
- Operation op = null;
- String name = DOMUtils.getAttribute(opEl, Constants.ATTR_NAME);
- String parameterOrderStr = DOMUtils.getAttribute(opEl, Constants.ATTR_PARAMETER_ORDER);
- Element tempEl = DOMUtils.getFirstChildElement(opEl);
- List messageOrder = new Vector();
- Element docEl = null;
- Input input = null;
- Output output = null;
- List faults = new Vector();
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- docEl = tempEl;
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
- {
- input = parseInput(tempEl, def);
- messageOrder.add(Constants.ELEM_INPUT);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
- {
- output = parseOutput(tempEl, def);
- messageOrder.add(Constants.ELEM_OUTPUT);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
- {
- faults.add(parseFault(tempEl, def));
- }
- else
- {
- // invalid element in the operation
- // XML check will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- if (name != null)
- {
- String inputName = (input != null ? input.getName() : null);
- String outputName = (output != null ? output.getName() : null);
-
- boolean opDefined = false;
-
- try
- {
-
- //op = portType.getOperation(name, inputName, outputName);
-
- //Operation op = null;
- List operations = portType.getOperations();
- if (operations != null)
- {
-
- Iterator iOperations = operations.iterator();
- while (iOperations.hasNext())
- {
- boolean inputNamesEqual = false;
- boolean outputNamesEqual = false;
- Operation oper = (Operation)iOperations.next();
- if (oper.getName().equalsIgnoreCase(name))
- {
- Input opInput = oper.getInput();
- if (opInput != null && input != null)
- {
- String opInputName = opInput.getName();
- if (opInputName != null && inputName != null && opInputName.equalsIgnoreCase(inputName))
- {
- inputNamesEqual = true;
- }
- else if (opInputName == null && inputName == null)
- {
- inputNamesEqual = true;
- }
- }
- else if (opInput == null && input == null)
- {
- inputNamesEqual = true;
- }
- Output opOutput = oper.getOutput();
- if (opOutput != null && output != null)
- {
- String opOutputName = opOutput.getName();
- if (opOutputName != null && outputName != null && opOutputName.equalsIgnoreCase(outputName))
- {
- outputNamesEqual = true;
- }
- else if (opOutputName == null && outputName == null)
- {
- outputNamesEqual = true;
- }
- }
- else if (opOutput == null && output == null)
- {
- outputNamesEqual = true;
- }
- if (inputNamesEqual && outputNamesEqual)
- {
- op = oper;
- break;
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- opDefined = true;
- }
-
- if (op != null /*&& !op.isUndefined()*/
- )
- {
- //op = null;
- opDefined = true;
-
- }
-
- if (op != null && !opDefined)
- {
- if (inputName == null)
- {
- Input tempIn = op.getInput();
-
- if (tempIn != null)
- {
- if (tempIn.getName() != null)
- {
- //op = null;
- opDefined = true;
- }
- }
- }
- }
-
- if (op != null && !opDefined)
- {
- if (outputName == null)
- {
- Output tempOut = op.getOutput();
-
- if (tempOut != null)
- {
- if (tempOut.getName() != null)
- {
- //op = null;
- opDefined = true;
- }
- }
- }
- }
-
- if (opDefined)
- {
- // instead of creating a new one with the same name we're going to return null.
- // According to the WSDL 1.2 working draft operation overloading is no longer allowed.
- // Going to use that here to save a lot of work
- setLocation(op, opEl);
- addReaderError(
- portType,
- op,
- messagegenerator.getString(
- "_DUPLICATE_OPERATION_FOR_PORTTYPE",
- "'" + op.getName() + "'",
- "'" + portType.getQName().getLocalPart() + "'"));
- return null;
- }
- if (op == null)
- {
- op = def.createOperation();
- op.setName(name);
-
- }
- }
- else
- {
- op = def.createOperation();
- }
-
- // Whether it was retrieved or created, the definition has been found.
- op.setUndefined(false);
-
- if (parameterOrderStr != null)
- {
- op.setParameterOrdering(StringUtils.parseNMTokens(parameterOrderStr));
- }
-
- if (docEl != null)
- {
- op.setDocumentationElement(docEl);
- }
-
- if (input != null)
- {
- op.setInput(input);
- }
-
- if (output != null)
- {
- op.setOutput(output);
- }
-
- if (faults.size() > 0)
- {
- Iterator faultIterator = faults.iterator();
-
- while (faultIterator.hasNext())
- {
- Fault f = (Fault)faultIterator.next();
- // if the fault isn't defined yet
- if (op.getFault(f.getName()) == null)
- {
- op.addFault(f);
- }
- else
- {
- addReaderError(
- op,
- f,
- messagegenerator.getString("_DUPLICATE_FAULT_NAME", "'" + f.getName() + "'", "'" + op.getName() + "'"));
- //faultErrors.add(new Object[]{f,"Duplicate Name",op});
- }
- }
- }
-
- OperationType style = null;
-
- if (messageOrder.equals(STYLE_ONE_WAY))
- {
- style = OperationType.ONE_WAY;
- }
- else if (messageOrder.equals(STYLE_REQUEST_RESPONSE))
- {
- style = OperationType.REQUEST_RESPONSE;
- }
- else if (messageOrder.equals(STYLE_SOLICIT_RESPONSE))
- {
- style = OperationType.SOLICIT_RESPONSE;
- }
- else if (messageOrder.equals(STYLE_NOTIFICATION))
- {
- style = OperationType.NOTIFICATION;
- }
-
- if (style != null)
- {
- op.setStyle(style);
- }
-
- // add the location of this element to elementLocations
- setLocation(op, opEl);
-
- // modified to remove duplicate operations
- // if(opDefined)
- // {
- // addReaderError(portType,op,ValidateWSDLPlugin.getInstance().getString("_DUPLICATE_OPERATION_FOR_PORTTYPE","'"+op.getName()+"'","'"+portType.getQName().getLocalPart()+"'"));
- // return null;
- // }
- return op;
- }
-
- /**
- * Parse a specific service element.
- *
- * @param serviceEl The service element.
- * @param def The defintions element.
- * @return A WSDL service element.
- * @throws WSDLException
- */
- protected Service parseService(Element serviceEl, Definition def) throws WSDLException
- {
- Service service = def.createService();
- String name = DOMUtils.getAttribute(serviceEl, Constants.ATTR_NAME);
-
- if (name != null)
- {
- service.setQName(new QName(def.getTargetNamespace(), name));
- }
- Service s;
- // a service with this name has already been defined
- if ((s = def.getService(service.getQName())) != null)
- {
- addReaderError(
- def,
- serviceEl,
- messagegenerator.getString("_SERVICE_NAME_ALREADY_DEFINED", "'" + s.getQName().getLocalPart() + "'"));
- return s;
- }
- Element tempEl = DOMUtils.getFirstChildElement(serviceEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- service.setDocumentationElement(tempEl);
- }
- else if (QNameUtils.matches(Constants.Q_ELEM_PORT, tempEl))
- {
- service.addPort(parsePort(tempEl, def));
- }
- else
- {
- service.addExtensibilityElement(parseExtensibilityElement(Service.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(service, serviceEl);
-
- return service;
- }
-
- /**
- * Parse a specific port element.
- *
- * @param portEl The port element.
- * @param def The definitions element.
- * @return A WSDL port element.
- * @throws WSDLException
- */
- protected Port parsePort(Element portEl, Definition def) throws WSDLException
- {
- Port port = def.createPort();
- String name = DOMUtils.getAttribute(portEl, Constants.ATTR_NAME);
- QName bindingStr;
- try
- {
- bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the message name
- bindingStr = new QName(null, DOMUtils.getAttribute(portEl, "binding"));
- }
-
- if (name != null)
- {
- port.setName(name);
- }
-
- if (bindingStr != null)
- {
- Binding binding = def.getBinding(bindingStr);
-
- if (binding == null)
- {
- binding = def.createBinding();
- binding.setQName(bindingStr);
- def.addBinding(binding);
- }
-
- port.setBinding(binding);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(portEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- port.setDocumentationElement(tempEl);
- }
- else
- {
- port.addExtensibilityElement(parseExtensibilityElement(Port.class, tempEl, def));
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(port, portEl);
-
- return port;
- }
-
- /**
- * Parse a specific extensibility element.
- *
- * @param parentType The parent type of the extensibility element.
- * @param el The extensibility element.
- * @param def The definitions element.
- * @return A WSDL extensibility element.
- * @throws WSDLException
- */
- protected ExtensibilityElement parseExtensibilityElement(Class parentType, Element el, Definition def)
- throws WSDLException
- {
- QName elementType = QNameUtils.newQName(el);
-
- try
- {
- ExtensionRegistry extReg = def.getExtensionRegistry();
-
- if (extReg == null)
- {
- throw new WSDLException(
- WSDLException.CONFIGURATION_ERROR,
- "No ExtensionRegistry set for this "
- + "Definition, so unable to deserialize "
- + "a '"
- + elementType
- + "' element in the "
- + "context of a '"
- + parentType.getName()
- + "'.");
- }
-
- ExtensionDeserializer extDS = extReg.queryDeserializer(parentType, elementType);
-
- // asign the ExtensibilityElement to a var so we can add it to the locations
- ExtensibilityElement extElem = extDS.unmarshall(parentType, elementType, el, def, extReg);
- // add the location of this element to elementLocations
- // this might not work properly
- setLocation(extElem, el);
-
- // register all of the child Elements so we can find them later
- // used for inline schema validation
- registerChildElements(extElem);
-
- return extElem;
- }
- catch (WSDLException e)
- {
- if (e.getLocation() == null)
- {
- e.setLocation(XPathUtils.getXPathExprFromNode(el));
- }
- throw e;
- }
- }
-
- /**
- * Parse a specific input element.
- *
- * @param inputEl The input element.
- * @param def The defintions element.
- * @return A WSDL input element.
- * @throws WSDLException
- */
- protected Input parseInput(Element inputEl, Definition def) throws WSDLException
- {
-
- Input input = def.createInput();
- String name = DOMUtils.getAttribute(inputEl, Constants.ATTR_NAME);
- QName messageName = null;
- try
- {
- messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the message name
- messageName = new QName(null, DOMUtils.getAttribute(inputEl, "message"));
- }
-
- if (name != null)
- {
- input.setName(name);
- }
-
- if (messageName != null)
- {
- Message message = def.getMessage(messageName);
-
- if (message == null)
- {
- message = def.createMessage();
- message.setQName(messageName);
- def.addMessage(message);
- }
-
- input.setMessage(message);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(inputEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- input.setDocumentationElement(tempEl);
- }
- else
- {
- // XML Validation will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(input, inputEl);
-
- return input;
- }
-
- /**
- * Parse a specific output element.
- *
- * @param outputEl The output element.
- * @param def The defintions element.
- * @return A WSDL output element.
- * @throws WSDLException
- */
- protected Output parseOutput(Element outputEl, Definition def) throws WSDLException
- {
- Output output = def.createOutput();
- String name = DOMUtils.getAttribute(outputEl, Constants.ATTR_NAME);
- QName messageName = null;
- try
- {
- messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the message name
- messageName = new QName(null, DOMUtils.getAttribute(outputEl, "message"));
- }
-
- if (name != null)
- {
- output.setName(name);
- }
-
- if (messageName != null)
- {
- Message message = def.getMessage(messageName);
-
- if (message == null)
- {
- message = def.createMessage();
- message.setQName(messageName);
- def.addMessage(message);
- }
-
- output.setMessage(message);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(outputEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- output.setDocumentationElement(tempEl);
- }
- else
- {
- // XML Validation will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(output, outputEl);
-
- return output;
- }
-
- /**
- * Parse a specific fault element.
- *
- * @param faultEl The fault element to parse.
- * @param def The definitions element.
- * @return A WSDL fault element.
- * @throws WSDLException
- */
- protected Fault parseFault(Element faultEl, Definition def) throws WSDLException
- {
- Fault fault = def.createFault();
- String name = DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
- QName messageName = null;
- try
- {
- messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
- }
- catch (Exception e)
- {
- //the call above fails if there is no qualified namespace for the message name
- messageName = new QName(null, DOMUtils.getAttribute(faultEl, "message"));
- }
-
- if (name != null)
- {
- fault.setName(name);
- }
-
- if (messageName != null)
- {
- Message message = def.getMessage(messageName);
-
- if (message == null)
- {
- message = def.createMessage();
- message.setQName(messageName);
- def.addMessage(message);
- }
-
- fault.setMessage(message);
- }
-
- Element tempEl = DOMUtils.getFirstChildElement(faultEl);
-
- while (tempEl != null)
- {
- if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
- {
- fault.setDocumentationElement(tempEl);
- }
- else
- {
- // XML Validation will catch this
- DOMUtils.throwWSDLException(tempEl);
- }
-
- tempEl = DOMUtils.getNextSiblingElement(tempEl);
- }
-
- // add the location of this element to elementLocations
- setLocation(fault, faultEl);
-
- return fault;
- }
-
- /**
- * Set the messagegenerator for the reader.
- *
- * @param mg The message generator to set.
- */
- public void setMessageGenerator(MessageGenerator mg)
- {
- messagegenerator = mg;
- }
-
- /**
- * Add the refObject to the elementLocation hashtable with the location defined in element.
- *
- * @param refObject The object to add.
- * @param element The element that contains the location information.
- */
- protected void setLocation(Object refObject, Element element)
- {
- try
- {
- ElementImpl elementImpl = (ElementImpl)element;
- ElementLocation elementLocation = (ElementLocation)elementImpl.getUserData();
- if (elementLocation != null)
- {
-
- elementLocations.put(
- refObject,
- new LocationHolder(elementLocation.getLineNumber(), elementLocation.getColumnNumber(), def.getDocumentBaseURI()));
- }
- }
- catch (ClassCastException e)
- {
- }
- }
- /**
- * Add a reader error to the list.
- *
- * @param parentobject The parent object of the object with the error.
- * @param object The object with the error.
- * @param error The error message.
- */
- protected void addReaderError(Object parentobject, Object object, String error)
- {
- readerErrors.add(new ReaderError(parentobject, object, error));
- }
-
- /**
- * Add a reader warning to the list.
- *
- * @param parentobject The parent object of the object with the error.
- * @param object The object with the error.
- * @param warning The warning message.
- */
- protected void addReaderWarning(Object parentobject, Object object, String warning)
- {
- readerWarnings.add(new ReaderError(parentobject, object, warning));
- }
-
- /**
- * Register all of the locations of the child elements of the extensibility
- * element given.
- *
- * @param extElem The extensibility element whose child elements will be registered.
- */
-
- protected void registerChildElements(ExtensibilityElement extElem)
- {
- // only add those that are of type unknown. if they're known they
- // will take care of themselves
- if (extElem instanceof UnknownExtensibilityElement)
- {
- Element elem = ((UnknownExtensibilityElement)extElem).getElement();
- registerChildElementsRecursively(elem);
- }
- }
-
- /**
- * Register the location of all of the child elements of elem.
- *
- * @param elem The element whose child elements will be registered.
- */
- protected void registerChildElementsRecursively(Element elem)
- {
- if (elem instanceof ElementNSImpl)
- {
- setLocation(elem, elem);
-
- // call the method recursively for each child element
- NodeList childNodes = elem.getChildNodes();
-
- for (int i = 0; i < childNodes.getLength() || i < 5; i++)
- {
- Node n = childNodes.item(i);
- // we only want nodes that are Elements
- if (n instanceof Element)
- {
- Element child = (Element)n;
- registerChildElementsRecursively(child);
- }
- }
- }
- }
- /**
- * Check that an element name matches the expected name.
- *
- * @param el The element with the name to check.
- * @param qname The name to check against.
- * @throws WSDLException
- */
- private static void checkElementName(Element el, QName qname) throws WSDLException
- {
- if (!QNameUtils.matches(qname, el))
- {
- WSDLException wsdlExc = new WSDLException(WSDLException.INVALID_WSDL, "Expected element '" + qname + "'.");
-
- wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
-
- throw wsdlExc;
- }
- }
-
- /**
- * Get the element locations hashtable.
- *
- * @return The element locations hashtable.
- */
- public Hashtable getElementLocations()
- {
- return elementLocations;
- }
-
- /**
- * Get the reader errors.
- *
- * @return The reader errors.
- */
- public List getReaderErrors()
- {
- return readerErrors;
- }
-
- /**
- * Get reader warnings.
- *
- * @return The reader warnings.
- */
- public List getReaderWarnings()
- {
- return readerWarnings;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
deleted file mode 100644
index 4e6ecd6a9..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.wsdl.Import;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.xml.LineNumberDOMParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import com.ibm.wsdl.DefinitionImpl;
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * A WSDL reader that supports cyclic WSDL imports, schema imports and inline schemas.
- * This reader is based on the WSDLReaderImpl from WSDL4J.
- */
-public class WSDLReaderImpl
-{
- protected MessageGenerator messagegenerator;
- protected IWSDL11ValidationInfo wsdlvalinfo;
-
- /**
- * Constructor.
- *
- * @param wsdlvalinfo The WSDL 1.1 validation info object to use.
- */
- public WSDLReaderImpl(IWSDL11ValidationInfo wsdlvalinfo)
- {
- this.wsdlvalinfo = wsdlvalinfo;
- }
-
- /**
- * Parse the root document. This method will find all imports and parse them as
- * well creating a WSDLDocument for each unique WSDL file. This method supports
- * cyclic WSDL import statements such that file A can import file B and file B
- * can import file A.
- *
- * @param documentBaseURI The base URI of the root document.
- * @param defEl The definition element of the root document.
- * @return An array of WSDLDocuments containing all of the unique files in the description.
- * @throws WSDLException
- */
- protected WSDLDocument[] parseDocument(String documentBaseURI, Element defEl) throws WSDLException
- {
- int initialImportArraySize = 20;
- List[] filesAtDepth = new ArrayList[initialImportArraySize];
- Map filesImporting = new Hashtable();
- SortedSet parsedImports = new TreeSet();
- SortedSet importsToParse = new TreeSet();
- int maxdepth = 0;
-
- WSDLDocument rootdoc = new WSDLDocument(documentBaseURI, defEl, 0, messagegenerator, wsdlvalinfo);
- String targetNamespace = rootdoc.getDefinition().getTargetNamespace();
- ImportHolder rootImport = new ImportHolder(targetNamespace, documentBaseURI, documentBaseURI, rootdoc, 0, null, messagegenerator, wsdlvalinfo);
- rootImport.createWSDLImport(rootdoc);
- parsedImports.add(rootImport);
- List rootList = new ArrayList();
- filesImporting.put(rootImport.getLocation(), new ArrayList());
- rootList.add(rootdoc);
- filesAtDepth[0] = rootList;
- importsToParse.addAll(rootdoc.getImports());
- Set imps = rootdoc.getImports();
- Iterator impIter = imps.iterator();
- while(impIter.hasNext())
- {
- ImportHolder imp = (ImportHolder)impIter.next();
- List tempList = new ArrayList();
- tempList.add(imp.getImportingDocument());
- filesImporting.put(imp.getLocation(), tempList);
- }
-
- while(!importsToParse.isEmpty())
- {
- ImportHolder imp = (ImportHolder)importsToParse.first();
- // It's important to initialize the import here so each import
- // is only created once. In the case of reciprical imports this
- // avoids an infinite loop.
- imp.initialize();
- WSDLDocument impDoc = imp.getWSDLDocument();
-
- importsToParse.remove(imp);
-
- parsedImports.add(imp);
-
- // Add new imports to the list of imports to parse.
- // Remove all the imports that have already been parsed.
- if(impDoc != null)
- {
- // Increate import array if necessary.
- if(imp.getDepth() >= initialImportArraySize)
- {
- List[] tempArray = new List[filesAtDepth.length + initialImportArraySize];
- System.arraycopy(filesAtDepth, 0, tempArray, 0, filesAtDepth.length);
- filesAtDepth = tempArray;
- }
- // Create the list for the depth if necessary.
- int impDepth = imp.getDepth();
- if(filesAtDepth[impDepth] == null)
- {
- if(maxdepth < impDepth)
- {
- maxdepth = impDepth;
- }
- filesAtDepth[impDepth] = new ArrayList();
- }
- filesAtDepth[imp.getDepth()].add(impDoc);
-
- Set imports = impDoc.getImports();
- ImportHolder[] importsArray = (ImportHolder[])imports.toArray(new ImportHolder[imports.size()]);
- for(int i = 0; i < importsArray.length; i++)
- {
- ImportHolder ih = importsArray[i];
- // If already parsed, add the definition importing this file to the list.
- if(filesImporting.containsKey(ih.getLocation()))
- {
- ((List)filesImporting.get(ih.getLocation())).add(ih.getImportingDocument());
- }
- // Otherwise add it to the list to parse.
- else
- {
- // Add this import to the list of files importing list.
- List tempList = new ArrayList();
- tempList.add(ih.getImportingDocument());
- filesImporting.put(ih.getLocation(), tempList);
- importsToParse.add(ih);
- }
- }
- }
- }
-
- // Add all of the imports to the respective documents.
- Iterator importElementsIter = parsedImports.iterator();
- while(importElementsIter.hasNext())
- {
- ImportHolder imp = (ImportHolder)importElementsIter.next();
- List files = (List)filesImporting.get(imp.getLocation());
- Iterator filesIter = files.iterator();
- while(filesIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)filesIter.next();
-
- DefinitionImpl def = (DefinitionImpl)doc.getDefinition();
- Import impElem = imp.getImport();
- if(impElem != null)
- {
- def.addImport(impElem);
- if(!imp.isWSDLFileImport())
- {
- doc.addSchemas(imp.getSchemas());
- }
- }
-
- }
- }
-
- // Parse the WSDL documents.
- // Parse the Messages.
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- doc.parseMessages();
- }
- }
- // Parse the Porttypes.
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- doc.parsePorttypes();
- }
- }
- // Parse the Bindings.
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- doc.parseBindings();
- }
- }
- // Parse the Services.
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- doc.parseServices();
- }
- }
- // Parse the Extensibility Elements.
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- doc.parseExtensibilityElements();
- }
- }
-
- List wsdlDocs = new ArrayList();
- for(int i = maxdepth; i >=0; i--)
- {
- List docs = filesAtDepth[i];
- Iterator docsIter = docs.iterator();
- while(docsIter.hasNext())
- {
- WSDLDocument doc = (WSDLDocument)docsIter.next();
- wsdlDocs.add(doc);
- }
- }
-
- return (WSDLDocument[])wsdlDocs.toArray(new WSDLDocument[wsdlDocs.size()]);
- }
-
- /**
- * Get the WSDL document.
- *
- * @param inputSource The source of the document being retrieved.
- * @param desc The description of the document being retrieved.
- * @return The WSDL document.
- * @throws WSDLException
- */
- public static Document getDocument(InputSource inputSource, String desc) throws WSDLException
- {
- try
- {
- StandardParserConfiguration configuration = new StandardParserConfiguration()
- {
- protected XMLErrorReporter createErrorReporter()
- {
- return new XMLErrorReporter()
- {
- public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
- {
- boolean reportError = true;
- if (key.equals("PrematureEOF"))
- {
- reportError = false;
- }
-
- if (reportError)
- {
- super.reportError(domain, key, arguments, severity);
- }
- }
- };
- }
- };
-
- ErrorHandler errorHandler = new ErrorHandler()
- {
- /* (non-Javadoc)
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
- */
- public void error(SAXParseException exception) throws SAXException
- {
- // TODO Auto-generated method stub
-
- }
- /* (non-Javadoc)
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
- */
- public void fatalError(SAXParseException exception) throws SAXException
- {
- // TODO Auto-generated method stub
-
- }
- /* (non-Javadoc)
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
- */
- public void warning(SAXParseException exception) throws SAXException
- {
- // TODO Auto-generated method stub
-
- }
- };
-
- DOMParser builder = new LineNumberDOMParser(configuration);
- builder.setErrorHandler(errorHandler);
- builder.parse(inputSource);
- Document doc = builder.getDocument();
-
- return doc;
- }
- catch (Throwable t)
- {
- throw new WSDLException(WSDLException.PARSER_ERROR, "Problem parsing '" + desc + "'.", t);
- }
- }
-
- /**
- * Read a WSDL document using a context URI and file URI.
- *
- * @param contextURI The context URI to use.
- * @param wsdlURI The WSDL URI to use.
- * @return An array of WSDLDocuments.
- * @throws WSDLException
- */
- public WSDLDocument[] readWSDL(String contextURI, String wsdlURI) throws WSDLException
- {
- try
- {
- URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
- URL url = StringUtils.getURL(contextURL, wsdlURI);
- Reader reader = StringUtils.getContentAsReader(url);
- InputSource inputSource = new InputSource(reader);
- Document doc = getDocument(inputSource, wsdlURI);
- reader.close();
- WSDLDocument[] wsdlDocs = null;
- // only parse the document if it isn't empty
- if(doc.getDocumentElement() != null)
- {
- wsdlDocs = readWSDL(url.toString(), doc);
- }
- return wsdlDocs;
- }
- catch (WSDLException e)
- {
- throw e;
- }
- catch (Throwable t)
- {
- throw new WSDLException(
- WSDLException.OTHER_ERROR,
- "Unable to resolve imported document at '" + wsdlURI + "'.",
- t);
- }
- }
-
- /**
- * Set the messagegenerator for the reader.
- *
- * @param mg The message generator to set.
- */
- public void setMessageGenerator(MessageGenerator mg)
- {
- messagegenerator = mg;
- }
-
- /**
- * Read the WSDL document accessible via the specified
- * URI into a WSDL definition.
- *
- * @param wsdlURI A URI pointing to a WSDL file.
- * @return An array of WSDLDocuments.
- */
- public WSDLDocument[] readWSDL(String wsdlURI) throws WSDLException
- {
- return readWSDL(null, wsdlURI);
- }
-
- /**
- * Read the WSDL document described by a URI and its definitions element.
- *
- * @param documentBaseURI The URI of the WSDL document.
- * @param definitionsElement The definitions element for the WSDL document.
- * @return An array of WSDLDocuments.
- * @throws WSDLException
- */
- protected WSDLDocument[] readWSDL(String documentBaseURI,
- Element definitionsElement)
- throws WSDLException
- {
- return parseDocument(documentBaseURI, definitionsElement);
- }
-
- /**
- * Read the specified WSDL document.
- *
- * @param documentBaseURI The document base URI.
- * @param wsdlDocument The WSDL document.
- * @return An array of WSDLDocuments.
- */
- public WSDLDocument[] readWSDL(String documentBaseURI, Document wsdlDocument)
- throws WSDLException
- {
- return readWSDL(documentBaseURI, wsdlDocument.getDocumentElement());
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java
deleted file mode 100644
index 6780e48e2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.http;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPOperation;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-import com.ibm.wsdl.BindingImpl;
-import com.ibm.wsdl.BindingInputImpl;
-import com.ibm.wsdl.BindingOperationImpl;
-import com.ibm.wsdl.PortImpl;
-import com.ibm.wsdl.extensions.http.HTTPAddressImpl;
-import com.ibm.wsdl.extensions.http.HTTPBindingImpl;
-import com.ibm.wsdl.extensions.http.HTTPOperationImpl;
-import com.ibm.wsdl.extensions.http.HTTPUrlEncodedImpl;
-import com.ibm.wsdl.extensions.http.HTTPUrlReplacementImpl;
-
-/**
- * The HTTP validator is an extension WSDL validator that validates all elements in the HTTP
- * namespace.
- */
-public class HTTPValidator implements IWSDL11Validator
-{
- private final String _ERROR_INVALID_PORT_ELEMENT = "_ERROR_INVALID_PORT_ELEMENT";
- private final String _ERROR_INVALID_BINDING_ELEMENT = "_ERROR_INVALID_BINDING_ELEMENT";
- private final String _ERROR_INVALID_BINDING_OPERATION_ELEMENT = "_ERROR_INVALID_BINDING_OPERATION_ELEMENT";
- private final String _ERROR_INVALID_BINDING_INPUT_ELEMENT = "_ERROR_INVALID_BINDING_INPUT_ELEMENT";
- private final String _ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION = "_ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION";
- private final String _ERROR_NO_LOCATION_FOR_ADDRESS = "_ERROR_NO_LOCATION_FOR_ADDRESS";
- private final String _ERROR_NO_HTTPBINDING_FOR_ADDRESS = "_ERROR_NO_HTTPBINDING_FOR_ADDRESS";
- private final String _ERROR_INVALID_BINDING_VERB = "_ERROR_INVALID_BINDING_VERB";
- private final String _ERROR_INVALID_LOCATION_URI = "_ERROR_INVALID_LOCATION_URI";
- private final String _ERROR_NO_HTTPBINDING_FOR_OPERATION = "_ERROR_NO_HTTPBINDING_FOR_OPERATION";
- private final String _ERROR_NOT_ONLY_ELEMENT_DEFINED = "_ERROR_NOT_ONLY_ELEMENT_DEFINED";
- private final String _ERROR_NO_HTTPOPERATION_FOR_URL = "_ERROR_NO_HTTPOPERATION_FOR_URL";
-
- private final String GET = "GET";
- private final String POST = "POST";
-
- private final String QUOTE = "'";
- private final String EMPTY_STRING = "";
-
- private MessageGenerator messagegenerator;
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- // Port HTTP definition
- // make sure every port has only one address element defined
- // if it is an address element, validate it
- if (parents.get(0).getClass() == PortImpl.class)
- {
- if (element.getClass() == HTTPAddressImpl.class)
- {
- validateAddress(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_PORT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
- element);
- }
- }
-
- // Binding HTTP definition
- // A HTTP Binding must have a verb of GET or POST
- else if (parents.get(0).getClass() == BindingImpl.class)
- {
- if (element.getClass() == HTTPBindingImpl.class)
- {
- validateBinding(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BINDING_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
- element);
- }
- }
- // Binding Operation HTTP definition
- // A HTTP Operation has a location uri defined
- else if (parents.get(0).getClass() == BindingOperationImpl.class)
- {
- if (element.getClass() == HTTPOperationImpl.class)
- {
- validateOperation(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_INVALID_BINDING_OPERATION_ELEMENT,
- QUOTE + e.getElementType().getLocalPart() + QUOTE),
- element);
- }
-
- }
- else if (parents.get(0).getClass() == BindingInputImpl.class)
- {
- // validate the HTTP urlEncoded and urlReplacement
- if (element.getClass() == HTTPUrlEncodedImpl.class || element.getClass() == HTTPUrlReplacementImpl.class)
- {
- validateHttpUrl(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BINDING_INPUT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
- element);
- }
- }
-
- // in this case there has been a HTTP element defined that is not defined for this point in the HTTP namespace
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION,
- QUOTE + e.getElementType().getLocalPart() + QUOTE),
- element);
- }
-
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- if (messagegenerator == null)
- {
- messagegenerator = new MessageGenerator(rb);
- }
- }
-
- /**
- * Ensure that the HTTP address has a value specified for it's uri and that there is a HTTP Binding defined
- * for the Binding specified in the port.
- *
- * @param element The HTTP address element.
- * @param parents The list of parents of the HTTP address element.
- * @param validatorcontroller The validator controller in charge of validation.
- */
- protected void validateAddress(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- HTTPAddressImpl ha = (HTTPAddressImpl)element;
-
- String uri = ha.getLocationURI();
- if (uri == null || uri.equalsIgnoreCase(EMPTY_STRING))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_NO_LOCATION_FOR_ADDRESS), ha);
- }
-
- Port port = (Port)parents.get(0);
-
- Binding binding = port.getBinding();
-
- if (!hasHttpBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_NO_HTTPBINDING_FOR_ADDRESS,
- QUOTE + binding.getQName().getLocalPart() + QUOTE,
- QUOTE + port.getName() + QUOTE),
- ha);
- }
- }
-
- /**
- * Ensure the HTTP Binding defined is valid. A HTTP Binding must have a verb of GET or POST.
- *
- * @param element The HTTP binding element.
- * @param parents The list of parents of the HTTP binding element.
- * @param validatorcontroller The validator controller in charge of validation.
- */
- protected void validateBinding(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- HTTPBindingImpl hb = (HTTPBindingImpl)element;
-
- String verb = hb.getVerb();
-
- if (verb != null && !verb.equals(GET) && !verb.equals(POST))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BINDING_VERB, QUOTE + verb + QUOTE), element);
- }
- }
-
- /**
- * An operation must have a location defined. A HTTP Binding must be specified to use an operation.
- *
- * @param element The HTTP operation element.
- * @param parents The list of parents of the HTTP operation element.
- * @param validatorcontroller The validator controller in charge of validation.
- */
- protected void validateOperation(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- HTTPOperation ho = (HTTPOperation)element;
-
- String locationURI = ho.getLocationURI();
-
- if (locationURI != null && locationURI.equalsIgnoreCase(EMPTY_STRING))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_LOCATION_URI), element);
- }
-
- Binding binding = (Binding)parents.get(1);
- if (!hasHttpBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_HTTPBINDING_FOR_OPERATION, QUOTE + binding.getQName().getLocalPart() + QUOTE),
- ho);
- }
- }
-
- /**
- * Validate the HTTP urlReplacement or urlEncoded. Ensure the HTTP operation has been defined.
- * Ensure that either element is the only element specified.
- *
- * @param element The HTTP binding operation element.
- * @param parents The list of parents of the HTTP binding operation element.
- * @param validatorcontroller The validator controller in charge of validation.
- */
- protected void validateHttpUrl(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- BindingOperation operation = (BindingOperation)parents.get(1);
-
- String elementName;
- if (element.getClass() == HTTPUrlEncodedImpl.class)
- {
- elementName = "urlEncoded";
- }
- else if (element.getClass() == HTTPUrlReplacementImpl.class)
- {
- elementName = "urlReplacement";
- }
- else
- {
- elementName = EMPTY_STRING;
- }
-
- BindingInput input = (BindingInput)parents.get(0);
- if (input.getExtensibilityElements().size() != 1)
- {
- valInfo.addError(messagegenerator.getString(_ERROR_NOT_ONLY_ELEMENT_DEFINED, elementName), element);
- }
-
- if (!hasHttpOperation(operation))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_HTTPOPERATION_FOR_URL, QUOTE + operation.getName() + QUOTE, elementName),
- element);
- }
- }
-
- /**
- * Given a BindingOperation tells whether it has a HTTP operation defined for it.
- *
- * @param binding The HTTP binding operation element.
- * @return True if there is an HTTP operation defined, false otherwise.
- */
- protected boolean hasHttpOperation(BindingOperation operation)
- {
- if (operation != null)
- {
- List extelems = operation.getExtensibilityElements();
- if (extelems != null)
- {
- Iterator iextelems = extelems.iterator();
- while (iextelems.hasNext())
- {
- if (iextelems.next().getClass() == HTTPOperationImpl.class)
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- /**
- * Given a binding returns true if it has a HTTP binding defined.
- *
- * @param binding The binding to check.
- * @return True if there is an HTTP binding defined.
- */
- protected boolean hasHttpBinding(Binding binding)
- {
- if (binding != null)
- {
- List extelems = binding.getExtensibilityElements();
- if (extelems != null)
- {
- Iterator iextelems = extelems.iterator();
- while (iextelems.hasNext())
- {
- if (iextelems.next().getClass() == HTTPBindingImpl.class)
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java
deleted file mode 100644
index 54fcea8f2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.mime;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-/**
- * The MIME validator plugs into the WSDL validator to provide
- * validation for all elements in a WSDL document within the MIME namespace.
- */
-public class MIMEValidator implements IWSDL11Validator
-{
- protected MessageGenerator messagegenerator;
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
-
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- if (messagegenerator == null)
- {
- messagegenerator = new MessageGenerator(rb);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java
deleted file mode 100644
index b3a95493e..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.soap;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-import com.ibm.wsdl.BindingFaultImpl;
-import com.ibm.wsdl.BindingImpl;
-import com.ibm.wsdl.BindingInputImpl;
-import com.ibm.wsdl.BindingOperationImpl;
-import com.ibm.wsdl.BindingOutputImpl;
-import com.ibm.wsdl.PortImpl;
-import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBindingImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBodyImpl;
-import com.ibm.wsdl.extensions.soap.SOAPFaultImpl;
-import com.ibm.wsdl.extensions.soap.SOAPHeaderFaultImpl;
-import com.ibm.wsdl.extensions.soap.SOAPHeaderImpl;
-import com.ibm.wsdl.extensions.soap.SOAPOperationImpl;
-
-/**
- * The SOAP validator plugs into the WSDL validator to provide
- * validation for all elements in a WSDL document within the SOAP namespace.
- *
- */
-public class SOAPValidator implements IWSDL11Validator
-{
- private final String _ERROR_INVALID_PORT_ELEMENT = "_ERROR_INVALID_PORT_ELEMENT";
- private final String _ERROR_INVALID_BINDING_ELEMENT = "_ERROR_INVALID_BINDING_ELEMENT";
- private final String _ERROR_INVALID_BINDING_OPERATION_ELEMENT = "_ERROR_INVALID_BINDING_OPERATION_ELEMENT";
- private final String _ERROR_INVALID_HEADER_BODY_ELEMENT = "_ERROR_INVALID_HEADER_BODY_ELEMENT";
- private final String _ERROR_INVALID_FAULT_ELEMENT = "_ERROR_INVALID_FAULT_ELEMENT";
- private final String _ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION = "_ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION";
- private final String _ERROR_NO_LOCATION_FOR_ADDRESS = "_ERROR_NO_LOCATION_FOR_ADDRESS";
- private final String _ERROR_NO_SOAPBINDING_FOR_ADDRESS = "_ERROR_NO_SOAPBINDING_FOR_ADDRESS";
- private final String _ERROR_INVALID_BINDING_STYLE = "_ERROR_INVALID_BINDING_STYLE";
- private final String _ERROR_INVALID_BINDING_URI = "_ERROR_INVALID_BINDING_URI";
- private final String _ERROR_INVALID_OPERATION_STYLE = "_ERROR_INVALID_OPERATION_STYLE";
- private final String _ERROR_NO_SOAPBINDING_FOR_OPERATION = "_ERROR_NO_SOAPBINDING_FOR_OPERATION";
- private final String _ERROR_INVALID_BODY_ENCODING_STYLE = "_ERROR_INVALID_BODY_ENCODING_STYLE";
- private final String _ERROR_INVALID_BODY_NAMESPACE_FOR_ENCODED = "_ERROR_INVALID_BODY_NAMESPACE_FOR_ENCODED";
- private final String _ERROR_INVALID_BODY_USE = "_ERROR_INVALID_BODY_USE";
- private final String _ERROR_INVALID_BODY_PART_NOT_TYPE = "_ERROR_INVALID_BODY_PART_NOT_TYPE";
- private final String _ERROR_INVALID_BODY_PART_UNDEFINED = "_ERROR_INVALID_BODY_PART_UNDEFINED";
- private final String _ERROR_NO_SOAPBINDING_FOR_BODY = "_ERROR_NO_SOAPBINDING_FOR_BODY";
- private final String _ERROR_HEADER_MESSAGE_UNDEFINED = "_ERROR_HEADER_MESSAGE_UNDEFINED";
- private final String _ERROR_HEADER_PART_UNDEFINED = "_ERROR_HEADER_PART_UNDEFINED";
- private final String _ERROR_HEADER_USE_UNDEFINED = "_ERROR_HEADER_USE_UNDEFINED";
- private final String _ERROR_HEADER_ENCODINGSTYLE_UNDEFINED = "_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED";
- private final String _ERROR_HEADER_NAMESPACE_UNDEFINED = "_ERROR_HEADER_NAMESPACE_UNDEFINED";
- private final String _ERROR_NO_SOAPBINDING_FOR_HEADER = "_ERROR_NO_SOAPBINDING_FOR_HEADER";
- private final String _ERROR_HEADERFAULT_MESSAGE_UNDEFINED = "_ERROR_HEADERFAULT_MESSAGE_UNDEFINED";
- private final String _ERROR_HEADERFAULT_PART_UNDEFINED = "_ERROR_HEADERFAULT_PART_UNDEFINED";
- private final String _ERROR_HEADERFAULT_USE_UNDEFINED = "_ERROR_HEADERFAULT_USE_UNDEFINED";
- private final String _ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED = "_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED";
- private final String _ERROR_HEADERFAULT_NAMESPACE_UNDEFINED = "_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED";
- private final String _ERROR_INVALID_FAULT_NAME = "_ERROR_INVALID_FAULT_NAME";
- private final String _ERROR_INVALID_FAULT_ENCODING_STYLE = "_ERROR_INVALID_FAULT_ENCODING_STYLE";
- private final String _ERROR_INVALID_FAULT_NAMESPACE_FOR_ENCODED = "_ERROR_INVALID_FAULT_NAMESPACE_FOR_ENCODED";
-
- private final String ENCODED = "encoded";
- private final String LITERAL = "literal";
- private final String RPC = "rpc";
- private final String DOCUMENT = "document";
-
- private final String QUOTE = "'";
- private final String EMPTY_STRING = "";
-
- protected MessageGenerator messagegenerator;
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- // Port SOAP definition
- // make sure every port has only one address element defined
- // if it is an address element, validate it
- if (parents.get(0).getClass() == PortImpl.class)
- {
- if (element.getClass() == SOAPAddressImpl.class)
- {
- validateAddress(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_PORT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
- }
-
- // Binding SOAP definition
- // A SOAP Binding must have a style or rpc or document or no style defined - defaults to document
- // Must have a transport uri defined - check if the uri is empty
- else if (parents.get(0).getClass() == BindingImpl.class)
- {
- if (element.getClass() == SOAPBindingImpl.class)
- {
- validateBinding(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BINDING_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
- }
- // Binding Operation SOAP definition
- // A SOAP Operation may have a style defined in which case it must be document or rpc
- // and may have a soapAction uri defined
- else if (parents.get(0).getClass() == BindingOperationImpl.class)
- {
- if (element.getClass() == SOAPOperationImpl.class)
- {
- validateOperation(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_INVALID_BINDING_OPERATION_ELEMENT,
- QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
-
- }
- else if (
- parents.get(0).getClass() == BindingInputImpl.class || parents.get(0).getClass() == BindingOutputImpl.class)
- {
- // validate the SOAP body
- if (element.getClass() == SOAPBodyImpl.class)
- {
- validateBody(element, parents, valInfo);
- }
- // valiate the SOAP header
- else if (element.getClass() == SOAPHeaderImpl.class)
- {
- validateHeader(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_HEADER_BODY_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
- }
- else if (parents.get(0).getClass() == BindingFaultImpl.class)
- {
- if (element.getClass() == SOAPFaultImpl.class)
- {
- validateFault(element, parents, valInfo);
- }
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_FAULT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
- }
- // in this case there has been a SOAP element defined that is not defined for this point in the SOAP namespace
- else
- {
- ExtensibilityElement e = (ExtensibilityElement)element;
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION,
- QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
- }
-
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- if (messagegenerator == null)
- {
- messagegenerator = new MessageGenerator(rb);
- }
- }
-
- /**
- * Ensure that the SOAP address has a value specified for it's uri and that the binding has a SOAP
- * Binding defined.
- *
- * @param element The SOAP address element.
- * @param parents A list of parents of the SOAP address element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateAddress(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPAddressImpl sa = (SOAPAddressImpl)element;
-
- String uri = sa.getLocationURI();
- if (uri == null || uri.equalsIgnoreCase(EMPTY_STRING))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_NO_LOCATION_FOR_ADDRESS), sa);
- }
-
- Port port = (Port)parents.get(0);
-
- Binding binding = port.getBinding();
-
- if (!hasSoapBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_NO_SOAPBINDING_FOR_ADDRESS,
- QUOTE + binding.getQName().getLocalPart() + QUOTE,
- QUOTE + port.getName() + QUOTE), sa);
- }
- }
-
- /**
- * Ensure the SOAP Binding defined is valid. A SOAP Binding must have a style of rpc or document
- * or no style defined (defaults to document.) A valid (non empty) URI must also be specified.
- *
- * @param element The SOAP binding element.
- * @param parents A list of parents of the SOAP binding element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateBinding(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPBindingImpl sb = (SOAPBindingImpl)element;
-
- String style = sb.getStyle();
- String uri = sb.getTransportURI();
-
- if (style != null && !style.equalsIgnoreCase(RPC) && !style.equalsIgnoreCase(DOCUMENT))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BINDING_STYLE, QUOTE + sb.getStyle() + QUOTE), element);
- }
- if (uri.equalsIgnoreCase(EMPTY_STRING))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BINDING_URI), element);
- }
- }
-
- /**
- * An operation may have a style defined. If it is defined it must be rpc or document. It may also have a
- * uri defined which must be non empty. It may have a soapAction defined as well.
- *
- * @param element The SOAP operation element.
- * @param parents A list of parents of the SOAP operation element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateOperation(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPOperation so = (SOAPOperation)element;
-
- String soapStyle = so.getStyle();
-
- if (soapStyle != null && !soapStyle.equalsIgnoreCase(RPC) && !soapStyle.equalsIgnoreCase(DOCUMENT))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_OPERATION_STYLE), element);
- }
-
- Binding binding = (Binding)parents.get(1);
- if (!hasSoapBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_OPERATION, QUOTE + binding.getQName().getLocalPart() + QUOTE), so);
- }
- }
-
- /**
- * Validate the SOAP body. If encoded a body must have an encodingStyle. Also,
- * if specified, all of the parts listed must be defined parts and in the encoding use case, the parts
- * must have types defined.
- *
- * @param element The SOAP body element.
- * @param parents A list of parents of the SOAP body element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateBody(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPBodyImpl sb = (SOAPBodyImpl)element;
-
- String use = sb.getUse();
-
- // if the use = encoded then there must be encodingStyles.
- if (use != null && use.equalsIgnoreCase(ENCODED))
- {
- List encodingStyles = sb.getEncodingStyles();
- if (encodingStyles == null || encodingStyles.size() == 0)
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BODY_ENCODING_STYLE), sb);
- }
- }
- else if (use != null && !use.equalsIgnoreCase(LITERAL))
- {
- valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BODY_USE, QUOTE + use + QUOTE), sb);
- }
-
- //Check that the parts are valid
- // parts must be defined in the message specified for the operation
- List parts = sb.getParts();
-
- if (parts != null)
- {
- Iterator partsIterator = parts.iterator();
- while (partsIterator.hasNext())
- {
- String part = (String)partsIterator.next();
- BindingOperation bo = (BindingOperation)parents.get(1);
- Operation o = bo.getOperation();
-
- if (o != null && !o.isUndefined())
- {
- // get the message from the input or output if it exists
- Message mess = null;
- if (parents.get(0).getClass() == BindingInputImpl.class)
- {
- Input input = o.getInput();
-
- if (input != null)
- {
- mess = input.getMessage();
- }
- }
- else if (parents.get(0).getClass() == BindingOutputImpl.class)
- {
- Output output = o.getOutput();
-
- if (output != null)
- {
- mess = output.getMessage();
- }
- }
-
- if (mess != null && !mess.isUndefined())
- {
- Part p = mess.getPart(part);
-
- if (p != null)
- {
- // if the use is encoded the parts must all have a type defined
- if (use != null && use.equalsIgnoreCase(ENCODED))
- {
- if (p.getTypeName() == null)
- {
- // part error - part needs to be type and isn't
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BODY_PART_NOT_TYPE, QUOTE + part + QUOTE), sb);
- }
- }
- }
- else
- {
- //part error - part isn't defined
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
- }
- }
- else
- {
- //part error - input isn't defined
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
- }
- }
- else
- {
- // parts error - operation isn't defined
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
- }
- }
- }
-
- Binding binding = (Binding)parents.get(2);
- if (!hasSoapBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_BODY, QUOTE + binding.getQName().getLocalPart() + QUOTE), sb);
- }
- }
-
- /**
- * A SOAP header must have a message, part and use defined. If the use is encoded, must
- * also have a non-empty encodingStyle and namespace defined.
- * A SOAP header may have headerfaults defined as well.
- *
- * @param element The SOAP header element.
- * @param parents A list of parents of the SOAP header element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateHeader(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPHeaderImpl soapHeader = (SOAPHeaderImpl)element;
-
- QName messageQName = soapHeader.getMessage();
- Message message = ((Definition)parents.get(parents.size() - 1)).getMessage(messageQName);
- if (message == null)
- {
- // message undefined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADER_MESSAGE_UNDEFINED, QUOTE + messageQName.getLocalPart() + QUOTE), soapHeader);
- }
- else
- {
- String partname = soapHeader.getPart();
- Part part = message.getPart(partname);
- if (part == null)
- {
- // part undefined
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_HEADER_PART_UNDEFINED,
- QUOTE + partname + QUOTE,
- QUOTE + messageQName.getLocalPart() + QUOTE), soapHeader);
- }
- }
-
- String use = soapHeader.getUse();
- if (use != null && !use.equalsIgnoreCase(LITERAL) && !use.equalsIgnoreCase(ENCODED))
- {
- // use undefined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADER_USE_UNDEFINED, QUOTE + use + QUOTE), soapHeader);
- }
-
- if (use.equalsIgnoreCase(ENCODED))
- {
- List encodingStyles = soapHeader.getEncodingStyles();
- if (encodingStyles == null || encodingStyles.isEmpty())
- {
- // no encodingStyle defined
- valInfo.addError(messagegenerator.getString(_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED), soapHeader);
- }
-
- String namespace = soapHeader.getNamespaceURI();
- if (namespace == null || namespace.equalsIgnoreCase(EMPTY_STRING))
- {
- // no namespace defined
- valInfo.addError(messagegenerator.getString(_ERROR_HEADER_NAMESPACE_UNDEFINED), soapHeader);
- }
- }
-
- List headerFaults = soapHeader.getSOAPHeaderFaults();
- if (headerFaults != null)
- {
- Iterator iheaderFaults = headerFaults.iterator();
- while (iheaderFaults.hasNext())
- {
- validateHeaderFault(iheaderFaults.next(), parents, valInfo);
- }
- }
-
- Binding binding = (Binding)parents.get(2);
- if (!hasSoapBinding(binding))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_HEADER, QUOTE + binding.getQName().getLocalPart() + QUOTE), soapHeader);
- }
- }
-
- /**
- * A SOAP headerfault must have a message, part and use defined. If the use is encoded, must
- * also have a non-empty encodingStyle and namespace defined.
- *
- * @param element The SOAP header fault element.
- * @param parents A list of parents of the SOAP header fault element.
- * @param valInfo The validation info for this validation.
- */
- protected void validateHeaderFault(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPHeaderFaultImpl soapHeaderFault = (SOAPHeaderFaultImpl)element;
-
- QName messageQName = soapHeaderFault.getMessage();
- Message message = ((Definition)parents.get(parents.size() - 1)).getMessage(messageQName);
- if (message == null)
- {
- // message undefined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADERFAULT_MESSAGE_UNDEFINED, QUOTE + messageQName.getLocalPart() + QUOTE), soapHeaderFault);
- }
- else
- {
- String partname = soapHeaderFault.getPart();
- Part part = message.getPart(partname);
- if (part == null)
- {
- // part undefined
- valInfo.addError(
- messagegenerator.getString(
- _ERROR_HEADERFAULT_PART_UNDEFINED,
- QUOTE + partname + QUOTE,
- QUOTE + messageQName.getLocalPart() + QUOTE), soapHeaderFault);
- }
- }
-
- String use = soapHeaderFault.getUse();
- if (use != null && !use.equalsIgnoreCase(LITERAL) && !use.equalsIgnoreCase(ENCODED))
- {
- // use undefined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADERFAULT_USE_UNDEFINED, QUOTE + use + QUOTE), soapHeaderFault);
- }
-
- if (use.equalsIgnoreCase(ENCODED))
- {
- List encodingStyles = soapHeaderFault.getEncodingStyles();
- if (encodingStyles == null || encodingStyles.isEmpty())
- {
- // no encodingStyle defined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED), soapHeaderFault);
- }
-
- String namespace = soapHeaderFault.getNamespaceURI();
- if (namespace == null || namespace.equalsIgnoreCase(EMPTY_STRING))
- {
- // no namespace defined
- valInfo.addError(
- messagegenerator.getString(_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED), soapHeaderFault);
- }
- }
- }
-
- /**
- * Validate the SOAP fault. A SOAP fault must have a name defined that corresponds with the name
- * specified in the portType. If encoded a fault must have an encodingStyle and a namespaceURI.
- *
- * @param element The SOAP fault element.
- * @param parents A list of parents of the SOAP fault element.
- * @param validationInfo The validation info for this validation.
- */
- protected void validateFault(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- SOAPFaultImpl fault = (SOAPFaultImpl)element;
-
- String name = fault.getName();
-
- String parentName = ((BindingFault)parents.get(0)).getName();
-
- if (!name.equals(parentName))
- {
- valInfo.addError(
- messagegenerator.getString(_ERROR_INVALID_FAULT_NAME, QUOTE + name + QUOTE, QUOTE + parentName + QUOTE), fault);
- }
-
- }
-
- /**
- * Method hasSoapBinding. - helper Method
- * Given a binding returns true if it has a SOAP binding defined.
- *
- * @param binding - the SOAP binding to check
- * @return true if a binding has a SOAP binding defined, false otherwise
- */
- protected boolean hasSoapBinding(Binding binding)
- {
- if (binding != null)
- {
- List extelems = binding.getExtensibilityElements();
- if (extelems != null)
- {
- Iterator iextelems = extelems.iterator();
- while (iextelems.hasNext())
- {
- if (iextelems.next().getClass() == SOAPBindingImpl.class)
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
deleted file mode 100644
index 329b1118b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
+++ /dev/null
@@ -1,26 +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.wsdl.validation.internal.wsdl11.xsd;
-
-/**
- * This interface is used to signify error levels that are the result of
- * XMLParseException. They conceptually correspond to org.w3c.dom.DOMError but
- * we use our own interface, since DOMError is not in Java 1.4, and its
- * package changes from Xerces 2.6.2 and Xerces 2.7.0.
- */
-
-public interface DOMError {
- int SEVERITY_WARNING = 1;
- int SEVERITY_ERROR = 2;
- int SEVERITY_FATAL_ERROR = 3;
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
deleted file mode 100644
index 2119778f3..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * Entity resolve to resolve file entities.
- */
-public class FileEntityResolver implements XMLEntityResolver
-{
-
- /**
- * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
- */
- public XMLInputSource resolveEntity(XMLResourceIdentifier resource) throws XNIException, IOException
- {
- String publicId = resource.getPublicId();
- String systemId = resource.getExpandedSystemId();
- String namespace = resource.getNamespace();
- String url = null;
- if(systemId != null)
- {
- url = systemId;
- }
- else if(publicId != null)
- {
- url = publicId;
- }
- else if(namespace != null)
- {
- url = namespace;
- }
- if(url != null)
- {
- InputStream is = new LazyURLInputStream(url);
- return new XMLInputSource(publicId, resource.getExpandedSystemId(), resource.getExpandedSystemId(), is, null);
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
deleted file mode 100644
index 6902be333..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Generate a String representation of a schema for an inline schema. Will add imports for unresolved
- * namespaces.
- */
-public class InlineSchemaGenerator
-{
- protected static final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
- protected static final String FILE_PREFIX = "file:///";
- protected static final String XMLNS = "xmlns";
- protected static final String TARGETNAMESPACE = "targetNamespace";
- protected static final String NAMESPACE = "namespace";
- protected static final String IMPORT = "import";
- protected static final String INCLUDE = "include";
- protected static final String SCHEMA = "schema";
- protected static final String SCHEMALOCATION = "schemaLocation";
- protected static final String TYPE = "type";
- protected static final String NAME = "name";
- protected static final String[] ignoreNamespaces =
- { Constants.NS_URI_XSD_1999, Constants.NS_URI_XSD_2000, Constants.NS_URI_XSD_2001 };
-
- protected static InlineSchemaGenerator instance = null;
-
- /**
- * Constructor.
- */
- protected InlineSchemaGenerator()
- {
- }
-
- /**
- * Get the instance of the InlineSchemaGenerator.
- *
- * @return The instance of the inline schema generator.
- */
- protected static InlineSchemaGenerator getInstance()
- {
- if (instance == null)
- {
- instance = new InlineSchemaGenerator();
- }
- return instance;
- }
-
- /**
- * Create a string representation of a schema from the element provided.
- *
- * @param element The root element of the schema.
- * @param elements A list of the elements in the schema in order.
- * @param filelocation The URI of the file that contains the schema.
- * @param validImportNSs A set of namespaces for which it's valid to create import statements.
- * @return A string representation of a schema.
- */
- public static String createXSDString(Element element, List elements, String filelocation, Set validImportNSs)
- {
- return InlineSchemaGenerator.createXSDString(element, elements, filelocation, new Hashtable(), validImportNSs);
- }
-
- /**
- * Creates a String representing the schema model with the root element of
- * extElem. Calls createXSDStringRecursively to take care of building the String
- * after it obtains the Element from the UnknownExtensibilityElement.
- *
- * @param element The root element of the schema.
- * @param elements A list to contain the elements in the schema in order.
- * @param filelocation The location of the file the schema is located in.
- * @param parentNSs A hashtable of parent namespaces to used to resolve prefixes.
- * @param validImportNSs A set of namespaces for which it's valid to create import statements.
- * @return A string representation of the schema with the root element 'element'.
- */
- public static String createXSDString(Element element, List elements, String filelocation, Hashtable parentNSs, Set validImportNSs)
- {
- Set importNSs = new TreeSet();
- importNSs.addAll(validImportNSs);
- importNSs.add(SOAP_ENCODING_URI);
-
- InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
- Hashtable nsResolver = schemaGenerator.getNSResolver(element);
- List reqns = schemaGenerator.getRequiredNamespaces(element);
- Hashtable reqNSDecl = schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
- //Hashtable reqNSDecl = schemaGenerator.getRequiredNSDeclarations(reqns, nsResolver, parentNSs);
- List importNS = schemaGenerator.getImportNamespaces(element);
- reqns = schemaGenerator.removeImports(reqns, importNS);
- reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
- reqns = schemaGenerator.restrictImports(reqns, validImportNSs);
- return schemaGenerator.createXSDStringRecursively(element, elements, reqns, reqNSDecl, filelocation);
- }
- /**
- * Returns true if the SOAP encoding namespace is required but not imported.
- *
- * @param element The root element of the schema.
- * @param filelocation The location of the file containing the schema.
- * @param parentNSs A hashtable of the parent namespaces.
- * @return True if the soap encoding namespace is required but not imported, false otherwise.
- */
- public static boolean soapEncodingRequiredNotImported(Element element, String filelocation, Hashtable parentNSs)
- {
- InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
- Hashtable nsResolver = schemaGenerator.getNSResolver(element);
- List reqns = null;
-
- reqns = schemaGenerator.getRequiredNamespaces(element);
- schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
- //schemaGenerator.resolveUndeclaredNamespaces(reqns, parentNSs);
- List importNS = schemaGenerator.getImportNamespaces(element);
- reqns = schemaGenerator.removeImports(reqns, importNS);
- reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
- return schemaGenerator.checkSOAPEncodingRequired(reqns);
- }
- /**
- * Resolve the undeclared namespaces.
- *
- * @param unresolvedNSs A list of unresolved namespaces.
- * @param nsResolver The namespace resolver to use.
- * @return A hashtable of prefixes and namespaces.
- */
-// protected Hashtable resolveUndeclaredNamespaces(List unresolvedNSs, Hashtable nsResolver)
-// {
-// Hashtable namespaces = new Hashtable();
-// if (unresolvedNSs != null && !unresolvedNSs.isEmpty() && nsResolver != null)
-// {
-// for (int i = unresolvedNSs.size() - 1; i >= 0; i--)
-// {
-// String ns = (String)unresolvedNSs.get(i);
-// if (ns.equals(""))
-// {
-// ns = XMLNS;
-// }
-// else
-// {
-// ns = XMLNS + ":" + ns;
-// }
-// if (nsResolver.containsKey(ns))
-// {
-// //namespaces.remove(i);
-// //namespaces.add(i, nsResolver.get(ns));
-// namespaces.put(ns, nsResolver.get(ns));
-// unresolvedNSs.remove(i);
-// unresolvedNSs.add(i, nsResolver.get(ns));
-// }
-// }
-// }
-// return namespaces;
-// }
-
- /**
- * This recursive method creates the schema String from the root Element.
- *
- * @param elem The root element of the schema.
- * @param elements A list to be created of the elements in the schema in order.
- * @param requiredNamespaces A list of required namespaces.
- * @param reqNSDecl A hashtable of required namespace declarations.
- * @param filelocation The uri of the file that contains this schema.
- * @return A string representation of this schema.
- */
- protected String createXSDStringRecursively(
- Element elem,
- List elements,
- List requiredNamespaces,
- Hashtable reqNSDecl,
- String filelocation)
- {
- if (elem == null)
- return ""; // just in case
-
- elements.add(elem);
-
- StringBuffer xsdString = new StringBuffer();
- String elementName = elem.getTagName();
- xsdString.append("<").append(elementName);
-
- boolean foundSchemaLocation = false; // flag if schemalocation is defined
- String namespace = ""; // the namespace if we're checking an import or include
- String namePrefix = ""; // the xmlns prefix used for the elements
- // Get all of the attributes for this element and append them to the xsdString
- NamedNodeMap atts = elem.getAttributes();
- for (int i = 0; i < atts.getLength(); i++)
- {
- Node n = atts.item(i);
- xsdString.append(" ").append(n.getNodeName()).append("=\"");
- String nodeName = n.getNodeName();
- if (nodeName.equalsIgnoreCase(SCHEMALOCATION) && filelocation != null)
- {
- foundSchemaLocation = true;
- String relativePath = n.getNodeValue();
- xsdString.append(relativePath).append("\"");
- }
- else
- {
- String nodeValue = n.getNodeValue();
- if (nodeName.equalsIgnoreCase(NAMESPACE))
- {
- namespace = nodeValue;
- }
- // get the name prefix for this schema to use in generating import statements
- else if (nodeName.indexOf(XMLNS) != -1)
- {
-
- if (nodeValue.equalsIgnoreCase(elem.getNamespaceURI()))
- {
- namePrefix = nodeName;
- if (namePrefix.equalsIgnoreCase(XMLNS))
- {
- namePrefix = "";
- }
- else
- {
- namePrefix = namePrefix.substring(6) + ":";
- }
- }
- }
- // Replace old schema namespaces with the new schema namespace.
- if(nodeValue.equals(Constants.NS_URI_XSD_1999) || nodeValue.equals(Constants.NS_URI_XSD_2000))
- {
- nodeValue = Constants.NS_URI_XSD_2001;
- }
- xsdString.append(nodeValue).append("\"");
- }
- }
- if (elementName.equalsIgnoreCase("import") && !foundSchemaLocation)
- {
- xsdString.append(" ").append(SCHEMALOCATION).append("=\"").append(namespace).append("\"");
- }
- // add in any required NS declarations from parent elements
- if (reqNSDecl != null)
- {
- Enumeration keys = reqNSDecl.keys();
- while (keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
- String declNS = (String)reqNSDecl.get(key);
- if(declNS.equals(Constants.NS_URI_XSD_1999) || declNS.equals(Constants.NS_URI_XSD_2000))
- {
- declNS = Constants.NS_URI_XSD_2001;
- }
- xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
- }
-
- }
- xsdString.append(">");
- if (requiredNamespaces != null)
- {
- Iterator iRequiredNamespaces = requiredNamespaces.iterator();
- while (iRequiredNamespaces.hasNext())
- {
- String ns = (String)iRequiredNamespaces.next();
-
- xsdString
- .append("<")
- .append(namePrefix)
- .append(IMPORT)
- .append(" ")
- .append(NAMESPACE)
- .append("=\"")
- .append(ns)
- .append("\" ")
- .append(SCHEMALOCATION)
- .append("=\"")
- .append(ns)
- .append("\"/>");
- }
-
- }
- xsdString.append("\n");
-
- // call the method recursively for each child element
- NodeList childNodes = elem.getChildNodes();
-
- for (int i = 0; i < childNodes.getLength() || i < 5; i++)
- {
- Node n = childNodes.item(i);
- // we only want nodes that are Elements
- if (n instanceof Element)
- {
- Element child = (Element)n;
- xsdString.append(createXSDStringRecursively(child, elements, null, null, filelocation));
- }
- }
-
- xsdString.append("</").append(elem.getTagName()).append(">");
-
- return xsdString.toString();
-
- }
- /**
- * Get a list of all the namespaces that are used for elements or types in the schema.
- * These are the required namespaces in order to ensure that all the elments are valid.
- *
- * @param elem The element to check for required namespaces.
- * @return A list of required namespaces for the element and all its children.
- */
- protected List getRequiredNamespaces(Element elem)
- {
- List namespace = new Vector();
-
- // call the method recursively for each child element
- // register all the child types first
- NodeList childNodes = elem.getChildNodes();
- int numChildren = childNodes.getLength();
- // TODO: why is there a < 5 condition?
- for (int i = 0; i < numChildren /*|| i < 5*/; i++)
- {
- Node n = childNodes.item(i);
- // we only want nodes that are Elements
- if (n instanceof Element)
- {
- Element child = (Element)n;
- List childns = getRequiredNamespaces(child);
- for (int j = childns.size() - 1; j >= 0; j--)
- {
- String ns = (String)childns.get(j);
-
- if (!namespace.contains(ns))
- {
- namespace.add(ns);
- }
- }
- }
- }
- // Add the namespace of the current element
- String elemNS = elem.getPrefix();
- // if there is no namespace prefix set it to the empty prefix.
- if(elemNS == null)
- {
- elemNS = "";
- }
- if (!namespace.contains(elemNS))
- {
- namespace.add(elemNS);
- }
- // now add all of the current element's namespaces
- // don't include import and schema elements
- String localname = elem.getLocalName();
- if (!localname.equals(IMPORT) && !localname.equals(INCLUDE) && !localname.equals(SCHEMA))
- {
- NamedNodeMap atts = elem.getAttributes();
- for (int i = 0; i < atts.getLength(); i++)
- {
- Node n = atts.item(i);
-
- String nodeName = n.getNodeName();
- // removed restriction that we're only looking at types
- // if (nodeName.equalsIgnoreCase(TYPE))
- // {
- // don't take namespace info from attributes defining namespaces.
- // that includes xmlns, targetNamespace
- // don't take namespace info from name attributes
- if (nodeName.indexOf(XMLNS) != -1 || nodeName.equals(TARGETNAMESPACE) || nodeName.equals(NAME))
- {
- continue;
- }
- String nodeValue = n.getNodeValue();
-
-
- int colonIndex = nodeValue.indexOf(":");
- // Don't take namespace info from attributes with the default namespace, that is attributes
- // that are not prefixed. (colonIndex == -1)
- // If the colonIndex is followed by a / then it is a URI and not
- // namespace qualified.
- if (colonIndex == -1 || (colonIndex + 1 < nodeValue.length() && nodeValue.charAt(colonIndex + 1) == '/'))
- {
- continue;
- }
- // here we have found a colon delimiter so we need the namespace defined here
- else
- {
- nodeValue = nodeValue.substring(0, colonIndex);
- }
- if (!namespace.contains(nodeValue))
- {
-
- namespace.add(nodeValue);
- }
- // }
- }
- }
-
- return namespace;
-
- }
-
- /**
- * Get a list of all the namespaces that have an import statement.
- *
- * @param elem The root element of the schema.
- * @return A list of all the namespaces that are imported.
- */
- protected List getImportNamespaces(Element elem)
- {
- List namespace = new Vector();
-
- // call the method recursively for each child element
- // register all the child types first
- NodeList childNodes = elem.getChildNodes();
-
- for (int i = 0; i < childNodes.getLength() || i < 5; i++)
- {
- Node n = childNodes.item(i);
- // we only want nodes that are Elements
- if (n instanceof Element)
- {
- Element child = (Element)n;
- List childns = getImportNamespaces(child);
- for (int j = childns.size() - 1; j >= 0; j--)
- {
- String ns = (String)childns.get(j);
- if (!namespace.contains(ns))
- {
- namespace.add(ns);
- }
- }
- }
- }
- // if this is an import element get the namespace and add it to the list
- if (elem.getLocalName().equalsIgnoreCase(IMPORT))
- {
- NamedNodeMap atts = elem.getAttributes();
- for (int i = 0; i < atts.getLength(); i++)
- {
- Node n = atts.item(i);
-
- String nodeName = n.getNodeName();
- if (nodeName.equalsIgnoreCase(NAMESPACE))
- {
- String nodeValue = n.getNodeValue();
- if (!namespace.contains(nodeValue))
- {
-
- namespace.add(nodeValue);
- }
- }
- }
- }
-
- return namespace;
-
- }
-
- /**
- * Return a Hashtable with namespace prefixes as keys from the given element.
- *
- * @param elem The root element of the schema.
- * @return A hashtable with namespace prefixes mapped to namespaces.
- */
- protected Hashtable getNSResolver(Element elem)
- {
- Hashtable nsResolver = new Hashtable();
-
- NamedNodeMap atts = elem.getAttributes();
- for (int i = 0; i < atts.getLength(); i++)
- {
- Node n = atts.item(i);
-
- String nodeName = n.getNodeName();
- if (nodeName.indexOf(XMLNS) != -1)
- {
- String nodeValue = n.getNodeValue();
- String namePrefix = nodeName;
-
- if (namePrefix.equalsIgnoreCase(XMLNS))
- {
- namePrefix = "";
- }
- else
- {
- namePrefix = namePrefix.substring(6);
- }
- nsResolver.put(namePrefix, nodeValue);
-
- }
- }
- return nsResolver;
-
- }
-
- /**
- * Resolve the namespaces in the given namespaces list with the two namespace
- * resolver hashtables provided. Return a list of all the namespace that need
- * to be declared.
- * First resolve against the local namespaces with nsResolver.
- * Next resolve against the parent namespace with parentNSResolver.
- * A side affect of this method is the namespaces list is left with only those
- * namespaces that are resolved and the resolved entities are placed in the
- * list instead of the original entries.
- * For ex. If you provide a list such as {xsd, intf} and only xsd can be resolved
- * you will end up with the list {http://www.w3.org/2001/XMLSchema}
- *
- * @param namespaces The list of namespaces to resolve.
- * @param nsResolver The hashtable to be used as the local resolver.
- * @param parentNSResolver The hashtable to be used as the parent namespace resolver.
- * @return A Hashtable of namespaces that must be declared.
- */
- protected Hashtable resolveNamespaces(List namespaces, Hashtable nsResolver, Hashtable parentNSResolver)
- {
- Hashtable reqNSDecl = new Hashtable();
- if (namespaces != null && !namespaces.isEmpty() && nsResolver != null)
- {
- for (int i = namespaces.size() - 1; i >= 0; i--)
- {
- String ns = (String)namespaces.get(i);
- // Remove the namespace from the list.
- namespaces.remove(i);
- // First try to resolve against the local namespace resolver.
- if (nsResolver.containsKey(ns))
- {
- Object resolvedNS = nsResolver.get(ns);
- // Only add the namespace if it's not already in the list.
- if(!namespaces.contains(resolvedNS))
- {
- namespaces.add(i, nsResolver.get(ns));
- }
- }
- // Next try to resolve against the parent namespace resolver.
- else
- {
- if (ns.equals(""))
- {
- ns = XMLNS;
- }
- else
- {
- ns = XMLNS + ":" + ns;
- }
- if (parentNSResolver.containsKey(ns))
- {
- Object resolvedNS = parentNSResolver.get(ns);
- // Only add the namespace if it's not already in the list.
- if(!namespaces.contains(resolvedNS))
- {
- namespaces.add(i, resolvedNS);
- }
- // Still need to declare the namespace though.
- reqNSDecl.put(ns, resolvedNS);
- }
- }
-
- }
- }
- return reqNSDecl;
- }
-
- /**
- * Remove any namespace from the namespaces list if it is in the import list.
- *
- * @param namespaces The namespaces list.
- * @param importedNamespaces A list of imported namespaces.
- * @return The list of namespaces without the imported namespaces.
- */
- protected List removeImports(List namespaces, List importedNamespaces)
- {
- if (namespaces != null && importedNamespaces != null && !importedNamespaces.isEmpty())
- {
- Iterator iImportedNS = importedNamespaces.iterator();
- while (iImportedNS.hasNext())
- {
- String iNS = (String)iImportedNS.next();
-
- namespaces.remove(iNS);
- }
- }
- return namespaces;
- }
-
- /**
- * Remove the local namespace for the schema and the namespaces listed in the ignoreNamespaces
- * list from the namespaces list provided.
- *
- * @param namespaces The list of local namespaces.
- * @param elem The root element of the schema.
- * @return The list of namespaces with the local namespaces removed.
- */
- protected List removeLocalNamespaces(List namespaces, Element elem)
- {
- if (namespaces != null && elem != null)
- {
- String ns = elem.getAttribute(TARGETNAMESPACE);
- namespaces.remove(ns);
-
- for (int i = ignoreNamespaces.length - 1; i >= 0; i--)
- {
- // keep removing the namespace until it is not in the list
- if (namespaces.remove(ignoreNamespaces[i]))
- {
- i++;
- }
- }
- }
- return namespaces;
- }
-
- /**
- * Remove all the namespaces in the namespaces list that aren't contained in the
- * validImportNSs set.
- *
- * @param namespaces A list of namespaces.
- * @param validImportNSs A set of valid namespaces.
- * @return A list of namespaces that does not contain any members which aren't in the validImportNSs set.
- */
- protected List restrictImports(List namespaces, Set validImportNSs)
- {
- Iterator nsIter = namespaces.iterator();
- while(nsIter.hasNext())
- {
- String ns = (String)nsIter.next();
- if(!validImportNSs.contains(ns))
- {
- namespaces.remove(ns);
- nsIter = namespaces.iterator();
- }
- }
- return namespaces;
- }
-
- /**
- * Returns true if the SOAP encoding namespace is in the list of required namespaces,
- * false otherwise.
- *
- * @param reqns The list of namespaces to check for the SOAP encoding namespace.
- * @return True if the SOAP encoding namespaces is in the list, false otherwise.
- */
- protected boolean checkSOAPEncodingRequired(List reqns)
- {
- if (reqns.contains(SOAP_ENCODING_URI))
- {
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
deleted file mode 100644
index 5b58f211c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Plugin validator for the WSDL Validation framework. Validates inline schema found in a WSDL document.
- */
-public class InlineSchemaValidator implements IWSDL11Validator
-{
- private final String _WARN_OLD_SCHEMA_NAMESPACE = "_WARN_OLD_SCHEMA_NAMESPACE";
- private final String _WARN_SOAPENC_IMPORTED_SCHEMA = "_WARN_SOAPENC_IMPORTED_SCHEMA";
- private final String EMPTY_STRING = "";
- private final String QUOTE = "'";
- MessageGenerator messagegenerator = null;
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo)
- */
- public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
- {
- List elements = new ArrayList();
- UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
- Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
- String baseLocation = wsdlDefinition.getDocumentBaseURI();
- // Add in the namespaces defined in the doc already that aren't defined locally in this schema.
- // There is no need to check for namespaces other then in the defintions and types elements as
- // inline schema can not have any other parents and must have there two parents.
- // First take care of the definitions element
-
- // create the inline schema string
- Element w3celement = elem.getElement();
- Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,w3celement);
- String targetNamespace = w3celement.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
- // if the targetNamespace hasn't been defined for the schema use the
- // targetNamespace of the definitions element
- if(targetNamespace == null || targetNamespace.equals(EMPTY_STRING))
- {
- targetNamespace = wsdlDefinition.getTargetNamespace();
- w3celement.setAttribute(Constants.ATTR_TARGET_NAMESPACE,targetNamespace);
- }
-
- // If the namespace given is one of the old schema namespaces produce a warning.
- String namespace = w3celement.getNamespaceURI();
- if(namespace.equals(Constants.NS_URI_XSD_1999) || namespace.equals(Constants.NS_URI_XSD_2000))
- {
- valInfo.addWarning(
- messagegenerator.getString(_WARN_OLD_SCHEMA_NAMESPACE, QUOTE + Constants.NS_URI_XSD_2001 + QUOTE), element);
- }
-
- // now create and call the validator for the inline schema
- XSDValidator schemav = new XSDValidator();
-
- //String fileLocation = new URL(validatormanager.getFilename()).getPath();
- InlineXSDResolver inlineEntityResolver =
- getEntityResolver(wsdlDefinition, (Types) parents.get(0), baseLocation, targetNamespace);
- // add in the external XSD Catalog to resolve schemas offline
- XMLEntityResolverChain entityResolverChain = new XMLEntityResolverChain();
- entityResolverChain.addEntityResolver(inlineEntityResolver);
- entityResolverChain.addEntityResolver((XMLEntityResolver)valInfo.getURIResolver());
- //entityResolverChain.addEntityResolver(XMLCatalogResolver.getInstance());
- entityResolverChain.addEntityResolver(new FileEntityResolver());
-
- // Create the string representation of the inline schema.
- String xsd = InlineSchemaGenerator.createXSDString(w3celement, elements, baseLocation, parentnamespaces, inlineEntityResolver.getInlineSchemaNSs());
-
-
- schemav.validateInlineSchema(xsd, targetNamespace, baseLocation, entityResolverChain, inlineEntityResolver);
-
-// check if the SOAP Encoding namespace is required but not imported
- if (InlineSchemaGenerator.soapEncodingRequiredNotImported(elem.getElement(), baseLocation, parentnamespaces))
- {
- valInfo.addWarning(messagegenerator.getString(_WARN_SOAPENC_IMPORTED_SCHEMA), element);
- }
-
- // If the schema isn't valid add the error messages produced to valinfo.
- // Don't add the errors if they are located on another inline schema. These
- // will be reported when the other schema is validated.
-
- if (!schemav.isValid())
- {
- Iterator errors = schemav.getErrors().iterator();
- while (errors.hasNext())
- {
- ErrorMessage err = (ErrorMessage) errors.next();
- String uri = err.getURI();
- int line = err.getErrorLine();
- String errmess = err.getErrorMessage();
- errmess = replaceNamespace(errmess, namespace);
- if(line > 0)
- {
- if(uri == null || uri.equals(valInfo.getFileURI()))
- {
- valInfo.addError(errmess, getObjectAtLine(line - 1, elements));
- }
- else if(!inlineEntityResolver.isInlineSchema(uri) && !uri.equals(valInfo.getFileURI() + InlineXSDResolver.INLINE_SCHEMA_ID))
- {
- valInfo.addError(errmess, line, err.getErrorColumn(), uri);
- }
- }
- else if(uri != null && !inlineEntityResolver.isInlineSchema(uri) && !uri.equals(valInfo.getFileURI() + InlineXSDResolver.INLINE_SCHEMA_ID))
- {
- valInfo.addError(errmess, 0,0, uri);
- }
- }
- }
- // if the schema is valid, assign the model to the validatormanager
- else
- {
- XSModel xsModel = schemav.getXSModel();
- valInfo.addSchema(xsModel);
- }
- }
-
- /**
- * Get an entity resolver that will resolve inline schemas. Every inline schema is preregistered with
- * the resolver.
- *
- * @param wsdlDefinition The WSDL definitions element.
- * @param types The types element.
- * @param referenceLocation The location of the file that contains this schema.
- * @param targetNamespace The targetNamespace of the schema.
- * @return An entity resolver that can resolve inline schemas.
- */
- protected InlineXSDResolver getEntityResolver(Definition wsdlDefinition, Types types, String referenceLocation, String targetNamespace)
- {
- InlineXSDResolver entityResolver = new InlineXSDResolver();
-// entityResolver.setReferenceLocation(referenceLocation);
- List schemas = types.getExtensibilityElements();
- if (schemas != null)
- {
- Iterator iSchemas = schemas.iterator();
- Set namespaces = new TreeSet();
- while (iSchemas.hasNext())
- {
- UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
- String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
- if(thisNamespace != null)
- {
- namespaces.add(thisNamespace);
- }
- }
- iSchemas = schemas.iterator();
-
- while (iSchemas.hasNext())
- {
- UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
- String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
- if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
- {
-
- Element element = extElem.getElement();
-
-// create the inline schema string
- //Element w3celement = elem.getElement();
- Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,element);
- String xsd = InlineSchemaGenerator.createXSDString(element, new ArrayList(), referenceLocation, parentnamespaces, namespaces);
- //addNamespaceDeclarationsFromParents(wsdlDefinition,element);
- entityResolver.add(thisNamespace, xsd);
- }
-
- }
- }
- return entityResolver;
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- messagegenerator = new MessageGenerator(rb);
- }
-
- public void setMessageGenerator(MessageGenerator messgen)
- {
- messagegenerator = messgen;
- }
-
- /**
- * Get the namespace declarations as in the form
- * xmlns="somenamespace"
- * from the definitions and types elements and add them to the schema element so the schema
- * validator will have access to them.
- *
- * @param wsdlDefinition The WSDL definitions element.
- * @param element The types element.
- * @return A hashtable with the namespace elements from the elements provided.
- */
- protected Hashtable getNamespaceDeclarationsFromParents(Definition wsdlDefinition, Element element)
- {
- Hashtable nss = new Hashtable();
- Iterator nameSpaces = wsdlDefinition.getNamespaces().keySet().iterator();
-
- String XMLNS = Constants.ATTR_XMLNS;
-
- String schemaLocation = "";
- while (nameSpaces.hasNext())
- {
- String nsprefix = XMLNS;
- String ns = (String) nameSpaces.next();
- if (!ns.equalsIgnoreCase(""))
- {
- nsprefix += ":";
- }
- if (!element.hasAttribute(nsprefix + ns))
- {
- nss.put(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-// element.setAttribute(nsprefix + ns, wsdlDefinition.getNamespace(ns));
- }
-
- }
- // Next handle the parent types element
- NamedNodeMap atts = element.getParentNode().getAttributes();
- int attslength = atts.getLength();
- for (int i = 0; i < attslength; i++)
- {
- Node tempnode = atts.item(i);
- String nodename = tempnode.getNodeName();
- // if this is a namespace attribute
- if (nodename.indexOf(XMLNS) != -1)
- {
- nss.put(nodename, tempnode.getNodeValue());
- //element.setAttribute(nodename, tempnode.getNodeValue());
- }
- }
- return nss;
- }
-
- /**
- * Given a line number for the schema returns the element found on that line.
- * Useful for obtaining elements from schema Strings.
- *
- * @param line The line number for the schema.
- * @param elements The list of elements to check.
- * @return The object located at the line or at line 0 if the line is invalid.
- */
- protected Object getObjectAtLine(int line, List elements)
- {
- if(line < 0 || line >= elements.size())
- {
- line = 0;
- }
- return elements.get(line);
- }
-
- /**
- * Replace any instance of the 2001 schema namespace in the given message with
- * the given namespace.
- *
- * @param message The message to replace the namespace in.
- * @param namespace The namespace used for replacement.
- * @return The message with the 2001 schema namespace replaced by the given namespace.
- */
- private String replaceNamespace(String message, String namespace)
- {
- String xsd2001 = Constants.NS_URI_XSD_2001;
- int start = message.indexOf(xsd2001);
- int end = start + xsd2001.length();
- if(start < 0)
- {
- return message;
- }
- String startString = message.substring(0,start);
- String endString = message.substring(end,message.length());
- return startString + namespace + endString;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java
deleted file mode 100644
index 5f87b3951..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * An XMLEntityResolver that allows inline schemas to resolve each other through imports.
- */
-public class InlineXSDResolver implements XMLEntityResolver
-{
- public static final String INLINE_SCHEMA_ID = "#inlineschema";
- protected final String FILE_PREFIX = "file:";
- protected final String XMLNS = "xmlns";
- protected Hashtable entities = new Hashtable();
-// protected String refLocation = null;
- protected XMLEntityResolver externalResolver = null;
- protected XMLInputSource referringSchemaInputSource = null;
- protected String referringSchemaNamespace = null;
-
- /**
- * Constuctor.
- */
- public InlineXSDResolver()
- {
- }
-
- /* (non-Javadoc)
- * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
- */
- public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier)
- throws XNIException, IOException {
- String systemId = resourceIdentifier.getExpandedSystemId();
- String publicId = resourceIdentifier.getPublicId();
- String namespace = resourceIdentifier.getNamespace();
- XMLInputSource is = null;
- Reader reader = null;
- String schema = null;
- if (systemId == null)
- {
- if(publicId == null)
- {
- if(namespace == null)
- {
- return null;
- }
- else
- {
- systemId = namespace;
- }
- }
- else
- {
- systemId = publicId;
- }
- }
-
- if(referringSchemaNamespace != null && referringSchemaNamespace.equals(systemId))
- {
- if(referringSchemaInputSource!=null)
- {
- return referringSchemaInputSource;
- }
- }
- else if ((schema = (String) entities.get(systemId)) != null && !schema.equals(""))
- {
- is = new XMLInputSource(publicId, referringSchemaInputSource.getSystemId() + INLINE_SCHEMA_ID, null, new StringReader(schema),null);
- }
-
- //if(is == null)
- //{
- // throw new IOException();
- //}
- return is;
- }
-
- /**
- * Add an inline schema.
- *
- * @param targetNamespace - the target namespace of the schema
- * @param schema - a string representation of the schema
- */
- public void add(String targetNamespace, String schema)
- {
- entities.put(targetNamespace, schema);
- }
-
- /**
- * Add the referring inline schema.
- *
- * @param inputSource - a representation of the inline schema
- * @param namespace - the namespace of the inline schema
- */
- public void addReferringSchema(XMLInputSource inputSource, String namespace)
- {
- referringSchemaInputSource = inputSource;
- referringSchemaNamespace = namespace;
- }
-
- /**
- * Return true if the namespace corresponds to an inline schema, false otherwise.
- *
- * @param namespace The namespace of the schema.
- * @return True if the namespace corresponds to an inline schema, false otherwise.
- */
- public boolean isInlineSchema(String namespace)
- {
- return entities.containsKey(namespace);
- }
-
- /**
- * Get the set of the inline schema namespaces.
- *
- * @return The set of the inline schema namespaces.
- */
- public Set getInlineSchemaNSs()
- {
- return entities.keySet();
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java
deleted file mode 100644
index fe43e121c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import org.apache.xerces.impl.xs.SchemaSymbols;
-import org.apache.xerces.util.SymbolTable;
-/**
- * This class will allow the calling code to see if the attribute is defined in schema.
- * This serves as schema for schema.
- */
-public class SchemaAttributeTable extends SymbolTable
-{
-
- /**
- * Constructor.
- */
- public SchemaAttributeTable()
- {
- // add all of the sybols to the table. SchemaSymbols probably should have
- // a SymbolTable for these but it doesn't
-
- super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDANY);
- super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDLOCAL);
- super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDOTHER);
- super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDTARGETNS);
- super.addSymbol(SchemaSymbols.ATTVAL_POUNDALL);
- super.addSymbol(SchemaSymbols.ATTVAL_FALSE_0);
- super.addSymbol(SchemaSymbols.ATTVAL_TRUE_1);
- super.addSymbol(SchemaSymbols.ATTVAL_ANYSIMPLETYPE);
- super.addSymbol(SchemaSymbols.ATTVAL_ANYTYPE);
- super.addSymbol(SchemaSymbols.ATTVAL_ANYURI);
- super.addSymbol(SchemaSymbols.ATTVAL_BASE64BINARY);
- super.addSymbol(SchemaSymbols.ATTVAL_BOOLEAN);
- super.addSymbol(SchemaSymbols.ATTVAL_BYTE);
- super.addSymbol(SchemaSymbols.ATTVAL_COLLAPSE);
- super.addSymbol(SchemaSymbols.ATTVAL_DATE);
- super.addSymbol(SchemaSymbols.ATTVAL_DATETIME);
- super.addSymbol(SchemaSymbols.ATTVAL_DAY);
- super.addSymbol(SchemaSymbols.ATTVAL_DECIMAL);
- super.addSymbol(SchemaSymbols.ATTVAL_DOUBLE);
- super.addSymbol(SchemaSymbols.ATTVAL_DURATION);
- super.addSymbol(SchemaSymbols.ATTVAL_ENTITY);
- super.addSymbol(SchemaSymbols.ATTVAL_ENTITIES);
- super.addSymbol(SchemaSymbols.ATTVAL_EXTENSION);
- super.addSymbol(SchemaSymbols.ATTVAL_FALSE);
- super.addSymbol(SchemaSymbols.ATTVAL_FLOAT);
- super.addSymbol(SchemaSymbols.ATTVAL_HEXBINARY);
- super.addSymbol(SchemaSymbols.ATTVAL_ID);
- super.addSymbol(SchemaSymbols.ATTVAL_IDREF);
- super.addSymbol(SchemaSymbols.ATTVAL_IDREFS);
- super.addSymbol(SchemaSymbols.ATTVAL_INT);
- super.addSymbol(SchemaSymbols.ATTVAL_INTEGER);
- super.addSymbol(SchemaSymbols.ATTVAL_LANGUAGE);
- super.addSymbol(SchemaSymbols.ATTVAL_LAX);
- super.addSymbol(SchemaSymbols.ATTVAL_LIST);
- super.addSymbol(SchemaSymbols.ATTVAL_LONG);
- super.addSymbol(SchemaSymbols.ATTVAL_NAME);
- super.addSymbol(SchemaSymbols.ATTVAL_NEGATIVEINTEGER);
- super.addSymbol(SchemaSymbols.ATTVAL_MONTH);
- super.addSymbol(SchemaSymbols.ATTVAL_MONTHDAY);
- super.addSymbol(SchemaSymbols.ATTVAL_NCNAME);
- super.addSymbol(SchemaSymbols.ATTVAL_NMTOKEN);
- super.addSymbol(SchemaSymbols.ATTVAL_NMTOKENS);
- super.addSymbol(SchemaSymbols.ATTVAL_NONNEGATIVEINTEGER);
- super.addSymbol(SchemaSymbols.ATTVAL_NONPOSITIVEINTEGER);
- super.addSymbol(SchemaSymbols.ATTVAL_NORMALIZEDSTRING);
- super.addSymbol(SchemaSymbols.ATTVAL_NOTATION);
- super.addSymbol(SchemaSymbols.ATTVAL_OPTIONAL);
- super.addSymbol(SchemaSymbols.ATTVAL_POSITIVEINTEGER);
- super.addSymbol(SchemaSymbols.ATTVAL_PRESERVE);
- super.addSymbol(SchemaSymbols.ATTVAL_PROHIBITED);
- super.addSymbol(SchemaSymbols.ATTVAL_QNAME);
- super.addSymbol(SchemaSymbols.ATTVAL_QUALIFIED);
- super.addSymbol(SchemaSymbols.ATTVAL_REPLACE);
- super.addSymbol(SchemaSymbols.ATTVAL_REQUIRED);
- super.addSymbol(SchemaSymbols.ATTVAL_RESTRICTION);
- super.addSymbol(SchemaSymbols.ATTVAL_SHORT);
- super.addSymbol(SchemaSymbols.ATTVAL_SKIP);
- super.addSymbol(SchemaSymbols.ATTVAL_STRICT);
- super.addSymbol(SchemaSymbols.ATTVAL_STRING);
- super.addSymbol(SchemaSymbols.ATTVAL_SUBSTITUTION);
- super.addSymbol(SchemaSymbols.ATTVAL_TIME);
- super.addSymbol(SchemaSymbols.ATTVAL_TOKEN);
- super.addSymbol(SchemaSymbols.ATTVAL_TRUE);
- super.addSymbol(SchemaSymbols.ATTVAL_UNBOUNDED);
- super.addSymbol(SchemaSymbols.ATTVAL_UNION);
- super.addSymbol(SchemaSymbols.ATTVAL_UNQUALIFIED);
- super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDBYTE);
- super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDINT);
- super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDLONG);
- super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDSHORT);
- super.addSymbol(SchemaSymbols.ATTVAL_YEAR);
- super.addSymbol(SchemaSymbols.ATTVAL_YEARMONTH);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java
deleted file mode 100644
index fda40a4d9..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLParseException;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-
-/**
- * An implementation of XMLErrorHandler that captures error from Xerces.
- */
-public class ValidateErrorHandler implements XMLErrorHandler
-{
- ArrayList errorList = new ArrayList();
-
-
-
- /**
- * Get the error messages created by Xerces.
- *
- * @return The errors list.
- */
- public List getErrorMessages()
- {
- return errorList;
- }
-
- /**
- * Create a validation message from the exception and severity.
- *
- * @param error The error.
- * @param severity The severity.
- * @return An error message.
- */
- protected ErrorMessage createValidationMessageForException(XMLParseException error, int severity)
- {
- String uri = error.getLiteralSystemId();
- if(uri == null)
- {
- uri = error.getPublicId();
- }
- ErrorMessage errorMessage = new ErrorMessage();
- errorMessage.setErrorLine(error.getLineNumber());
- errorMessage.setErrorMessage(error.getMessage());
- errorMessage.setErrorColumn(error.getColumnNumber());
- errorMessage.setURI(uri);
- errorMessage.setSeverity(severity);
- return errorMessage;
- }
-
- /**
- * @see org.apache.xerces.xni.parser.XMLErrorHandler#error(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
- */
- public void error(String arg0, String arg1, XMLParseException exception) throws XNIException
- {
- errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_ERROR));
- }
-
- /**
- * @see org.apache.xerces.xni.parser.XMLErrorHandler#fatalError(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
- */
- public void fatalError(String arg0, String arg1, XMLParseException exception) throws XNIException
- {
- errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_FATAL_ERROR));
- }
-
- /**
- * @see org.apache.xerces.xni.parser.XMLErrorHandler#warning(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
- */
- public void warning(String arg0, String arg1, XMLParseException exception) throws XNIException
- {
- errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_WARNING));
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java
deleted file mode 100644
index cf936152a..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * Handle a chain of entity resolvers.
- */
-public class XMLEntityResolverChain implements XMLEntityResolver
-{
- private List entityResolvers = new Vector();
-
- /**
- * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
- */
- public XMLInputSource resolveEntity(XMLResourceIdentifier xmlResourceIdentifier) throws XNIException, IOException
- {
- XMLInputSource is = null;
- Iterator entityResolverIter = entityResolvers.iterator();
- while (entityResolverIter.hasNext())
- {
- XMLEntityResolver entityResolver = (XMLEntityResolver)entityResolverIter.next();
- try
- {
- is = entityResolver.resolveEntity(xmlResourceIdentifier);
- }
- catch (XNIException e)
- {
- }
- catch (IOException e)
- {
- }
- if (is != null)
- {
- break;
- }
- }
- // Throw and IOException if the file isn't found
- if (is == null)
- {
- throw new IOException("Unable to locate file");
- }
- return is;
- }
-
- /**
- * Add an entity resolver to this chain.
- *
- * @param entityResolver The resolver to add to the chain.
- */
- public void addEntityResolver(XMLEntityResolver entityResolver)
- {
- entityResolvers.add(entityResolver);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java
deleted file mode 100644
index 1ed97f647..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.List;
-
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarLoader;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xs.XSModel;
-
-
-/**
- * Validate schemas from files or String.
- */
-public class XSDValidator
-{
- protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
- protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
- protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
- protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
- "http://apache.org/xml/features/validation/schema-full-checking";
- protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
- protected final String FILE_PREFIX = "file:";
- protected final String XMLNS = "xmlns";
- protected final String TARGETNAMESPACE = "targetNamespace";
- protected final String NAMESPACE = "namespace";
- protected final String IMPORT = "import";
- protected final String SCHEMALOCATION = "schemaLocation";
- protected final String TYPE = "type";
- protected final String[] ignoreNamespaces =
- { "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/1999/XMLSchema" };
-
- protected XSModel xsModel;
- protected boolean isValidXSD;
- protected List errors;
- protected String filelocation;
-
- /**
- * Constructor.
- */
- public XSDValidator()
- {
- xsModel = null;
- isValidXSD = false;
- errors = null;
- }
- /**
- * Validate an inline schema.
- *
- * @param schema A schema represented as a string.
- * @param targetNamespace The target namespace of the schema.
- * @param fileloc The uri of the file that contains the schema.
- */
- public void validateInlineSchema(String schema, String targetNamespace, String fileloc)
- {
- validateInlineSchema(schema, targetNamespace, fileloc, null, null);
- }
-
- /**
- * Validate an inline schema and specify an entity resolver.
- *
- * @param schema This schema represented as a string.
- * @param targetNamespace The target namespace of the schema.
- * @param fileloc The uri of the file that contains this schema.
- * @param entityResolverChain The entity resolver chain.
- * @param inlineSchemaEntityResolver An inline schema resolver for this schema.
- */
- public void validateInlineSchema(
- String schema,
- String targetNamespace,
- String fileloc,
- XMLEntityResolver entityResolverChain,
- XMLEntityResolver inlineSchemaEntityResolver)
- {
- filelocation = fileloc;
-
- validateXSD(schema, true, entityResolverChain,targetNamespace, inlineSchemaEntityResolver);
- }
-
- /**
- * Validate the file located at the uri specified with the given entity resolver.
- *
- * @param uri An absolute uri for the schema location.
- * @param entityResolver An entity resolver to be used.
- */
- public void validate(String uri, XMLEntityResolver entityResolver)
- {
- validateXSD(uri, false, entityResolver, null, null);
- }
-
- /**
- * Validate the schema.
- *
- * @param schema The schema or it's location.
- * @param inlineXSD True if an inline schema, false otherwise.
- * @param entityResolver An entity resolver to use.
- * @param targetNamespace The target namespace of the schema being validated.
- * @param inlineSchemaEntityResolver An inline schema entity resolver.
- */
- protected void validateXSD(String schema, boolean inlineXSD, XMLEntityResolver entityResolver, String targetNamespace, XMLEntityResolver inlineSchemaEntityResolver)
- {
- ValidateErrorHandler errorHandler = new ValidateErrorHandler();
- errorHandler.getErrorMessages().clear();
- try
- {
- XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
- XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
- grammarPreparser.setGrammarPool(grammarPool);
-
- grammarPreparser.setErrorHandler(errorHandler);
- if (entityResolver != null)
- {
- grammarPreparser.setEntityResolver(entityResolver);
- }
-
- try
- {
- XMLInputSource is = null;
- // this allows support for the inline schema in WSDL documents
- if (inlineXSD)
- {
-
- Reader reader = new StringReader(schema);
- is = new XMLInputSource(null,filelocation,filelocation,reader,null);
-
- ((InlineXSDResolver)inlineSchemaEntityResolver).addReferringSchema(is,targetNamespace);
-
- }
- // get the input source for an external schema file
- else
- {
- is = new XMLInputSource(null,schema,schema);
- }
-
- grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
- XMLGrammarLoader schemaLoader = grammarPreparser.getLoader(XMLGrammarDescription.XML_SCHEMA);
-
- XSGrammar grammar = (XSGrammar)grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
- xsModel = grammar.toXSModel();
- }
- catch (Exception e)
- {
- //parser will return null pointer exception if the document is structurally invalid
- //TODO: log error message
- System.out.println(e);
- }
-
- errors = errorHandler.getErrorMessages();
- }
- catch (Exception e)
- {
- System.out.println(e);
- }
- if (errors.isEmpty())
- {
- isValidXSD = true;
- }
- }
-
- /**
- * Returns the XSModel created.
- *
- * @return The XSModel created.
- */
-
- public XSModel getXSModel()
- {
- return xsModel;
- }
- /**
- * Returns true if the schema is valid, false otherwise.
- *
- * @return True if the schema is valid, false otherwise.
- */
- public boolean isValid()
- {
- return isValidXSD;
- }
-
- /**
- * Return the error list.
- *
- * @return A list of error from the schema.
- */
- public List getErrors()
- {
- return errors;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java
deleted file mode 100644
index bfc792d72..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-
-/**
- * Interface for a validator plugged into the WSDL 2.0 validator.
- */
-public interface IWSDL20Validator
-{
- /**
- * Validate the given element.
- *
- * @param element The element to validate.
- * @param parents A list of parents of this element.
- * @param valInfo The validation info for the current validation.
- */
- public void validate(Object element, List parents, IValidationInfo valInfo);
-
- /**
- * Set the resource bundle of the validator.
- *
- * @param rb The resource bundle to set.
- */
- public void setResourceBundle(ResourceBundle rb);
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java
deleted file mode 100644
index f983bd96d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-
-/**
- * A registry to hold all the WSDL 2.0 validators.
- */
-public class ValidatorRegistry
-{
-
- protected static ValidatorRegistry verInstance;
-
- protected Map validatorReg = new Hashtable();
-
- /**
- * Constructor.
- */
- protected ValidatorRegistry()
- {
- }
-
- /**
- * Returns the instance of this registry.
- *
- * @return The instance of this registry.
- */
- public static ValidatorRegistry getInstance()
- {
- if (verInstance == null)
- {
- verInstance = new ValidatorRegistry();
- }
- return verInstance;
- }
-
- /**
- * Register this validator delegate with the given namespace.
- *
- * @param namespace The namespace the validator is associated with.
- * @param valDelegate The validator delegate to register.
- */
- public void registerValidator(String namespace, WSDL20ValidatorDelegate valDelegate)
- {
- // allow the null namespace but make it the empty string
- if (namespace == null)
- {
- namespace = "";
- }
-
- // add the validator to the hashtable
- validatorReg.put(namespace, valDelegate);
- }
-
- /**
- * Ask for the validator associated with this namespace. If none is found
- * return null.
- *
- * @param namespace The namespace of the validator.
- * @return The WSDL 1.1 validator for the given namespace.
- */
- public IWSDL20Validator queryValidatorRegistry(String namespace)
- {
- // if the namespace is null allow it and treat it as the empty string
- if (namespace == null)
- {
- namespace = "";
- }
- WSDL20ValidatorDelegate delegate = (WSDL20ValidatorDelegate)validatorReg.get(namespace);
- if(delegate != null)
- {
- return delegate.getValidator();
- }
- return null;
- }
-
- /**
- * Convenience method that tells whether a validator for a given namespace is registered.
- *
- * @param namespace The namespace to check.
- * @return True if there is a validator registered, false otherwise.
- */
- public boolean hasRegisteredValidator(String namespace)
- {
- if (queryValidatorRegistry(namespace) != null)
- {
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java
deleted file mode 100644
index fa38c9944..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-/**
- * Validate the elements defined in a WSDL 1.1 Document.
- */
-public class WSDL20BasicValidator implements IWSDL20Validator
-{
- protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
- protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
- protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
- protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
- "http://apache.org/xml/features/validation/schema-full-checking";
- protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
- protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-
- protected final int ELEMENT = 0;
- protected final int TYPE = 1;
-
- //protected WSDL20ValidatorController validatorcontroller;
- protected MessageGenerator messagegenerator;
-
- /**
- * Constructor.
- */
- public WSDL20BasicValidator()
- {
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.IValidationInfo)
- */
- public void validate(Object element, List parents, IValidationInfo valInfo)
- {
- //this.validatorcontroller = validatorcontroller;
- //setDefaultResourceBundleIfNeeded(validatorcontroller);
-
-// Definitions wsdlDefinitions = (Definitions)element;
-// validateTypes(wsdlDefinitions, valInfo);
-// validateServices(wsdlDefinitions, valInfo);
-// validateBindings(wsdlDefinitions, valInfo);
-// validateInterfaces(wsdlDefinitions, valInfo);
-
- }
-
- /**
- * Takes a list of ExtensibilityElements and checks if there's a validator
- * associated with each element and if so calls the validator.
- *
- * @param parents The list of parents of the elements.
- * @param extensibilityElements The list of elements to validate.
- * @param validatorcontroller The validator controller.
- * @param wsdlDefinition The defnintions element for this document.
- */
-// protected void validateExtensibilityElementList(
-// List parents,
-// ElementInfoItem[] extensibilityElements,
-// ValidationInfo valInfo,
-// Definitions wsdlDefinitions)
-// {
-// //TODO: get the validation controller statically to get the extensibility validator
-//// ValidatorRegistry ver = ValidatorRegistry.getInstance();
-//// Iterator extElems = extensibilityElements.iterator();
-//// while (extElems.hasNext())
-//// {
-//// ElementInfoItem element = (ExtensibilityElement)extElems.next();
-//// // if (ver.hasRegisteredValidator(element.getElementType().getNamespaceURI()))
-//// // {
-//// validatorcontroller.validateWSDLElement(element.getElementType().getNamespaceURI(), element, parents);
-//// //ver.queryValidatorRegistry(element.getElementType().getNamespaceURI()).validate(element, parents, validatormanager);
-//// // }
-//// }
-// }
-
- /**
- * If the resourcebundle hasn't been set, set it to the one registered with the ValidatorController.
- *
- * @param validatorcontroller The validator controller to get the resource bundle from.
- */
-// protected void setDefaultResourceBundleIfNeeded(WSDL20ValidatorController validatorcontroller)
-// {
-// if (messagegenerator == null)
-// {
-// setResourceBundle(validatorcontroller.getResourceBundle());
-// }
-// }
- /**
- * Set the resourcebundle to the one specified.
- *
- * @param rb The resource bundle to set.
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- messagegenerator = new MessageGenerator(rb);
- }
-
- /**
- * Ensure that the Types element is correct.
- *
- * @param wsdlDefinition The definitions element from the current document.
- */
-
-// protected void validateTypes(Definitions wsdlDefinitions, ValidationInfo valInfo)
-// {
-// Types types = wsdlDefinitions.getTypes();
-// // ensure that types is defined
-// if (types != null)
-// {
-// List parents = new Vector();
-// parents.add(wsdlDefinitions);
-// ElementInfoItem elementInfoItems[] = types.getElementInfoItems();
-// parents.add(0, types);
-// validateExtensibilityElementList(parents, elementInfoItems, valInfo, wsdlDefinitions);
-// parents.remove(0);
-// }
-// }
-
- /**
- * Validates all of the declared services for the definition.
- *
- * @param wsdlDefinitions The WSDL definitions element.
- * @param valInfo Validation info for the current validation.
- */
-// protected void validateServices(Definitions wsdlDefinitions, ValidationInfo valInfo)
-// {
-//
-// }
-
- /**
- * Checks that the bindings refer to valid interfaces and all of the operations
- * in a given binding refer to a defined operation within the corresponding
- * interfaces.
- *
- * @param wsdlDefinitions The WSDL definitions element.
- * @param valInfo Validation info for the current validation.
- */
-// protected void validateBindings(Definitions wsdlDefinitions, ValidationInfo valInfo)
-// {
-//
-// }
-
- /**
- * Check that all of the Interfaces have valid messages associated with their
- * operation input, output, infault and outfault types.
- *
- * @param wsdlDefinitions The WSDL definitions element.
- * @param valInfo Validation info for the current validation.
- */
-// private void validateInterfaces(Definitions wsdlDefinitions, ValidationInfo valInfo)
-// {
-//
-// }
-
- /**
- * Checks whether the given name is defined in the namespace for the part. A part is an
- * ELEMENT in WSDL 2.0.
- *
- * @param namespace The namespace to check.
- * @param name The name to check.
- * @param valInfo Validation info for the current validation.
- * @return True if the part element is defined, false otherwise.
- */
- protected boolean checkMessage(String namespace, String name, IValidationInfo valInfo)
- {
-
- boolean partvalid = false;
-// // first take care of the situation where it's schema for schema
-// if (namespace.equalsIgnoreCase(SchemaSymbols.URI_SCHEMAFORSCHEMA))
-// {
-// SchemaAttributeTable xsdTable = new SchemaAttributeTable();
-// if (xsdTable.containsSymbol(name))
-// {
-// partvalid = true;
-// }
-// }
-// // check inline and imported schema
-// else
-// {
-// List schemas = validatorcontroller.getSchemas();
-// Iterator schemasIter = schemas.iterator();
-// while (schemasIter.hasNext())
-// {
-// XSModel schema = (XSModel)schemasIter.next();
-// if (schema != null)
-// {
-// if (schema.getElementDeclaration(name, namespace) != null)
-// {
-// partvalid = true;
-// break;
-// }
-//
-// }
-// }
-// }
- // If the SOAP encoding namespace hasn't been explicitly imported do so now.
- // Allow the SOAP encoding namespace to be automatically imported but mark it as a warning.
-// if (!partvalid && namespace.equals(SOAP_ENCODING_URI))
-// {
-// try
-// {
-// XSDValidator xsdVal = new XSDValidator();
-// xsdVal.validate(XMLCatalog.getInstance().resolveEntityLocation(SOAP_ENCODING_URI, null), null);
-// // sanity check in case something goes wrong
-// if (xsdVal.isValid())
-// {
-// XSModel xsModel = xsdVal.getXSModel();
-//
-// if (xsModel.getElementDeclaration(name, namespace) != null)
-// {
-// partvalid = true;
-// }
-//
-// validatorcontroller.addWarningMessage(
-// partObject,
-// messagegenerator.getString("_WARN_SOAPENC_IMPORTED_PART", "'" + name + "'"));
-// }
-// }
-// catch (Exception e)
-// {
-// //TODO: log the error message
-// //System.out.println(e);
-// }
-// }
- return partvalid;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java
deleted file mode 100644
index b8175cf47..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.IWSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.w3c.dom.Document;
-
-/**
- * The validator controller is the head of validation. Has methods for getting
- * extension validators.
- */
-public class WSDL20ValidatorController implements IWSDLValidator
-{
- protected final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
- protected final int ERROR_MESSAGE = 0;
- protected final int WARNING_MESSAGE = 1;
- protected String fileURI;
- protected List schemas = new Vector();
-// protected Definitions wsdlDefinition;
- protected Hashtable elementLocations = null;
- protected ResourceBundle resourcebundle;
- protected MessageGenerator messagegenerator = null;
- //protected ValidationController validationController;
- protected ValidatorRegistry ver = ValidatorRegistry.getInstance();
- protected boolean errors = false;
-
- /**
- * Constructor.
- *
- * @param rb The resource bundle to set for this controller.
- */
- public WSDL20ValidatorController(ResourceBundle rb)
- {
- setResourceBundle(rb);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
- */
- public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
- {
- // reset the variables
- //reset();
- fileURI = valInfo.getFileURI();
- //this.validationController = validationcontroller;
-
-
-// List readerErrors = readWSDLDocument(domModel, fileURI, getMessageGenerator());
- // handle any reader errors
-// if (readerErrors != null)
-// {
-// Iterator readerErrorsI = readerErrors.iterator();
-// while (readerErrorsI.hasNext())
-// {
-// ReaderError re = (ReaderError)readerErrorsI.next();
-// valInfo.addError(re.getMessage(), re.getLine(), re.getColumn(), re.getFileURI());
-// }
-// }
-// validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), valInfo);
- }
-
- /**
- * Read in the WSDL document and set the model and imported schemas.
- *
- * @param domModel A DOM document model of the file to be read.
- * @param file The file to read.
- * @param messagegenerator The messagegenerator the reader should use for any messages produced.
- * @throws ValidateWSDLException
- * @return A list of reader errors.
- */
-// protected List readWSDLDocument(Document domModel, String file, MessageGenerator messagegenerator) throws ValidateWSDLException
-// {
-// List readerErrors = null;
-// try
-// {
-//
-// WSDLReaderImpl wsdlReader = new WSDLReaderImpl();
-// wsdlDefinition = wsdlReader.readWSDL(file, domModel);
-//
-// readerErrors = wsdlReader.getReaderErrors();
-//
-// }
-// catch (WSDLException e)
-// {
-// throw new ValidateWSDLException(e.getMessage() /*+ " " + e.getFaultCode()*/);
-// }
-//
-// catch (Exception e)
-// {
-// throw new ValidateWSDLException("unable to read file" + e.getMessage() + " " + e.toString());
-// }
-// return readerErrors;
-// }
-
- /**
- * Given a WSDL element, call ValidateElement for it.
- *
- * @param namespace The namespace of the element to validate.
- * @param element The element to validate.
- * @param parents The list of parents for this element.
- */
- public void validateWSDLElement(String namespace, Object element, List parents, IValidationInfo valInfo)
- {
- IWSDL20Validator val = ver.queryValidatorRegistry(namespace);
- if (val != null)
- {
- val.validate(element, parents, valInfo);
- }
- else
- {
- //valInfo.addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), element);
- }
- }
-
- /**
- * Add a schema to the list of schemas.
- *
- * @param xsModel The schema to add.
- */
-// public void addSchema(XSModel xsModel)
-// {
-// if (xsModel != null)
-// {
-// schemas.add(xsModel);
-// }
-// }
-
- /**
- * Return the list containing the schemas.
- *
- * @return The list of schemas.
- */
-// public List getSchemas()
-// {
-// return schemas;
-// }
-
- /**
- * Get the ResourceBundle for this ValidatorManager.
- *
- * @return The resource bundle registered for this controller.
- * @see #setResourceBundle
- */
- public ResourceBundle getResourceBundle()
- {
- return resourcebundle;
- }
-
- /**
- * Set the ResourceBundle for this ValidatorManager.
- *
- * @param rb The resource bundle to set.
- * @see #getResourceBundle
- */
- public void setResourceBundle(ResourceBundle rb)
- {
- if (rb != null)
- {
- resourcebundle = rb;
- messagegenerator = new MessageGenerator(rb);
- }
-
- }
-
- /**
- * Get the message generator registered for this controller.
- *
- * @return The message generator registered for this controller.
- */
- public MessageGenerator getMessageGenerator()
- {
- return messagegenerator;
- }
-
- /**
- * Return the filename for the file currently being validated. Some validators require this.
- *
- * @return The filename for the file being validated.
- */
-// public String getFilename()
-// {
-// return fileURI;
-// }
-
- /**
- * Convenience method for extensibly validators to add error messages.
- *
- * @param object The object to add the error for.
- * @param error The error to add.
- */
-// public void addErrorMessage(Object object, String error)
-// {
-// addValidationMessage(ERROR_MESSAGE, object, error);
-// errors = true;
-// }
-
- /**
- * Method for extensibly validators to add error messages when they know
- * line and column numbers.
- *
- * @param line The line where the error message is located.
- * @param column The column where the error message is located.
- * @param error The error message.
- */
-// public void addErrorMessage(int line, int column, String error)
-// {
-// addValidationMessage(ERROR_MESSAGE, line, column, error);
-// errors = true;
-// }
-
- /**
- * Convenience method for extensibly validators to add warning messages.
- *
- * @param object The object to add the warning message.
- * @param warning The warning message.
- */
-// public void addWarningMessage(Object object, String warning)
-// {
-// addValidationMessage(WARNING_MESSAGE, object, warning);
-// }
-
- /**
- * Method for extensibly validators to add warning messages when they know
- * line and column numbers.
- *
- * @param line The line where the error message is located.
- * @param column The column where the error message is located.
- * @param warning The warning message.
- */
-// public void addWarningMessage(int line, int column, String warning)
-// {
-// addValidationMessage(WARNING_MESSAGE, line, column, warning);
-// }
-
- /**
- * If you have an object read in by the reader for this
- * validatorcontroller the object can be passed in here and the line and column
- * information will be abstracted from it.
- *
- * @param type The type of message to add.
- * @param o The object that has the error (used to get the location).
- * @param message The message to add.
- */
-// protected void addValidationMessage(int type, Object o, String message)
-// {
-// ValidatableElement ve = (ValidatableElement)o;
-//// int[] location;
-//// if (elementLocations.containsKey(o))
-//// {
-//// location = (int[])elementLocations.get(o);
-//// }
-//// // if we give it an element that hasn't been defined we'll set the location
-//// // at (0,0) so the error shows up but no line marker in the editor
-//// else
-//// {
-//// location = new int[] { 0, 0 };
-//// }
-// addValidationMessage(type, ve.getLine(), ve.getColumn(), message);
-// }
-
- /**
- * Creates a validation message of the specified type.
- *
- * @param type The type of validation message to add.
- * @param line The line where the error message is located.
- * @param column The line where the column message is located.
- * @param message The message to add.
- */
-// protected void addValidationMessage(int type, int line, int column, String message)
-// {
-// if (message != null)
-// {
-// if (type == ERROR_MESSAGE)
-// {
-// validationController.addErrorMessage(line, column, message);
-// }
-// else if (type == WARNING_MESSAGE)
-// {
-// validationController.addWarningMessage(line, column, message);
-// }
-// }
-// }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.controller.IWSDLValidator#isValid()
- */
- public boolean isValid()
- {
- return !errors;
- }
-
- /**
- * Reset the validator controller.
- */
-// protected void reset()
-// {
-// schemas = new Vector();
-// fileURI = "";
-// wsdlDefinition = null;
-// elementLocations = null;
-// resourcebundle = null;
-// //validationController = null;
-// errors = false;
-// }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java
deleted file mode 100644
index 7661f7de5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * The WSDL 1.1 validator delegate holds a reference to a validator to be instantiated at
- * a later point.
- */
-public class WSDL20ValidatorDelegate
-{
- private String validatorClassname = null;
- private String resourceBundle = null;
- private ClassLoader classLoader = null;
- private IWSDL20Validator validator = null;
-
- /**
- * Create a delegate for a validator by its class name and resource bundle name.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- */
- public WSDL20ValidatorDelegate(String validatorClassname, String resourceBundle)
- {
- this.validatorClassname = validatorClassname;
- this.resourceBundle = resourceBundle;
- }
-
- /**
- * Create a delegate for a validator by its class name, resource bundle name and
- * a class loader to load the validator and bundle.
- *
- * @param validatorClassname The name of the validator class.
- * @param resourceBundle The name of the validator base resource bundle.
- * @param classLoader The class loader to use to load the validator and bundle.
- */
- public WSDL20ValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
- {
- this(validatorClassname, resourceBundle);
- this.classLoader = classLoader;
- }
-
- /**
- * Get the validator specified in this delegate.
- *
- * @return The WSDL 1.1 validator specified by this delegate.
- */
- public IWSDL20Validator getValidator()
- {
- if (validator == null)
- {
- if(classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- try
- {
- Class validatorClass =
- classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
- validator = (IWSDL20Validator)validatorClass.newInstance();
- if (resourceBundle != null)
- {
- ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
- validator.setResourceBundle(validatorBundle);
- }
- }
- catch (ClassNotFoundException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- catch (IllegalAccessException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- catch (InstantiationException e)
- {
- // TODO: add logging
- System.err.println(e);
- }
- }
- return validator;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java
deleted file mode 100644
index d7cb52e10..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * Factory for generating objects needed for XML Conformance validation.
- */
-public abstract class AbstractXMLConformanceFactory
-{
- protected static AbstractXMLConformanceFactory instance;
-
- /**
- * Returns the instance of this factory.
- *
- * @return the instance of this factory
- */
- public static AbstractXMLConformanceFactory getInstance()
- {
- if (instance == null)
- {
- instance = new DefaultXMLConformanceFactory();
- }
- return instance;
- }
-
- /**
- * Set the implementation for this factory to use.
- *
- * @param factory - the implementation this factory will use
- */
- public static void setImplementation(AbstractXMLConformanceFactory factory)
- {
- instance = factory;
- }
-
- /**
- * Return an XML validator.
- *
- * @return an XML validator
- */
- abstract public IXMLValidator getXMLValidator();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java
deleted file mode 100644
index 1e4e15c4d..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-
-/**
- * The default implementation of AbstractXMLConformanceFactory.
- */
-public class DefaultXMLConformanceFactory extends AbstractXMLConformanceFactory
-{
-
- /**
- * Constructor.
- */
- public DefaultXMLConformanceFactory()
- {
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory#getXMLValidator()
- */
- public IXMLValidator getXMLValidator()
- {
- return new DefaultXMLValidator();
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
deleted file mode 100644
index ba8a0c1de..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.jaxp.SAXParserFactoryImpl;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * The default implementation of IXMLValidator.
- */
-public class DefaultXMLValidator implements IXMLValidator
-{
- private final String _APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR =
- "http://apache.org/xml/features/continue-after-fatal-error";
- private final String _APACHE_FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
- private final String _APACHE_FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
- private final String _APACHE_FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
- private final String _APACHE_FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
- private final String _APACHE_PROPERTY_EXTERNAL_SCHEMALOCATION =
- "http://apache.org/xml/properties/schema/external-schemaLocation";
- private final String DEFINITIONS = "definitions";
-
- protected static final String IGNORE_ALWAYS = "IGNORE_ALWAYS";
- protected static final String PREMATURE_EOF = "PrematureEOF";
-
- protected Hashtable ingoredErrorKeyTable = new Hashtable();
-
- protected String uri;
- protected URIResolver uriResolver = null;
- protected List errors = new ArrayList();
- protected StringBuffer schemaLocationString = new StringBuffer();
- protected List ignoredNamespaceList = new ArrayList();
-
- protected InputStream inputStream = null;
-
- protected String currentErrorKey = null;
- protected Object[] currentMessageArguments = null;
-
- protected boolean isChildOfDoc = false;
-// protected String wsdlNamespace = null;
-
-
-
-
-/**
- * Constructor.
- */
- public DefaultXMLValidator()
- {
- super();
-
- ignoredNamespaceList.add(Constants.NS_URI_XSD_1999);
- ignoredNamespaceList.add(Constants.NS_URI_XSD_2000);
- ignoredNamespaceList.add(Constants.NS_URI_XSD_2001);
-
- ingoredErrorKeyTable.put(PREMATURE_EOF, IGNORE_ALWAYS);
- }
-
- /**
- * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#setFile(IFile)
- */
- public void setFile(String uri)
- {
- this.uri = uri;
- }
-
- public void setURIResolver(URIResolver uriResolver)
- {
- this.uriResolver = uriResolver;
- }
-
- /**
- * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#run()
- */
- public void run()
- {
- // Validate the XML file.
- try
- {
- Reader reader1 = null; // Used for the preparse.
- Reader reader2 = null; // Used for validation parse.
-
- InputSource validateInputSource;
-
-
- if (this.inputStream != null)
- {
-
-
- String string = createStringForInputStream(inputStream);
- reader1 = new StringReader(string);
- reader2 = new StringReader(string);
-
- validateInputSource = new InputSource(inputStream);
- validateInputSource.setCharacterStream(reader2);
- } else
- { validateInputSource = new InputSource(uri);
- }
-
- preparse(uri, reader1);
-
- SAXParser saxparser = createSAXParser();
- XMLConformanceDefaultHandler handler = new XMLConformanceDefaultHandler();
-
- saxparser.setErrorHandler(handler);
- saxparser.setEntityResolver(handler);
- saxparser.setContentHandler(handler);
-
- saxparser.parse(validateInputSource);
-// wsdlNamespace = handler.getWSDLNamespace();
- }
- catch (SAXParseException e)
- {
- addError(e.getMessage(), e.getLineNumber(), e.getColumnNumber(), uri);
- }
- catch (IOException e)
- {
- }
- catch (Exception e)
- {
- //System.out.println(e);
- }
- }
-
- /**
- * Create and configure a SAX parser.
- *
- * @return The new SAX parser.
- */
- protected SAXParser createSAXParser()
- {
- SAXParser saxParser = null;
- try
- {
- //SAXParserFactory parserfactory = new SAXParserFactoryImpl();
- try
- { MyStandardParserConfiguration configuration = new MyStandardParserConfiguration();
- saxParser = new org.apache.xerces.parsers.SAXParser(configuration);
- saxParser.setFeature(_APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR, true);
- saxParser.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
- saxParser.setFeature(_APACHE_FEATURE_NAMESPACES, true);
- saxParser.setFeature(_APACHE_FEATURE_VALIDATION, true);
- saxParser.setFeature(_APACHE_FEATURE_VALIDATION_SCHEMA, true);
- }
- catch (SAXNotRecognizedException e)
- {
- }
- catch (SAXNotSupportedException e)
- {
- }
- if (schemaLocationString.length() > 0)
- {
- saxParser.setProperty(_APACHE_PROPERTY_EXTERNAL_SCHEMALOCATION, schemaLocationString.toString());
- }
- }
- catch (FactoryConfigurationError e)
- {
- }
- catch (SAXNotRecognizedException e)
- {
- }
- catch (SAXNotSupportedException e)
- {
- }
-// catch (SAXException e)
-// {
-// }
- return saxParser;
- }
-
-
- final String createStringForInputStream(InputStream inputStream)
- {
- // Here we are reading the file and storing to a stringbuffer.
- StringBuffer fileString = new StringBuffer();
- try
- {
- InputStreamReader inputReader = new InputStreamReader(inputStream);
- BufferedReader reader = new BufferedReader(inputReader);
- char[] chars = new char[1024];
- int numberRead = reader.read(chars);
- while (numberRead != -1)
- {
- fileString.append(chars, 0, numberRead);
- numberRead = reader.read(chars);
- }
- }
- catch (Exception e)
- {
- //TODO: log error message
- //e.printStackTrace();
- }
- return fileString.toString();
- }
-
- /**
- * Preparse the file to find all of the namespaces that are defined in order
- * to specify the schemalocation.
- *
- * @param uri The uri of the file to parse.
- */
- protected void preparse(String uri, Reader characterStream)
- {
- javax.xml.parsers.SAXParser saxParser = null;
- try
- {
-
- InputSource inputSource;
-
- if (characterStream != null)
- {
- inputSource = new InputSource(uri);
- inputSource.setCharacterStream(characterStream);
- }
- else
- {
- inputSource = new InputSource(uri);
- }
-
- SAXParserFactory parserfactory = new SAXParserFactoryImpl();
-
- parserfactory.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
- parserfactory.setFeature(_APACHE_FEATURE_NAMESPACES, true);
-
- saxParser = parserfactory.newSAXParser();
- SchemaStringHandler handler = new SchemaStringHandler(uri);
-
- saxParser.parse(inputSource, handler);
- }
- catch (FactoryConfigurationError e)
- {
- }
- catch (SAXNotRecognizedException e)
- {
- }
- catch (ParserConfigurationException e)
- {
- }
- catch (SAXNotSupportedException e)
- {
- }
- catch (SAXException e)
- {
- }
- catch (IOException e)
- {
- }
- }
-
- /**
- * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#hasErrors()
- */
- public boolean hasErrors()
- {
- return !errors.isEmpty();
- }
-
- /**
- * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#getErrorList()
- */
- public List getErrors()
- {
- return errors;
- }
-
- /**
- * Add an error message.
- *
- * @param error The error message to add.
- * @param line The line location of the error.
- * @param column The column location of the error.
- * @param uri The URI of the file containing the error.
- */
- protected void addError(String error, int line, int column, String uri)
- {
- errors.add(new ValidationMessageImpl(error, line, column, ValidationMessageImpl.SEV_ERROR, uri, currentErrorKey, currentMessageArguments));
- }
-
- /**
- * The handler for the SAX parser. This handler will obtain the WSDL
- * namespace, handle errors and resolve entities.
- */
- protected class XMLConformanceDefaultHandler extends DefaultHandler
- {
- /**
- * @see org.xml.sax.ErrorHandler#error(SAXParseException)
- */
- public void error(SAXParseException arg0) throws SAXException
- {
- String tempURI = arg0.getSystemId();
- if (inputStream!= null && arg0.getSystemId() == null)
- {
- //mh: In this case we are validating a stream so the URI may be null in this exception
- tempURI = uri;
- }
- addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), tempURI);
- }
-
- /**
- * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
- */
- public void fatalError(SAXParseException arg0) throws SAXException
- {
- addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
- }
-
- /**
- * @see org.xml.sax.ErrorHandler#warning(SAXParseException)
- */
- public void warning(SAXParseException arg0) throws SAXException
- {
- addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
- }
-
- /**
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
- */
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
- if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
- {
- isChildOfDoc = false;
- }
- super.endElement(uri, localName, qName);
- }
- /**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
- */
- public void startElement(String uri, String localName, String qName,
- Attributes atts) throws SAXException {
- if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
- {
- isChildOfDoc = true;
- }
- super.startElement(uri, localName, qName, atts);
- }
-
- /**
- * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
- * java.lang.String)
- */
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException
- {
- // If we're currently examining a subelement of the
- // WSDL or schema documentation element we don't want to resolve it
- // as anything is allowed as a child of documentation.
- if(isChildOfDoc)
- {
- return new InputSource();
- }
- if(publicId == null)
- {
- publicId = systemId;
- }
-
- IURIResolutionResult result = uriResolver.resolve(null, publicId, systemId);
- String uri = result.getPhysicalLocation();
- if (uri != null && !uri.equals(""))
- {
- try
- {
-// String entity = systemId;
-// if(publicId != null)
-// {
-// entity = publicId;
-// }
- URL entityURL = new URL(uri);
- InputSource is = new InputSource(result.getLogicalLocation());
- is.setByteStream(entityURL.openStream());
- if (is != null)
- {
- return is;
- }
- }
- catch(Exception e)
- {
- // Do nothing.
- }
- }
- // This try/catch block with the IOException is here to handle a difference
- // between different versions of the EntityResolver interface.
- try
- {
- InputSource is = super.resolveEntity(publicId, systemId);
- if(is == null)
- {
- throw new IOException();
- }
- return is;
- }
- catch(IOException e)
- {
- }
- return null;
- }
-
- }
-
- /**
- * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidator#setSchemaLocation(String,
- * String)
- */
- public void setSchemaLocation(String namespace, String location)
- {
- if (namespace != null && location != null && !namespace.equalsIgnoreCase("") && !location.equalsIgnoreCase(""))
- {
- schemaLocationString.append(" ").append(namespace).append(" ").append(formatURI(location));
- }
- }
-
-
- /**
- * @param inputStream - set the inputStream to validate
- */
- public void setInputStream(InputStream inputStream)
- {
- this.inputStream = inputStream;
- }
-
- /**
- * Remove space characters from a String and replace them with %20.
- *
- * @param uri -
- * the uri to format
- * @return the formatted string
- */
- protected String formatURI(String uri)
- {
- String space = "%20";
- StringBuffer newUri = new StringBuffer(uri);
- int newUriLength = newUri.length();
-
- // work backwards through the stringbuffer in case it grows to the
- // point
- // where the last space would be missed.
- for (int i = newUriLength - 1; i >= 0; i--)
- {
- if (newUri.charAt(i) == ' ')
- {
- newUri.replace(i, i + 1, space);
- }
- }
-
- return newUri.toString();
- }
-
- /**
- * A handler used in preparsing to get the schemaLocation string.
- */
- protected class SchemaStringHandler extends DefaultHandler
- {
- private final String XMLNS = "xmlns";
- private final String TARGETNAMESPACE = "targetNamespace";
- private String baselocation = null;
-
- public SchemaStringHandler(String baselocation)
- {
- this.baselocation = baselocation;
- }
- /**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
- * java.lang.String, java.lang.String, org.xml.sax.Attributes)
- */
- public void startElement(String uri, String localname, String arg2, Attributes attributes) throws SAXException
- {
- if (localname.equals(DEFINITIONS))
- {
- String targetNamespace = attributes.getValue(TARGETNAMESPACE);
- int numAtts = attributes.getLength();
- for (int i = 0; i < numAtts; i++)
- {
-
- String attname = attributes.getQName(i);
- if (attname.startsWith(XMLNS))
- {
- String namespace = attributes.getValue(i);
- if(!(namespace.equals(targetNamespace) || ignoredNamespaceList.contains(namespace)))
- {
- String resolvedURI = namespace;
- setSchemaLocation(namespace, resolvedURI);
- }
- }
- }
-
- }
- super.startElement(uri, localname, arg2, attributes);
-
- }
- }
-
-
- protected class MyStandardParserConfiguration extends StandardParserConfiguration
- {
- public MyStandardParserConfiguration()
- {
- }
-
- /* (non-Javadoc)
- * @see org.apache.xerces.parsers.DTDConfiguration#createErrorReporter()
- */
- protected XMLErrorReporter createErrorReporter()
- {
- return new XMLErrorReporter()
- {
- /* (non-Javadoc)
- * @see org.apache.xerces.impl.XMLErrorReporter#reportError(java.lang.String, java.lang.String, java.lang.Object[], short)
- */
- public void reportError(String domain, String key, Object[] arguments,
- short severity) throws XNIException
- {
- currentErrorKey = key;
- currentMessageArguments = arguments;
- super.reportError(domain, key, arguments, severity);
- }
- };
- }
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java
deleted file mode 100644
index 57d9a3abe..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * Holds the location information for an element in the model.
- */
-public class ElementLocation
-{
- public static final String ID = "location";
- protected int line;
- protected int column;
- /**
- * Constructor.
- *
- * @param line - the line location of the element
- * @param column - the column location of the element
- */
- public ElementLocation(int line, int column)
- {
- this.line = line;
- this.column = column;
- }
-
- /**
- * Return the line number for this element.
- *
- * @return the line number for this element
- */
- public int getLineNumber()
- {
- return line;
- }
-
- /**
- * Return the column number for this element.
- *
- * @return the column number for this element
- */
- public int getColumnNumber()
- {
- return column;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java
deleted file mode 100644
index 43f456e45..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * An interface for an XML catalog.
- */
-public interface IXMLCatalog
-{
-
- /**
- * Add a public id and a location to the catalog.
- *
- * @param publicId -
- * the public id of the entry
- * @param systemId -
- * the system id of the entry
- */
- public abstract void addEntryToCatalog(String publicId, String systemId);
-
- /**
- * Resolve the location of an entity given public and system ids.
- *
- * @param publicId -
- * the public id of the entity to be resolved
- * @param systemId -
- * the system id of the entity to be resolved
- * @return the location of the entity
- */
- public abstract String resolveEntityLocation(String publicId, String systemId);
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java
deleted file mode 100644
index b4cadfe03..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An interface for an XML validator.
- */
-public interface IXMLValidator
-{
- /**
- * Set the file to be validated.
- *
- * @param uri - the uri of the file to be validated
- */
- public void setFile(String uri);
-
- /**
- * Validate the file.
- */
- public void run();
-
- /**
- * Returns true if there were validation errors, false otherwise.
- *
- * @return true if there were validation errors, false otherwise
- */
- public boolean hasErrors();
-
- /**
- * Returns the list of errors.
- *
- * @return the list of errors
- */
- public List getErrors();
-
- /**
- * Add a schema location to be schema locatino string used by the XML parser.
- *
- * @param namespace - the namespaces of the schema
- * @param location - the location of the schema
- */
- public void setSchemaLocation(String namespace, String location);
-
- /**
- * Set the URI resolver to use.
- *
- * @param uriResolver The URI resolver to use.
- */
- public void setURIResolver(URIResolver uriResolver);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
deleted file mode 100644
index 0ade3673c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * A DOM parser that will register location information with the elements in the model.
- */
-public class LineNumberDOMParser extends DOMParser
-{
- XMLLocator locator = null;
-
- /**
- * Constructor.
- */
- public LineNumberDOMParser()
- {
- super();
- try
- {
- setFeature(DEFER_NODE_EXPANSION, false);
- }
- catch (SAXNotSupportedException e)
- {
- System.out.println(e);
- }
- catch (SAXNotRecognizedException e)
- {
- System.out.println(e);
- }
- }
-
- /**
- * Constuctor.
- *
- * @param arg0 The parser configuration.
- */
- public LineNumberDOMParser(XMLParserConfiguration arg0)
- {
- super(arg0);
- try
- {
- setFeature(DEFER_NODE_EXPANSION, false);
- }
- catch (SAXNotSupportedException e)
- {
- System.out.println(e);
- }
- catch (SAXNotRecognizedException e)
- {
- System.out.println(e);
- }
- }
-
- /**
- * Constructor.
- *
- * @param arg0 A symbol table for the parser.
- */
- public LineNumberDOMParser(SymbolTable arg0)
- {
- super(arg0);
- }
-
- /**
- * Constructor.
- *
- * @param arg0 A symbol table for the parser.
- * @param arg1 A grammar pool for the parser.
- */
- public LineNumberDOMParser(SymbolTable arg0, XMLGrammarPool arg1)
- {
- super(arg0, arg1);
- }
-
- /**
- * @see org.apache.xerces.xni.XMLDocumentHandler#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
- */
- public void startElement(QName arg0, XMLAttributes arg1, Augmentations arg2) throws XNIException
- {
- Element element;
- // For elements from the Schema namespace we want to preserve them
- // the way they were entered. Revert the values to the non-normalized values.
- String ns = arg0.uri;
- if(ns != null && (ns.equals(Constants.NS_URI_XSD_2001) || ns.equals(Constants.NS_URI_XSD_1999) || ns.equals(Constants.NS_URI_XSD_2000)))
- {
- int numatts = arg1.getLength();
- for(int i = 0; i < numatts; i++)
- {
- String nonNormalizedValue = arg1.getNonNormalizedValue(i);
- arg1.setValue(i, nonNormalizedValue);
- }
- }
- super.startElement(arg0, arg1, arg2);
- try
- {
- element = (Element)getProperty(CURRENT_ELEMENT_NODE);
- ElementImpl elementImpl = (ElementImpl)element;
- // Setting the user data with an identifier such as ElementLocation.KEY_NAME
- // may be a long term good idea. The setUserData method with no id is used
- // to support JVMs with alternate versions of Xerces.
- elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
- }
- // catch SAXNotRecognizedException and SAXNotSupportedException if can't get element
- catch (ClassCastException e)
- {
- //System.out.println(e);
- }
- catch (SAXNotRecognizedException e)
- {
- //System.out.println(e);
- }
- catch (SAXNotSupportedException e)
- {
- //System.out.println(e);
- }
- }
-
- /**
- * @see org.apache.xerces.xni.XMLDocumentHandler#startDocument(org.apache.xerces.xni.XMLLocator, java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xni.Augmentations)
- */
- public void startDocument(XMLLocator arg0, String arg1, NamespaceContext arg2, Augmentations arg3)
- throws XNIException
- {
- locator = arg0;
- super.startDocument(arg0, arg1, arg2, arg3);
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
deleted file mode 100644
index 0a6cfaf70..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.xerces.jaxp.SAXParserFactoryImpl;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * XMLCatalog This class can be used to register, obtain and delete an instance
- * of an XML catalog. Method definitions are provided for the catalog to set a
- * location in the catalog and resolve an entity from the catalog.
- */
-public class XMLCatalog implements IXMLCatalog
-{
- private final static String _APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR = "http://apache.org/xml/features/continue-after-fatal-error";
-
- private final static String _APACHE_FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-
- private final static String _APACHE_FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-
- private final static String _APACHE_FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
-
- private final static String _APACHE_FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-
- private final static String FILE_PROTOCOL = "file:///";
-
- private static IXMLCatalog instance = null;
-
- private static String extxmlcatalogclass = null;
-
- private static ClassLoader extclassLoader = null;
-
- private static IXMLCatalog extXMLCatalogInstance = null;
-
- private static List schemadirs = new ArrayList();
-
- private static List entities = new ArrayList();
-
- /**
- * A hashtable to hold the XML catalog entries.
- */
- protected Map catalog = new Hashtable();
-
- /**
- * Return an instance of the XML catalog. Assigns all registered schemas to
- * the XML catalog.
- *
- * @return The instance of the XML catalog.
- */
- public static IXMLCatalog getInstance()
- {
- if (instance == null)
- {
- instance = new XMLCatalog();
-
- // Add the registered entities to the catalog.
- Iterator entityIter = entities.iterator();
- while (entityIter.hasNext())
- {
- XMLCatalogEntityHolder entity = (XMLCatalogEntityHolder) entityIter.next();
- instance.addEntryToCatalog(entity.getPublicId(), entity.getSystemId());
- }
-
- // Add the schemas in the schema directories to the catalog.
- if (schemadirs.size() > 0)
- {
- SAXParser saxParser = null;
- try
- {
- SAXParserFactory parserfactory = new SAXParserFactoryImpl();
- parserfactory.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
- parserfactory.setFeature(_APACHE_FEATURE_NAMESPACES, true);
- saxParser = parserfactory.newSAXParser();
- }
- catch (FactoryConfigurationError e)
- {
- }
- catch (SAXNotRecognizedException e)
- {
- }
- catch (ParserConfigurationException e)
- {
- }
- catch (SAXNotSupportedException e)
- {
- }
- catch (SAXException e)
- {
- }
- Iterator schemadirIter = schemadirs.iterator();
- SchemaNamespaceHandler handler = ((XMLCatalog) instance).new SchemaNamespaceHandler();
- while (schemadirIter.hasNext())
- {
- String schemadir = (String) schemadirIter.next();
- registerSchemasForDir(instance, schemadir, saxParser, handler);
- }
- }
- }
- return instance;
- }
-
- /**
- * Register the schemas in the given directory and all subdirectories with the
- * XML catalog.
- *
- * @param catalog
- * The catalog to register the schemas with.
- * @param schemadir
- * The schema directory to search for schema files.
- * @param parser
- * The SAXParser to use to parse the schemas for their
- * targetNamespace.
- * @param handler
- * The handler to use to get the targetNamespace.
- */
- private static void registerSchemasForDir(IXMLCatalog catalog, String schemadir, SAXParser parser,
- SchemaNamespaceHandler handler)
- {
- // Remove file: and file:/ from beginning of file location if they are present.
- if(schemadir.startsWith("file:"))
- {
- schemadir = schemadir.substring(5);
- }
- while(schemadir.startsWith("//"))
- {
- schemadir = schemadir.substring(1);
- }
-
- File dir = new File(schemadir);
- if (dir.isDirectory())
- {
- File[] files = dir.listFiles();
- int numfiles = files.length;
- for (int i = 0; i < numfiles; i++)
- {
- File tempfile = files[i];
- String tempfilepath = tempfile.getAbsolutePath();
- tempfilepath = tempfilepath.replace('\\','/');
- while(tempfilepath.startsWith("/"))
- {
- tempfilepath = tempfilepath.substring(1);
- }
- tempfilepath = FILE_PROTOCOL + tempfilepath;
- if (tempfile.isDirectory())
- {
- registerSchemasForDir(catalog, tempfilepath, parser, handler);
- } else
- {
- handler.reset();
- try
- {
- parser.parse(tempfilepath, handler);
- }
- catch (Exception e)
- {
- // TODO: log error.
- }
- String targetNamespace = handler.getTargetNamespace();
- if (targetNamespace != null)
- {
- catalog.addEntryToCatalog(targetNamespace, tempfilepath);
- }
- }
- }
- }
- }
-
- /**
- * Get the instance of the extension XML catalog. Returns the instance if one
- * is registered and can be created, null otherwise.
- *
- * @return The instance of the extension XML catalog if one is registered,
- * null otherwise.
- */
- public static IXMLCatalog getExtensionCatalogInstance()
- {
- if (extXMLCatalogInstance == null)
- {
- if (extxmlcatalogclass != null && extclassLoader != null)
- {
- try
- {
- Class catalogClass = extclassLoader != null ? extclassLoader.loadClass(extxmlcatalogclass) : Class
- .forName(extxmlcatalogclass);
- extXMLCatalogInstance = (IXMLCatalog) catalogClass.newInstance();
- }
- catch (Exception e)
- {
- //TODO: Log error
- }
- }
- }
- return extXMLCatalogInstance;
- }
-
- /**
- * Set the class of the XML catalog to be used.
- *
- * @param xmlcatalog
- * The class of the XML catalog to be used.
- * @param classloader
- * The classloader to use to load the catalog.
- */
- public static void setExtensionXMLCatalog(String xmlcatalog, ClassLoader classloader)
- {
- extxmlcatalogclass = xmlcatalog;
- extclassLoader = classloader;
- }
-
- /**
- * Resets the instance of the XML catalog to null. For deleting the catalog if
- * necessary.
- */
- public static void reset()
- {
- instance = null;
- extxmlcatalogclass = null;
- extclassLoader = null;
- extXMLCatalogInstance = null;
- entities = new ArrayList();
- schemadirs = new ArrayList();
- }
-
- /**
- * Add a schema directory to be checked for schemas to register in the
- * catalog.
- *
- * @param schemadir
- * The directory to check for schemas.
- */
- public static void addSchemaDir(String schemadir)
- {
- schemadirs.add(schemadir);
- }
-
- /**
- * Add an entity to the catalog.
- *
- * @param entity
- * The entity to add to the catalog.
- */
- public static void addEntity(XMLCatalogEntityHolder entity)
- {
- entities.add(entity);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#addEntryToCatalog(java.lang.String,
- * java.lang.String)
- */
- public void addEntryToCatalog(String publicId, String systemId)
- {
- catalog.put(publicId, systemId);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#resolveEntityLocation(java.lang.String,
- * java.lang.String)
- */
- public String resolveEntityLocation(String publicId, String systemId)
- {
- String resolvedlocation = null;
- // First try to resolve using the ext catalog.
- IXMLCatalog extcatalog = getExtensionCatalogInstance();
- if (extcatalog != null)
- {
- resolvedlocation = extcatalog.resolveEntityLocation(publicId, systemId);
- }
- if (resolvedlocation == null)
- {
- // if there's no system id use the public id
- if (systemId == null || systemId.equals(""))
- {
- systemId = publicId;
- }
- resolvedlocation = (String) catalog.get(systemId);
- }
- return resolvedlocation;
- }
-
- /**
- * A handler used in parsing to get the targetNamespace string of a schema.
- */
- protected class SchemaNamespaceHandler extends DefaultHandler
- {
- private final String TARGET_NAMESPACE = "targetNamespace";
-
- private final String SCHEMA = "schema";
-
- private String targetNamespace = null;
-
- /**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
- * java.lang.String, java.lang.String, org.xml.sax.Attributes)
- */
- public void startElement(String uri, String localname, String arg2, Attributes attributes) throws SAXException
- {
- if (localname.equals(SCHEMA))
- {
-
- int numAtts = attributes.getLength();
- for (int i = 0; i < numAtts; i++)
- {
-
- String attname = attributes.getQName(i);
- if (attname.equals(TARGET_NAMESPACE))
- {
- targetNamespace = attributes.getValue(i);
- }
- }
-
- }
- super.startElement(uri, localname, arg2, attributes);
- }
-
- /**
- * Return the targetNamespace found by parsing the file.
- *
- * @return The targetNamespace found by parsing the file.
- */
- public String getTargetNamespace()
- {
- return targetNamespace;
- }
-
- /**
- * Reset the state of the handler so it can be reused.
- */
- public void reset()
- {
- targetNamespace = null;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java
deleted file mode 100644
index 5eca6ac92..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * A container to hold the entity information until an XML catalog is
- * to be initialized.
- */
-public class XMLCatalogEntityHolder
-{
- private String publicId;
- private String systemId;
-
- /**
- * Constructor.
- *
- * @param publicId The public id of the entity.
- * @param systemId The system id of the entity.
- */
- public XMLCatalogEntityHolder(String publicId, String systemId)
- {
- this.publicId = publicId;
- this.systemId = systemId;
- }
-
- /**
- * Returns the public id of the entity.
- * @return The public id of the entity.
- */
- public String getPublicId()
- {
- return publicId;
- }
-
- /**
- * Returns the system id of the entity.
- * @return The system id of the entity.
- */
- public String getSystemId()
- {
- return systemId;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
deleted file mode 100644
index 0e850c0e5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.IOException;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * A resolver to resolver entities from the XML catalog.
- */
-public class XMLCatalogResolver implements XMLEntityResolver
-{
- protected static XMLCatalogResolver xmlCatalog;
-
- /**
- * Constructor.
- */
- protected XMLCatalogResolver()
- {
- }
-
- /**
- * Get the instance of this resolver.
- *
- * @return the instance of this resolver
- */
- public static XMLCatalogResolver getInstance()
- {
- if (xmlCatalog == null)
- {
- xmlCatalog = new XMLCatalogResolver();
- }
- return xmlCatalog;
- }
-
- /**
- * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
- */
- public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
- {
- String publicId = resourceIdentifier.getPublicId();
- if(publicId == null)
- {
- publicId = resourceIdentifier.getNamespace();
- }
- String systemId = resourceIdentifier.getLiteralSystemId();
- String location = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
- if (location != null)
- {
- LazyURLInputStream is = new LazyURLInputStream(location);
- XMLInputSource inputSource = new XMLInputSource(publicId, systemId, systemId, is, null);
- return inputSource;
- }
- // otherwise return null to tell the parser to locate the systemId as a URI
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java
deleted file mode 100644
index 443ab84ae..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java
+++ /dev/null
@@ -1,132 +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.wsdl.validation.internal.xml;
-
-public class XMLMessageInfoHelper
-{
-
- //see org.eclipse.wst.xml.ui.reconcile.DelegatingSourceValidator
- protected static final String ALL_ATTRIBUTES = "ALL_ATTRIBUTES";
- protected static final String ATTRIBUTE_NAME ="ATTRIBUTE_NAME";
- protected static final String ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE";
- protected static final String START_TAG = "START_TAG";
- protected static final String TEXT = "TEXT";
- protected static final String FIRST_NON_WHITESPACE_TEXT = "FIRST_NON_WHITESPACE_TEXT";
- protected static final String TEXT_ENTITY_REFERENCE = "TEXT_ENTITY_REFERENCE";
- protected static final String VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE = "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE";
-
-
- public XMLMessageInfoHelper()
- {
- super();
- }
-
- /**
- * returns an array containing information about what should be underlined with the red "squiggles"
- * using the errorKey, and the messageArguments
- * <br>Position 0 of the array returned contains the selection Strategy,or what DOM Element to underline.
- * For example "ATTRIBUTE_NAME"
- * <br>Position 1 contains the name or value to squiggle.
- * <p>For example, if we wanted to squiggle the attribute name of an attribute name
- * foo this method would return {"ATTRIBUTE_NAME", "foo"}
- * </p>
- * @param errorKey the error key given by the Xerces parser
- * @param messageArguments the arguments used by Xerces to "fill in the blanks" of their messages
- * @return an array containing the squiggle information
- * @see org.eclipse.wst.xml.ui.reconcile.DelegatingReconcileValidator
- *
- */
- public String[] createMessageInfo(String errorKey, Object[] messageArguments)
- {
- String selectionStrategy = null;
- String nameOrValue = null;
-
- //XML Errors
- if (errorKey.equals("cvc-complex-type.2.4.a") || errorKey.equals("cvc-complex-type.2.4.d") || errorKey.equals("cvc-complex-type.2.4.b") || errorKey.equals("MSG_CONTENT_INVALID")
- | errorKey.equals("MSG_CONTENT_INCOMPLETE") || errorKey.equals("MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED") || errorKey.equals("cvc-complex-type.4"))
- {
- selectionStrategy = START_TAG;
- }
- else if (errorKey.equals("cvc-type.3.1.3"))
- {
- selectionStrategy = TEXT;
- }
- else if (errorKey.equals("cvc-complex-type.2.3"))
- {
- selectionStrategy = FIRST_NON_WHITESPACE_TEXT;
- }
- else if (errorKey.equals("cvc-type.3.1.1"))
- {
- selectionStrategy = ALL_ATTRIBUTES;
- }
- else if (errorKey.equals("cvc-complex-type.3.2.2") || errorKey.equals("MSG_ATTRIBUTE_NOT_DECLARED"))
- {
- selectionStrategy = ATTRIBUTE_NAME;
- //in this case we need nameOrValue to be the name of the attribute to underline
- nameOrValue = (String)messageArguments[1];
- }
- else if (errorKey.equals("cvc-attribute.3") || errorKey.equals("MSG_ATTRIBUTE_VALUE_NOT_IN_LIST"))
- {
- selectionStrategy = ATTRIBUTE_VALUE;
- //in this case we need nameOrValue to be the name of the Attribute
- if (errorKey.equals("cvc-attribute.3"))
- { nameOrValue = (String)messageArguments[1];
- }
- else if (errorKey.equals("MSG_ATTRIBUTE_VALUE_NOT_IN_LIST"))
- { nameOrValue = (String)messageArguments[0];
- }
- }
- else if (errorKey.equals("cvc-elt.4.2"))
- { selectionStrategy=VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE;
- //in this case we need nameOrValue to be the value of the attribute we want to unerline
- nameOrValue = (String)messageArguments[1];
- }
- else if (errorKey.equals("EntityNotDeclared"))
- { selectionStrategy=TEXT_ENTITY_REFERENCE;
- }
-
-
- //WSDL Errors
- else if (errorKey.equals("_MESSAGE_UNDEFINED_FOR_OUTPUT") ||
- errorKey.equals("_MESSAGE_UNDEFINED_FOR_INPUT") ||
- errorKey.equals("_MESSAGE_UNDEFINED_FOR_FAULT"))
- {
- selectionStrategy=ATTRIBUTE_VALUE;
- nameOrValue= "message";
- }
- else if (errorKey.equals("_PORTTYPE_UNDEFINED_FOR_BINDING"))
- {
- selectionStrategy=ATTRIBUTE_VALUE;
- nameOrValue="type";
- }
- else if (errorKey.equals("_OPERATION_UNDEFINED_FOR_PORTTYPE"))
- {
- selectionStrategy=ATTRIBUTE_VALUE;
- nameOrValue="name";
- }
- else if (errorKey.equals("_PART_INVALID_ELEMENT"))
- {
- selectionStrategy=ATTRIBUTE_VALUE;
- nameOrValue="element";
- }
- else if (errorKey.equals("_NO_BINDING_FOR_PORT"))
- {
- selectionStrategy=ATTRIBUTE_VALUE;
- nameOrValue="binding";
- }
-
- String messageInfo[] = new String[2];
- messageInfo[0] = selectionStrategy;
- messageInfo[1] = nameOrValue;
- return messageInfo;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties
deleted file mode 100644
index 73d05dec5..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties
+++ /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
-###############################################################################
-!-- Constants for strings
-
-!-- Warning Messages
-_WARN_NO_VALDIATOR = There is no registered validator for the namespace {0}.
-
-_ERROR_PROBLEM_WSDL_VALIDATOR = A problem occurred while running the WSDL validator for namespace {0}.
-_ERROR_NO_WSDL_VALIDATOR = The namespace {0} specified is not a valid WSDL namespace.
-_ERROR_PROBLEM_EXT_VALIDATOR = A problem occurred while running the Extension validator {0} for namespace {1}.
-
-!-- Strings for WSDL 1.1 validator
-
-_UNABLE_TO_IMPORT_BAD_LOCATION = The {0} document could not be imported. Check that the document exists and that the location is correct.
-_UNABLE_TO_IMPORT_NO_LOCATION = The location attribute is empty. A location must be specified for the location attribute.
-_UNABLE_TO_IMPORT_INVALID = The {0} document could not be imported because it is not valid. The document must be corrected before it can be imported.
-_NO_BINDING_FOR_PORT = The {0} port has an invalid binding - {1}. Check that the {1} binding is defined.
-_PORTTYPE_UNDEFINED_FOR_BINDING = The {0} port type specified for the {1} binding is undefined. Check the {0} port type name and ensure it is defined.
-_OPERATION_UNDEFINED_FOR_PORTTYPE = The operation specified for the {0} binding is not defined for port type {1}. All operations specified in this binding must be defined in port type {1}.
-_INPUT_NAME_NOT_UNIQUE = The name {0} specified for this input element is not unique. The name of an input element must be unique from the names of all other input and output elements defined in the {1} port type.
-_OUTPUT_NAME_NOT_UNIQUE = The name {0} specified for this output element is not unique. The name of an output element must be unique from the names of all other inputs and output elements defined in the {1} port type.
-_MESSAGE_UNDEFINED_FOR_INPUT = The input element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_OUTPUT = The output element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_FAULT = The fault element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_DUPLICATE_FAULT_NAME = A fault with the name {0} has already been defined for the {1} 0peration. Check that every fault defined for this operation has a unique name.
-_PART_NO_ELEMENT_OR_TYPE = The part {0} does not have a type defined. Every part must specify a type from some type system. The type can be specified using the built in "element" or "type" attributes or may be specified using an extension attribute.
-_PART_BOTH_ELEMENT_AND_TYPE = The part {0} has both an element and a type defined. Every part must only have an element or a type defined.
-_PART_INVALID_ELEMENT = The part {0} has an invalid value {1} defined for its element. Element declarations must refer to valid values defined in a schema.
-_PART_INVALID_TYPE = The part {0} has an invalid value {1} defined for its type. Type declarations must refer to valid values defined in a schema.
-_DUPLICATE_OPERATION_FOR_PORTTYPE = An operation with the name {0} has already been defined for the {1} port type. Every operation defined for a port type must have a unique name.
-_SERVICE_NAME_ALREADY_DEFINED = A Service with the name {0} has already been defined. Every service in the WSDL document must have a unique name.
-_BINDING_NAME_ALREADY_DEFINED = A binding with the name {0} has already been defined. Every binding in the WSDL document must have a unique name.
-_MESSAGE_NAME_ALREADY_DEFINED = A message with the name {0} has already been defined. Every message in the WSDL document must have a unique name.
-_PORTTYPE_NAME_ALREADY_DEFINED = A port type with the name {0} has already been defined. Every port type in the WSDL document must have a unique name.
-_MORE_THEN_ONE_ADDRESS_PORT = An address has already been defined for port {0}. Each port can have only one address defined.
-_NO_ADDRESS_PORT = The port {0} has no address defined. Each port must define one address.
-_PORT_NAME_NOT_UNIQUE = A port with the name {0} has already been defined. Every port in the WSDL document must have a unique name.
-_OPERATION_NO_INPUT_OR_OUTPUT = No input or output element has been defined for the {0} operation. An input element, an output element, or both must be defined for every operation.
-_WARN_SOAPENC_IMPORTED_PART = The part {0} uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_WARN_SOAPENC_IMPORTED_SCHEMA = The inline schema uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_REFERENCED_FILE_CONTAINS_ERRORS = Referenced file contains errors ({0}).
-_WARN_OLD_SCHEMA_NAMESPACE = An old version of the schema namespace has been specified. {0} is the schema namespace that should be used.
-_ERROR_MULTIPLE_TYPES_DEFINED = A types section has already been defined. Only one types element is allowed.
-_WARN_WRONG_NS_ON_IMPORT = The file cannot be imported because the namespace {0} does not match the target namespace {1} of the imported document.
-!-- Referenced file error
-!-- Note to translator - _REF_FILE_ERROR_MESSAGE needs a trailing space as another message may follow.
-_REF_FILE_ERROR_MESSAGE = Referenced file contains errors ({0}).
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties
deleted file mode 100644
index 7e7afd00b..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties
+++ /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
-###############################################################################
-
-_ERROR_NO_LOCATION_FOR_ADDRESS = No location has been specified for this address. Every address must have a valid location specified.
-_ERROR_INVALID_PORT_ELEMENT = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "address".
-_ERROR_INVALID_BINDING_ELEMENT = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "binding".
-_ERROR_INVALID_BINDING_OPERATION_ELEMENT = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "operation".
-_ERROR_INVALID_BINDING_INPUT_ELEMENT = The {0} element defined here is undefined for the HTTP namespace. The only valid elements are "urlReplacement" and "urlEncoded".
-_ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION = The {0} element cannot be specified here. This element is not defined in the HTTP namespace for use at this point.
-_ERROR_NO_HTTPBINDING_FOR_ADDRESS = An HTTP address cannot be specified here as the {0} binding that the {1} port refers to does not have an HTTP binding element defined. There must be an HTTP binding element defined in order to specify an HTTP address for a binding.
-_ERROR_INVALID_BINDING_VERB = The {0} verb defined for the HTTP binding is invalid. The HTTP binding verb must be "GET" or "POST" and is case sensitive.
-_ERROR_INVALID_LOCATION_URI = The location URI is invalid for the HTTP operation. You must specify a valid location URI for every HTTP Operation.
-_ERROR_NO_HTTPBINDING_FOR_OPERATION = The {0} binding that the HTTP operation is specified for does not have an HTTP binding defined. An HTTP binding must be defined in order to define an HTTP operation here.
-_ERROR_NO_HTTPOPERATION_FOR_URL = The {0} operation that the {1} HTTP element is specified for does not have an HTTP operation defined. A HTTP operation must be defined in order to define a {1} HTTP element here.
-_ERROR_NOT_ONLY_ELEMENT_DEFINED = The {0} HTTP element defined is not the only element defined for the input element. When {0} is defined it must be the only child element defined for the input element.
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties
deleted file mode 100644
index 633e7bf7f..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties
deleted file mode 100644
index 4a2b96ee8..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties
+++ /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
-###############################################################################
-
-_ERROR_NO_LOCATION_FOR_ADDRESS = No location has been specified for this address. Every address must have a valid location specified.
-_ERROR_INVALID_PORT_ELEMENT = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "address".
-_ERROR_INVALID_BINDING_STYLE = The {0} style defined for the SOAP binding in invalid. The SOAP binding style must be "rpc" or "document".
-_ERROR_INVALID_BINDING_URI = The transport URI has not been defined for the SOAP binding. You must specify a transport URI for every SOAP binding.
-_ERROR_INVALID_OPERATION_STYLE = The style specified for the SOAP operation is invalid. The SOAP operation style must be "rpc" or "document".
-_ERROR_INVALID_BINDING_ELEMENT = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "binding".
-_ERROR_INVALID_BINDING_OPERATION_ELEMENT = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "operation".
-_ERROR_INVALID_HEADER_BODY_ELEMENT = The {0} element defined here is undefined for the SOAP namespace. The only valid elements are "body", "header" and "headerfault".
-_ERROR_INVALID_FAULT_ELEMENT = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "fault".
-
-!-- A SOAP body element in a WSDL document can have an attribute "use" defined to be either literal or encoded. --
-!-- This string is used in an error task in WSAD if the document specifies a use other then literal or encoded. --
-!-- For example, if the document specifies the use of the SOAP body as "simple" the output string should be: --
-!-- The 'simple' use specified for the SOAP body is invalid. The use must be literal or encoded. --
-_ERROR_INVALID_BODY_USE = The {0} use specified for the SOAP body is invalid. The use must be literal or encoded.
-_ERROR_INVALID_BODY_ENCODING_STYLE = There is no encoding style URI defined for the SOAP body. You must specify at least one URI for the encoding style when the use is encoded.
-_ERROR_INVALID_BODY_PART_UNDEFINED = The {0} part specified as a part for the SOAP body is undefined. You can only specify defined parts.
-_ERROR_INVALID_BODY_PART_NOT_TYPE = The {0} part does not have a type defined and has been specified for a SOAP body with its use encoded. When use is encoded on a SOAP body, all parts defined must only contain a valid type.
-_ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION = The {0} element cannot be specified here. This element is not defined in the SOAP namespace for use at this point.
-_ERROR_NO_SOAPBINDING_FOR_ADDRESS = A SOAP address cannot be specified here as the {0} binding that the {1} port refers to does not have a SOAP binding element defined. There must be a SOAP binding element defined in order to specify a SOAP address for a binding.
-_ERROR_HEADER_MESSAGE_UNDEFINED = The {0} message specified for the SOAP header is undefined. The message specified must be defined in the WSDL document.
-_ERROR_HEADER_PART_UNDEFINED = The {0} part specified in message {1} for the SOAP header is undefined. Ensure the part is defined in the {1} message.
-_ERROR_HEADER_USE_UNDEFINED = The {0} use specified for the SOAP header is invalid. The use must be specified as literal or encoded.
-_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED = The encoding style for the SOAP header is not specified. When the use is encoded the encoding style must specify at least one URI.
-_ERROR_HEADER_NAMESPACE_UNDEFINED = The namespace for the SOAP header is not specified. When the use is encoded a namespace URI must be defined.
-_ERROR_HEADERFAULT_MESSAGE_UNDEFINED = The {0} message specified for the SOAP header fault is undefined. The message specified must be defined in the WSDL document.
-_ERROR_HEADERFAULT_PART_UNDEFINED = The {0} part specified in message {1} for the SOAP header fault is undefined. Ensure the part is defined in the {1} message.
-_ERROR_HEADERFAULT_USE_UNDEFINED = The {0} use specified for the SOAP header fault is invalid. The use must be specified as literal or encoded.
-_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED = The encoding style for the SOAP header fault is not specified. When the use is encoded the encoding style must specify at least one URI.
-_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED = The namespace for the SOAP header fault is not specified. When the use is encoded a namespace URI must be defined.
-_ERROR_INVALID_FAULT_NAME = The {0} name specified for the SOAP fault is invalid. The name specified must be {1}, the name from the fault parent element.
-_ERROR_NO_SOAPBINDING_FOR_OPERATION = The {0} binding that the SOAP operation is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP operation here.
-_ERROR_NO_SOAPBINDING_FOR_BODY = The {0} binding that the SOAP body is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP body here.
-_ERROR_NO_SOAPBINDING_FOR_HEADER = The {0} binding that the SOAP header is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP header here. \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java
deleted file mode 100644
index 6b9aa2003..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-/**
- * An extension Ant WSDL validator.
- */
-public class ExtensionValidator
-{
- private String classname = null;
- private String namespace = null;
- private String resourcebundle = null;
-
- public void setClass(String classname)
- {
- this.classname = classname;
- }
-
- public String getClassName()
- {
- return this.classname;
- }
-
- public void setNamespace(String namespace)
- {
- this.namespace = namespace;
- }
-
- public String getNamespace()
- {
- return this.namespace;
- }
-
- public void setResourceBundle(String resourcebundle)
- {
- this.resourcebundle = resourcebundle;
- }
-
- public String getResourceBundle()
- {
- return this.resourcebundle;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java
deleted file mode 100644
index 2d66239b6..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import org.apache.tools.ant.Task;
-
-/**
- * The URIResolver task allows specifying an extension URI resolver with
- * the WSDLValidate Ant task.
- */
-public class URIResolver extends Task
-{
- private String clazz = null;
-
- /**
- * Set the class name of the extension URI resolver.
- *
- * @param clazz The class name of the extension URI resolver.
- */
- public void setClassName(String clazz)
- {
- this.clazz = clazz;
- }
-
- /**
- * Get the class name of the extension URI resolver.
- *
- * @return The class name of the extension URI resolver.
- */
- public String getClassName()
- {
- return clazz;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
deleted file mode 100644
index 5ad53d9c2..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import java.io.File;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-
-/**
- * An Ant task to run WSDL validation on a file or a set of files.
- *
- * Options
- * - file - the file to run validation on (optional if fileset is used)
- * - failonerror - fail the build process on the first file with an error
- * - wsicompliance - how to report WS-I errors - REQUIRE, SUGGEST, IGNORE (defaults to REQUIRE)
- *
- * Supported Nested Elements
- * - xmlcatalog - an xml catalog
- * - dtd - a dtd specification as would appear in an xmlcatalog
- * - schema - a schema specification as would appear in an xmlcatalog
- * - entity - an entity specification as would appear in an xmlcatalog
- * - fileset - a set of files to validate
- * - wsdl11validator - an extension WSDL 1.1 validator
- * - uriresolver - an extension URI resolver
- *
- */
-public class WSDLValidate extends Task
-{
- protected final String UI_PROPERTIES = "validatewsdlui";
- protected final String VALIDATOR_PROPERTIES = org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
- protected final String _ERROR_NO_FILE_SPECIFIED = "_ERROR_NO_FILE_SPECIFIED";
- protected final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
- protected final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
- protected final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
- protected final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
- protected final String _UI_VALID = "_UI_VALID";
- protected final String _UI_INVALID = "_UI_INVALID";
- protected final String _EXC_UNABLE_TO_VALIDATE_FILE = "_EXC_UNABLE_TO_VALIDATE_FILE";
- protected final String _EXC_WSDL_FAIL_ON_ERROR = "_EXC_WSDL_FAIL_ON_ERROR";
-
- protected final String FILE_PROTOCOL = "file:///";
-
- // Global Vars
- protected List filesets = new ArrayList();
- protected String file = null;
- protected Path classpath;
- protected String xsdDirectory = null;
- protected boolean failOnError = false;
- protected XMLCatalog globalXMLCatalog = new XMLCatalog();
- protected List wsdl11validators = new ArrayList();
- protected List extvalidators = new ArrayList();
- protected List extURIResolvers = new ArrayList();
-
- /**
- * Constuctor.
- */
- public WSDLValidate()
- {
- }
-
- /**
- * Tells the WSDL validate task to fail the build if an error is encountered.
- *
- * @param failOnError Whether to fail on error or not.
- */
- public void setFailOnError(boolean failOnError)
- {
- this.failOnError = failOnError;
- }
-
- /**
- * Set the directory where the base schema files for the catalog are located.
- *
- * @param dir - the directory of the base schema files
- */
- public void setSchemaDir(String dir)
- {
- xsdDirectory = dir;
- }
-
- /**
- * Set a file to run WSDL validation on.
- *
- * @param file - a file to run validation on
- */
- public void setFile(String file)
- {
- this.file = file;
- }
-
- /**
- * Create a set of files to run WSDL validation on.
- *
- * @return the FileSet of files to run WSDL validation on
- */
- public FileSet createFileset()
- {
- FileSet fileset = new FileSet();
- filesets.add(fileset);
- return fileset;
- }
-
- /**
- * Add an XML catalog to the validator.
- *
- * @param catalog - the catalog to add to the validator
- */
- public void addConfiguredXMLCatalog(XMLCatalog catalog)
- {
- globalXMLCatalog.addConfiguredXMLCatalog(catalog);
- }
- /**
- * Add an extension validator.
- *
- * @param extVal The extension validator to add.
- */
- public void addConfiguredExtensionValidator(ExtensionValidator extVal)
- {
- extvalidators.add(extVal);
- }
- /**
- * Add an extension WSDL 1.1 validator.
- *
- * @param extVal The extension WSDL 1.1 validator to add.
- */
- public void addConfiguredWSDL11Validator(ExtensionValidator extVal)
- {
- wsdl11validators.add(extVal);
- }
-
- /**
- * Allow specification of an entity outside of an XMLCatalog.
- *
- * @return a DTDLocation with the specified entity
- **/
- public DTDLocation createEntity()
- {
- DTDLocation dtdLoc = new DTDLocation();
- globalXMLCatalog.addEntity(dtdLoc);
- return dtdLoc;
- }
-
- /**
- * Allow specification of a DTD outside of an XMLCatalog.
- *
- * @return a DTDLocation with the specified DTD
- **/
- public DTDLocation createDTD()
- {
- DTDLocation dtdLoc = new DTDLocation();
- globalXMLCatalog.addEntity(dtdLoc);
- return dtdLoc;
- }
-
- /**
- * Create a URIResolver extension.
- *
- * @return A URIResolver.
- */
- public URIResolver createURIResolver()
- {
- URIResolver urires = new URIResolver();
- extURIResolvers.add(urires.getClassName());
- return urires;
-
- }
-
- /**
- * Get a list of all the files to run WSDL validation on. Takes the file and fileset
- * and creates the list.
- *
- * @return the list of files to be validated
- */
- protected List getFileList()
- {
- List files = new ArrayList();
-
- // if a specific file was specified add it to the list
- if (file != null)
- {
- try
- {
- URL url = new URL(file);
- files.add(url.toExternalForm());
- }
- catch(Exception e)
- {
- File theFile = new File(file);
- if(!theFile.isAbsolute())
- {
- theFile = new File(getProject().getBaseDir(), file);
- }
- String absFile = theFile.toString();
- if(!absFile.startsWith("file:"))
- {
- absFile = FILE_PROTOCOL + absFile;
- }
- absFile = absFile.replace('\\','/');
- files.add(absFile);
- }
- }
-
- // go through all filesets specified and add all the files to the list
- Iterator fsIter = filesets.iterator();
- while (fsIter.hasNext())
- {
- FileSet fileset = (FileSet)fsIter.next();
- DirectoryScanner ds = fileset.getDirectoryScanner(fileset.getProject());
- String basedir = ds.getBasedir().toString() + File.separator;
-
- String[] filelist = ds.getIncludedFiles();
- int numFiles = filelist.length;
- if (files != null && numFiles > 0)
- {
- for (int i = 0; i < numFiles; i++)
- {
- String absFile = FILE_PROTOCOL + basedir + filelist[i];
- absFile = absFile.replace('\\','/');
- files.add(absFile);
- }
- }
- }
- return files;
- }
-
- /* (non-Javadoc)
- * @see org.apache.tools.ant.Task#execute()
- */
- public void execute() throws BuildException
- {
- // the resource bundles for the ui and validator are needed
- MessageGenerator messGen = null;
- try
- {
- ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
- messGen = new MessageGenerator(uiRB);
- }
- catch (MissingResourceException e)
- {
- // if the resource bundles can't be opened we can't report error so throw an exception
- throw new BuildException("Unable to open resource bundle. " + e);
- }
-
- // Set the XML catalog.
- org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.setExtensionXMLCatalog(XMLCatalogImpl.class.getName(), getClass().getClassLoader());
- XMLCatalogImpl xmlCatalog = (XMLCatalogImpl)org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.getExtensionCatalogInstance();
- xmlCatalog.addXMLCatalog(globalXMLCatalog);
-
- WSDLValidator wsdlValidator = new WSDLValidator();
-
- // Set the extension URIResolvers.
- Iterator resolversIter = extURIResolvers.iterator();
- while(resolversIter.hasNext())
- {
- String resolverClass = (String)resolversIter.next();
- wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, getClass().getClassLoader()).getURIResolver());
- }
-
- // Get the list of files to validate.
- List files = getFileList();
-
- // Register the WSDL 1.1 extension validators.
- Iterator wsdl11extIter = wsdl11validators.iterator();
- while(wsdl11extIter.hasNext())
- {
- ExtensionValidator extVal = (ExtensionValidator)wsdl11extIter.next();
- WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
- wsdlValidator.registerWSDL11Validator(extVal.getNamespace(), delegate);
- }
-
- // Register the extension validators.
- Iterator extIter = extvalidators.iterator();
- while(extIter.hasNext())
- {
- ExtensionValidator extVal = (ExtensionValidator)extIter.next();
- WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
- wsdlValidator.registerWSDLExtensionValidator(extVal.getNamespace(), delegate);
- }
-
- // The user didn't specify any files to validate.
- if (files == null || files.isEmpty())
- {
- System.err.println(messGen.getString(_ERROR_NO_FILE_SPECIFIED));
- return;
- }
-
- if (xsdDirectory != null)
- {
- org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.addSchemaDir(xsdDirectory);
- }
-
- // Validate all the files specified.
- Iterator iFiles = files.iterator();
-
- // Common strings needed in validation output.
- String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
- String valid = messGen.getString(_UI_VALID);
- String invalid = messGen.getString(_UI_INVALID);
- String errormarker = messGen.getString(_UI_ERROR_MARKER);
- String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
- StringBuffer result = null;
- boolean notvalid = true;
- while (iFiles.hasNext())
- {
- result = new StringBuffer();
- notvalid = false;
- String filename = (String)iFiles.next();
- try
- {
- result.append(infoDelim).append("\n");
- result.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, filename)).append(" - ");
-
- IValidationReport valReport = wsdlValidator.validate(filename);
-
- IValidationMessage[] messages = valReport.getValidationMessages();
-
- if (!valReport.hasErrors())
- {
- result.append(valid);
- }
- else
- {
- result.append(invalid);
- notvalid = true;
- }
- result.append("\n").append(infoDelim).append("\n");
-
- result.append(reportMessages(messages, errormarker, warningmarker));
-
- System.out.println(result.toString());
- }
- catch (Exception e)
- {
- System.err.println(messGen.getString(_EXC_UNABLE_TO_VALIDATE_FILE, filename, e));
- }
- finally
- {
- if (notvalid && failOnError)
- {
- // To fail on error, throw a build exception.
- throw new BuildException(messGen.getString(_EXC_WSDL_FAIL_ON_ERROR));
- }
- }
- }
-
- org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.reset();
-
- }
-
- /**
- * Return a string with formatted output for the messages.
- *
- * @param messages The messages to report.
- * @param errormarker The marker to use for error messages.
- * @param warningmarker The marker to use for warning messages.
- * @return A string with the formatted output.
- */
- protected String reportMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
- {
- StringBuffer returnBuffer = new StringBuffer();
-
- if (messages == null)
- return returnBuffer.toString();
-
- String prefix = null;
- int numMessages = messages.length;
- for(int i = 0; i < numMessages; i++)
- {
- IValidationMessage message = messages[i];
-
- if(message.getSeverity() == IValidationMessage.SEV_ERROR)
- {
- prefix = errormarker;
- }
- else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- prefix = warningmarker;
- }
- else
- {
- prefix = "";
- }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
- {
- prefix = errormarker;
- }
- else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- prefix = warningmarker;
- }
- else
- {
- prefix = "";
- }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
- {
- prefix = errormarker;
- }
- else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- prefix = warningmarker;
- }
- else
- {
- prefix = "";
- }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
- {
- prefix = errormarker;
- }
- else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- prefix = warningmarker;
- }
- else
- {
- prefix = "";
- }
- returnBuffer
- .append(prefix)
- .append(" ")
- .append(message.getLine())
- .append(":")
- .append(message.getColumn())
- .append(":")
- .append(message.getMessage())
- .append("\n");
- }
- return returnBuffer.toString();
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
deleted file mode 100644
index 2f762b1a4..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.xml.sax.InputSource;
-
-/**
- * An implementation of the WSDL Validator's XML Catalog that uses the XML Catalog
- * from ant.
- */
-public class XMLCatalogImpl extends org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog
-{
- protected XMLCatalog xmlCatalog = new XMLCatalog();
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#addEntryToCatalog(java.lang.String, java.lang.String)
- */
- public void addEntryToCatalog(String publicId, String systemId)
- {
- DTDLocation resLoc = new DTDLocation();
- resLoc.setLocation(systemId);
- resLoc.setPublicId(publicId);
- xmlCatalog.addEntity(resLoc);
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#resolveEntityLocation(java.lang.String, java.lang.String)
- */
- public String resolveEntityLocation(String publicId, String systemId)
- {
- String resolvedId = null;
-
- try
- {
- InputSource is = xmlCatalog.resolveEntity(publicId, systemId);
- if (is != null)
- {
- resolvedId = is.getSystemId();
- }
- }
- //
- catch (Exception e)
- {
- // Do nothing if the resource can't be resolved.
- }
- // needs to return null if it can't resolve the id
- if (resolvedId != null && resolvedId.equals(""))
- {
- resolvedId = null;
- }
- return resolvedId;
- }
-
- /**
- * Add a configured XML Catalog to this catalog.
- *
- * @param catalog A configured XML catalog to add to this catalog.
- */
- public void addXMLCatalog(XMLCatalog catalog)
- {
- xmlCatalog.addConfiguredXMLCatalog(catalog);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java
deleted file mode 100644
index aa85b8def..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-
-/**
- * Read extension URI resolvers.
- *
- * <extension
- * point="org.eclipse.wst.wsdl.validation.uriresolver">
- * <uriresolver
- * class="org.eclipse.wst.wsdl.validation.someclass"/>
- * </extension>
- *
- */
-class URIResolverRegistryReader
-{
- protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
- protected static final String EXTENSION_POINT_ID = "uriresolver";
- protected static final String ATT_CLASS = "class";
- protected String tagName;
-
- /**
- * Constructor.
- */
- public URIResolverRegistryReader()
- {
- }
-
- /**
- * Read from plugin registry and handle the configuration elements that match
- * the spedified elements.
- */
- public List readRegistry()
- {
- List resolverList = new ArrayList();
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- IExtensibleURIResolver resolver = readElement(elements[i]);
- if(resolver != null)
- {
- resolverList.add(resolver);
- }
- }
- }
- return resolverList;
- }
-
- /**
- * Parse and deal with the extension points.
- *
- * @param element The extension point element.
- */
- protected IExtensibleURIResolver readElement(IConfigurationElement element)
- {
- if (element.getName().equals(EXTENSION_POINT_ID))
- {
- String resolverClass = element.getAttribute(ATT_CLASS);
-
- if (resolverClass != null)
- {
- try
- {
- ClassLoader pluginLoader =
- element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-
- return new URIResolverDelegate(resolverClass, pluginLoader).getURIResolver();
- }
- catch (Exception e)
- {
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java
deleted file mode 100644
index d00d0d36c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-
-/**
- * An wrapper URI resolver that wraps the Web Standard Tools URI resolver
- * in a WSDL validator URI resolver.
- */
-public class URIResolverWrapper implements IExtensibleURIResolver
-{
- /**
- * Constructor.
- */
- public URIResolverWrapper()
- {
- }
-
- /**
- * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
- */
- public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
- {
- URIResolver resolver = URIResolverPlugin.createResolver();
- String location = null;
- if (publicId != null || systemId != null)
- {
- location = resolver.resolve(baseLocation, publicId, systemId);
- }
-
- if (location != null)
- {
- result.setLogicalLocation(location);
- String physical = resolver.resolvePhysicalLocation(baseLocation, publicId, location);
- if(physical != null)
- {
- result.setPhysicalLocation(physical);
- }
- else
- {
- result.setPhysicalLocation(location);
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java
deleted file mode 100644
index 4a6cfa307..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLMessageInfoHelper;
-import org.eclipse.wst.xml.ui.internal.validation.core.ValidateAction;
-
-/**
- * Eclipse action for running the WSDL validator.
- */
-public class ValidateWSDLAction extends ValidateAction
-{
- private static final String REFERENCED_FILE_ERROR_OPEN = "referencedFileError(";
-
- private static final String REFERENCED_FILE_ERROR_CLOSE = ")";
- private final String FILE_PROTOCOL = "file:///";
-
- private static final String _UI_SAVE_DIRTY_FILE_MESSAGE = "_UI_SAVE_DIRTY_FILE_MESSAGE";
-
- private static final String _UI_SAVE_DIRTY_FILE_TITLE = "_UI_SAVE_DIRTY_FILE_TITLE";
- private static final String _UI_REF_FILE_ERROR_MESSAGE = "_UI_REF_FILE_ERROR_MESSAGE";
- private static final String NESTED_ERRORS = "NESTED_ERRORS";
-
- private InputStream inputStream = null;
- /**
- * Constructor.
- *
- * @param file The file to validate.
- * @param showDialog Whether to show a dialog with the status upon completion.
- */
- public ValidateWSDLAction(IFile file, boolean showDialog)
- {
- super(file, showDialog);
- }
-
-
- /**
- * Validate the given file and assign markers correspondingly to the file. If
- * required, show a dialog with the results of the validation.
- *
- * @param file The file to validate.
- */
- protected void validate(final IFile file)
- {
- final ValidationOutcome validationOutcome = new ValidationOutcome();
- IWorkspaceRunnable op = new IWorkspaceRunnable()
- {
- public void run(IProgressMonitor progressMonitor) throws CoreException
- {
- WSDLValidator wsdlValidator = WSDLValidator.getInstance();
- clearMarkers(file);
- IValidationReport valReport = null;
-
- String location = null;
- try
- {
- location = file.getLocation().toFile().getCanonicalFile().getAbsolutePath();
- }
- catch (IOException e)
- {
- location = file.getLocation().toString();
- }
- location = location.replace('\\','/');
- if (location.startsWith("/"))
- {
- valReport = wsdlValidator.validate(FILE_PROTOCOL + location.substring(1), inputStream);
- }
- else
- {
- valReport = wsdlValidator.validate(FILE_PROTOCOL + location, inputStream);
- }
- validationOutcome.isWSDLValid = valReport.isWSDLValid();
- validationOutcome.isValid = !valReport.hasErrors();
- if (valReport.getValidationMessages().length == 0)
- {
- validationOutcome.hasMessages = false;
- }
- else
- {
- validationOutcome.hasMessages = true;
- }
-
- createMarkers(file, convertValidationMessages(valReport.getValidationMessages()));
- //createMarkers(file, validatormanager.getWarningList(), WARNING_MARKER);
-
- //file.setSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, valReport.getNestedMessages());
- file.setSessionProperty(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, convertNestedValidationMessages(valReport.getNestedMessages()));
- }
- };
-
- try
- {
- ResourcesPlugin.getWorkspace().run(op, null);
-
- if (showDialog)
- {
- showDialog(validationOutcome);
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- /**
- * Convert WSDL validation messages to validation framework messages.
- *
- * @param messages The WSDL validation messages to convert.
- * @return The converted validation messages.
- */
- private org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertValidationMessages(IValidationMessage[] messages)
- {
- int numMessages = messages.length;
- org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessages = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[numMessages];
-
- for(int i = 0; i < numMessages; i++)
- {
- IValidationMessage mess = messages[i];
-
- org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertMess = null;
- if (mess instanceof ValidationMessageImpl)
- { String errorKey = ((ValidationMessageImpl)mess).getErrorKey();
- Object[] messageArgs = ((ValidationMessageImpl)mess).getMessageArguments();
- convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(), mess.getLine(), mess.getColumn(), mess.getURI(), errorKey, messageArgs);
- }
- else
- {
- convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(),mess.getLine(),mess.getColumn(), mess.getURI());
- }
- if(mess.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
- }
- else
- {
- convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
- }
-
- // Convert any nested messages.
- List nestedMessages = mess.getNestedMessages();
- if(nestedMessages != null && !nestedMessages.isEmpty())
- {
- Iterator nestedIter = nestedMessages.iterator();
- while(nestedIter.hasNext())
- {
- IValidationMessage nestedMess = (IValidationMessage)nestedIter.next();
- org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertNestedMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(nestedMess.getMessage(),nestedMess.getLine(),nestedMess.getColumn(), nestedMess.getURI());
- if(nestedMess.getSeverity() == IValidationMessage.SEV_WARNING)
- {
- convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
- }
- else
- {
- convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
- }
- convertMess.addNestedMessage(convertNestedMess);
- }
- }
- convertedMessages[i] = convertMess;
- }
- return convertedMessages;
- }
-
- /**
- * Convert the nested messages hashmap.
- *
- * @param nestedMessages The nested messages hashmap to convert.
- * @return A hashmap with the converted validation messages.
- */
- private HashMap convertNestedValidationMessages(HashMap nestedMessages)
- {
- HashMap convertedMap = new HashMap();
-
- Set keySet = nestedMessages.keySet();
- Iterator keysIter = keySet.iterator();
- while(keysIter.hasNext())
- {
- String key = (String)keysIter.next();
- IValidationMessage message = (IValidationMessage)nestedMessages.get(key);
- org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessage = convertValidationMessages(new IValidationMessage[]{message});
-
- convertedMap.put(key, convertedMessage[0]);
- }
- return convertedMap;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
-// public void run()
-// {
-// // Only run the validation if the file exists and is available.
-// if (fileIsOK(file))
-// {
-// if (showDialog)
-// {
-// // Check if the file is dirty - prompts user to save.
-// checkIfFileDirty(file);
-// }
-// super.run();
-// }
-// }
-
- /**
- * Test whether the file given is OK to use. A file is OK to use if 1. It is
- * not null 2. It exists. 3. The project containing the file is accessible.
- *
- * @param file The file to check to see if it is OK to validate.
- * @return True if the file is OK to validate, false otherwise.
- */
-// protected boolean fileIsOK(IFile file)
-// {
-// if (file != null && file.exists() && file.getProject().isAccessible())
-// {
-// return true;
-// }
-// return false;
-// }
-
- /**
- * Check if the file is dirty. A file is dirty if there is an open editor for
- * the file that contains changes that haven't been saved.
- *
- * @param file The file to check to see if it is dirty.
- */
-// protected void checkIfFileDirty(IFile file)
-// {
-// IEditorPart[] dirtyEditors = ValidateWSDLPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getDirtyEditors();
-//
-// int numeditors = dirtyEditors.length;
-// for (int i = 0; i < numeditors; i++)
-// {
-// IEditorInput editorInput = dirtyEditors[i].getEditorInput();
-// if (editorInput instanceof FileEditorInput)
-// {
-// FileEditorInput fileEditorInput = (FileEditorInput) editorInput;
-// if (fileEditorInput.getFile().equals(file))
-// {
-// String message = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_MESSAGE);
-// String title = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_TITLE);
-// if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), title, message))
-// {
-// dirtyEditors[i].doSave(null);
-// }
-// // There can only be one open editor/file so we can break.
-// break;
-// }
-// }
-//
-// }
-// }
-
- /**
- * Create a marker on the file of the indicated type for each
- * ValidationMessage in the array.
- *
- * @param iFile
- * The file to add the markers to.
- * @param valMessages
- * The array of messages to add as markers.
- */
-// public void createMarkers(IFile iFile, ValidationMessage[] valMessages)
-// {
-// if (!fileIsOK(iFile))
-// {
-// return;
-// }
-// int numValMessages = valMessages.length;
-// for (int i = 0; i < numValMessages; i++)
-// {
-// ValidationMessage validationMessage = valMessages[i];
-//
-// int line = validationMessage.getLine();
-// int column = validationMessage.getColumn();
-// String message = validationMessage.getMessage();
-// int severity = validationMessage.getSeverity();
-// IMarker marker = null;
-//
-// boolean hasNestedErrors = false;
-// List nestederrors = validationMessage.getNestedMessages();
-// if(nestederrors != null && !nestederrors.isEmpty())
-// {
-// hasNestedErrors = true;
-// message += ValidateWSDLPlugin.getInstance().getString(_UI_REF_FILE_ERROR_MESSAGE);
-// }
-// if (severity == ValidationMessage.SEV_ERROR)
-// {
-// marker = getOrCreateReporter().addErrorMessage(iFile, message, line, column);
-// }
-// else if (severity == ValidationMessage.SEV_WARNING)
-// {
-// marker = getOrCreateReporter().addWarningMessage(iFile, message, line, column);
-// }
-//
-// if (hasNestedErrors && marker != null)
-// {
-// try
-// {
-// marker.setAttribute("groupName", REFERENCED_FILE_ERROR_OPEN + validationMessage.getURI() + REFERENCED_FILE_ERROR_CLOSE);
-// marker.setAttribute(IMarker.DONE, true);
-// }
-// catch(CoreException e)
-// {
-// }
-// }
-//
-// }
-// }
-
- /**
- * Show a dialog containing the status of the validation. Will display valid
- * or invalid depending on whether there are errors or not.
- *
- * @param validationOutcome
- * The outcome of the validation.
- */
- public void showDialog(ValidationOutcome validationOutcome)
- {
- String title, message;
- if (validationOutcome.isValid)
- {
- if (validationOutcome.hasMessages)
- {
- showProblemsView();
- title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_SUCCEEDED");
- message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID_WITH_WARNINGS");
- MessageDialog.openWarning(Display.getDefault().getActiveShell(), title, message);
- }
- else
- {
- title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_SUCCEEDED");
- message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID");
- MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
- }
-
- }
- else
- {
- if (validationOutcome.isWSDLValid)
- {
- title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_FAILED");
- message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID_WSDL11");
- }
- else
- {
- title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_FAILED");
- message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_NOT_VALID");
- }
- showProblemsView();
- MessageDialog.openError(Display.getDefault().getActiveShell(), title, message);
- }
-
- }
-
- /**
- * Show the problems view if it is not already visible.
- */
-// protected void showProblemsView()
-// {
-// IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-// IWorkbenchPage page = dw.getActivePage();
-// IWorkbenchPart activePart = page.getActivePart();
-// try
-// {
-// if (page != null)
-// {
-// page.showView("org.eclipse.ui.views.ProblemView");
-// }
-// }
-// catch (PartInitException e)
-// {
-// }
-// page.activate(activePart);
-// }
-
- /**
- * If a reporter doesn't exist creates it or uses the reporter already
- * created.
- *
- * @return a reporter
- */
-// protected IReporter getOrCreateReporter()
-// {
-// if (reporter == null)
-// {
-// reporter = new WorkbenchReporter(file.getProject(), new NullProgressMonitor());
-// }
-// return reporter;
-// }
-
- /**
- * Clear all the markers on the given resource generated by this validator.
- *
- * @param resource -
- * the resrouce to clear all the markers from
- */
-// public void clearMarkers(IResource resource)
-// {
-// getOrCreateReporter().removeAllMessages(resource);
-// }
-
- protected class ValidationOutcome
- {
- public boolean isValid = true;
-
- public boolean isWSDLValid = true;
-
- public boolean hasMessages = false;
-
- public ValidationOutcome()
- {
- }
- }
-
- public void setInputStream(InputStream inputStream)
- { this.inputStream = inputStream;
- }
-
- /**
- * Set extra attributes in the IMessage to provide information on what should be "squiggled"
- * @param valMess the ValidationMessage corresponding to this error
- * @param message the IMessage to set the attributes for
- */
- protected void addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage valMess, IMessage message)
- { if (valMess.getKey() != null)
- {
- XMLMessageInfoHelper helper = new XMLMessageInfoHelper();
- String[] squiggleInfo = helper.createMessageInfo(valMess.getKey(), valMess.getMessageArguments());
-
- message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(valMess.getColumnNumber()));
- message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, squiggleInfo[0]);
- message.setAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE, squiggleInfo[1]);
- }
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java
deleted file mode 100644
index 40199de9c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-/**
- * An action delegate for the WSDL validator.
- */
-public class ValidateWSDLActionDelegate implements IActionDelegate
-{
- protected ISelection selection;
- protected void validate(IFile file)
- {
- ValidateWSDLAction validateAction = new ValidateWSDLAction(file, true);
- validateAction.setValidator(new Validator());
- validateAction.run();
- }
-
- /**
- * @see org.eclipse.ui.IActionDelegate#run(IAction)
- */
- public void run(IAction action)
- {
- IFile file = null;
- if (!selection.isEmpty() && selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- Object element = structuredSelection.getFirstElement();
-
- if (element instanceof IFile)
- {
- file = (IFile) element;
- }
- else
- {
- return;
- }
- }
-
- if (file != null)
- {
- validate(file);
- }
- }
-
- /**
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection)
- {
- this.selection = selection;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java
deleted file mode 100644
index 6b6600366..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.wsdl.validation.internal.Constants;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogEntityHolder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class required for eclipse.
- */
-public class ValidateWSDLPlugin extends AbstractUIPlugin
-{
- protected final String PROPERTIES_FILE = "validatewsdlui";
- protected static ValidateWSDLPlugin instance;
- protected ResourceBundle resourcebundle = null;
- protected ResourceBundle wsdlValidatorResourceBundle = null;
-
- /**
- * Constructor.
- */
- public ValidateWSDLPlugin()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- instance = this;
- wsdlValidatorResourceBundle = ResourceBundle.getBundle(Constants.WSDL_VALIDATOR_PROPERTIES_FILE);
- resourcebundle = ResourceBundle.getBundle(PROPERTIES_FILE);
-
- // Configure the XML catalog.
- new ExtXMLCatalogPluginRegistryReader().readRegistry();
- new WSDLValidatorPluginRegistryReader(
- "extvalidator",
- "extvalidator",
- WSDLValidatorPluginRegistryReader.EXT_VALIDATOR)
- .readRegistry();
-
- // register any WSDL 1.1 validators defined
- new WSDL11ValidatorPluginRegistryReader("wsdl11validator", "validator").readRegistry();
- }
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- super.stop(context);
- XMLCatalog.reset();
- }
-
- /**
- * Return the instance of this plugin object.
- *
- * @return the instance of this plugin object
- */
- public static ValidateWSDLPlugin getInstance()
- {
- return instance;
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public String getInstallURL()
- {
- try
- {
- return Platform.resolve(getBundle().getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-
- /*************************************************************
- * ResourceBundle helper methods
- *
- *************************************************************/
- /**
- * Returns the resource bundle for this plugin.
- *
- * @return the resource bundle for this plugin
- */
- public ResourceBundle getResourceBundle()
- {
- return resourcebundle;
- }
-
- /**
- * Returns the resource bundle for the WSDL validator.
- *
- * @return the resource bundle for the WSDL validator
- */
- public ResourceBundle getWSDLValidatorResourceBundle()
- {
- return wsdlValidatorResourceBundle;
- }
-
- /**
- * Returns the string for the given id.
- *
- * @param stringID - the id for the string
- * @return the string for the given id
- */
- public String getString(String stringID)
- {
- return getResourceBundle().getString(stringID);
- }
-}
-
-/**
- * This class reads the plugin manifests and registers each WSDLExtensionValidator
- */
-class WSDLValidatorPluginRegistryReader
-{
- protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
- protected static final String ATT_CLASS = "class";
- protected static final String ATT_NAMESPACE = "namespace";
- protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
- protected static final int WSDL_VALIDATOR = 0;
- protected static final int EXT_VALIDATOR = 1;
- protected String extensionPointId;
- protected String tagName;
- protected int validatorType;
-
- /**
- *
- */
- public WSDLValidatorPluginRegistryReader(String extensionPointId, String tagName, int validatorType)
- {
- this.extensionPointId = extensionPointId;
- this.tagName = tagName;
- this.validatorType = validatorType;
- }
-
- /**
- * read from plugin registry and parse it.
- */
- public void readRegistry()
- {
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- readElement(elements[i]);
- }
- }
- }
-
- /**
- * readElement() - parse and deal with an extension like:
- *
- * <extension point="org.eclipse.validate.wsdl.WSDLExtensionValidator"
- * id="soapValidator"
- * name="SOAP Validator">>
- * <validator>
- * <run class=" org.eclipse.validate.wsdl.soap.SOAPValidator"/>
- * </validator>
- * <attribute name="namespace" value="http://schemas.xmlsoap.org/wsdl/soap/"/>
- * </extension>
- */
- protected void readElement(IConfigurationElement element)
- {
- if (element.getName().equals(tagName))
- {
- String validatorClass = element.getAttribute(ATT_CLASS);
- String namespace = element.getAttribute(ATT_NAMESPACE);
- String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
- if (validatorClass != null)
- {
- try
- {
- // ClassLoader pluginLoader =
- // element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
- // modified to resolve certain situations where the plugin has not been initialized
-
- ClassLoader pluginLoader =
- element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-
-// if (validatorType == WSDL_VALIDATOR)
-// {
-// WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-// WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
-// }
- if (validatorType == EXT_VALIDATOR)
- {
- WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
- WSDLValidator.getInstance().registerWSDLExtensionValidator(namespace, delegate);
- }
-// registerWSDLValidatorPluginExtensionWithClassName(
-// pluginLoader,
-// WSDLValidatorExtensionClass,
-// WSDLValidatorExtensionNamespace);
- }
- catch (Exception e)
- {
- }
- }
- }
- }
-
- /**
- * Register the extension validator with the given class name and namespaces.
- *
- * @param classLoader - the class loader to create the validator
- * @param className - the name of the extension validator
- * @param namespace - the namespace of the extension validator
- * @throws Exception
- */
-// protected void registerWSDLValidatorPluginExtensionWithClassName(
-// ClassLoader classLoader,
-// String className,
-// String namespace)
-// throws Exception
-// {
-// try
-// {
-// Class validatorExtensionClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-//
-//
-// //IValidatorExtensionPlugin validatorHandler = (IValidatorExtensionPlugin)validatorExtensionClass.newInstance();
-// //add(namespace, validatorHandler.getValidator());
-// }
-// catch (Exception e)
-// {
-// //System.out.println(e.getMessage());
-// //TODO: write the error message to the log file - use custom log writer class
-// //ValidateWSDLPlugin.getInstance().getMsgLogger().write("WSDL Validator could not register the extension validator." + e.getMessage());
-// }
-// }
-
- /**
- * Register the loaded validator.
- *
- * @param namespace - the namespace of the validator
- * @param validatorExtension - the extension validator
- */
-// protected void add(String namespace, IWSDLValidator validatorExtension)
-// {
-// if (validatorType == WSDL_VALIDATOR)
-// {
-// WSDLConfigurator.registerWSDLValidator(namespace, validatorExtension);
-// }
-// else if (validatorType == WSI_VALIDATOR)
-// {
-// WSDLConfigurator.registerWSIValidator(namespace, validatorExtension);
-// }
-// }
-}
-
-/**
- * Read WSDl 1.1 extension validators.
- *
- * <extension
- * point="com.ibm.etools.validation.validator"
- * id="wsdlValidator"
- * name="%_UI_WSDL_VALIDATOR">
- * <wsdl11validator
- * namespace="http://schemas.xmlsoap.org/wsdl/soap/"
- * class="org.eclipse.wsdl.validate.soap.wsdl11.SOAPValidator"
- * resourcebundle="validatewsdlsoap"/>
- * </extension>
- *
- */
-class WSDL11ValidatorPluginRegistryReader
-{
- protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
- protected static final String ATT_CLASS = "class";
- protected static final String ATT_NAMESPACE = "namespace";
- protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
- protected String extensionPointId;
- protected String tagName;
-
- /**
- * Constructor.
- *
- * @param extensionPointId - the id of the extension point
- * @param tagName - the tag name of the extension point
- */
- public WSDL11ValidatorPluginRegistryReader(String extensionPointId, String tagName)
- {
- this.extensionPointId = extensionPointId;
- this.tagName = tagName;
- }
-
- /**
- * Read from plugin registry and handle the configuration elements that match
- * the spedified elements.
- */
- public void readRegistry()
- {
- IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- readElement(elements[i]);
- }
- }
- }
-
- /**
- * Parse and deal with the extension points.
- *
- * @param element The extension point element.
- */
- protected void readElement(IConfigurationElement element)
- {
- if (element.getName().equals(tagName))
- {
- String validatorClass = element.getAttribute(ATT_CLASS);
- String namespace = element.getAttribute(ATT_NAMESPACE);
- String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
- if (validatorClass != null && namespace != null)
- {
- try
- {
- ClassLoader pluginLoader =
- element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
- WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
- WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
- }
- catch (Exception e)
- {
- }
- }
- }
- }
-}
-
-/**
- * This class reads the plugin manifests and registers each WSDLExtensionValidator
- */
-class ExtXMLCatalogPluginRegistryReader
-{
- protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
- protected static final String EXTENSION_POINT_ID = "xmlcatalog";
-
- /**
- * The xmlcatalog element allow adding an extension XML Catalog such as
- * <xmlcatalog class="org.eclipse.wsdl.validate.ExtXMLCatalog">
- */
- protected static final String EXT_CATALOG_TAG_NAME = "xmlcatalog";
- protected static final String ATT_CLASS = "class";
-
- /**
- * The entity element allows adding specific XML catalog entities such as
- * <entity
- * publicid="http://schemas.xmlsoap.org/wsdl/"
- * systemid="xsd/wsdl.xsd" />
- */
- protected static final String ENTITY_TAG_NAME = "entity";
- protected static final String ATT_PUBLIC_ID = "publicId";
- protected static final String ATT_SYSTEM_ID = "location";
-
- /**
- * The schemadir element allows adding a director of schemas to the XML catalog such as
- * <schemadir location="c:\myschemadir" />
- * Note: It is more expensive to use this method then the entity method
- * of adding schemas to the catalog as this method requires that all of
- * the schemas be read.
- */
- protected static final String SCHEMA_DIR_TAG_NAME = "schemadir";
- protected static final String ATT_LOCATION = "location";
- protected String pluginId, extensionPointId;
-
- /**
- * read from plugin registry and parse it.
- */
- public void readRegistry()
- {
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = extensionRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
- if (point != null)
- {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- readElement(elements[i]);
- }
- }
- }
-
- /**
- * readElement() - parse and deal with an extension like:
- *
- * <extension point="com.ibm.etools.validate.wsdl.WSDLExtensionValidator"
- * id="soapValidator"
- * name="SOAP Validator">>
- * <validator>
- * <run class=" com.ibm.etools.validate.wsdl.soap.SOAPValidator"/>
- * </validator>
- * <attribute name="namespace" value="http://schemas.xmlsoap.org/wsdl/soap/"/>
- * </extension>
- */
- protected void readElement(IConfigurationElement element)
- {
- String elementname = element.getName();
- // Extension XML Catalogs.
- if (elementname.equals(EXT_CATALOG_TAG_NAME))
- {
- String xmlCatalogClass = element.getAttribute(ATT_CLASS);
-
- if (xmlCatalogClass != null)
- {
- try
- {
- // modified to resolve certain situations where the plugin has not been initialized
- ClassLoader pluginLoader =
- element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
- // ClassLoader pluginLoader =
- // element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
- XMLCatalog.setExtensionXMLCatalog(xmlCatalogClass, pluginLoader);
- }
- catch (Exception e)
- {
- System.out.println(e);
- }
- }
- }
- // XML Catalog entites.
- else if(elementname.equals(ENTITY_TAG_NAME))
- {
- String publicid = element.getAttribute(ATT_PUBLIC_ID);
- String systemid = element.getAttribute(ATT_SYSTEM_ID);
- if(publicid == null || systemid == null)
- {
- return;
- }
- Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getNamespace());
- systemid = getAbsoluteLocation(systemid, bundle);
-
- XMLCatalog.addEntity(new XMLCatalogEntityHolder(publicid, systemid));
- }
- // Schema directories for the XML Catalog.
- else if(elementname.equals(SCHEMA_DIR_TAG_NAME))
- {
- String location = element.getAttribute(ATT_LOCATION);
- if(location != null)
- {
- Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getNamespace());
- location = getAbsoluteLocation(location, bundle);
- XMLCatalog.addSchemaDir(location);
- }
- }
- }
-
- private String getAbsoluteLocation(String location, Bundle bundle)
- {
- URL url = null;
- if(bundle != null)
- {
- url = bundle.getEntry(location);
- }
-
- if(url != null)
- {
- try
- {
- url = Platform.resolve(url);
- return url.toExternalForm();
- }
- catch(IOException e)
- {
- //Unable to register the schema.
- }
- }
- return location;
- }
-}
-
-
-
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java
deleted file mode 100644
index b1a750b37..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.Helper;
-
-
-/**
- * A validator to plug the WSDL validator into the validation framework.
- */
-public class Validator implements IValidator
-{
-
- /**
- * Validate the given IFile.
- *
- * @param file
- * The file to validate.
- */
-// public void validate(IFile file)
-// {
-// ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-// validateAction.setValidator(this);
-// validateAction.run();
-// }
-
- protected void validate(IFile file, InputStream inputStream, IReporter reporter)
- {
- ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
- validateAction.setValidator(this);
- validateAction.setReporter(reporter);
- validateAction.setInputStream(inputStream);
- validateAction.run();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.core.IValidator#validate(org.eclipse.wst.validation.core.IHelper, org.eclipse.wst.validation.core.IReporter, org.eclipse.wst.validation.core.IFileDelta[])
- */
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
- {
- String[] changedFiles = helper.getURIs();
- if (changedFiles != null && changedFiles.length > 0)
- {
- InputStream streamToValidate = (InputStream) helper.loadModel("inputStream");
- if (streamToValidate != null)
- {
- String fileName = changedFiles[0];
- Object[] parms = { fileName };
- IFile file = (IFile) helper.loadModel(Helper.GET_FILE, parms);
-
- validate(file, streamToValidate, reporter);
-
- } else
- { for (int i = 0; i < changedFiles.length; i++)
- {
- String fileName = changedFiles[i];
- if (fileName != null)
- {
- Object[] parms = {fileName};
-
- IFile file = (IFile) helper.loadModel(Helper.GET_FILE, parms);
- if (file != null)
- {
- validateIfNeeded(file, helper, reporter);
- }
- }
- }
- }
- } else
- {
- Object[] parms = {this.getClass().getName()};
- Collection files = (Collection) helper.loadModel(Helper.GET_PROJECT_FILES, parms);
- Iterator iter = files.iterator();
- while (iter.hasNext())
- {
- IFile file = (IFile) iter.next();
- validateIfNeeded(file, helper, reporter);
- }
- }
- }
-
- /**
- * @param file
- * @param reporter
- * @param ruleGroup
- */
- protected void validate(IFile file, IReporter reporter, int ruleGroup)
- {
- ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
- validateAction.setValidator(this);
- validateAction.run();
- }
-
- /**
- * Validate the given file if validation is required.
- *
- * @param file
- * @param model
- * @param helper
- * @param reporter
- */
- protected void validateIfNeeded(IFile file, Object model, IValidationContext helper, IReporter reporter)
- {
- if (model == null)
- {
- validateIfNeeded(file, helper, reporter);
- }
- }
-
- /**
- * Unpacks the fileModelPair and returns an IFile object.
- */
- protected IFile getFile(Object object)
- {
- IFile result = null;
- if (object instanceof List)
- {
- List fileModelPair = (List) object;
- if (fileModelPair.size() > 0)
- {
- Object file = fileModelPair.get(0);
- if (file instanceof IFile)
- {
- result = (IFile) file;
- }
- }
- }
- return result;
- }
-
- /**
- * Validate the given file if validation is required.
- *
- * @param file
- * The file to validate.
- * @param helper
- * An aid for the validation.
- * @param reporter
- * The reporter to report the validation messages.
- */
- protected void validateIfNeeded(IFile file, IValidationContext helper, IReporter reporter)
- {
- ValidatorManager mgr = ValidatorManager.getManager();
- // Pass in a "null" so that loadModel doesn't attempt to cast the result into a RefObject.
- Integer ruleGroupInt = (Integer) helper.loadModel(IRuleGroup.PASS_LEVEL, null);
- int ruleGroup = (ruleGroupInt == null) ? IRuleGroup.PASS_FULL : ruleGroupInt.intValue();
-
- validate(file, reporter, ruleGroup);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.validation.IValidator#cleanup(com.ibm.etools.validation.IReporter)
- */
- public void cleanup(IReporter reporter)
- {
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java
deleted file mode 100644
index 184f53001..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-
-/**
- * An Eclipse WSDL validator. This validator is the default validator
- * used in the validation framework. There is only a single instance of
- * this validator. When created, this validator registers all extension
- * URI resolvers.
- */
-public class WSDLValidator extends org.eclipse.wst.wsdl.validation.internal.WSDLValidator
-{
- private static WSDLValidator instance = null;
-
- /**
- * The constructor registers all of the URI resolvers defined via the
- * WSDL URI resolver extension point with the WSDL validator.
- *
- */
- private WSDLValidator()
- {
- super();
- URIResolverRegistryReader uriRR = new URIResolverRegistryReader();
- List resolvers = uriRR.readRegistry();
- Iterator resolverIter = resolvers.iterator();
- while(resolverIter.hasNext())
- {
- IExtensibleURIResolver resolver = (IExtensibleURIResolver)resolverIter.next();
- addURIResolver(resolver);
- }
- }
-
- /**
- * Get the one and only instance of this Eclipse WSDL validator.
- *
- * @return The one and only instance of this Eclipse WSDL validator.
- */
- public static WSDLValidator getInstance()
- {
- if(instance == null)
- {
- instance = new WSDLValidator();
- }
- return instance;
- }
-
-// /**
-// * Validate the specified WSDL file.
-// *
-// * @param fileURI The URI of the WSDL file.
-// * @return A validation report with the validation results.
-// */
-// public IValidationReport validate(String fileURI)
-// {
-// return wsdlValidator.validate(fileURI);
-// }
-// /**
-// * Validate the given WSDL InputStream
-// *
-// * @param fileURI The URI of the WSDL file.
-// * @param inputStream the InputStream to validate
-// * @return A validation report with the validation results.
-// */
-// public IValidationReport validate(String fileURI, InputStream inputStream)
-// {
-// return wsdlValidator.validate(fileURI, inputStream);
-// }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
deleted file mode 100644
index d7e939737..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.text;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogEntityHolder;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * A commande line tool to run WSDL Validation on a single or multiple files.
- *
- * Options
- * -schemaDir directory : a directory of schemas to load into the catalog
- * -schema namespace location : a schema to load into the registry
- * -wsdl11v classname namespace resourcebundle : register a WSDL 1.1 extension validator
- * to load for the given namespace with the given resourcebundle
- * -wsiv validatorClass namespace propertiesfile : register a WS-I validator
- * -uriresolver URIResolverClass : register an extension URI resolver
- */
-public class WSDLValidate
-{
- private final String FILE_PREFIX = "file:///";
- private static final String VALIDATOR_PROPERTIES =
- org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
- private static final String UI_PROPERTIES = "validatewsdlui";
- private static final String _ERROR_WRONG_ARGUMENTS = "_ERROR_WRONG_ARGUMENTS";
- private static final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
- private static final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
- private static final String _UI_VALID = "_UI_VALID";
- private static final String _UI_INVALID = "_UI_INVALID";
- private static final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
- private static final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
- private static final String _ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR = "_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR";
-
- private static final String PARAM_WSDL11VAL = "-wsdl11v";
- private static final String PARAM_EXTVAL = "-extv";
- private static final String PARAM_SCHEMADIR = "-schemaDir";
- private static final String PARAM_SCHEMA = "-schema";
- private static final String PARAM_URIRESOLVER = "-uriresolver";
-
- private static final String STRING_EMPTY = "";
- private static final String STRING_SPACE = " ";
- private static final String STRING_DASH = "-";
-
-
- protected ResourceBundle resourceBundle;
- protected List errors = null;
- protected List warnings = null;
- protected WSDLValidator wsdlValidator;
-
- /**
- * Constuctor.
- */
- public WSDLValidate()
- {
- wsdlValidator = new WSDLValidator();
- }
-
- public void addURIResolver(IExtensibleURIResolver uriResolver)
- {
- wsdlValidator.addURIResolver(uriResolver);
- }
-
- /**
- * Run WSDL validation on a given file.
- *
- * @param directory - the current dir for resolving relative file names
- * @param filename - the name of the file to validate
- * @param validatorRB - the WSDL validator resource bundle
- * @throws Exception
- */
- protected IValidationReport validateFile(String directory, String filename, ResourceBundle validatorRB)
- throws Exception
- {
- // resolve the location of the file
- String filelocation = null;
- try
- {
- URL test = StringUtils.getURL(new URL(FILE_PREFIX + directory + "/"), filename);
- filelocation = test.toExternalForm();
- }
- catch (MalformedURLException e)
- {
- throw new Exception("Unable to resolve WSDL file location");
- }
- // run validation on the file and record the errors and warnings
- IValidationReport valReport = wsdlValidator.validate(filelocation);
- return valReport;
- }
-
- /**
- * Returns a String with formatted output for a list of messages.
- *
- * @param messages The messages to get.
- * @param errormarker The marker to use to label error messages.
- * @param warningmarker The marker to use to label warning messages.
- * @return A string with a formatted list of the messages.
- */
- protected String getMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
- {
- StringBuffer outputBuffer = new StringBuffer();
- if (messages != null)
- {
- // create a list of messages that looks like
- // ERROR 1:1 Error message content
- int numMessages = messages.length;
- String marker = null;
- for (int i = 0; i < numMessages; i++)
- {
- IValidationMessage message = messages[i];
- int severity = message.getSeverity();
- if (severity == IValidationMessage.SEV_ERROR)
- {
- marker = errormarker;
- }
- else if (severity == IValidationMessage.SEV_WARNING)
- {
- marker = warningmarker;
- }
- else
- {
- marker = STRING_EMPTY;
- }
- outputBuffer
- .append(marker)
- .append(STRING_SPACE)
- .append(message.getLine())
- .append(":")
- .append(message.getColumn())
- .append(STRING_SPACE)
- .append(message.getMessage())
- .append("\n");
- }
- }
- return outputBuffer.toString();
- }
-
- /**
- * The main entry point into the command line tool.
- * Checks the command line arguments, registers the default validators and runs validation on the
- * list of files.
- *
- * @param args - the arguments to the validator
- */
- public static void main(String[] args)
- {
- List wsdlFiles = new Vector();
- MessageGenerator messGen = null;
- ResourceBundle validatorRB = null;
- try
- {
- ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
- messGen = new MessageGenerator(uiRB);
- validatorRB = ResourceBundle.getBundle(VALIDATOR_PROPERTIES);
- }
- catch (MissingResourceException e)
- {
- System.err.println("Validation failed: Unable to load the properties file.");
- return;
- }
- // no arguments specified. Print usage.
- if (args.length < 1)
- {
- System.out.println(messGen.getString(_ERROR_WRONG_ARGUMENTS));
- return;
- }
-
- int argslength = args.length;
-
- WSDLValidate wsdlValidator = new WSDLValidate();
- // go through the parameters
- for (int i = 0; i < argslength; i++)
- {
- String param = args[i];
-
- // registering a validator
- if (param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL) || param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
- {
-
- String validatorClass = args[++i];
- if (!validatorClass.startsWith(WSDLValidate.STRING_DASH))
- {
- String namespace = args[++i];
-
- if (!namespace.startsWith(WSDLValidate.STRING_DASH))
- {
- String propertiesFile = args[++i];
- if (propertiesFile.startsWith(WSDLValidate.STRING_DASH))
- {
- propertiesFile = null;
- i--;
- }
- if(param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL))
- {
- WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, propertiesFile);
- wsdlValidator.wsdlValidator.registerWSDL11Validator(namespace, delegate);
- }
- else if(param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
- {
- WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, propertiesFile);
- wsdlValidator.wsdlValidator.registerWSDLExtensionValidator(namespace, delegate);
- }
- }
- else
- {
- namespace = null;
- i--;
- }
- }
- else
- {
- validatorClass = null;
- i--;
- }
- }
- // registering a directory with schemas
- else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMADIR))
- {
- String xsdDir = args[++i];
- XMLCatalog.addSchemaDir(xsdDir);
- }
- // registering a schema
- else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMA))
- {
- String publicid = args[++i];
- String systemid = args[++i];
- XMLCatalog.addEntity(new XMLCatalogEntityHolder(publicid, systemid));
- }
- else if(param.equalsIgnoreCase(PARAM_URIRESOLVER))
- {
- String resolverClass = args[++i];
- wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, null).getURIResolver());
- }
- // a file to validate
- else
- {
- if(!param.startsWith(WSDLValidate.STRING_DASH))
- {
- wsdlFiles.add(param);
- }
- }
-
- }
- // validate the file
- StringBuffer outputBuffer = null;
- String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
- String valid = messGen.getString(_UI_VALID);
- String invalid = messGen.getString(_UI_INVALID);
- String errormarker = messGen.getString(_UI_ERROR_MARKER);
- String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
- Iterator filesIter = wsdlFiles.iterator();
- while (filesIter.hasNext())
- {
- outputBuffer = new StringBuffer();
- String wsdlFile = (String)filesIter.next();
- try
- {
- IValidationReport valReport = wsdlValidator.validateFile(System.getProperty("user.dir"), wsdlFile, validatorRB);
-
- outputBuffer.append(infoDelim).append("\n");
- outputBuffer.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, wsdlFile)).append(" - ");
- if (!valReport.hasErrors())
- {
- outputBuffer.append(valid);
- }
- else
- {
- outputBuffer.append(invalid);
- }
- outputBuffer.append("\n").append(infoDelim).append("\n");
- outputBuffer.append(wsdlValidator.getMessages(valReport.getValidationMessages(), errormarker, warningmarker));
- System.out.println(outputBuffer.toString());
- }
- catch (Exception e)
- {
- System.out.println(e.getMessage());
- }
- }
- }
-
- /**
- * Load a validator into the wsdl validation framework registry.
- *
- * @param namespace - the namespace the validator checks
- * @param validatorClass - the name of the class the implements IWSDLValidator
- * @param propertiesFile - the name of the properties file for the validator
- * @param type - the type of validator - WSDL or WS-I
- * @param messGen - a MessageGenerator for producing error messages
- */
-// protected static void loadExtensionValidator(
-// String namespace,
-// String validatorClass,
-// String propertiesFile,
-// Integer type,
-// MessageGenerator messGen)
-// {
-// try
-// {
-// ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-// IWSDLValidator validator = (IWSDLValidator)classLoader.loadClass(validatorClass).newInstance();
-// // if no properties file is specified we can still load the validator
-// if (propertiesFile != null && !propertiesFile.equals(""))
-// {
-// ResourceBundle rb = ResourceBundle.getBundle(propertiesFile);
-// validator.setResourceBundle(rb);
-// }
-// else
-// {
-// propertiesFile = null;
-// }
-//
-// ValidatorRegistry.getInstance().registerValidator(namespace, validator, type);
-// }
-// catch (Exception e)
-// {
-// System.out.println(messGen.getString(_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR, namespace, e));
-// }
-//
-// }
- // /**
- // * loadWSDL11ExtensionValidator
- // * Load an extension validator into the WSDL 1.1 validator
- // * @param namespace
- // * @param validatorClass
- // * @param propertiesFile
- // * @param type
- // * @param classLoader
- // */
- // protected static void loadWSDL11ExtensionValidator(
- // String namespace,
- // String validatorClass,
- // String resourceBundle,
- // ClassLoader classLoader)
- // {
- // try
- // {
- // Class valclass = classLoader.loadClass(validatorClass);
- // IWSDL11Validator validator = (IWSDL11Validator)valclass.newInstance();
- // validator.setResourceBundle(ResourceBundle.getBundle(resourceBundle));
- // WSDLConfigurator.registerWSDL11Validator(namespace,validator);
- // }
- // catch(Exception e)
- // {
- // System.out.println("Unable to load the WSDL 1.1 validator for namespace "
- // + namespace + e);
- // }
- //
- // }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties
deleted file mode 100644
index 9e9e80b7c..000000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties
+++ /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
-###############################################################################
-!-- Eclipse UI Message Dialog
-_VALIDATION_SUCCEEDED = Validation Succeeded
-_VALIDATION_FAILED = Validation Failed
-_UI_THE_WSDL_FILE_IS_VALID = The WSDL file is valid.
-_UI_THE_WSDL_FILE_IS_NOT_VALID = The WSDL file is not valid. See the Problems view for a list of the validation errors.
-_UI_THE_WSDL_FILE_IS_VALID_WSDL11 = The WSDL file is valid according to the WSDL specification however an extension validator has determined that the file is not valid. See the Problems view for a list of the validation errors.
-_UI_THE_WSDL_FILE_IS_VALID_WITH_WARNINGS = The WSDL file is valid however warnings have been issued. See the Problems view for a list of the validation warnings.
-
-!-- Ant UI
-_UI_INFORMATION_DELIMITER = ---------------------------------------
-_UI_ERROR_MARKER = ERROR
-_UI_WARNING_MARKER = WARNING
-_UI_VALID = VALID
-_UI_INVALID = INVALID
-_UI_ACTION_VALIDATING_FILE = Validating {0}
-
-_ERROR_NO_FILE_SPECIFIED = Unable to run WSDL Validation. You must specify at least one file.
-
-_EXC_UNABLE_TO_VALIDATE_FILE = Unable to validate the WSDL file {0}. {1}
-_EXC_WSDL_FAIL_ON_ERROR = The WSDL file is not valid. (Fail On Error is enabled.)
-
-!-- Text UI
-_ERROR_WRONG_ARGUMENTS = Usage: WSDLValidate filename"
-_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR = Unable to load the validator for namespace {0}. {1}
diff --git a/bundles/org.eclipse.wst.wsdl/.classpath b/bundles/org.eclipse.wst.wsdl/.classpath
deleted file mode 100644
index 1c993bebf..000000000
--- a/bundles/org.eclipse.wst.wsdl/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-http"/>
- <classpathentry kind="src" path="src-mime"/>
- <classpathentry kind="src" path="src-soap"/>
- <classpathentry kind="src" path="src-wsdl"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.wsdl/.cvsignore b/bundles/org.eclipse.wst.wsdl/.cvsignore
deleted file mode 100644
index cca1c096f..000000000
--- a/bundles/org.eclipse.wst.wsdl/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-wsdl.jar
-build.xml
-temp.folder
-org.eclipse.wst.wsdl_1.0.0.jar
-org.eclipse.wst.wsdl.patch
-@dot
diff --git a/bundles/org.eclipse.wst.wsdl/.project b/bundles/org.eclipse.wst.wsdl/.project
deleted file mode 100644
index ebc53b6ba..000000000
--- a/bundles/org.eclipse.wst.wsdl/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.wsdl</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.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
deleted file mode 100644
index ca194e0de..000000000
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: model,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.wsdl.binding.http,
- org.eclipse.wst.wsdl.binding.http.internal.generator,
- org.eclipse.wst.wsdl.binding.http.internal.impl,
- org.eclipse.wst.wsdl.binding.http.internal.util,
- org.eclipse.wst.wsdl.binding.mime,
- org.eclipse.wst.wsdl.binding.mime.internal.impl,
- org.eclipse.wst.wsdl.binding.mime.internal.util,
- org.eclipse.wst.wsdl.binding.soap,
- org.eclipse.wst.wsdl.binding.soap.internal.generator,
- org.eclipse.wst.wsdl.binding.soap.internal.impl,
- org.eclipse.wst.wsdl.binding.soap.internal.util,
- org.eclipse.wst.wsdl.internal.extensibility,
- org.eclipse.wst.wsdl.internal.generator,
- org.eclipse.wst.wsdl.internal.generator.extension,
- org.eclipse.wst.wsdl.internal.impl,
- org.eclipse.wst.wsdl.internal.impl.wsdl4j,
- org.eclipse.wst.wsdl.internal.util,
- org.eclipse.wst.wsdl.util
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.ecore,
- org.eclipse.xsd,
- org.eclipse.core.resources,
- org.wsdl4j
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.WSDLPluginImplementation
diff --git a/bundles/org.eclipse.wst.wsdl/about.html b/bundles/org.eclipse.wst.wsdl/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.wsdl/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl/build.properties b/bundles/org.eclipse.wst.wsdl/build.properties
deleted file mode 100644
index 19b356fec..000000000
--- a/bundles/org.eclipse.wst.wsdl/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- xsd/,\
- META-INF/,\
- about.html
-jars.compile.order = .
-source.. = src-http/,\
- src-mime/,\
- src-soap/,\
- src-wsdl/
-output.. = bin/
-src.includes = src/,\
- xsd/,\
- component.xml
diff --git a/bundles/org.eclipse.wst.wsdl/component.xml b/bundles/org.eclipse.wst.wsdl/component.xml
deleted file mode 100644
index dd9c56d80..000000000
--- a/bundles/org.eclipse.wst.wsdl/component.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
- name="org.eclipse.wst.wsdl">
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.wst.wsdl" fragment="false" />
- <plugin id="org.eclipse.wst.wsdl.ui" fragment="false" />
- <plugin id="org.eclipse.wst.wsdl.validation" fragment="false" />
- <plugin id="org.wsdl4j" fragment="false" />
- <package name="org.eclipse.wst.wsdl" api="false">
- <type name="BindingFault" />
- <type name="BindingOutput" />
- <type name="Types" />
- <type name="Operation" />
- <type name="Fault" />
- <type name="ExtensibilityElement" />
- <type name="Message" />
- <type name="ExtensibleElement" />
- <type name="BindingInput" />
- <type name="PortType" />
- <type name="Service" />
- <type name="Input" />
- <type name="WSDLElement" />
- <type name="Port" />
- <type name="Namespace" />
- <type name="Part" />
- <type name="Definition" />
- <type name="Import" />
- <type name="XSDSchemaExtensibilityElement" />
- <type name="WSDLPlugin" />
- <type name="WSDLFactory" />
- <type name="MessageReference" />
- <type name="UnknownExtensibilityElement" />
- <type name="Output" />
- <type name="Binding" />
- <type name="BindingOperation" />
- </package>
- <package name="org.eclipse.wst.wsdl.util" api="false">
- <type name="WSDLConstants" />
- <type name="ExtensibilityElementFactoryRegistry" />
- <type name="WSDLResourceFactoryImpl" />
- <type name="ExtensibilityElementFactory" />
- <type name="WSDLResourceImpl" subclass="false"/>
- </package>
- <package name="org.eclipse.wst.wsdl.binding.soap" api="false">
- <type name="SOAPBody" />
- <type name="SOAPHeaderFault" />
- <type name="SOAPAddress" />
- <type name="SOAPFactory" />
- <type name="SOAPHeader" />
- <type name="SOAPBinding" />
- <type name="SOAPHeaderBase" />
- <type name="SOAPFault" />
- <type name="SOAPOperation" />
- </package>
-<!-- provisional APIs -->
-<!--
- <package name="org.eclipse.wst.wsdl.binding.mime">
- <type name="MIMEContent" />
- <type name="MIMEPackage" />
- <type name="MIMEMultipartRelated" />
- <type name="MIMEPart" />
- <type name="MIMEMimeXml" />
- <type name="MIMEFactory" />
- </package>
--->
-<!--
- <package name="org.eclipse.wst.wsdl.binding.http">
- <type name="HTTPFactory" />
- <type name="HTTPOperation" />
- <type name="HTTPUrlEncoded" />
- <type name="HTTPPackage" />
- <type name="HTTPAddress" />
- <type name="HTTPUrlReplacement" />
- <type name="HTTPBinding" />
- </package>
--->
-</component>
diff --git a/bundles/org.eclipse.wst.wsdl/grabjars.xml b/bundles/org.eclipse.wst.wsdl/grabjars.xml
deleted file mode 100644
index 106edbf25..000000000
--- a/bundles/org.eclipse.wst.wsdl/grabjars.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project default="copyJars" basedir=".">
-
- <property name="pluginName" value="org.eclipse.wst.wsdl"/>
- <property name="version" value=""/>
-
- <target name="copyJars" if="downloadPath">
- <antcall target="copyJars2"/>
- </target>
-
- <target name="copyJars2" if="pluginsPath">
- <antcall target="copyJars3"/>
- </target>
-
- <target name="copyJars3" if="pluginName">
- <copy todir="${pluginsPath}/${pluginName}${version}/lib" overwrite="true">
- <fileset dir="${downloadPath}/${pluginName}${version}">
- <filename name="*.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="cleanupJars" if="pluginsPath">
- <antcall target="cleanupJars2"/>
- </target>
-
- <target name="cleanupJars2" if="pluginName">
- <delete>
- <fileset dir="${pluginsPath}/${pluginName}${version}/lib">
- <filename name="*.jar"/>
- </fileset>
- </delete>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore b/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
deleted file mode 100644
index d392f0e82..000000000
--- a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/bundles/org.eclipse.wst.wsdl/plugin.properties b/bundles/org.eclipse.wst.wsdl/plugin.properties
deleted file mode 100644
index 4edaf9d7d..000000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.properties
+++ /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
-###############################################################################
-
-# ====================================================================
-# To code developer:
-# Do NOT change the properties between this line and the
-# "%%% END OF TRANSLATED PROPERTIES %%%" line.
-# Make a new property name, append to the end of the file and change
-# the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = WSDL Model
-providerName = Eclipse.org
-
-xpExtensibilityElementFactories = WSDL Extensibility Element Factories
-xpPortAndBindingContentGenerators = Port and Binding Content Generators
-xpWSDLContentType = WSDL Content Type
-
-_ERROR_INVALID_WSDL = The input source is not a valid WSDL document.
-
diff --git a/bundles/org.eclipse.wst.wsdl/plugin.xml b/bundles/org.eclipse.wst.wsdl/plugin.xml
deleted file mode 100644
index b8f0266a6..000000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point
- id="extensibilityElementFactories"
- name="%xpExtensibilityElementFactories" />
- <extension-point
- id="contentGenerators"
- name="%xpPortAndBindingContentGenerators" />
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.ibm.com/wsdl/2003/WSDL"
- class="org.eclipse.wst.wsdl.WSDLPackage">
- </package>
- </extension>
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="wsdl"
- class="org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl">
- </parser>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/wsdl/2003/HTTP"
- class="org.eclipse.wst.wsdl.binding.http.HTTPPackage">
- </package>
- </extension>
-
- <extension
- point="org.eclipse.wst.wsdl.extensibilityElementFactories">
- <extensibilityElementFactory
- namespace="http://schemas.xmlsoap.org/wsdl/http/"
- class="org.eclipse.wst.wsdl.binding.http.internal.util.HTTPExtensibilityElementFactory" />
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/wsdl/2003/MIME"
- class="org.eclipse.wst.wsdl.binding.mime.MIMEPackage">
- </package>
- </extension>
-
- <extension
- point="org.eclipse.wst.wsdl.extensibilityElementFactories">
- <extensibilityElementFactory
- namespace="http://schemas.xmlsoap.org/wsdl/mime/"
- class="org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEExtensibilityElementFactory" />
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.eclipse.org/wsdl/2003/SOAP"
- class="org.eclipse.wst.wsdl.binding.soap.SOAPPackage">
- </package>
- </extension>
-
- <extension
- point="org.eclipse.wst.wsdl.extensibilityElementFactories">
- <extensibilityElementFactory
- namespace="http://schemas.xmlsoap.org/wsdl/soap/"
- class="org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPExtensibilityElementFactory" />
- </extension>
-
- <extension point="org.eclipse.wst.wsdl.contentGenerators">
- <contentGenerator
- name="SOAP"
- namespace="http://schemas.xmlsoap.org/wsdl/soap/"
- class="org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator">
- </contentGenerator>
- </extension>
-
- <extension point="org.eclipse.wst.wsdl.contentGenerators">
- <contentGenerator
- name="HTTP"
- namespace="http://schemas.xmlsoap.org/wsdl/http/"
- class="org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator">
- </contentGenerator>
- </extension>
-
-
-
- <!-- define a wsdl content type -->
- <extension point="org.eclipse.core.runtime.contentTypes">
- <content-type
- priority="high"
- name="%xpWSDLContentType"
- id="wsdlsource"
- base-type="org.eclipse.core.runtime.xml"
- default-charset="UTF-8"
- file-extensions="wsdl" />
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
deleted file mode 100644
index fbc41586b..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.http/src"
- editDirectory="/com.ibm.etools.wsdl.binding.http.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.http.editor/src"
- modelPluginID="com.ibm.etools.wsdl.binding.http" modelName="HTTP" editPluginClass=""
- editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
- <foreignModel>..\rose\http.mdl</foreignModel>
- <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
- <foreignModel>../../..</foreignModel>
- <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
- <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
- <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
- <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
- <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
- <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
- <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
- <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
- <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
- <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//PortType">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Operation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Message">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Part">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Binding">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Service">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Port">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Definition">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
- <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
- <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
- <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Import">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
- <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
- <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
- <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
- <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
- <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
- <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Input"/>
- <genClasses ecoreClass="wsdl.ecore#//Output"/>
- <genClasses ecoreClass="wsdl.ecore#//Fault"/>
- <genClasses ecoreClass="wsdl.ecore#//BindingInput">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
- <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
- <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//BindingFault">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
- <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
- <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//Namespace">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IPortType">
- <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
- <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
- <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
- <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
- <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IOperation">
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
- <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
- <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
- <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
- <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
- <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IInput">
- <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
- <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IOutput">
- <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
- <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IFault">
- <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
- <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IMessage">
- <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
- <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
- <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
- <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
- <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IPart">
- <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
- <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
- <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
- <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
- <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IService">
- <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
- <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
- <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
- <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IPort">
- <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
- <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
- <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IBinding">
- <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
- <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
- <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
- <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
- <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
- <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
- <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
- <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
- <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
- <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
- <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
- <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
- <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
- <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
- <genClasses ecoreClass="wsdl.ecore#//IDefinition">
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
- </genOperations>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
- <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
- <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IImport"/>
- <genClasses ecoreClass="wsdl.ecore#//IList"/>
- <genClasses ecoreClass="wsdl.ecore#//IMap"/>
- <genClasses ecoreClass="wsdl.ecore#//IURL"/>
- <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
- <genClasses ecoreClass="wsdl.ecore#//Types">
- <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
- <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
- <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
- <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
- <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
- </genClasses>
- <genClasses ecoreClass="wsdl.ecore#//MessageReference">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
- </genClasses>
- </genPackages>
- <genPackages prefix="HTTP" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="http.ecore#/">
- <genClasses ecoreClass="http.ecore#//HTTPBinding">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPBinding/verb"/>
- </genClasses>
- <genClasses ecoreClass="http.ecore#//HTTPOperation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPOperation/locationURI"/>
- </genClasses>
- <genClasses ecoreClass="http.ecore#//HTTPUrlReplacement"/>
- <genClasses ecoreClass="http.ecore#//HTTPUrlEncoded"/>
- <genClasses ecoreClass="http.ecore#//HTTPAddress">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPAddress/locationURI"/>
- </genClasses>
- <genClasses ecoreClass="http.ecore#//IHTTPAddress"/>
- <genClasses ecoreClass="http.ecore#//IHTTPBinding"/>
- <genClasses ecoreClass="http.ecore#//IHTTPOperation"/>
- <genClasses ecoreClass="http.ecore#//IHTTPUrlEncoded"/>
- <genClasses ecoreClass="http.ecore#//IHTTPUrlReplacement"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat b/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
deleted file mode 100644
index a63207abb..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
+++ /dev/null
@@ -1,378 +0,0 @@
-
-(object Petal
- version 42
- _written "Rose 4.5.8054a"
- charSet 0)
-
-(object Class_Category "http"
- is_unit TRUE
- is_loaded TRUE
- quid "3ABFD9AD01F8"
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "HTTPBinding"
- quid "3ABFE57C0136"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3AE5FF1D0019"
- supplier "Logical View::wsdl::ExtensibilityElement"
- quidu "3AD5DBB602A9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "verb"
- quid "3ABFE60D00DB"
- type "String"))
- language "Java")
- (object Class "HTTPOperation"
- quid "3ABFE6AE0050"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3AE5FF4B037C"
- supplier "Logical View::wsdl::ExtensibilityElement"
- quidu "3AD5DBB602A9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "locationURI"
- quid "3ABFE70D0147"
- type "String"))
- language "Java")
- (object Class "HTTPUrlReplacement"
- quid "3ABFEA1A017C"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3AE728B802C3"
- supplier "Logical View::wsdl::ExtensibilityElement"
- quidu "3AD5DBB602A9"))
- language "Java")
- (object Class "HTTPUrlEncoded"
- quid "3ABFEA6D0294"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3AE728D50094"
- supplier "Logical View::wsdl::ExtensibilityElement"
- quidu "3AD5DBB602A9"))
- language "Java")
- (object Class "HTTPAddress"
- quid "3AC3BF2500F5"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3AE5FEA901B7"
- supplier "Logical View::wsdl::ExtensibilityElement"
- quidu "3AD5DBB602A9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "locationURI"
- quid "3AC3BFA7012E"
- type "String"))
- language "Java"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Port"
- quid "3AC11E5201FB"
- title "Port"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::http::HTTPAddress" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (336, 432)
- label (object ItemLabel
- Parent_View @1
- location (135, 351)
- fill_color 13434879
- nlines 1
- max_width 402
- justify 0
- label "HTTPAddress")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3AC3BF2500F5"
- width 420
- height 186
- annotation 8
- autoResize TRUE)))
- (object ClassDiagram "Extensibility"
- quid "3AE5FE3B037B"
- title "Extensibility"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (272, 128)
- font (object Font
- italics TRUE)
- label (object ItemLabel
- Parent_View @2
- location (70, 53)
- fill_color 13434879
- nlines 1
- max_width 404
- justify 0
- label "ExtensibilityElement")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3AD5DBB602A9"
- width 422
- height 174
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::http::HTTPAddress" @3
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (272, 480)
- label (object ItemLabel
- Parent_View @3
- location (128, 428)
- fill_color 13434879
- nlines 1
- max_width 288
- justify 0
- label "HTTPAddress")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3AC3BF2500F5"
- width 306
- height 128
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::http::HTTPBinding" @4
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (480, 640)
- label (object ItemLabel
- Parent_View @4
- location (344, 588)
- fill_color 13434879
- nlines 1
- max_width 272
- justify 0
- label "HTTPBinding")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFE57C0136"
- width 290
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @5
- location (272, 305)
- line_color 3342489
- fill_color 13434879
- supplier @2
- vertices (list Points
- (272, 305)
- (272, 215)))
- (object InheritView "" @6
- stereotype TRUE
- line_color 3342489
- quidu "3AE5FEA901B7"
- client @3
- supplier @2
- line_style 3
- origin_attachment (272, 416)
- terminal_attachment (272, 305)
- drawSupplier @5)
- (object InheritView "" @7
- stereotype TRUE
- line_color 3342489
- quidu "3AE5FF1D0019"
- client @4
- supplier @2
- line_style 3
- origin_attachment (475, 576)
- terminal_attachment (475, 305)
- drawSupplier @5)
- (object ClassView "Class" "Logical View::http::HTTPOperation" @8
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (672, 816)
- label (object ItemLabel
- Parent_View @8
- location (518, 764)
- fill_color 13434879
- nlines 1
- max_width 308
- justify 0
- label "HTTPOperation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFE6AE0050"
- width 326
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritView "" @9
- stereotype TRUE
- line_color 3342489
- quidu "3AE5FF4B037C"
- client @8
- supplier @2
- line_style 3
- origin_attachment (656, 752)
- terminal_attachment (656, 305)
- drawSupplier @5)
- (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @10
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (816, 992)
- label (object ItemLabel
- Parent_View @10
- location (605, 941)
- fill_color 13434879
- nlines 1
- max_width 422
- justify 0
- label "HTTPUrlReplacement")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFEA1A017C"
- width 440
- height 126
- annotation 8
- autoResize TRUE)
- (object InheritView "" @11
- stereotype TRUE
- line_color 3342489
- quidu "3AE728B802C3"
- client @10
- supplier @2
- line_style 3
- origin_attachment (869, 929)
- terminal_attachment (869, 305)
- drawSupplier @5)
- (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @12
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (1072, 1168)
- label (object ItemLabel
- Parent_View @12
- location (900, 1117)
- fill_color 13434879
- nlines 1
- max_width 344
- justify 0
- label "HTTPUrlEncoded")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFEA6D0294"
- width 362
- height 126
- annotation 8
- autoResize TRUE)
- (object InheritView "" @13
- stereotype TRUE
- line_color 3342489
- quidu "3AE728D50094"
- client @12
- supplier @2
- line_style 3
- origin_attachment (1103, 1105)
- terminal_attachment (1103, 305)
- drawSupplier @5)))
- (object ClassDiagram "Binding"
- quid "3AE72A7000A9"
- title "Binding"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::http::HTTPBinding" @14
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (336, 272)
- label (object ItemLabel
- Parent_View @14
- location (200, 220)
- fill_color 13434879
- nlines 1
- max_width 272
- justify 0
- label "HTTPBinding")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFE57C0136"
- width 290
- height 128
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::http::HTTPOperation" @15
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (720, 272)
- label (object ItemLabel
- Parent_View @15
- location (519, 191)
- fill_color 13434879
- nlines 1
- max_width 402
- justify 0
- label "HTTPOperation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFE6AE0050"
- width 420
- height 186
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @16
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (848, 592)
- label (object ItemLabel
- Parent_View @16
- location (637, 541)
- fill_color 13434879
- nlines 1
- max_width 422
- justify 0
- label "HTTPUrlReplacement")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFEA1A017C"
- width 440
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @17
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (384, 592)
- label (object ItemLabel
- Parent_View @17
- location (212, 541)
- fill_color 13434879
- nlines 1
- max_width 344
- justify 0
- label "HTTPUrlEncoded")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3ABFEA6D0294"
- width 362
- height 126
- annotation 8
- autoResize TRUE)))))
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore b/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
deleted file mode 100644
index 831039d66..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="http"
- nsURI="http://www.ibm.com/wsdl/2003/HTTP" nsPrefix="http">
- <eClassifiers xsi:type="ecore:EClass" name="HTTPBinding" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPBinding">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="verb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="HTTPOperation" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPOperation">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlReplacement" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlReplacement"/>
- <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlEncoded" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlEncoded"/>
- <eClassifiers xsi:type="ecore:EClass" name="HTTPAddress" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPAddress">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IHTTPAddress" instanceClassName="javax.wsdl.extensions.http.HTTPAddress"
- abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IHTTPBinding" instanceClassName="javax.wsdl.extensions.http.HTTPBinding"
- abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IHTTPOperation" instanceClassName="javax.wsdl.extensions.http.HTTPOperation"
- abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlEncoded" instanceClassName="javax.wsdl.extensions.http.HTTPUrlEncoded"
- abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlReplacement" instanceClassName="javax.wsdl.extensions.http.HTTPUrlReplacement"
- abstract="true" interface="true"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl b/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
deleted file mode 100644
index 4de2bea62..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
+++ /dev/null