diff options
| author | lauzond | 2005-04-06 03:10:15 +0000 |
|---|---|---|
| committer | lauzond | 2005-04-06 03:10:15 +0000 |
| commit | 5c55da53da9033d535e4071057219fd9ab4a57f8 (patch) | |
| tree | b53a4d0d39d0d0ac4414d46f2938f22fc9bb6766 | |
| parent | 3e914544e83091b097fd05b4c1f6844715677654 (diff) | |
| download | webtools.webservices-5c55da53da9033d535e4071057219fd9ab4a57f8.tar.gz webtools.webservices-5c55da53da9033d535e4071057219fd9ab4a57f8.tar.xz webtools.webservices-5c55da53da9033d535e4071057219fd9ab4a57f8.zip | |
[88955] Enable the building of initial WS-I contribution
15 files changed, 445 insertions, 165 deletions
diff --git a/bundles/org.eclipse.wst.wsi.ui/.classpath b/bundles/org.eclipse.wst.wsi.ui/.classpath index fd7014dcf..275b34c69 100644 --- a/bundles/org.eclipse.wst.wsi.ui/.classpath +++ b/bundles/org.eclipse.wst.wsi.ui/.classpath @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/"/> - <classpathentry kind="lib" path="jars/wsdl4j.jar"/> - <classpathentry kind="lib" path="jars/qname.jar"/> - <classpathentry kind="lib" path="jars/validateutility.jar"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.wst.wsi.ui/.cvsignore b/bundles/org.eclipse.wst.wsi.ui/.cvsignore index ba077a403..eb450a762 100644 --- a/bundles/org.eclipse.wst.wsi.ui/.cvsignore +++ b/bundles/org.eclipse.wst.wsi.ui/.cvsignore @@ -1 +1,2 @@ bin +temp.folder diff --git a/bundles/org.eclipse.wst.wsi.ui/build.properties b/bundles/org.eclipse.wst.wsi.ui/build.properties index 74f401ba5..9adcfa0d5 100644 --- a/bundles/org.eclipse.wst.wsi.ui/build.properties +++ b/bundles/org.eclipse.wst.wsi.ui/build.properties @@ -1,13 +1,11 @@ bin.includes = wsiui.jar,\ plugin.properties,\ plugin.xml,\ - jars/,\ icons/ source.wsiui.jar = src/ jars.compile.order = wsiui.jar output.wsiui.jar = bin/ src.includes = icons/,\ - jars/,\ plugin.properties,\ plugin.xml,\ src/,\ diff --git a/bundles/org.eclipse.wst.wsi.ui/build.xml b/bundles/org.eclipse.wst.wsi.ui/build.xml new file mode 100644 index 000000000..1b97d0086 --- /dev/null +++ b/bundles/org.eclipse.wst.wsi.ui/build.xml @@ -0,0 +1,269 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="org.eclipse.wst.wsi.ui" default="build.jars" basedir="."> + + <property name="basews" value="${ws}"/> + <property name="baseos" value="${os}"/> + <property name="basearch" value="${arch}"/> + <property name="basenl" value="${nl}"/> + + <!-- Compiler settings. --> + <property name="javacFailOnError" value="false"/> + <property name="javacDebugInfo" value="on"/> + <property name="javacVerbose" value="true"/> + <property name="javacSource" value="1.3"/> + <property name="javacTarget" value="1.2"/> + <property name="compilerArg" value=""/> + <path id="path_bootclasspath"> + <fileset dir="${java.home}/lib"> + <include name="*.jar"/> + </fileset> + </path> + <property name="bootclasspath" refid="path_bootclasspath"/> + + <target name="init" depends="properties"> + <condition property="pluginTemp" value="${buildTempFolder}/plugins"> + <isset property="buildTempFolder"/> + </condition> + <property name="pluginTemp" value="${basedir}"/> + <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.wst.wsi.ui"> + <isset property="buildTempFolder"/> + </condition> + <property name="build.result.folder" value="${basedir}"/> + <property name="temp.folder" value="${basedir}/temp.folder"/> + <property name="plugin.destination" value="${basedir}"/> + </target> + + <target name="properties" if="eclipse.running"> + <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/> + + </target> + + <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.wst.wsi.ui for an update site."> + <delete dir="${temp.folder}"/> + <mkdir dir="${temp.folder}"/> + <antcall target="build.jars"/> + <antcall target="gather.bin.parts"> + <param name="destination.temp.folder" value="${temp.folder}/"/> + </antcall> + <zip destfile="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.jar" basedir="${temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" filesonly="false" whenempty="skip" update="false"/> + <delete dir="${temp.folder}"/> + </target> + + <target name="wsiui.jar" depends="init" unless="wsiui.jar" description="Create jar: org.eclipse.wst.wsi.ui wsiui.jar."> + <delete dir="${temp.folder}/wsiui.jar.bin"/> + <mkdir dir="${temp.folder}/wsiui.jar.bin"/> + <!-- compile the source code --> + <javac destdir="${temp.folder}/wsiui.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" > + <compilerarg line="${compilerArg}"/> + <classpath> + <pathelement path="../../plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar"/> + <pathelement path="..\..\plugins\org.eclipse.core.runtime_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.osgi_3.1.0.jar"/> + <pathelement path="../../plugins/org.eclipse.text_3.1.0/text.jar"/> + <pathelement path="..\..\plugins\org.eclipse.swt_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.swt.win32_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.jface_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.core.commands_3.1.0.jar"/> + <pathelement path="../../plugins/org.eclipse.core.resources_3.1.0/resources.jar"/> + <pathelement path="../../plugins/org.eclipse.core.resources.compatibility_3.1.0/resources.jar"/> + <pathelement path="../../plugins/org.eclipse.core.resources.compatibility_3.1.0/compatibility.jar"/> + <pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/> + <pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/> + <pathelement path="../../plugins/org.eclipse.core.runtime.compatibility_3.1.0/compatibility.jar"/> + <pathelement path="..\..\plugins\org.eclipse.update.configurator_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.help_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui.workbench_3.1.0.jar"/> + <pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar"/> + <pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/@dot"/> + <pathelement path="..\..\plugins\org.eclipse.core.expressions_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui.ide_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui.win32_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui.views_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.update.core_3.1.0.jar"/> + <pathelement path="../../plugins/org.eclipse.update.core.win32_3.1.0/@dot"/> + <pathelement path="..\..\plugins\org.eclipse.update.ui_3.1.0.jar"/> + <pathelement path="..\..\plugins\org.eclipse.ui.forms_3.1.0.jar"/> + <pathelement path="../../plugins/org.eclipse.ui.editors_3.1.0/editors.jar"/> + <pathelement path="../../plugins/org.eclipse.ui.workbench.texteditor_3.1.0/texteditor.jar"/> + <pathelement path="../../plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.jar"/> + <pathelement path="../../plugins/org.eclipse.debug.core_3.1.0/dtcore.jar"/> + <pathelement path="../../plugins/org.eclipse.core.variables_3.1.0/variables.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.common.ui_1.0.0/ui.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.validation_1.0.0/validate.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.validation_1.0.0/common.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.common.frameworks_1.0.0/common.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.common.frameworks_1.0.0/common_core.jar"/> + <pathelement path="../../plugins/org.eclipse.jem.util_1.1.0/util.jar"/> + <pathelement path="../../plugins/org.eclipse.emf.ecore_2.1.0/runtime/ecore.jar"/> + <pathelement path="../../plugins/org.eclipse.emf.common_2.1.0/runtime/common.jar"/> + <pathelement path="../../plugins/org.eclipse.emf.ecore.xmi_2.1.0/runtime/ecore.xmi.jar"/> + <pathelement path="../../plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-bsf.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-commons-net.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-icontract.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jai.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-junit.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-netrexx.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-swing.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-trax.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-vaj.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-weblogic.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar"/> + <pathelement path="../../plugins/org.apache.ant_1.6.2/lib/ant-xslp.jar"/> + <pathelement path="../../plugins/org.eclipse.team.core_3.1.0/team.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/runtime/validatexml.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/jars/xercesImpl.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.xml.validation_1.0.0/jars/xmlParserAPIs.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.common.uriresolver_1.0.0/uriresolver.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/wsdlvalidateui.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/wsdlvalidate.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/lib/wsdl4j.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.wsdl.validation_1.0.0/lib/qname.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.common.dependencychecker_1.0.0/dependencychecker.jar"/> + <pathelement path="../org.eclipse.wst.wsi/bin"/> + <pathelement path="../org.eclipse.wst.wsi/wsicore.jar"/> + <pathelement path="../org.eclipse.wst.wsi/wsivalidate.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.command.env_1.0.0/env.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.command.env.core_1.0.0/envcore.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.command.env.ui_1.0.0/envui.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.uddi4j_1.0.0/lib/uddi4j.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/axis-ant.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/axis.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/commons-discovery.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/jaxrpc.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/log4j-1.2.8.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/saaj.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.ws.apache.axis_1.0.0/lib/wsdl4j.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcatwrapper.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/catalina.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/bootstrap.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-beanutils.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-collections.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-digester.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-logging.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-logging-api.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/commons-modeler.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jakarta-regexp-1.3.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jasper-compiler.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/jasper-runtime.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/mx4j-jmx.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-common.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-factory.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/naming-resources.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlet.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-common.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-default.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-invoker.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/servlets-manager.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-coyote.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-http11.jar"/> + <pathelement path="../../plugins/org.eclipse.tomcat_4.1.30.1/tomcat-util.jar"/> + <pathelement path="..\..\plugins\org.eclipse.help.appserver_3.1.0.jar"/> + <pathelement path="../org.eclipse.wst.ws.ui/bin/"/> + <pathelement path="../org.eclipse.wst.ws.ui/wsui.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.internet.monitor.core_1.0.0/monitorcore.jar"/> + <pathelement path="../../plugins/org.eclipse.wst.internet.monitor.ui_1.0.0/monitorui.jar"/> + </classpath> + <src path="src/" /> + </javac> + <!-- Copy necessary resources --> + <copy todir="${temp.folder}/wsiui.jar.bin" failonerror="true"> + <fileset dir="src/" excludes="**/*.java, **/package.htm*" /> + </copy> + <mkdir dir="${build.result.folder}"/> + <jar destfile="${build.result.folder}/wsiui.jar" basedir="${temp.folder}/wsiui.jar.bin"/> + <delete dir="${temp.folder}/wsiui.jar.bin"/> + </target> + + <target name="wsiuisrc.zip" depends="init" unless="wsiuisrc.zip"> + <mkdir dir="${build.result.folder}"/> + <zip destfile="${build.result.folder}/wsiuisrc.zip" filesonly="false" whenempty="skip" update="false"> + <fileset dir="src/" includes="**/*.java" /> + </zip> + </target> + + <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.wst.wsi.ui."> + <available property="wsiui.jar" file="${build.result.folder}/wsiui.jar"/> + <antcall target="wsiui.jar"/> + </target> + + <target name="build.sources" depends="init"> + <available property="wsiuisrc.zip" file="${build.result.folder}/wsiuisrc.zip"/> + <antcall target="wsiuisrc.zip"/> + </target> + + <target name="gather.bin.parts" depends="init" if="destination.temp.folder"> + <mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/> + <copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="true"> + <fileset dir="${build.result.folder}" includes="wsiui.jar" /> + </copy> + <copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="true"> + <fileset dir="${basedir}" includes="wsiui.jar,plugin.properties,plugin.xml,icons/" /> + </copy> + </target> + + <target name="build.zips" depends="init"> + </target> + + <target name="gather.sources" depends="init" if="destination.temp.folder"> + <mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/> + <copy file="${build.result.folder}/wsiuisrc.zip" todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false"/> + <copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false"> + <fileset dir="${basedir}" includes="icons/,plugin.properties,plugin.xml,src/,build.properties" /> + </copy> + </target> + + <target name="gather.logs" depends="init" if="destination.temp.folder"> + <mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0"/> + <copy file="${temp.folder}/wsiui.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui_1.0.0" failonerror="false"/> + </target> + + <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.wst.wsi.ui of all the zips, jars and logs created."> + <delete file="${build.result.folder}/wsiui.jar"/> + <delete file="${build.result.folder}/wsiuisrc.zip"/> + <delete file="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.jar"/> + <delete file="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.zip"/> + <delete dir="${temp.folder}"/> + </target> + + <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> + <eclipse.convertPath fileSystemPath="d:/wtp/eclipse/workspace/org.eclipse.wst.wsi.ui" property="resourcePath"/> + <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> + </target> + + <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.wst.wsi.ui."> + <delete dir="${temp.folder}"/> + <mkdir dir="${temp.folder}"/> + <antcall target="build.jars"/> + <antcall target="build.sources"/> + <antcall target="gather.bin.parts"> + <param name="destination.temp.folder" value="${temp.folder}/"/> + </antcall> + <antcall target="gather.sources"> + <param name="destination.temp.folder" value="${temp.folder}/"/> + </antcall> + <delete> + <fileset dir="${temp.folder}" includes="**/*.bin.log" /> + </delete> + <zip destfile="${plugin.destination}/org.eclipse.wst.wsi.ui_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/> + <delete dir="${temp.folder}"/> + </target> + +</project> diff --git a/bundles/org.eclipse.wst.wsi.ui/plugin.xml b/bundles/org.eclipse.wst.wsi.ui/plugin.xml index 076a88c8a..0b57aa2f3 100644 --- a/bundles/org.eclipse.wst.wsi.ui/plugin.xml +++ b/bundles/org.eclipse.wst.wsi.ui/plugin.xml @@ -15,17 +15,14 @@ <plugin id="org.eclipse.wst.wsi.ui" name="%_PLUGIN_NAME" - version="1.1" + version="1.0.0" provider-name="%_PROVIDER_NAME" - class="org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin"> + class="org.eclipse.wst.wsi.ui.internal.WSIUIPlugin"> <runtime> <library name="wsiui.jar"> <export name="*"/> </library> - <library name="jars/wsdl4j.jar"/> - <library name="jars/qname.jar"/> - <library name="jars/validateutility.jar"/> </runtime> <requires> <import plugin="org.eclipse.jface.text"/> @@ -39,6 +36,9 @@ <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.wst.common.ui"/> + <import plugin="org.eclipse.wst.validation"/> + <import plugin="org.eclipse.wst.xml.validation"/> + <import plugin="org.eclipse.wst.wsdl.validation"/> <import plugin="org.eclipse.wst.wsi"/> <import plugin="org.eclipse.wst.internet.monitor.core"/> <import plugin="org.eclipse.wst.internet.monitor.ui"/> @@ -49,7 +49,7 @@ <!-- Purpose: Add validator action to TCPIP monitor. --> <!-- Extension point: org.eclipse.ui.viewActions --> <!-- ======================================================= --> - <extension +<!-- <extension point="org.eclipse.ui.viewActions"> <viewContribution targetID="org.eclipse.wst.monitor.view" @@ -64,7 +64,7 @@ id="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSIProfileActionDelegate"> </action> </viewContribution> - </extension> + </extension--> <!-- ======================================================= --> <!-- Purpose: To register WS-I message validator. --> diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java index 03760501e..f7ae943b4 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java @@ -19,23 +19,23 @@ import java.util.TimeZone; import org.eclipse.core.internal.preferences.Base64; import org.eclipse.core.resources.IFile; -import org.eclipse.wst.monitor.core.IRequest; -import org.eclipse.wst.wsi.core.internal.WSIConstants; -import org.eclipse.wst.wsi.core.internal.test.ToolInfo; -import org.eclipse.wst.wsi.core.internal.test.common.AddStyleSheet; -import org.eclipse.wst.wsi.core.internal.test.common.impl.AddStyleSheetImpl; -import org.eclipse.wst.wsi.core.internal.test.document.DocumentFactory; -import org.eclipse.wst.wsi.core.internal.test.log.Log; -import org.eclipse.wst.wsi.core.internal.test.log.LogWriter; -import org.eclipse.wst.wsi.core.internal.test.log.MessageEntry; -import org.eclipse.wst.wsi.core.internal.test.log.impl.LogImpl; -import org.eclipse.wst.wsi.core.internal.test.log.impl.LogWriterImpl; -import org.eclipse.wst.wsi.core.internal.test.log.impl.MessageEntryImpl; -import org.eclipse.wst.wsi.core.internal.test.monitor.config.Comment; -import org.eclipse.wst.wsi.core.internal.test.monitor.config.ManInTheMiddle; -import org.eclipse.wst.wsi.core.internal.test.monitor.config.MonitorConfig; -import org.eclipse.wst.wsi.core.internal.test.monitor.config.impl.CommentImpl; -import org.eclipse.wst.wsi.core.internal.test.monitor.config.impl.ManInTheMiddleImpl; +import org.eclipse.wst.internet.monitor.core.Request; +import org.eclipse.wst.wsi.internal.core.WSIConstants; +import org.eclipse.wst.wsi.internal.core.ToolInfo; +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.document.DocumentFactory; +import org.eclipse.wst.wsi.internal.core.log.Log; +import org.eclipse.wst.wsi.internal.core.log.LogWriter; +import org.eclipse.wst.wsi.internal.core.log.MessageEntry; +import org.eclipse.wst.wsi.internal.core.log.impl.LogImpl; +import org.eclipse.wst.wsi.internal.core.log.impl.LogWriterImpl; +import org.eclipse.wst.wsi.internal.core.log.impl.MessageEntryImpl; +import org.eclipse.wst.wsi.internal.core.monitor.config.Comment; +import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle; +import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig; +import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl; +import org.eclipse.wst.wsi.internal.core.monitor.config.impl.ManInTheMiddleImpl; /** * Given a list of RequestResponses from a TCPIP Monitor, @@ -60,7 +60,7 @@ public class LogBuilder /** * The list of RequestResponces from a TCPIP Monitor used to generate the log file. */ - protected IRequest[] requestResponses; + protected Request[] requestResponses; /** * The actual log object. @@ -108,7 +108,7 @@ public class LogBuilder * @param requestResponses: a list of messages in the form of request-response pairs. * @return a log based on a list of request-response pairs. */ - public Log buildLog(IRequest[] requestResponses) + public Log buildLog(Request[] requestResponses) { this.requestResponses = requestResponses; @@ -118,7 +118,7 @@ public class LogBuilder // log the messages for (int i=0; i<requestResponses.length; i++) { - IRequest rr = requestResponses[i]; + Request rr = requestResponses[i]; if ((rr != null) && (!omitRequestResponse(rr))) { logRequestResponse(rr); @@ -138,17 +138,17 @@ public class LogBuilder * Log the request-response pair. *@param rr: a request-response pair. */ - protected void logRequestResponse(IRequest rr) + protected void logRequestResponse(Request rr) { if (rr != null) { - byte[] request = rr.getRequest(IRequest.ALL); - byte[] response = rr.getResponse(IRequest.ALL); + byte[] request = rr.getRequest(Request.ALL); + byte[] response = rr.getResponse(Request.ALL); - String requestHeader = new String(rr.getRequest(IRequest.TRANSPORT)); - String responseHeader = new String(rr.getResponse(IRequest.TRANSPORT)); - byte[] unchunkedRequestBody = rr.getRequest(IRequest.CONTENT); - byte[] unchunkedResponseBody = rr.getResponse(IRequest.CONTENT); + String requestHeader = new String(rr.getRequest(Request.TRANSPORT)); + String responseHeader = new String(rr.getResponse(Request.TRANSPORT)); + byte[] unchunkedRequestBody = rr.getRequest(Request.CONTENT); + byte[] unchunkedResponseBody = rr.getResponse(Request.CONTENT); String requestBody = null; String responseBody = null; @@ -225,7 +225,9 @@ public class LogBuilder String senderHostAndPort, String receiverHostAndPort, String messageContent, String header) { // Create log entry - MessageEntry messageEntry = new MessageEntryImpl(header, messageContent); + MessageEntry messageEntry = new MessageEntryImpl(); + messageEntry.setHTTPHeaders(header); + messageEntry.setMessage(messageContent); messageEntry.setId(String.valueOf(id)); messageEntry.setConversationId(String.valueOf(conversationId)); messageEntry.setType(type); @@ -260,12 +262,12 @@ public class LogBuilder * @param rr: a request-response pair. * @return true if the request-response pair should be omitted from the log. */ - private boolean omitRequestResponse(IRequest rr) + private boolean omitRequestResponse(Request rr) { boolean omit = false; if (rr != null) { - String request = rr.getRequest(IRequest.TRANSPORT).toString(); + String request = rr.getRequest(Request.TRANSPORT).toString(); if ((request != null) && ((request.startsWith("CONNECT")) || (request.startsWith("TRACE")) || diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java index c0e16682c..8898af632 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java @@ -12,9 +12,12 @@ package org.eclipse.wst.wsi.ui.internal; import org.eclipse.core.resources.IFile; import org.eclipse.wst.wsi.ui.internal.actions.WSIValidateAction; -import org.eclipse.validate.IReporter; -import org.eclipse.validate.IValidator; -import org.eclipse.validate.DefaultReporter; +import org.eclipse.wst.validation.core.IFileDelta; +import org.eclipse.wst.validation.core.IReporter; +import org.eclipse.wst.validation.core.IValidationContext; +import org.eclipse.wst.validation.core.IValidator; +import org.eclipse.wst.validation.core.ValidationException; +//import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter; /** * A Validator that performs validation on a WS-I Message Log file. @@ -32,7 +35,7 @@ public class WSIMessageValidator implements IValidator public void validate(IFile file) { WSIValidateAction validateAction = new WSIValidateAction(file, false); - validateAction.setValidator(this); + //validateAction.setValidator(this); validateAction.setReporter(getReporter()); validateAction.run(); } @@ -44,7 +47,7 @@ public class WSIMessageValidator implements IValidator { if (reporter == null) { - reporter = new DefaultReporter(WSI_MESSAGE_VALIDATOR_ID); + //reporter = new DefaultReporter(WSI_MESSAGE_VALIDATOR_ID); } return reporter; } @@ -56,4 +59,14 @@ public class WSIMessageValidator implements IValidator { this.reporter = reporter; } + +public void cleanup(IReporter reporter) { + // TODO Auto-generated method stub + +} + +public void validate(IValidationContext helper, IReporter reporter, IFileDelta[] changedFiles) throws ValidationException { + // TODO Auto-generated method stub + +} } diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/SoapMonitorPlugin.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java index 3bcf64ce0..46bf5a596 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/SoapMonitorPlugin.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java @@ -23,13 +23,13 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; * @author Lawrence Mandel, IBM */ -public class SoapMonitorPlugin extends AbstractUIPlugin +public class WSIUIPlugin extends AbstractUIPlugin { private ResourceBundle pluginRB = null; /** * The singleton. */ - protected static SoapMonitorPlugin instance; + protected static WSIUIPlugin instance; // /** // * Message Logger associated with this plugin. @@ -39,7 +39,7 @@ public class SoapMonitorPlugin extends AbstractUIPlugin /** * Constructor. */ - public SoapMonitorPlugin(IPluginDescriptor descriptor) + public WSIUIPlugin(IPluginDescriptor descriptor) { super(descriptor); instance = this; @@ -49,7 +49,7 @@ public class SoapMonitorPlugin extends AbstractUIPlugin /** * Returns the singleton. (Based on the Singleton Pattern). */ - public static SoapMonitorPlugin getInstance() + public static WSIUIPlugin getInstance() { return instance; } diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java index 5c4eaee7e..a8529a092 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.wsi.ui.internal.actions; -import java.util.Iterator; -import java.util.List; +//import java.util.Iterator; +//import java.util.List; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; +//import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -21,15 +21,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; -import org.eclipse.wst.wsi.core.internal.tmp.analyzer.MessageAnalyzer; -import org.eclipse.wst.wsi.core.internal.tmp.exception.WSIAnalyzerException; -import org.eclipse.wst.wsi.core.internal.tmp.report.AssertionError; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; -import org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -import org.eclipse.validate.IReporter; -import org.eclipse.validate.IValidator; -import org.eclipse.validate.ValidateAction; -import org.eclipse.validate.ReporterRegister; +import org.eclipse.wst.wsi.internal.analyzer.MessageAnalyzer; +import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException; +//import org.eclipse.wst.wsi.internal.report.AssertionError; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; +//import org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; +//import org.eclipse.wst.validation.core.IReporter; +import org.eclipse.wst.validation.core.IValidator; +import org.eclipse.wst.xml.validation.internal.core.ValidateAction; import org.xml.sax.SAXParseException; /** @@ -87,7 +86,7 @@ public class WSIValidateAction extends ValidateAction /* (non-Javadoc) * @see org.eclipse.validate.ValidateAction#validate(org.eclipse.core.resources.IFile) */ - protected void validate(final IFile file) throws Exception + protected void validate(final IFile file) { final MessageAnalyzer messageanalyzer; @@ -114,16 +113,18 @@ public class WSIValidateAction extends ValidateAction if (ae.getTargetException() instanceof SAXParseException) { exceptionCaught = true; - createMarker(file, ae, ERROR_MARKER); +// createMarker(file, ae, ERROR_MARKER); } } catch (Exception e) { } - createMarkers(file, messageanalyzer.getAssertionWarnings(), WARNING_MARKER); - createMarkers(file, messageanalyzer.getAssertionErrors(), ERROR_MARKER); - } - }; +// createMarkers(file, messageanalyzer.getAssertionWarnings(), WARNING_MARKER); +// createMarkers(file, messageanalyzer.getAssertionErrors(), ERROR_MARKER); +// + } + }; + try { @@ -133,25 +134,25 @@ public class WSIValidateAction extends ValidateAction if (exceptionCaught) { MessageDialog.openError(Display.getDefault().getActiveShell(), - SoapMonitorPlugin.getResourceString("_UI_UNABLE_TO_VALIDATE"), - SoapMonitorPlugin.getResourceString("_UI_PROBLEMS_READING_WSIMSG_FILE")); + WSIUIPlugin.getResourceString("_UI_UNABLE_TO_VALIDATE"), + WSIUIPlugin.getResourceString("_UI_PROBLEMS_READING_WSIMSG_FILE")); } else if (messageanalyzer.getAssertionErrors().size() != 0) { MessageDialog.openError(Display.getDefault().getActiveShell(), - SoapMonitorPlugin.getResourceString("_UI_VALIDATION_FAILED"), - SoapMonitorPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_NOT_VALID")); + WSIUIPlugin.getResourceString("_UI_VALIDATION_FAILED"), + WSIUIPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_NOT_VALID")); } else if (messageanalyzer.getAssertionWarnings().size() != 0) { - String title = SoapMonitorPlugin.getResourceString("_UI_VALIDATION_SUCEEDED"); - String message = SoapMonitorPlugin.getResourceString("_UI_VALIDATION_WARNINGS_DETECTED"); + String title = WSIUIPlugin.getResourceString("_UI_VALIDATION_SUCEEDED"); + String message = WSIUIPlugin.getResourceString("_UI_VALIDATION_WARNINGS_DETECTED"); MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message); } else { - String title = SoapMonitorPlugin.getResourceString("_UI_VALIDATION_SUCEEDED"); - String message = SoapMonitorPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_VALID"); + String title = WSIUIPlugin.getResourceString("_UI_VALIDATION_SUCEEDED"); + String message = WSIUIPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_VALID"); MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message); } } @@ -165,69 +166,69 @@ public class WSIValidateAction extends ValidateAction * @param ae the WS-I Analyzer exception * @param error_marker flag indicating severity of problem */ - protected void createMarker(IResource resource, WSIAnalyzerException ae, int error_marker) - { - Throwable throwable = ae.getTargetException(); - - if (throwable instanceof SAXParseException) - { - int n = ((SAXParseException)throwable).getLineNumber(); - int c = ((SAXParseException)throwable).getColumnNumber(); - - getOrCreateReporter().addErrorMessage(resource, ((SAXParseException)throwable).getMessage(), n, c); - } - else - { - getOrCreateReporter().addErrorMessage(resource, ae.getMessage(), 0, 0); - } - } +// protected void createMarker(IResource resource, WSIAnalyzerException ae, int error_marker) +// { +// Throwable throwable = ae.getTargetException(); +// +// if (throwable instanceof SAXParseException) +// { +// int n = ((SAXParseException)throwable).getLineNumber(); +// int c = ((SAXParseException)throwable).getColumnNumber(); +// +// getOrCreateReporter().addErrorMessage(resource, ((SAXParseException)throwable).getMessage(), n, c); +// } +// else +// { +// getOrCreateReporter().addErrorMessage(resource, ae.getMessage(), 0, 0); +// } +// } /* (non-Javadoc) * @see org.eclipse.validate.ValidateAction#createMarkers(org.eclipse.core.resources.IResource, java.util.List, int) */ - public void createMarkers(IResource resource, List list, int marker) - { - for (Iterator i = list.iterator(); i.hasNext(); ) - { - AssertionError assertionError = (AssertionError) i.next(); - - int n = assertionError.getLine(); - int c = assertionError.getColumn(); - - if(marker == WARNING_MARKER) - { - getOrCreateReporter().addWarningMessage(resource, assertionError.getErrorMessage(), n, c); - } - else if (marker == ERROR_MARKER) - { - getOrCreateReporter().addErrorMessage(resource, assertionError.getErrorMessage(), n, c); - } - } - } +// public void createMarkers(IResource resource, List list, int marker) +// { +// for (Iterator i = list.iterator(); i.hasNext(); ) +// { +// AssertionError assertionError = (AssertionError) i.next(); +// +// int n = assertionError.getLine(); +// int c = assertionError.getColumn(); +// +// if(marker == WARNING_MARKER) +// { +// getOrCreateReporter().addWarningMessage(resource, assertionError.getErrorMessage(), n, c); +// } +// else if (marker == ERROR_MARKER) +// { +// getOrCreateReporter().addErrorMessage(resource, assertionError.getErrorMessage(), n, c); +// } +// } +// } /** * Clear all the markers on the given resource generated by this validator. * * @param resource The resource with the markers to clear. */ - public void clearMarkers(IResource resource) - { - getOrCreateReporter().removeAllMessages(resource); - } +// public void clearMarkers(IResource resource) +// { +// getOrCreateReporter().removeAllMessages(resource); +// } /** * If a reporter doesn't exist creates it or uses the reporter already created. * * @return The reporter. */ - protected IReporter getOrCreateReporter() - { - if (reporter == null) - { - reporter = ReporterRegister.getInstance().getReporter(WSIMessageValidator.WSI_MESSAGE_VALIDATOR_ID); - } - return reporter; - } +// protected IReporter getOrCreateReporter() +// { +// if (reporter == null) +// { +// reporter = ReporterRegister.getInstance().getReporter(WSIMessageValidator.WSI_MESSAGE_VALIDATOR_ID); +// } +// return reporter; +// } /** * Gets the validator. diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java index b1c505738..8626c1246 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java @@ -22,8 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.wst.monitor.core.IRequest; -import org.eclipse.wst.monitor.core.MonitorCore; +import org.eclipse.wst.internet.monitor.core.Request; import org.eclipse.wst.wsi.ui.internal.LogBuilder; import org.eclipse.wst.wsi.ui.internal.wizards.ValidationWizard; import org.eclipse.wst.wsi.ui.internal.WSIValidator; @@ -33,7 +32,7 @@ import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.dialogs.ContainerGenerator; -import org.eclipse.wst.wsi.core.internal.test.log.Log; +import org.eclipse.wst.wsi.internal.core.log.Log; /** * Action delegate for the WS-I validator. @@ -67,7 +66,7 @@ public class ValidateWSIProfileActionDelegate implements IViewActionDelegate /** * The list of messages in the form of request-response pairs. */ - IRequest[] requestResponses; + Request[] requestResponses; /** * The view that provides the context for this delegate. @@ -124,16 +123,16 @@ public class ValidateWSIProfileActionDelegate implements IViewActionDelegate { ValidationWizard validateWizard = new ValidationWizard(DEFAULT_LOG_FILENAME); - requestResponses = MonitorCore.getRequests(); + //TODO requestResponses = MonitorCore.getRequests(); List wsdllocs = new Vector(); if(requestResponses != null) { for (int i=0; i<requestResponses.length; i++) { - IRequest reqresp = requestResponses[i]; + Request reqresp = requestResponses[i]; String remotehost = reqresp.getRemoteHost(); int remoteport = reqresp.getRemotePort(); - String remotelabel = reqresp.getLabel(); + String remotelabel = reqresp.getName(); String location = HTTP + remotehost + ":" + remoteport + remotelabel + WSDL; if(!wsdllocs.contains(location)) { diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.java index 9716d02d3..2b8711253 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/dialogs/SelectSingleFileDialog.java @@ -26,7 +26,7 @@ import org.eclipse.ui.internal.IWorkbenchGraphicConstants; import org.eclipse.ui.internal.WorkbenchImages; import org.eclipse.wst.common.ui.viewers.SelectSingleFileView; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; public class SelectSingleFileDialog extends TitleAreaDialog @@ -84,9 +84,9 @@ public class SelectSingleFileDialog extends TitleAreaDialog { super.create(); selectSingleFileView.setVisibleHelper(true); - getShell().setText(SoapMonitorPlugin.getResourceString("_UI_DIALOG_SS_FILE_SHELL_TEXT")); - setTitle(SoapMonitorPlugin.getResourceString("_UI_DIALOG_SS_FILE_TITLE")); - setMessage(SoapMonitorPlugin.getResourceString("_UI_DIALOG_SS_FILE_DESCRIPTION")); + getShell().setText(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_SHELL_TEXT")); + setTitle(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_TITLE")); + setMessage(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_DESCRIPTION")); setTitleImage(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_DLGBAN_SAVEAS_DLG).createImage()); } diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java index 4622ce5d4..be3f395d3 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java @@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.wst.wsi.ui.internal.Resource; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; import org.eclipse.ui.IViewReference; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.navigator.ResourceNavigator; @@ -119,9 +119,9 @@ public class ValidationWizard extends Wizard public ValidationWizard(String filename) { this.filename = filename; - this.setWindowTitle(SoapMonitorPlugin.getResourceString("_UI_WIZARD_VALIDATE_LOG_TITLE")); + this.setWindowTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_VALIDATE_LOG_TITLE")); setDefaultPageImageDescriptor( - ImageDescriptor.createFromFile(SoapMonitorPlugin.class, Resource.VALIDATE_WSI_LOGFILE_WIZ)); + ImageDescriptor.createFromFile(WSIUIPlugin.class, Resource.VALIDATE_WSI_LOGFILE_WIZ)); setNeedsProgressMonitor(true); } diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java index 9fe9bc914..e92c4f336 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.dialogs.WizardNewFileCreationPage; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; /** * Wizard page that allows the user to specify the location of the @@ -49,8 +49,8 @@ public class ValidationWizardLogPage extends WizardNewFileCreationPage { super("ValidationWizardLogPage", selection); this.filename = filename; - this.setTitle(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_HEADING")); - this.setDescription(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_EXPL")); + this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_HEADING")); + this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_EXPL")); } @@ -99,7 +99,7 @@ public class ValidationWizardLogPage extends WizardNewFileCreationPage { if (fileExtension.compareTo(WSI_LOG_EXTENSION) != 0) { - setErrorMessage(SoapMonitorPlugin.getResourceString("_ERROR_INVALID_LOG_FILE_EXTENSION")); + setErrorMessage(WSIUIPlugin.getResourceString("_ERROR_INVALID_LOG_FILE_EXTENSION")); return false; } } @@ -121,7 +121,7 @@ public class ValidationWizardLogPage extends WizardNewFileCreationPage setErrorMessage(null); if (resource != null) - setMessage(SoapMonitorPlugin.getResourceString("_WARNING_FILE_ALREADY_EXISTS")); + setMessage(WSIUIPlugin.getResourceString("_WARNING_FILE_ALREADY_EXISTS")); else setMessage(null); diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java index d2b3a68e6..9f57a426f 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -92,8 +92,8 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec { super("ValidationWizardWSDLContentPage"); this.selection = selection; - this.setTitle(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_HEADING")); - this.setDescription(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_EXPL")); + this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_HEADING")); + this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_EXPL")); } /** @@ -128,7 +128,7 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec // create a group Group wsdlElementGroup = new Group(base, SWT.SHADOW_ETCHED_IN); - wsdlElementGroup.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_ELEMENT")); + wsdlElementGroup.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_ELEMENT")); data = new GridData(); data.horizontalAlignment = GridData.FILL; data.grabExcessHorizontalSpace = true; @@ -167,7 +167,7 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec { // create a group Group wsdlTypeGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); - wsdlTypeGroup.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_TYPE")); + wsdlTypeGroup.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_TYPE")); GridData data = new GridData(); data.horizontalAlignment = GridData.FILL; data.grabExcessHorizontalSpace = false; @@ -177,32 +177,32 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec wsdlTypeGroup.setLayout(layout); wsdlPortButton = new Button(wsdlTypeGroup, SWT.RADIO); - wsdlPortButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT")); + wsdlPortButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT")); wsdlPortButton.setData("wsdlPortButton"); wsdlPortButton.setSelection(true); wsdlPortButton.addSelectionListener(new PortButtonSelectionListener()); wsdlBindingButton = new Button(wsdlTypeGroup, SWT.RADIO); wsdlBindingButton.setData("wsdlBindingButton"); - wsdlBindingButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_RADIO_BINDING")); + wsdlBindingButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_BINDING")); wsdlBindingButton.setSelection(false); wsdlBindingButton.addSelectionListener(new BindingButtonSelectionListener()); wsdlPortTypeButton = new Button(wsdlTypeGroup, SWT.RADIO); wsdlPortTypeButton.setData("wsdlPortTypeButton"); - wsdlPortTypeButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT_TYPE")); + wsdlPortTypeButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT_TYPE")); wsdlPortTypeButton.setSelection(false); wsdlPortTypeButton.addSelectionListener(new PortTypeButtonSelectionListener()); wsdlOperationButton = new Button(wsdlTypeGroup, SWT.RADIO); wsdlOperationButton.setData("wsdlOperationButton"); - wsdlOperationButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_RADIO_OPERATION")); + wsdlOperationButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_OPERATION")); wsdlOperationButton.setSelection(false); wsdlOperationButton.addSelectionListener(new OperationButtonSelectionListener()); wsdlMessageButton = new Button(wsdlTypeGroup, SWT.RADIO); wsdlMessageButton.setData("wsdlMessageButton"); - wsdlMessageButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_RADIO_MESSAGE")); + wsdlMessageButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_MESSAGE")); wsdlMessageButton.setSelection(false); wsdlMessageButton.addSelectionListener(new MessageButtonSelectionListener()); } @@ -228,7 +228,7 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec // The WSDL element name label Label label = new Label(fieldColumn, SWT.LEFT); - label.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAME")); + label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAME")); data = new GridData(); data.horizontalAlignment = GridData.FILL; label.setLayoutData(data); @@ -250,7 +250,7 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec // The WSDL element namespace label label = new Label(fieldColumn, SWT.LEFT); - label.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAMESPACE")); + label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAMESPACE")); data = new GridData(); data.horizontalAlignment = GridData.FILL; label.setLayoutData(data); @@ -267,7 +267,7 @@ public class ValidationWizardWSDLContentPage extends WizardPage implements Selec // The WSDL element parent label label = new Label(fieldColumn, SWT.LEFT); - label.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_LABEL_PARENT")); + label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_PARENT")); data = new GridData(); data.horizontalAlignment = GridData.FILL; label.setLayoutData(data); diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java index 633a55474..c7468e26a 100644 --- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java +++ b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.wst.wsi.ui.internal.SoapMonitorPlugin; +import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin; import org.eclipse.wst.wsi.ui.internal.dialogs.SelectSingleFileDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -66,8 +66,8 @@ public class ValidationWizardWSDLPage extends WizardPage implements SelectionLis { super("ValidationWizardWSDLPage"); this.selection = selection; - this.setTitle(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_HEADING")); - this.setDescription(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_EXPL")); + this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_HEADING")); + this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_EXPL")); } /** @@ -101,7 +101,7 @@ public class ValidationWizardWSDLPage extends WizardPage implements SelectionLis // add includeWSDL flag includeWSDLButton = new Button(base, SWT.CHECK); - includeWSDLButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_BUTTON")); + includeWSDLButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_BUTTON")); data = new GridData(); data.horizontalAlignment = GridData.FILL; includeWSDLButton.setLayoutData(data); @@ -149,7 +149,7 @@ public class ValidationWizardWSDLPage extends WizardPage implements SelectionLis group1.setLayoutData(data); Label documentLabel = new Label(group1, SWT.LEFT); - documentLabel.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_LABEL")); + documentLabel.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_LABEL")); data = new GridData(); data.horizontalAlignment = GridData.FILL; documentLabel.setLayoutData(data); @@ -178,7 +178,7 @@ public class ValidationWizardWSDLPage extends WizardPage implements SelectionLis fileField.addModifyListener(new FileFieldListener()); Label wsdlLabel = new Label(group1, SWT.LEFT); - wsdlLabel.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_VALID_WSDL_LABEL")); + wsdlLabel.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_VALID_WSDL_LABEL")); data = new GridData(); data.horizontalAlignment = GridData.FILL; documentLabel.setLayoutData(data); @@ -201,21 +201,21 @@ public class ValidationWizardWSDLPage extends WizardPage implements SelectionLis group.setLayoutData(data); Button workspaceButton = new Button(group, SWT.PUSH); - workspaceButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_WORKBENCH_BUTTON")); + workspaceButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_WORKBENCH_BUTTON")); data = new GridData(); data.horizontalAlignment = GridData.FILL; workspaceButton.setLayoutData(data); workspaceButton.addSelectionListener(new WorkspaceButtonListener()); Button browseButton = new Button(group, SWT.PUSH); - browseButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_BROWSE_BUTTON")); + browseButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_BROWSE_BUTTON")); data = new GridData(); data.horizontalAlignment = GridData.FILL; browseButton.setLayoutData(data); browseButton.addSelectionListener(new BrowseButtonListener()); // Button searchUDDIButton = new Button(group, SWT.PUSH); - // searchUDDIButton.setText(SoapMonitorPlugin.getResourceString("_UI_WIZARD_V_SEARCH_UDDI_BUTTON")); + // searchUDDIButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SEARCH_UDDI_BUTTON")); // data = new GridData(); // data.horizontalAlignment = GridData.FILL; // searchUDDIButton.setLayoutData(data); |