Attachment 39410 Details for Bug 138379 – patch that adds extension points

[patch] patch that adds extension points

patch.txt (text/plain), 86.65 KB, created by Craig Chaney

on 2006-04-25 10:49:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Chaney

Created: 2006-04-25 10:49:31 EDT

Size: 86.65 KB

patch

obsolete

>Index: plugin.properties
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/plugin.properties,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- plugin.properties	17 Apr 2006 18:19:38 -0000	1.1
>+++ plugin.properties	25 Apr 2006 14:14:11 -0000	1.2
>@@ -9,5 +9,11 @@
> #  *   IBM - Initial API and implementation
> #  *******************************************************************************/
> _PLUGIN_NAME   = WSI Conformance Tools
>-_UI_WSDL_WSI_VALIDATOR = WSDL WS-I Validator
> _PROVIDER_NAME = Eclipse.org
>+
>+_UI_WSDL_WSI_VALIDATOR = WSDL WS-I Validator
>+_UI_WSI_FRAMEWORK_UDDI_VALIDATOR = WS-I Framework UDDI Validator
>+_UI_WSI_FRAMEWORK_WSDL_VALIDATOR = WS-I Framework WSDLValidator
>+_UI_WSI_FRAMEWORK_MESSAGE_VALIDATOR = WS-I Framework Message Validator
>+_UI_WSI_FRAMEWORK_ENVELOPE_VALIDATOR = WS-I Framework Envelope Validator
>+_UI_WSI_BP_TAD_VERSIONS = WS-I Basic Profile TAD Versions
>Index: plugin.xml
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/plugin.xml,v
>retrieving revision 1.1
>retrieving revision 1.4
>diff -u -3 -p -u -r1.1 -r1.4
>--- plugin.xml	17 Apr 2006 18:19:38 -0000	1.1
>+++ plugin.xml	25 Apr 2006 14:14:11 -0000	1.4
>@@ -13,6 +13,8 @@
> --> 
> 
> <plugin>
>+   <extension-point id="validator" name="WS-I validator" schema="schema/validator.exsd"/>
>+   <extension-point id="tad_versions" name="TAD version" schema="schema/tad_versions.exsd"/>
> 
>      <extension
>          id="wsdlWSIValidator"
>@@ -23,5 +25,49 @@
>             class="org.eclipse.wst.wsi.internal.validate.wsdl.WSDLValidator">
>       </extvalidator>
>    </extension>
>-  
>+   <extension
>+           id="uddiValidator"
>+           name="%_UI_WSI_FRAMEWORK_UDDI_VALIDATOR"
>+           point="org.eclipse.wst.wsi.validator">
>+        <wsi_validator
>+        			class="org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi.UDDIValidatorImpl"/>
>+   </extension>
>+   <extension
>+           id="wsdlValidator"
>+           name="%_UI_WSI_FRAMEWORK_WSDL_VALIDATOR"
>+           point="org.eclipse.wst.wsi.validator">
>+        <wsi_validator
>+        			class="org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl"/>
>+   </extension>
>+   <extension
>+           id="messageValidator"
>+           name="%_UI_WSI_FRAMEWORK_MESSAGE_VALIDATOR"
>+           point="org.eclipse.wst.wsi.validator">
>+        <wsi_validator
>+        			class="org.eclipse.wst.wsi.internal.core.profile.validator.impl.message.MessageValidatorImpl"/>
>+   </extension>
>+   <extension
>+           id="envelopeValidator"
>+           name="%_UI_WSI_FRAMEWORK_ENVELOPE_VALIDATOR"
>+           point="org.eclipse.wst.wsi.validator">
>+        <wsi_validator
>+        			class="org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.EnvelopeValidatorImpl"/>
>+   </extension>
>+   <extension
>+           id="bpTadVersions"
>+           name="%_UI_WSI_BP_TAD_VERSIONS"
>+           point="org.eclipse.wst.wsi.tad_versions">
>+        <tad_version
>+        			tad_name="Basic Profile Test Assertions"
>+        			version="1.1.0"/>
>+        <tad_version
>+        			tad_name="Basic Profile 1.1 Test Assertions"
>+        			version="1.1.0"/>
>+        <tad_version
>+        			tad_name="Simple Soap Binding Profile [1.0] (with Basic Profile [1.1]) Test Assertions"
>+        			version="1.0.0"/>
>+        <tad_version
>+        			tad_name="Attachments Profile [1.0] (with Basic Profile [1.1] and Simple Soap Binding Profile [1.0]) Test Assertions"
>+        			version="1.0.0"/>
>+   </extension>
> </plugin>
>Index: schema/tad_versions.exsd
>===================================================================
>RCS file: schema/tad_versions.exsd
>diff -N schema/tad_versions.exsd
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ schema/tad_versions.exsd	25 Apr 2006 14:14:11 -0000	1.1
>@@ -0,0 +1,119 @@
>+<?xml version='1.0' encoding='UTF-8'?>
>+
>+<schema targetNamespace="org.eclipse.wst.wsi">
>+<annotation>
>+      <appInfo>
>+         <meta.schema plugin="org.eclipse.wst.wsi" id="tad_versions" name="TAD version"/>
>+      </appInfo>
>+      <documentation>
>+         The TAD version extension point allows clients to denote additional versions of the WS-I Test Assertion Documents that they can handle.
>+      </documentation>
>+   </annotation>
>+
>+   <element name="extension">
>+      <complexType>
>+         <sequence>
>+            <element ref="tad_version"/>
>+         </sequence>
>+         <attribute name="point" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+         <attribute name="id" type="string">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+         <attribute name="name" type="string">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+               <appInfo>
>+                  <meta.attribute translatable="true"/>
>+               </appInfo>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <element name="tad_version">
>+      <complexType>
>+         <attribute name="tad_name" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+         <attribute name="version" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="since"/>
>+      </appInfo>
>+      <documentation>
>+         WTP 2.0
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="examples"/>
>+      </appInfo>
>+      <documentation>
>+         The following is an example of a TAD version contribution:
>+&lt;pre&gt;
>+&lt;extension
>+        id=&quot;bpTadVersions&quot;
>+        name=&quot;%_UI_WSI_BP_TAD_VERSIONS&quot;
>+        point=&quot;org.eclipse.wst.wsi.tad_versions&quot;&gt;
>+     &lt;tad_version
>+        tad_name=&quot;Basic Profile Test Assertions&quot;
>+        version=&quot;1.1.0&quot;/&gt;
>+&lt;/extension&gt;
>+&lt;/pre&gt;
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="apiInfo"/>
>+      </appInfo>
>+      <documentation>
>+         No API is associated with this extension point.
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="implementation"/>
>+      </appInfo>
>+      <documentation>
>+         No implementation is associated with this extension point.
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="copyright"/>
>+      </appInfo>
>+      <documentation>
>+         
>+      </documentation>
>+   </annotation>
>+
>+</schema>
>Index: schema/validator.exsd
>===================================================================
>RCS file: schema/validator.exsd
>diff -N schema/validator.exsd
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ schema/validator.exsd	25 Apr 2006 14:14:11 -0000	1.3
>@@ -0,0 +1,117 @@
>+<?xml version='1.0' encoding='UTF-8'?>
>+
>+<schema targetNamespace="bsp.org.eclipse.wst.wsi">
>+<annotation>
>+      <appInfo>
>+         <meta.schema plugin="bsp.org.eclipse.wst.wsi" id="validator" name="WS-I validator"/>
>+      </appInfo>
>+      <documentation>
>+         The WS-I Validator extension point allows clients to contribute a validator that can validate different WS-I Profiles.
>+      </documentation>
>+   </annotation>
>+
>+   <element name="extension">
>+      <complexType>
>+         <sequence>
>+            <element ref="wsi_validator"/>
>+         </sequence>
>+         <attribute name="point" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+         <attribute name="id" type="string">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+         <attribute name="name" type="string">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+               <appInfo>
>+                  <meta.attribute translatable="true"/>
>+               </appInfo>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <element name="wsi_validator">
>+      <complexType>
>+         <attribute name="class" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+               <appInfo>
>+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator"/>
>+               </appInfo>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="since"/>
>+      </appInfo>
>+      <documentation>
>+         WTP 2.0
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="examples"/>
>+      </appInfo>
>+      <documentation>
>+         The following is an example of a WS-I Validator contribution:
>+&lt;pre&gt;
>+&lt;extension
>+        id=&quot;messageValidator&quot;
>+        name=&quot;%_UI_WSI_FRAMEWORK_MESSAGE_VALIDATOR&quot;
>+        point=&quot;org.eclipse.wst.wsi.validator&quot;&gt;
>+     &lt;wsi_validator
>+        class=&quot;org.eclipse.wst.wsi.internal.core.profile.validator.impl.message.MessageValidatorImpl&quot;/&gt;
>+&lt;/extension&gt;
>+&lt;/pre&gt;
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="apiInfo"/>
>+      </appInfo>
>+      <documentation>
>+         The supplied class must implement &lt;code&gt;org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator&lt;/code&gt;.
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="implementation"/>
>+      </appInfo>
>+      <documentation>
>+         &lt;code&gt;
>+org.eclipse.wst.wsi.internal.core.profile.validator.impl.message.MessageValidatorImpl
>+&lt;/code&gt;
>+Contributes WS-I validation logic for the Basic Profile validation of messages.
>+      </documentation>
>+   </annotation>
>+
>+   <annotation>
>+      <appInfo>
>+         <meta.section type="copyright"/>
>+      </appInfo>
>+      <documentation>
>+         
>+      </documentation>
>+   </annotation>
>+
>+</schema>
>Index: src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java,v
>retrieving revision 1.1
>retrieving revision 1.4
>diff -u -3 -p -u -r1.1 -r1.4
>--- src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java	17 Apr 2006 18:19:39 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java	25 Apr 2006 14:14:11 -0000	1.4
>@@ -10,7 +10,15 @@
>  *******************************************************************************/
> package org.eclipse.wst.wsi.internal;
> 
>+import java.util.ArrayList;
>+
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.core.runtime.IExtension;
>+import org.eclipse.core.runtime.IExtensionPoint;
>+import org.eclipse.core.runtime.IExtensionRegistry;
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Plugin;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
> 
> /**
>  * The WS-I test tools plugin.
>@@ -22,8 +30,26 @@ public class WSITestToolsPlugin extends 
> {
>   private static Plugin instance;
>   protected final String PLUGIN_PROPERTIES = "wsivalidate";
>+  protected static final String PLUGIN_ID = "org.eclipse.wst.wsi";
>+  protected static final String VALIDATOR_EXT_ID = PLUGIN_ID + ".validator";
>+  protected static final String TAD_VERSION_EXT_ID = PLUGIN_ID +
>+          ".tad_versions";
>+  protected static final String ATT_CLASS = "class";
>+  protected static final String ATT_TAD_NAME = "tad_name";
>+  protected static final String ATT_TAD_VERSION = "version";
>   //protected ResourceBundle resourcebundle = null;
>-  
>+
>+  /* Holds validators read from the platform registry.  Lazy initialized in
>+   * computeValidators().  */
>+  private BaseValidator validators[];
>+
>+  /* Holds arrays containing information about Test Assertion document (TAD)
>+   * versions read from the platform registry.  Each array has two elements:
>+   *   0: the TAD name
>+   *   1: the TAD version string
>+   * Lazy initialized in computeTADVersions().  */
>+  private String tadVersions[][];
>+
>   /**
>    * Constructor for wsiTestToolsPlugin.
>    * @param descriptor an IPluginDescriptor object.
>@@ -54,5 +80,92 @@ public class WSITestToolsPlugin extends 
>   public static WSITestToolsPlugin getPlugin()
>   {
>     return (WSITestToolsPlugin) instance;
>+  }
>+
>+  /* Computes the list of validators by scanning the platform registry. */
>+  private BaseValidator[] computeValidators() {
>+      IExtensionRegistry registry = Platform.getExtensionRegistry();
>+      IExtensionPoint extensionPoint = registry.getExtensionPoint(
>+              VALIDATOR_EXT_ID);
>+      IExtension[] extensions = extensionPoint.getExtensions();
>+      ArrayList results = new ArrayList();
>+      for (int i = 0; i < extensions.length; i++) {
>+          /* Only one validator per extension point */
>+          IConfigurationElement validatorElement = extensions[i].
>+                  getConfigurationElements()[0];
>+          BaseValidator validator = null;
>+          try {
>+              validator = (BaseValidator) validatorElement.
>+                      createExecutableExtension(ATT_CLASS);
>+          } catch (Throwable e) {
>+              e.printStackTrace();
>+          }
>+          results.add(validator);
>+      }
>+      return (BaseValidator[]) results.toArray(new BaseValidator[0]);
>+  }
>+
>+  /**
>+   * Find all validators found in the platform registry extension points
>+   * org.eclipse.wst.wsi.validator.
>+   * @return an array containing these validators
>+   */
>+  public BaseValidator[] getBaseValidators() {
>+      if (validators == null)
>+          validators = computeValidators();
>+      return validators;
>+  }
>+
>+  /**
>+   * Scan all validators found in the platform registry for supported artifact
>+   * types.
>+   * @return an array of artifact type names (Strings)
>+   */
>+  public String[] getArtifactTypes() {
>+      if (validators == null)
>+          validators = computeValidators();
>+      String artifactTypes[] = new String[validators.length];
>+      
>+      for (int i = 0; i < validators.length; i++)
>+          artifactTypes[i] = validators[i].getArtifactType();
>+      return artifactTypes;
>+  }
>+  
>+  /* Computes the list of supported TAD versions by scanning the platform 
>+   * registry.  See comment for tadVersions inst var for a description of the
>+   * return type. */
>+  private String[][] computeTADVersions() {
>+      IExtensionRegistry registry = Platform.getExtensionRegistry();
>+      IExtensionPoint extensionPoint = registry.getExtensionPoint(
>+              TAD_VERSION_EXT_ID);
>+      IExtension[] extensions = extensionPoint.getExtensions();
>+      ArrayList results = new ArrayList();
>+      for (int i = 0; i < extensions.length; i++) {
>+
>+          IConfigurationElement versionElements[] = extensions[i].
>+                  getConfigurationElements();
>+          for (int j = 0; j < versionElements.length; j++) {
>+              String nameVersion[] = new String[2];
>+              nameVersion[0] = versionElements[j].getAttribute(ATT_TAD_NAME);
>+              nameVersion[1] = versionElements[j].getAttribute(ATT_TAD_VERSION);
>+              results.add(nameVersion);
>+          }
>+      }
>+      return (String[][]) results.toArray(new String[0][0]);
>+  }
>+
>+  /**
>+   * Find all TAD versions found in the platform registry extension points
>+   * org.eclipse.wst.wsi.tad_versions.
>+   * 
>+   * @return an array where each member is a two element arrays that describes
>+   * one TAD version:
>+   *   element 0: the TAD name
>+   *   element 1: the TAD version string
>+   */
>+  public String[][] getAllTADVersions() {
>+      if (tadVersions == null)
>+          tadVersions = computeTADVersions();
>+      return tadVersions;
>   }
> }
>Index: src/org/eclipse/wst/wsi/internal/core/WSIConstants.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIConstants.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/WSIConstants.java	17 Apr 2006 18:19:38 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/WSIConstants.java	25 Apr 2006 14:14:11 -0000	1.2
>@@ -442,26 +442,6 @@ public interface WSIConstants {
> 	public static final String ATTRVAL_UDDI_CLAIM_TMODELKEY = "uuid:65719168-72c6-3f29-8c20-62defb0961c0";
> 
> 	/**
>-	 * WS-I names and versions of the profile test assertion document supported
>-	 * in the current version of the test tools.
>-	 */
>-	public static final String BASIC_PROFILE_TAD_NAME = "Basic Profile Test Assertions";
>-
>-	public static final String BASIC_PROFILE_1_1_TAD_NAME = "Basic Profile 1.1 Test Assertions";
>-
>-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME = "Simple Soap Binding Profile [1.0] (with Basic Profile [1.1]) Test Assertions";
>-
>-	public static final String ATTACHMENTS_PROFILE_TAD_NAME = "Attachments Profile [1.0] (with Basic Profile [1.1] and Simple Soap Binding Profile [1.0]) Test Assertions";
>-
>-	public static final String BASIC_PROFILE_TAD_VERSION = "1.1.0";
>-
>-	public static final String BASIC_PROFILE_1_1_TAD_VERSION = "1.1.0";
>-
>-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION = "1.0.0";
>-
>-	public static final String ATTACHMENTS_PROFILE_TAD_VERSION = "1.0.0";
>-
>-	/**
> 	 * System dependent line separator character.
> 	 */
> 	public static final String LINE_SEPARATOR = System
>Index: src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -3 -p -u -r1.7 -r1.8
>--- src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java	20 Apr 2006 15:00:01 -0000	1.7
>+++ src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java	24 Apr 2006 19:47:48 -0000	1.8
>@@ -30,6 +30,7 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
> import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
> import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
> import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
> import org.eclipse.wst.wsi.internal.core.report.Report;
> import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
>@@ -37,7 +38,6 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
> import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter;
> import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
>-import org.eclipse.wst.wsi.internal.core.util.EntryType;
> import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
> import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
> import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
>@@ -171,7 +171,7 @@ public class BasicProfileAnalyzer extend
>             WSDLElement wsdlElement = new WSDLElementImpl();
>             wsdlElement.setName(bindingName);
>             wsdlElement.setNamespace(namespace);
>-            wsdlElement.setType(EntryType.TYPE_DESCRIPTION_BINDING);
>+            wsdlElement.setType(WSDLValidator.TYPE_DESCRIPTION_BINDING);
>             analyzerContext.getServiceReference().setWSDLElement(wsdlElement);
>           }
>           return wsdlDoc;
>@@ -259,9 +259,9 @@ public class BasicProfileAnalyzer extend
>               i.hasNext(); ) {
>           String artifactType = (String) i.next();
>           // Set current artifact
>-          reportArtifact = setCurrentArtifact(ArtifactType.newArtifactType(
>+          reportArtifact = setCurrentArtifact(ArtifactType.getArtifactType(
>                   artifactType));
>-          validate(reportArtifact, factory.newValidatorForArtifact(
>+          validate(reportArtifact, factory.getValidatorForArtifact(
>                   artifactType));
>           this.reporter.endCurrentArtifact();
>       }
>Index: src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java	17 Apr 2006 18:19:39 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -28,7 +28,7 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
> import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
> import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
>-import org.eclipse.wst.wsi.internal.core.util.EntryType;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
> import org.eclipse.wst.wsi.internal.core.util.MessageList;
> import org.eclipse.wst.wsi.internal.core.util.TestUtils;
> import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
>@@ -381,20 +381,20 @@ public class AnalyzerConfigReaderImpl im
>     if (((wsdlReference
>       .getWSDLElement()
>       .getType()
>-      .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_PORT))
>+      .equalsIgnoreCase(WSDLValidator.TYPE_DESCRIPTION_PORT))
>       || (wsdlReference
>         .getWSDLElement()
>         .getType()
>-        .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_OPERATION)))
>+        .equalsIgnoreCase(WSDLValidator.TYPE_DESCRIPTION_OPERATION)))
>       && (wsdlReference.getWSDLElement().getParentElementName() == null))
>     {
>       throw new IllegalArgumentException(
>         getMessage(
>           "config09",
>           "The parentElementName attribute must be specified with a WSDL type of "
>-            + EntryType.TYPE_DESCRIPTION_PORT
>+            + WSDLValidator.TYPE_DESCRIPTION_PORT
>             + " or "
>-            + EntryType.TYPE_DESCRIPTION_OPERATION
>+            + WSDLValidator.TYPE_DESCRIPTION_OPERATION
>             + "."));
>     }
>   }
>Index: src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java	17 Apr 2006 18:19:39 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -17,7 +17,7 @@ import javax.xml.namespace.QName;
> 
> import org.eclipse.wst.wsi.internal.core.WSIConstants;
> import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
>-import org.eclipse.wst.wsi.internal.core.util.EntryType;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
> 
> /**
>  * The implementation for WSDL definitions. 
>@@ -117,7 +117,7 @@ public class WSDLElementImpl implements 
>    */
>   public boolean isPort()
>   {
>-    return type.equals(EntryType.TYPE_DESCRIPTION_PORT);
>+    return type.equals(WSDLValidator.TYPE_DESCRIPTION_PORT);
>   }
> 
>   /**
>@@ -125,7 +125,7 @@ public class WSDLElementImpl implements 
>    */
>   public boolean isBinding()
>   {
>-    return type.equals(EntryType.TYPE_DESCRIPTION_BINDING);
>+    return type.equals(WSDLValidator.TYPE_DESCRIPTION_BINDING);
>   }
> 
>   /**
>@@ -133,7 +133,7 @@ public class WSDLElementImpl implements 
>    */
>   public boolean isPortType()
>   {
>-    return type.equals(EntryType.TYPE_DESCRIPTION_PORTTYPE);
>+    return type.equals(WSDLValidator.TYPE_DESCRIPTION_PORTTYPE);
>   }
> 
>   /**
>@@ -141,7 +141,7 @@ public class WSDLElementImpl implements 
>    */
>   public boolean isOperation()
>   {
>-    return type.equals(EntryType.TYPE_DESCRIPTION_OPERATION);
>+    return type.equals(WSDLValidator.TYPE_DESCRIPTION_OPERATION);
>   }
> 
>   /**
>@@ -149,7 +149,7 @@ public class WSDLElementImpl implements 
>    */
>   public boolean isMessage()
>   {
>-    return type.equals(EntryType.TYPE_DESCRIPTION_MESSAGE);
>+    return type.equals(WSDLValidator.TYPE_DESCRIPTION_MESSAGE);
>   }
> 
>   /**
>Index: src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java	17 Apr 2006 18:19:40 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -27,6 +27,7 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
> import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
> import org.eclipse.wst.wsi.internal.core.report.Entry;
> import org.eclipse.wst.wsi.internal.core.report.impl.ArtifactReferenceImpl;
>@@ -594,7 +595,7 @@ public class LogReaderImpl implements Lo
>               //Entry entry = this.reporter.getReport().createEntry();
>               Entry entry = new EntryImpl();
>               entry.setEntryType(
>-                  EntryType.getEntryType(EntryType.TYPE_MESSAGE_REQUEST));
>+                  EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_REQUEST));
>               entry.setReferenceID(messageEntryRequest.getId());
>               entry.setEntryDetail(messageEntryRequest);
> 
>@@ -613,7 +614,7 @@ public class LogReaderImpl implements Lo
>             //Entry entry = this.reporter.getReport().createEntry();
>             Entry entry = new EntryImpl();
>             entry.setEntryType(
>-                EntryType.getEntryType(EntryType.TYPE_MESSAGE_RESPONSE));
>+                EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_RESPONSE));
>             entry.setReferenceID(messageEntryResponse.getId());
>             entry.setEntryDetail(messageEntryResponse);
> 
>Index: src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java	17 Apr 2006 18:19:40 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java	24 Apr 2006 19:47:49 -0000	1.2
>@@ -275,7 +275,7 @@ public class ProfileAssertionsReaderImpl
> 
>           // Set type
>           artifact.setType(
>-            ArtifactType.newArtifactType(
>+            ArtifactType.getArtifactType(
>               atts.getValue(WSIConstants.ATTR_TYPE)));
> 
>           // ADD: Get specification list
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java,v
>retrieving revision 1.6
>retrieving revision 1.8
>diff -u -3 -p -u -r1.6 -r1.8
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java	20 Apr 2006 15:00:01 -0000	1.6
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java	25 Apr 2006 14:14:11 -0000	1.8
>@@ -83,4 +83,16 @@ public interface BaseValidator
>    * @throws WSIException if an unexpected error occurs during validation
>    */
>   public void validate() throws WSIException;
>+
>+  /**
>+   * Get the artifact type that this validator applies to.
>+   * @return the artifact type (a String)
>+   */
>+  public String getArtifactType();
>+
>+  /**
>+   * Get the collection of entry types that this validator applies to.
>+   * @return an array of entry types (Strings)
>+   */
>+  public String[] getEntryTypes();
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java	17 Apr 2006 18:19:39 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -105,7 +105,7 @@ public class EntryContext
>     }
> 
>     // need some exception handling in here and more careful checking
>-    if (entry.getEntryType().equals(EntryType.ENTRY_TYPE_REQUEST))
>+    if (entry.getEntryType().equals(EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_REQUEST)))
>     {
>       this.messageEntry = request;
>       this.messageEntryDocument = requestDocument;
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java,v
>retrieving revision 1.4
>retrieving revision 1.6
>diff -u -3 -p -u -r1.4 -r1.6
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java	20 Apr 2006 14:29:34 -0000	1.4
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java	25 Apr 2006 14:14:11 -0000	1.6
>@@ -17,5 +17,17 @@ package org.eclipse.wst.wsi.internal.cor
>  */
> public interface EnvelopeValidator extends LogValidator
> {
>+    /** Envelope artifact type */
>+    public static final String TYPE_ENVELOPE = "envelope";
>+
>+    /** Request envelope entry type. */
>+    public static final String TYPE_ENVELOPE_REQUEST = "requestEnvelope";
>+
>+    /** Response envelope entry type. */
>+    public static final String TYPE_ENVELOPE_RESPONSE = "responseEnvelope";
>+
>+    /** Any envelope entry type. */
>+    public static final String TYPE_ENVELOPE_ANY = "anyEnvelope";
>+    
> 
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java,v
>retrieving revision 1.4
>retrieving revision 1.6
>diff -u -3 -p -u -r1.4 -r1.6
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java	20 Apr 2006 14:29:34 -0000	1.4
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java	25 Apr 2006 14:14:11 -0000	1.6
>@@ -34,4 +34,22 @@ public interface MessageValidator extend
>    */
>   public static final String HTTP_POST = "POST";
> 
>+  /** Message artifact type */
>+  public static final String TYPE_MESSAGE = "message";
>+
>+  /** Request message entry type. */
>+  public static final String TYPE_MESSAGE_REQUEST = "requestMessage";
>+
>+  /** Response message entry type. */
>+  public static final String TYPE_MESSAGE_RESPONSE = "responseMessage";
>+
>+  /** Any message entry type. */
>+  public static final String TYPE_MESSAGE_ANY = "anyMessage";
>+
>+  /** Mime part message entry type. */
>+  public static final String TYPE_MIME_PART = "part";
>+
>+  /** Mime root part message entry type. */
>+  public static final String TYPE_MIME_ROOT_PART = "root-part";
>+
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -3 -p -u -r1.3 -r1.4
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java	19 Apr 2006 19:38:48 -0000	1.3
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java	24 Apr 2006 19:47:48 -0000	1.4
>@@ -21,58 +21,15 @@ import org.eclipse.wst.wsi.internal.core
>  */
> public abstract class ProfileValidatorFactory
> {
>-    
>-
>   /**
>    * Create a new instance of a validator depending on the given artifact name
>    * @param artifactName - String containing the artifact name from the TAD
>    * @return an object that implements the BaseValidator interface.
>    * @throws WSIException if the validator cannot be instantiated
>    */
>-  public abstract BaseValidator newValidatorForArtifact(String artifactName)
>+  public abstract BaseValidator getValidatorForArtifact(String artifactName)
>           throws WSIException;
>-  /** 
>-   * Create a new instance of a UDDI validator.
>-   * @return  an object that implements the WSDLValidator interface.
>-   * @throws WSIException if UDDI validator cannot be instantiated. 
>-   */
>-  public abstract UDDIValidator newUDDIValidator() throws WSIException;
>-
>-  /** 
>-   * Create a new instance of a WSDL validator.
>-   * @return an object that implements the WSDLValidator interface. 
>-   * @throws WSIException if WSDL validator cannot be instantiated.
>-   */
>-  public abstract WSDLValidator newWSDLValidator() throws WSIException;
>-
>-  /** 
>-   * Create a new instance of a message validator.
>-   * NOTE: Do we need to differentiate between the tranport and SOAP 
>-   * message validator?
>-   *
>-   * @return an object that implements the MessageValidator interface.
>-   * @throws WSIException if message validatorcannot be instantiated. 
>-   */
>-  public abstract MessageValidator newMessageValidator() throws WSIException;
>-
>-  /** 
>-   * Create a new instance of an envelope validator.
>-   * @return an object that implements the EnvelopeValidator interface.
>-   * @throws WSIException if message validator cannot be instantiated. 
>-   */
>-  public abstract EnvelopeValidator newEnvelopeValidator() throws WSIException;
> 
>-  /**
>-   * Instantiate the implementation of the ProfileValidatorFactory class.
>-   * The implementation class for this interface is specified in the following 
>-   * Java system property:
>-   * <UL>
>-   *   <LI>wsi.profile.validator.factory
>-   * </UL>
>-   *
>-   * @return the ProfileValidatorFactory object.
>-   * @throws WSIException if factory class cannot be instantiated.
>-   */
>   public static ProfileValidatorFactory newInstance() throws WSIException
>   {
>     ProfileValidatorFactory factory = null;
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java,v
>retrieving revision 1.5
>retrieving revision 1.7
>diff -u -3 -p -u -r1.5 -r1.7
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java	20 Apr 2006 14:29:34 -0000	1.5
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java	25 Apr 2006 14:14:11 -0000	1.7
>@@ -19,5 +19,15 @@ package org.eclipse.wst.wsi.internal.cor
>  */
> public interface UDDIValidator extends BaseValidator
> {
>+    /** Discovery artifact type */
>+    public static final String TYPE_DISCOVERY = "discovery";
>+
>+    /** Binding template discovery entry type. */
>+    public static final String TYPE_DISCOVERY_BINDINGTEMPLATE =
>+        "bindingTemplate";
>+
>+    /** tModel discovery entry type. */
>+    public static final String TYPE_DISCOVERY_TMODEL = "tModel";
>+
> 
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java,v
>retrieving revision 1.5
>retrieving revision 1.7
>diff -u -3 -p -u -r1.5 -r1.7
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java	20 Apr 2006 14:29:34 -0000	1.5
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java	25 Apr 2006 14:14:11 -0000	1.7
>@@ -19,5 +19,30 @@ package org.eclipse.wst.wsi.internal.cor
>  */
> public interface WSDLValidator extends BaseValidator
> {
>+    /** Description artifact type */
>+    public static final String TYPE_DESCRIPTION = "description";
> 
>+    /** Definitions description entry type. */
>+    public static final String TYPE_DESCRIPTION_DEFINITIONS = "definitions";
>+
>+    /** Import description entry type. */
>+    public static final String TYPE_DESCRIPTION_IMPORT = "import";
>+
>+    /** Types description entry type. */
>+    public static final String TYPE_DESCRIPTION_TYPES = "types";
>+
>+    /** Message description entry type. */
>+    public static final String TYPE_DESCRIPTION_MESSAGE = "message";
>+
>+    /** Operation description entry type. */
>+    public static final String TYPE_DESCRIPTION_OPERATION = "operation";
>+
>+    /** PortType description entry type. */
>+    public static final String TYPE_DESCRIPTION_PORTTYPE = "portType";
>+
>+    /** Binding description entry type. */
>+    public static final String TYPE_DESCRIPTION_BINDING = "binding";
>+
>+    /** Port description entry type. */
>+    public static final String TYPE_DESCRIPTION_PORT = "port";
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -3 -p -u -r1.6 -r1.7
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java	20 Apr 2006 15:00:01 -0000	1.6
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java	24 Apr 2006 19:47:48 -0000	1.7
>@@ -56,6 +56,7 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
> import org.eclipse.wst.wsi.internal.core.profile.validator.LogValidator;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
> import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
> import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
>@@ -113,7 +114,7 @@ public abstract class BaseMessageValidat
>           Reporter reporter)
>           throws WSIException {
> 
>-      super.init(analyzerContext, assertions.getArtifact(artifactTypeTag()),
>+      super.init(analyzerContext, assertions.getArtifact(getArtifactType()),
>               reportArtifact, reporter);
> 
>       testable = analyzerConfig.getLogLocation() != null;
>@@ -996,14 +997,14 @@ public abstract class BaseMessageValidat
>       List extensibles = null;
>       BindingOperation bindingOp = op[k];
> 
>-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
>+      if (messageEntryType.isType(MessageValidator.TYPE_MESSAGE_REQUEST)
>         && (bindingOp.getOperation().getInput() != null))
>       {
>         name = bindingOp.getOperation().getName();
>         extensibles = bindingOp.getBindingInput().getExtensibilityElements();
>       }
>       else if (
>-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
>+        messageEntryType.isType(MessageValidator.TYPE_MESSAGE_RESPONSE)
>           && (bindingOp.getOperation().getOutput() != null))
>       {
>         name = bindingOp.getOperation().getName() + "Response";
>@@ -1047,14 +1048,14 @@ public abstract class BaseMessageValidat
>       List extensibles = null;
>       BindingOperation bindingOp = op[k];
> 
>-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
>+      if (messageEntryType.isType(MessageValidator.TYPE_MESSAGE_REQUEST)
>         && (bindingOp.getOperation().getInput() != null))
>       {
>         wsdlMessage = bindingOp.getOperation().getInput().getMessage();
>         extensibles = bindingOp.getBindingInput().getExtensibilityElements();
>       }
>       else if (
>-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
>+        messageEntryType.isType(MessageValidator.TYPE_MESSAGE_RESPONSE)
>           && (bindingOp.getOperation().getOutput() != null))
>       {
>         wsdlMessage = bindingOp.getOperation().getOutput().getMessage();
>@@ -1248,11 +1249,11 @@ public abstract class BaseMessageValidat
>     BindingOperation[] wsdlOperations)
>   {
> 
>-    if (messageType.isType(EntryType.ENTRY_TYPE_REQUEST))
>+    if (messageType.isType(EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_REQUEST)))
>     {
>       return getInputDocLitOperations(partElementQName, wsdlOperations);
>     }
>-    else if (messageType.isType(EntryType.ENTRY_TYPE_RESPONSE))
>+    else if (messageType.isType(EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_RESPONSE)))
>     {
>       return getOutputDocLitOperations(partElementQName, wsdlOperations);
>     }
>@@ -1840,7 +1841,6 @@ public abstract class BaseMessageValidat
>     }
>     return result;
>   }
>-  public abstract String artifactTypeTag();
> 
>   /**
>    * Returns true if these tests should be run (depending on the analyzer
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java,v
>retrieving revision 1.3
>retrieving revision 1.5
>diff -u -3 -p -u -r1.3 -r1.5
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java	19 Apr 2006 19:38:49 -0000	1.3
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java	25 Apr 2006 14:14:11 -0000	1.5
>@@ -13,17 +13,10 @@ package org.eclipse.wst.wsi.internal.cor
> import java.util.HashMap;
> import java.util.Map;
> 
>+import org.eclipse.wst.wsi.internal.WSITestToolsPlugin;
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.EnvelopeValidatorImpl;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.message.MessageValidatorImpl;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi.UDDIValidatorImpl;
>-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
> 
> /**
>  * This class is an implementation of the WSILDocumentFactory.
>@@ -35,75 +28,23 @@ public class ProfileValidatorFactoryImpl
> {
>   private static Map validatorRegistry;
> 
>-  // TODO: come up with a more dynamic way to add the validators
>-  static {
>-      addToValidatatorRegistry("discovery", UDDIValidatorImpl.class);
>-      addToValidatatorRegistry("description", WSDLValidatorImpl.class);
>-      addToValidatatorRegistry("message", MessageValidatorImpl.class);
>-      addToValidatatorRegistry("envelope", EnvelopeValidatorImpl.class);
>-  }
>-
>   public static void addToValidatatorRegistry(String artifactName,
>-          Class validatorClass) {
>+          BaseValidator validatorClass) {
>       if (validatorRegistry == null)
>           validatorRegistry = new HashMap();
>       validatorRegistry.put(artifactName, validatorClass);
>   }
> 
>-  public BaseValidator newValidatorForArtifact(String artifactName) 
>+  public BaseValidator getValidatorForArtifact(String artifactName) 
>           throws WSIException {
>-      Class validatorClass = (Class) validatorRegistry.get(artifactName);
>-      BaseValidator newValidator;
>-      try {
>-          newValidator = (BaseValidator) validatorClass.
>-                  getConstructor(new Class[0]).newInstance(new Object[0]);
>-      } catch (Exception e) {
>-          throw new WSIException("Error instantiating validator", e);
>+      if (validatorRegistry == null) {
>+          BaseValidator validators[] = WSITestToolsPlugin.getPlugin().
>+                  getBaseValidators();
>+          for (int i = 0; i < validators.length; i++)
>+              addToValidatatorRegistry(validators[i].getArtifactType(),
>+              validators[i]);
>+          
>       }
>-      return newValidator;
>-  }
>-
>-  /* (non-Javadoc)
>-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newUDDIValidator()
>-   */
>-  public UDDIValidator newUDDIValidator() throws WSIException
>-  {
>-    // Create new UDDI validator 
>-    UDDIValidator uddiValidator = new UDDIValidatorImpl();
>-    // Return validator
>-    return uddiValidator;
>-  }
>-  /* (non-Javadoc)
>-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newWSDLValidator()
>-   */
>-  public WSDLValidator newWSDLValidator() throws WSIException
>-  {
>-    // Create new WSDL validator 
>-    WSDLValidator wsdlValidator = new WSDLValidatorImpl();
>-
>-    // Return validator
>-    return wsdlValidator;
>-  }
>-
>-  /* (non-Javadoc)
>-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newMessageValidator()
>-   */
>-  public MessageValidator newMessageValidator() throws WSIException
>-  {
>-    // Create new message validator 
>-    MessageValidator messageValidator = new MessageValidatorImpl();
>-    // Return validator
>-    return messageValidator;
>-  }
>-
>-  /* (non-Javadoc)
>-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newEnvelopeValidator()
>-   */
>-  public EnvelopeValidator newEnvelopeValidator() throws WSIException
>-  {
>-    // Create new envelope validator 
>-    EnvelopeValidator envelopeValidator = new EnvelopeValidatorImpl();
>-    // Return validator
>-    return envelopeValidator;
>+      return (BaseValidator) validatorRegistry.get(artifactName);
>   }
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java	17 Apr 2006 18:19:38 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -20,6 +20,7 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
> import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
> import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
>@@ -70,7 +71,7 @@ public class AP1920 extends AssertionPro
>         throw new AssertionNotApplicableException();
>       
>       BindingOperation bindingOperation = validator.getOperationMatch(
>-          EntryType.getEntryType(EntryType.TYPE_MESSAGE_REQUEST),
>+          EntryType.getEntryType(MessageValidator.TYPE_MESSAGE_REQUEST),
>           entryContext.getRequestDocument());
> 
>       // If there is no matched operation, the assertion is not applicable
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java,v
>retrieving revision 1.5
>retrieving revision 1.7
>diff -u -3 -p -u -r1.5 -r1.7
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java	19 Apr 2006 19:38:49 -0000	1.5
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java	25 Apr 2006 14:14:11 -0000	1.7
>@@ -14,9 +14,8 @@ package org.eclipse.wst.wsi.internal.cor
> import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
>-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
>-import org.eclipse.wst.wsi.internal.core.util.EntryType;
> 
> /**
>  * @version 1.0
>@@ -25,6 +24,26 @@ public class EnvelopeValidatorImpl
>   extends BaseMessageValidator
>   implements EnvelopeValidator
> {
>+  /**
>+   * Get the artifact type that this validator applies to.
>+   * @return the artifact type (a String)
>+   */
>+  public String getArtifactType() {
>+      return TYPE_ENVELOPE;
>+  }
>+
>+  /**
>+   * Get the collection of entry types that this validator applies to.
>+   * @return an array of entry types (Strings)
>+   */
>+  public String[] getEntryTypes() {
>+      return new String[] {
>+              TYPE_ENVELOPE_REQUEST,
>+              TYPE_ENVELOPE_RESPONSE,
>+              TYPE_ENVELOPE_ANY
>+      };
>+  }
>+
>   /* (non-Javadoc)
>    * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
>    */
>@@ -35,28 +54,23 @@ public class EnvelopeValidatorImpl
>     boolean match = false;
> 
>     // Verify that the entry and test assertion have the same primary context
>-    if ((testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_ANY))
>-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_REQUEST)
>+    if ((testAssertion.getEntryTypeName().equals(TYPE_ENVELOPE_ANY))
>+      || (testAssertion.getEntryTypeName().equals(TYPE_ENVELOPE_REQUEST)
>         && (entryContext
>           .getEntry()
>           .getEntryType()
>           .getTypeName()
>-          .equals(EntryType.TYPE_MESSAGE_REQUEST)))
>-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_RESPONSE)
>+          .equals(MessageValidator.TYPE_MESSAGE_REQUEST)))
>+      || (testAssertion.getEntryTypeName().equals(TYPE_ENVELOPE_RESPONSE)
>         && (entryContext
>           .getEntry()
>           .getEntryType()
>           .getTypeName()
>-          .equals(EntryType.TYPE_MESSAGE_RESPONSE))))
>+          .equals(MessageValidator.TYPE_MESSAGE_RESPONSE))))
>     {
>       match = true;
>     }
> 
>     return match;
>-  }
>-
>-  /** Returns the string label for this artifact type. */
>-  public String artifactTypeTag() {
>-      return ArtifactType.TYPE_ENVELOPE;
>   }
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java,v
>retrieving revision 1.4
>retrieving revision 1.6
>diff -u -3 -p -u -r1.4 -r1.6
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java	19 Apr 2006 19:38:49 -0000	1.4
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java	25 Apr 2006 14:14:11 -0000	1.6
>@@ -14,8 +14,6 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
> import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
>-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
>-import org.eclipse.wst.wsi.internal.core.util.EntryType;
> 
> /**
>  * @version 1.0
>@@ -24,6 +22,28 @@ public class MessageValidatorImpl
>   extends BaseMessageValidator
>   implements MessageValidator
> {
>+  /**
>+   * Get the artifact type that this validator applies to.
>+   * @return the artifact type (a String)
>+   */
>+  public String getArtifactType() {
>+      return TYPE_MESSAGE;
>+  }
>+
>+  /**
>+   * Get the collection of entry types that this validator applies to.
>+   * @return an array of entry types (Strings)
>+   */
>+  public String[] getEntryTypes() {
>+      return new String[] {
>+              TYPE_MESSAGE_REQUEST,
>+              TYPE_MESSAGE_RESPONSE,
>+              TYPE_MESSAGE_ANY,
>+              TYPE_MIME_PART,
>+              TYPE_MIME_ROOT_PART
>+      };
>+  }
>+
>   /* (non-Javadoc)
>    * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
>    */
>@@ -34,30 +54,25 @@ public class MessageValidatorImpl
>     boolean match = false;
> 
>     // Verify that the entry and test assertion have the same primary context
>-    if ((testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_ANY))
>-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_REQUEST)
>+    if ((testAssertion.getEntryTypeName().equals(TYPE_MESSAGE_ANY))
>+      || (testAssertion.getEntryTypeName().equals(TYPE_MESSAGE_REQUEST)
>         && (entryContext
>           .getEntry()
>           .getEntryType()
>           .getTypeName()
>-          .equals(EntryType.TYPE_MESSAGE_REQUEST)))
>-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_RESPONSE)
>+          .equals(TYPE_MESSAGE_REQUEST)))
>+      || (testAssertion.getEntryTypeName().equals(TYPE_MESSAGE_RESPONSE)
>         && (entryContext
>           .getEntry()
>           .getEntryType()
>           .getTypeName()
>-          .equals(EntryType.TYPE_MESSAGE_RESPONSE)))
>-      || testAssertion.getEntryTypeName().equals(EntryType.TYPE_MIME_ROOT_PART)
>-      || testAssertion.getEntryTypeName().equals(EntryType.TYPE_MIME_PART))
>+          .equals(TYPE_MESSAGE_RESPONSE)))
>+      || testAssertion.getEntryTypeName().equals(TYPE_MIME_ROOT_PART)
>+      || testAssertion.getEntryTypeName().equals(TYPE_MIME_PART))
>     {
>       match = true;
>     }
> 
>     return match;
>-  }
>-
>-  /** Returns the string label for this artifact type. */
>-  public String artifactTypeTag() {
>-      return ArtifactType.TYPE_MESSAGE;
>   }
> }
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java,v
>retrieving revision 1.6
>retrieving revision 1.8
>diff -u -3 -p -u -r1.6 -r1.8
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java	20 Apr 2006 14:29:34 -0000	1.6
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java	25 Apr 2006 14:14:11 -0000	1.8
>@@ -32,11 +32,11 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
> import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
> import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
> import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
> import org.eclipse.wst.wsi.internal.core.report.Entry;
> import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
> import org.eclipse.wst.wsi.internal.core.report.Reporter;
>-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
> import org.eclipse.wst.wsi.internal.core.util.EntryType;
> import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
> import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
>@@ -70,6 +70,24 @@ public class UDDIValidatorImpl
>   protected UDDIProxy uddiProxy;
>   private boolean testable;
> 
>+  /**
>+   * Get the artifact type that this validator applies to.
>+   * @return the artifact type (a String)
>+   */
>+  public String getArtifactType() {
>+      return TYPE_DISCOVERY;
>+  }
>+
>+  /**
>+   * Get the collection of entry types that this validator applies to.
>+   * @return an array of entry types (Strings)
>+   */
>+  public String[] getEntryTypes() {
>+      return new String[] {
>+              TYPE_DISCOVERY_BINDINGTEMPLATE,
>+              TYPE_DISCOVERY_TMODEL};
>+  }
>+  
>   public void init(
>           AnalyzerContext analyzerContext,
>           ProfileAssertions assertions,
>@@ -78,8 +96,7 @@ public class UDDIValidatorImpl
>           Reporter reporter)
>           throws WSIException {
>       super.init(analyzerContext,
>-              assertions.getArtifact(ArtifactType.TYPE_DISCOVERY),
>-              reportArtifact, reporter);
>+              assertions.getArtifact(TYPE_DISCOVERY), reportArtifact, reporter);
>       this.uddiReference = analyzerConfig.getUDDIReference();
>       testable = analyzerConfig.isUDDIReferenceSet();
>   }
>@@ -172,7 +189,7 @@ public class UDDIValidatorImpl
>       if (bindingTemplate == null)
>       {
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
>+          EntryType.getEntryType(TYPE_DISCOVERY_BINDINGTEMPLATE));
>       }
> 
>       // If there is a bindingTemplate, then process test assertions for it
>@@ -181,7 +198,7 @@ public class UDDIValidatorImpl
>         // Create entry
>         entry = this.reporter.getReport().createEntry();
>         entry.setEntryType(
>-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
>+          EntryType.getEntryType(TYPE_DISCOVERY_BINDINGTEMPLATE));
>         entry.setReferenceID(bindingTemplate.getBindingKey());
>         entry.setEntryDetail(bindingTemplate);
> 
>@@ -197,7 +214,7 @@ public class UDDIValidatorImpl
>       // Create entry
>       entry = this.reporter.getReport().createEntry();
>       entry.setEntryType(
>-        EntryType.getEntryType(EntryType.TYPE_DISCOVERY_TMODEL));
>+        EntryType.getEntryType(TYPE_DISCOVERY_TMODEL));
>       entry.setReferenceID(
>         (tModel == null ? "[tModel]" : tModel.getTModelKey()));
>       entry.setEntryDetail(tModel);
>@@ -245,7 +262,7 @@ public class UDDIValidatorImpl
>       wsdlElement = new WSDLElementImpl();
>       wsdlElement.setName(bindingName);
>       wsdlElement.setNamespace(namespace);
>-      wsdlElement.setType(EntryType.TYPE_DESCRIPTION_BINDING);
>+      wsdlElement.setType(WSDLValidator.TYPE_DESCRIPTION_BINDING);
>     }
> 
>     // Set the wsdlElement in the service reference
>Index: src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java,v
>retrieving revision 1.6
>retrieving revision 1.8
>diff -u -3 -p -u -r1.6 -r1.8
>--- src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java	20 Apr 2006 15:00:01 -0000	1.6
>+++ src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java	25 Apr 2006 14:14:11 -0000	1.8
>@@ -63,7 +63,6 @@ import org.eclipse.wst.wsi.internal.core
> import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
> import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
> import org.eclipse.wst.wsi.internal.core.report.Reporter;
>-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
> import org.eclipse.wst.wsi.internal.core.util.EntryType;
> import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
> import org.eclipse.wst.wsi.internal.core.wsdl.WSDLElementList;
>@@ -103,6 +102,31 @@ public class WSDLValidatorImpl
>   protected HashMap containerMap = new HashMap();
>   private boolean testable;
> 
>+  /**
>+   * Get the artifact type that this validator applies to.
>+   * @return the artifact type (a String)
>+   */
>+  public String getArtifactType() {
>+      return TYPE_DESCRIPTION;
>+  }
>+
>+  /**
>+   * Get the collection of entry types that this validator applies to.
>+   * @return an array of entry types (Strings)
>+   */
>+  public String[] getEntryTypes() {
>+      return new String[] {
>+              TYPE_DESCRIPTION_DEFINITIONS,
>+              TYPE_DESCRIPTION_IMPORT,
>+              TYPE_DESCRIPTION_TYPES,
>+              TYPE_DESCRIPTION_MESSAGE,
>+              TYPE_DESCRIPTION_OPERATION,
>+              TYPE_DESCRIPTION_PORTTYPE,
>+              TYPE_DESCRIPTION_BINDING,
>+              TYPE_DESCRIPTION_PORT
>+      };
>+  }
>+
>   public void init(
>           AnalyzerContext analyzerContext,
>           ProfileAssertions assertions,
>@@ -111,7 +135,7 @@ public class WSDLValidatorImpl
>           Reporter reporter)
>           throws WSIException {
>       super.init(analyzerContext,
>-              assertions.getArtifact(ArtifactType.TYPE_DESCRIPTION),
>+              assertions.getArtifact(TYPE_DESCRIPTION),
>               reportArtifact, reporter);
>       this.wsdlDocument = analyzerContext.getWsdlDocument();
>       testable = analyzerContext.getWsdlDocument() != null;
>@@ -192,13 +216,13 @@ public class WSDLValidatorImpl
>         //throw new WSIRuntimeException("Could not locate WSDL binding for port: " + port.getName());  
>         // Set missingInput for all binding, portType, operation and message test assertions 
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>       }
> 
>       else
>@@ -216,11 +240,11 @@ public class WSDLValidatorImpl
>           //throw new WSIRuntimeException("Could not locate WSDL portType for binding: " + binding.getQName().getLocalPart());
>           // Set missingInput for all portType, operation and message test assertions 
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>         }
> 
>         else
>@@ -290,11 +314,11 @@ public class WSDLValidatorImpl
> 
>           // Set missingInput for all portType, operation and message test assertions 
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>         }
> 
>         else
>@@ -325,13 +349,13 @@ public class WSDLValidatorImpl
>       {
>         // Set missingInput for all binding, portType, operation and message test assertions 
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>       }
>     }
> 
>@@ -353,7 +377,7 @@ public class WSDLValidatorImpl
> 
>       // Set missingInput for all binding test assertions 
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
> 
>       processPortTypeAssertions(
>         portType,
>@@ -408,9 +432,9 @@ public class WSDLValidatorImpl
> 
>       // Set missingInput for all binding and portType test assertions 
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
> 
>       processOperationAssertions(
>         operation,
>@@ -443,11 +467,11 @@ public class WSDLValidatorImpl
> 
>       // Set missingInput for all binding, portType, and operation test assertions 
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
> 
>       processMessageAssertions(
>         message,
>@@ -547,7 +571,7 @@ public class WSDLValidatorImpl
>       // Create entry 
>       entry = this.reporter.getReport().createEntry();
>       entry.setEntryType(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_DEFINITIONS));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_DEFINITIONS));
>       entry.setReferenceID(definition.getDocumentBaseURI());
>       entry.setEntryDetail(definition);
> 
>@@ -585,7 +609,7 @@ public class WSDLValidatorImpl
>     if (wsdlTypes == null || wsdlTypes.length == 0)
>     {
>       // Set missingInput for all test assertions with this entry type
>-      setMissingInput(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
>+      setMissingInput(EntryType.getEntryType(TYPE_DESCRIPTION_TYPES));
>     }
> 
>     else
>@@ -602,7 +626,7 @@ public class WSDLValidatorImpl
>         // Create entry 
>         entry = this.reporter.getReport().createEntry();
>         entry.setEntryType(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_TYPES));
>         entry.setReferenceID(
>           candidate.getDefinition(types).getDocumentBaseURI() + "-Types");
>         entry.setEntryDetail(types);
>@@ -641,7 +665,7 @@ public class WSDLValidatorImpl
>     {
>       // Set missingInput for all test assertions with this entry type
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_IMPORT));
>     }
> 
>     else
>@@ -652,7 +676,7 @@ public class WSDLValidatorImpl
>         // Create entry 
>         entry = this.reporter.getReport().createEntry();
>         entry.setEntryType(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_IMPORT));
>         entry.setReferenceID(wsdlImport.getNamespaceURI());
>         entry.setEntryDetail(wsdlImport);
> 
>@@ -688,7 +712,7 @@ public class WSDLValidatorImpl
> 
>     // Create entry 	  
>     entry = this.reporter.getReport().createEntry();
>-    entry.setEntryType(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORT));
>+    entry.setEntryType(EntryType.getEntryType(TYPE_DESCRIPTION_PORT));
>     entry.setReferenceID(port.getName());
>     entry.setParentElementName(
>       serviceReference.getWSDLElement().getParentElementName());
>@@ -720,7 +744,7 @@ public class WSDLValidatorImpl
>     // Create entry 
>     entry = this.reporter.getReport().createEntry();
>     entry.setEntryType(
>-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
>+      EntryType.getEntryType(TYPE_DESCRIPTION_BINDING));
>     entry.setReferenceID(bindingQName.toString());
>     entry.setEntryDetail(binding);
> 
>@@ -758,7 +782,7 @@ public class WSDLValidatorImpl
>     // Create entry 
>     entry = this.reporter.getReport().createEntry();
>     entry.setEntryType(
>-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
>+      EntryType.getEntryType(TYPE_DESCRIPTION_PORTTYPE));
>     entry.setReferenceID(portTypeQName.toString());
>     entry.setEntryDetail(portType);
> 
>@@ -797,7 +821,7 @@ public class WSDLValidatorImpl
>     // Create entry 
>     entry = this.reporter.getReport().createEntry();
>     entry.setEntryType(
>-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+      EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>     entry.setReferenceID(operation.getName());
>     entry.setParentElementName(portType.getQName().getLocalPart());
>     entry.setEntryDetail(operation);
>@@ -833,7 +857,7 @@ public class WSDLValidatorImpl
>     if (portType.getOperations() == null)
>     {
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>     }
> 
>     else
>@@ -845,7 +869,7 @@ public class WSDLValidatorImpl
>         operation = (Operation) opIt.next();
>         if (operation == null || operation.isUndefined())
>           setMissingInput(
>-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
>+            EntryType.getEntryType(TYPE_DESCRIPTION_OPERATION));
>         else
>           processOperationAssertions(
>             operation,
>@@ -880,7 +904,7 @@ public class WSDLValidatorImpl
>     // Create entry 
>     entry = this.reporter.getReport().createEntry();
>     entry.setEntryType(
>-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+      EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>     entry.setReferenceID(messageQName.toString());
>     entry.setEntryDetail(message);
> 
>@@ -992,7 +1016,7 @@ public class WSDLValidatorImpl
>       {
>         // Set all message test assertion results to missingInput
>         setMissingInput(
>-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+          EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>       }
> 
>       else
>@@ -1049,7 +1073,7 @@ public class WSDLValidatorImpl
>     {
>       // Set all message test assertion results to missingInput
>       setMissingInput(
>-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
>+        EntryType.getEntryType(TYPE_DESCRIPTION_MESSAGE));
>     }
> 
>     else
>Index: src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -3 -p -u -r1.1 -r1.2
>--- src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java	17 Apr 2006 18:19:37 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java	24 Apr 2006 19:47:48 -0000	1.2
>@@ -15,6 +15,8 @@ import java.io.StringWriter;
> 
> import org.eclipse.wst.wsi.internal.core.WSIConstants;
> import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
> import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
> import org.eclipse.wst.wsi.internal.core.report.Entry;
> import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
>@@ -219,7 +221,7 @@ public class EntryImpl extends EntryResu
> 
>     // If target is a log entry, then add reference to it
>     if ((entryType != null)
>-      && (entryType.getArtifactType().isMessages())
>+      && (entryType.getArtifactType().equals(MessageValidator.TYPE_MESSAGE))
>       && (showLogEntry))
>     {
>       MessageEntry logEntry = (MessageEntry) entryDetail;
>@@ -263,12 +265,12 @@ public class EntryImpl extends EntryResu
>   	String envelopeEntryTypeName = messageEntryTypeName;
>   	if (messageEntryTypeName != null)
>   	{
>-  	if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_ANY))
>-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_ANY;
>-  	else if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_REQUEST))
>-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_REQUEST;
>-  	else if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_RESPONSE))
>-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_RESPONSE;
>+  	if (messageEntryTypeName.equals(MessageValidator.TYPE_MESSAGE_ANY))
>+  		envelopeEntryTypeName = EnvelopeValidator.TYPE_ENVELOPE_ANY;
>+  	else if (messageEntryTypeName.equals(MessageValidator.TYPE_MESSAGE_REQUEST))
>+  		envelopeEntryTypeName = EnvelopeValidator.TYPE_ENVELOPE_REQUEST;
>+  	else if (messageEntryTypeName.equals(MessageValidator.TYPE_MESSAGE_RESPONSE))
>+  		envelopeEntryTypeName = EnvelopeValidator.TYPE_ENVELOPE_RESPONSE;
>   	}
> 
>   	return envelopeEntryTypeName;
>Index: src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java,v
>retrieving revision 1.2
>retrieving revision 1.5
>diff -u -3 -p -u -r1.2 -r1.5
>--- src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java	21 Apr 2006 11:36:07 -0000	1.2
>+++ src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java	25 Apr 2006 14:14:11 -0000	1.5
>@@ -13,6 +13,8 @@ package org.eclipse.wst.wsi.internal.cor
> import java.util.HashMap;
> import java.util.Map;
> 
>+import org.eclipse.wst.wsi.internal.WSITestToolsPlugin;
>+
> /**
>  * This class ...
>  * 
>@@ -26,36 +28,8 @@ public class ArtifactType
>    */
>   private String type;
> 
>-  /**
>-   * ReportArtifact types.
>-   */
>-  public static final String TYPE_ENVELOPE = "envelope";
>-  public static final String TYPE_MESSAGE = "message";
>-  public static final String TYPE_DESCRIPTION = "description";
>-  public static final String TYPE_DISCOVERY = "discovery";
>-
>-  /**
>-   * ReportArtifact types.
>-   */
>-  public static final ArtifactType ARTIFACT_TYPE_ENVELOPE =
>-    new ArtifactType(TYPE_ENVELOPE);
>-  public static final ArtifactType ARTIFACT_TYPE_MESSAGE =
>-    new ArtifactType(TYPE_MESSAGE);
>-  public static final ArtifactType ARTIFACT_TYPE_DESCRIPTION =
>-    new ArtifactType(TYPE_DESCRIPTION);
>-  public static final ArtifactType ARTIFACT_TYPE_DISCOVERY =
>-    new ArtifactType(TYPE_DISCOVERY);
>-
>   private static Map typeMap;
>   
>-  static {
>-      typeMap = new HashMap();
>-      typeMap.put(TYPE_ENVELOPE, ARTIFACT_TYPE_ENVELOPE);
>-      typeMap.put(TYPE_MESSAGE, ARTIFACT_TYPE_MESSAGE);
>-      typeMap.put(TYPE_DESCRIPTION, ARTIFACT_TYPE_DESCRIPTION);
>-      typeMap.put(TYPE_DISCOVERY, ARTIFACT_TYPE_DISCOVERY);
>-  }
>-  
>   /**
>    * Create artifact type.
>    */
>@@ -65,42 +39,6 @@ public class ArtifactType
>   }
> 
>   /**
>-   * Is artifact type envelope.
>-   * @return true if artifact type envelope.
>-   */
>-  public boolean isEnvelope()
>-  {
>-    return type.equals(TYPE_ENVELOPE);
>-  }
>-
>-  /**
>-   * Is artifact type messages.
>-   * @return true if artifact type messages.
>-   */
>-  public boolean isMessages()
>-  {
>-    return type.equals(TYPE_MESSAGE);
>-  }
>-
>-  /**
>-   * Is artifact type description.
>-   * @return true if artifact type description.
>-   */
>-  public boolean isDescription()
>-  {
>-    return type.equals(TYPE_DESCRIPTION);
>-  }
>-
>-  /**
>-   * Is artifact type discovery.
>-   * @return true if artifact type discovery.
>-   */
>-  public boolean isDiscovery()
>-  {
>-    return type.equals(TYPE_DISCOVERY);
>-  }
>-
>-  /**
>    * Get artifact type.
>    * @return artifact type.
>    */
>@@ -114,6 +52,8 @@ public class ArtifactType
>    * @param name - the artifact name (matches artifact type attribute from TAD)
>    */
>   public static void registerArtifactType(String name) {
>+      if (typeMap == null)
>+          typeMap = new HashMap();
>       typeMap.put(name, new ArtifactType(name));
>   }
>   
>@@ -123,9 +63,15 @@ public class ArtifactType
>    * @return newly created artifact type.
>    * @throws RuntimeException if artifact type name is invalid or inappropriate.
>    */
>-  public static final ArtifactType newArtifactType(String typeName)
>+  public static final ArtifactType getArtifactType(String typeName)
>     throws RuntimeException
>   {
>+      if (typeMap == null) {
>+          String types[] = WSITestToolsPlugin.getPlugin().getArtifactTypes();
>+          for (int i = 0; i < types.length; i++)
>+              registerArtifactType(types[i]);
>+      }
>+      
>     if (typeMap.containsKey(typeName))
>         return (ArtifactType) typeMap.get(typeName);
>      else {
>Index: src/org/eclipse/wst/wsi/internal/core/util/EntryType.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/EntryType.java,v
>retrieving revision 1.1
>retrieving revision 1.3
>diff -u -3 -p -u -r1.1 -r1.3
>--- src/org/eclipse/wst/wsi/internal/core/util/EntryType.java	17 Apr 2006 18:19:39 -0000	1.1
>+++ src/org/eclipse/wst/wsi/internal/core/util/EntryType.java	24 Apr 2006 19:47:48 -0000	1.3
>@@ -13,6 +13,9 @@ package org.eclipse.wst.wsi.internal.cor
> import java.util.TreeMap;
> import java.util.Vector;
> 
>+import org.eclipse.wst.wsi.internal.WSITestToolsPlugin;
>+import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
>+
> /**
>  * This class ...
>  * 
>@@ -34,118 +37,12 @@ public class EntryType
>   /**
>    * Entry types accessible by type name.
>    */
>-  protected static final TreeMap entryTypeMap = new TreeMap();
>+  protected static TreeMap entryTypeMap;
> 
>   /**
>    * Entry type names accessible by artifact.
>    */
>   protected static final TreeMap entryTypeNameMap = new TreeMap();
>-  static {
>-    entryTypeNameMap.put(ArtifactType.TYPE_ENVELOPE, new Vector());
>-    entryTypeNameMap.put(ArtifactType.TYPE_MESSAGE, new Vector());
>-    entryTypeNameMap.put(ArtifactType.TYPE_DESCRIPTION, new Vector());
>-    entryTypeNameMap.put(ArtifactType.TYPE_DISCOVERY, new Vector());
>-  }
>-
>-  /**
>-   * Envelope entry types.
>-   */
>-  public static final String TYPE_ENVELOPE_REQUEST = "requestEnvelope";
>-  public static final String TYPE_ENVELOPE_RESPONSE = "responseEnvelope";
>-  public static final String TYPE_ENVELOPE_ANY = "anyEnvelope";
>-
>-  /**
>-   * Message entry types.
>-   */
>-  public static final String TYPE_MESSAGE_REQUEST = "requestMessage";
>-  public static final String TYPE_MESSAGE_RESPONSE = "responseMessage";
>-  public static final String TYPE_MESSAGE_ANY = "anyMessage";
>-
>-  /**
>-   * MIME entry types.
>-   */
>-  public static final String TYPE_MIME_PART = "part";
>-  public static final String TYPE_MIME_ROOT_PART = "root-part";
>-
>-  /**
>-   * Description entry types.
>-   */
>-  public static final String TYPE_DESCRIPTION_DEFINITIONS = "definitions";
>-  public static final String TYPE_DESCRIPTION_IMPORT = "import";
>-  public static final String TYPE_DESCRIPTION_TYPES = "types";
>-  public static final String TYPE_DESCRIPTION_MESSAGE = "message";
>-  public static final String TYPE_DESCRIPTION_OPERATION = "operation";
>-  public static final String TYPE_DESCRIPTION_PORTTYPE = "portType";
>-  public static final String TYPE_DESCRIPTION_BINDING = "binding";
>-  public static final String TYPE_DESCRIPTION_PORT = "port";
>-
>-  /**
>-   * Discovery entry types.
>-   */
>-  public static final String TYPE_DISCOVERY_BINDINGTEMPLATE = "bindingTemplate";
>-  public static final String TYPE_DISCOVERY_TMODEL = "tModel";
>-
>-  /**
>-   * Envelope entry types.
>-   */
>-  public static final EntryType ENTRY_TYPE_REQUESTENV =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_ENVELOPE, TYPE_ENVELOPE_REQUEST);
>-  public static final EntryType ENTRY_TYPE_RESPONSEENV =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_ENVELOPE, TYPE_ENVELOPE_RESPONSE);
>-
>-  /**
>-   * Message entry types.
>-   */
>-  public static final EntryType ENTRY_TYPE_REQUEST =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_MESSAGE, TYPE_MESSAGE_REQUEST);
>-  public static final EntryType ENTRY_TYPE_RESPONSE =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_MESSAGE, TYPE_MESSAGE_RESPONSE);
>-  //  public static final EntryType ENTRY_TYPE_ANYENTRY = 
>-  //        new EntryType(ArtifactType.ARTIFACT_TYPE_MESSAGES, TYPE_MESSAGE_ANYENTRY);
>-
>-  /**
>-   * Description entry types.
>-   */
>-  public static final EntryType ENTRY_TYPE_DEFINITIONS =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_DEFINITIONS);
>-  public static final EntryType ENTRY_TYPE_IMPORT =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_IMPORT);
>-  public static final EntryType ENTRY_TYPE_TYPES =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_TYPES);
>-  public static final EntryType ENTRY_TYPE_MESSAGE =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_MESSAGE);
>-  public static final EntryType ENTRY_TYPE_OPERATION =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_OPERATION);
>-  public static final EntryType ENTRY_TYPE_PORTTYPE =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_PORTTYPE);
>-  public static final EntryType ENTRY_TYPE_BINDING =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
>-      TYPE_DESCRIPTION_BINDING);
>-  public static final EntryType ENTRY_TYPE_PORT =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_DESCRIPTION, TYPE_DESCRIPTION_PORT);
>-
>-  /**
>-   * Discovery entry types.
>-   */
>-  public static final EntryType ENTRY_TYPE_BINDINGTEMPLATE =
>-    newEntryType(
>-      ArtifactType.ARTIFACT_TYPE_DISCOVERY,
>-      TYPE_DISCOVERY_BINDINGTEMPLATE);
>-  public static final EntryType ENTRY_TYPE_TMODEL =
>-    newEntryType(ArtifactType.ARTIFACT_TYPE_DISCOVERY, TYPE_DISCOVERY_TMODEL);
> 
>   /**
>    * Create entry type.
>@@ -213,6 +110,16 @@ public class EntryType
>   public static final EntryType getEntryType(String typeName)
>     throws RuntimeException
>   {
>+    if (entryTypeMap == null) {
>+        BaseValidator validators[] = WSITestToolsPlugin.getPlugin()
>+                .getBaseValidators();
>+        for (int i = 0; i < validators.length; i++) {
>+            String entryTypes[] = validators[i].getEntryTypes();
>+            for (int j = 0; j < entryTypes.length; j++)
>+                registerEntryType(ArtifactType.getArtifactType(
>+                        validators[i].getArtifactType()), entryTypes[j]);
>+        }
>+    }
>     // Get the entry type by type name
>     EntryType entryType = (EntryType) entryTypeMap.get(typeName);
> 
>@@ -254,7 +161,7 @@ public class EntryType
>   /**
>    * Get list of type names for a specified artifact type name.
>    */
>-  private static final EntryType newEntryType(
>+  public static final EntryType registerEntryType(
>     ArtifactType artifactType,
>     String typeName)
>   {
>@@ -263,12 +170,21 @@ public class EntryType
>     // Create entry type
>     entryType = new EntryType(artifactType, typeName);
> 
>+    if (entryTypeMap == null) {
>+        entryTypeMap = new TreeMap();
>+    }
>     // Add to entry type map
>     entryTypeMap.put(typeName, entryType);
> 
>     // Get the entry type name vector for the artifact type
>     Vector entryTypeNameList =
>       (Vector) entryTypeNameMap.get(artifactType.getTypeName());
>+    
>+    // Lazy initialize
>+    if (entryTypeNameList == null) {
>+        entryTypeNameList = new Vector();
>+        entryTypeNameMap.put(artifactType.getTypeName(), entryTypeNameList);
>+    }
> 
>     // Add the type name to the list
>     entryTypeNameList.add(typeName);
>Index: src/org/eclipse/wst/wsi/internal/core/util/Utils.java
>===================================================================
>RCS file: /home/cvs/ws-i/bsp.org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Utils.java,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -3 -p -u -r1.2 -r1.3
>--- src/org/eclipse/wst/wsi/internal/core/util/Utils.java	20 Apr 2006 20:04:05 -0000	1.2
>+++ src/org/eclipse/wst/wsi/internal/core/util/Utils.java	25 Apr 2006 14:14:11 -0000	1.3
>@@ -35,6 +35,7 @@ import java.util.ResourceBundle;
> import java.util.StringTokenizer;
> import java.util.Vector;
> 
>+import org.eclipse.wst.wsi.internal.WSITestToolsPlugin;
> import org.eclipse.wst.wsi.internal.core.WSIConstants;
> import org.eclipse.wst.wsi.internal.core.WSIException;
> import org.eclipse.wst.wsi.internal.core.log.MimePart;
>@@ -57,19 +58,6 @@ public final class Utils
> 
>   
>   private static Map validProfileTADVersions;
>-  
>-  /* Register Basic Profile TAD versions */
>-  static {
>-      validProfileTADVersions = new HashMap();
>-      registerValidProfileTADVersion(WSIConstants.BASIC_PROFILE_TAD_NAME,
>-              WSIConstants.BASIC_PROFILE_TAD_VERSION);
>-      registerValidProfileTADVersion(WSIConstants.BASIC_PROFILE_1_1_TAD_NAME,
>-              WSIConstants.BASIC_PROFILE_1_1_TAD_VERSION);
>-      registerValidProfileTADVersion(WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME,
>-              WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION);
>-      registerValidProfileTADVersion(WSIConstants.ATTACHMENTS_PROFILE_TAD_NAME,
>-              WSIConstants.ATTACHMENTS_PROFILE_TAD_VERSION);
>-  }
> 
>   /**
>    * Common timestamp format.
>@@ -1159,6 +1147,8 @@ public final class Utils
>    */
>   public static void registerValidProfileTADVersion(String name, String version)
>   {
>+      if (validProfileTADVersions == null)
>+          validProfileTADVersions = new HashMap();
>       validProfileTADVersions.put(name, version);
>   }
>   
>@@ -1174,6 +1164,12 @@ public final class Utils
> 
>     String name = profileAssertions.getTADName();
>     String version = profileAssertions.getTADVersion();
>+    
>+    if (validProfileTADVersions == null) {
>+       String versions[][] = WSITestToolsPlugin.getPlugin().getAllTADVersions();
>+       for (int i = 0; i < versions.length; i++)
>+           registerValidProfileTADVersion(versions[i][0], versions[i][1]);
>+    }
> 
>     if (validProfileTADVersions.containsKey(name))
>         return checkVersionNumber((String) validProfileTADVersions.get(name),

Actions: View | Diff

Attachments on bug 138379: 39410 | 39456 | 39547