Author: Grid.Qian Date: 2008-06-26 01:28:13 -0400 (Thu, 26 Jun 2008) New Revision: 8950 Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.classpath trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.project trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/.jsdtscope trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jdt.core.prefs trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/web.xml trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorld.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorldService.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/ObjectFactory.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2Response.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHelloResponse.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/clientsample/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/clientsample/ClientSample.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/package-info.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorld.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/ObjectFactory.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2Response.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHelloResponse.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/clientsample/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/clientsample/ClientSample.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/package-info.java trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.project trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/web.xml trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/www/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/www/helloworld/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/www/helloworld/HelloWorld.class trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/helloworld/ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/helloworld/HelloWorld.java trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JavaFirstCommandTest.java trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/WSClientCommandTest.java Removed: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JbossWSCoreAllTests.java trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java Log: JBIDE-2323: add tests for creation commands Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -109,6 +109,8 @@ createWebServiceClient(clientUnits, serviceUnits, sb); sb.append(" System.out.println(\"***********************\");"); sb.append(LINE_SEPARATOR); + sb.append(JBossWSCreationCoreMessages.Client_Sample_Run_Over); + sb.append(LINE_SEPARATOR); sb.append("}"); try { clientClsType.createMethod(sb.toString(), null, true, null); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -79,6 +79,8 @@ .readWSDL(wsClient.getWebServiceClientInfo() .getWsdlURL()); model.setCustomPackage(reader.packageFromTargetNamespace()); + model.setServiceList(reader.getServiceList()); + model.setPortTypeList(reader.getPortTypeList()); } catch (WSDLException e) { JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(e.getLocalizedMessage(), e); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -79,11 +79,7 @@ } catch (JavaModelException e) { JBossWSCreationCore.getDefault().logError(e); } - try { - project.getRawClasspath(); - } catch (JavaModelException e) { - JBossWSCreationCore.getDefault().logError(e); - } + return status; } Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.ws.creation.core.commands; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.jboss.tools.ws.core.utils.StatusUtils; -import org.jboss.tools.ws.creation.core.JBossWSCreationCore; -import org.jboss.tools.ws.creation.core.data.ServiceModel; -import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; -import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; - -/** - * @author Grid Qian - */ -public class ValidateWSImpl extends AbstractDataModelOperation { - - private ServiceModel model; - - public ValidateWSImpl(ServiceModel model) { - this.model = model; - } - - @Override - public IStatus execute(IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { - - String implClass = model.getServiceClasses().get(0); - String project = model.getWebProjectName(); - ICompilationUnit unit = null; - try { - if (JBossWSCreationUtils.getJavaProjectByName(project).findType( - implClass) != null) { - unit = JBossWSCreationUtils.getJavaProjectByName(project) - .findType(implClass).getCompilationUnit(); - } else { - return StatusUtils.errorStatus(NLS.bind( - JBossWSCreationCoreMessages.Error_No_Class, - new String[] { implClass, project })); - } - if (!unit.getSource().contains( - JBossWSCreationCoreMessages.Webservice_Annotation)) { - return StatusUtils - .errorStatus(JBossWSCreationCoreMessages.Error_No_Annotation); - } - } catch (JavaModelException e) { - JBossWSCreationCore.getDefault().logError(e); - return StatusUtils.errorStatus(NLS.bind( - JBossWSCreationCoreMessages.Error_No_Class, new String[] { - implClass, project })); - } - return Status.OK_STATUS; - } - -} Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java (from rev 8911, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ws.creation.core.commands; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.osgi.util.NLS; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.jboss.tools.ws.core.utils.StatusUtils; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; +import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; +import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; + +/** + * @author Grid Qian + */ +public class ValidateWSImplCommand extends AbstractDataModelOperation { + + private ServiceModel model; + + public ValidateWSImplCommand(ServiceModel model) { + this.model = model; + } + + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + + String implClass = model.getServiceClasses().get(0); + String project = model.getWebProjectName(); + ICompilationUnit unit = null; + try { + if (JBossWSCreationUtils.getJavaProjectByName(project).findType( + implClass) != null) { + unit = JBossWSCreationUtils.getJavaProjectByName(project) + .findType(implClass).getCompilationUnit(); + } else { + return StatusUtils.errorStatus(NLS.bind( + JBossWSCreationCoreMessages.Error_No_Class, + new String[] { implClass, project })); + } + if (!unit.getSource().contains( + JBossWSCreationCoreMessages.Webservice_Annotation)) { + return StatusUtils + .errorStatus(JBossWSCreationCoreMessages.Error_No_Annotation); + } + } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); + return StatusUtils.errorStatus(NLS.bind( + JBossWSCreationCoreMessages.Error_No_Class, new String[] { + implClass, project })); + } + return Status.OK_STATUS; + } + +} Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-26 05:28:13 UTC (rev 8950) @@ -38,4 +38,5 @@ JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime JBossWSFacetInstallPage_Deploy=Deploy JBossWSFacetInstallPage_New=New... +Client_Sample_Run_Over= Call Over! Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -56,6 +56,7 @@ public static String WebEndpoint; public static String Error_Message_No_Runtime_Specified; + public static String Client_Sample_Run_Over; private JBossWSCreationCoreMessages() { } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -14,7 +14,7 @@ import org.jboss.tools.ws.creation.core.commands.ImplementationClassCreationCommand; import org.jboss.tools.ws.creation.core.commands.InitialCommand; import org.jboss.tools.ws.creation.core.commands.MergeWebXMLCommand; -import org.jboss.tools.ws.creation.core.commands.ValidateWSImpl; +import org.jboss.tools.ws.creation.core.commands.ValidateWSImplCommand; import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand; import org.jboss.tools.ws.creation.core.commands.WSProviderInvokeCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; @@ -56,7 +56,7 @@ } else if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP){ commands.add(new InitialCommand(model, this, WebServiceScenario.BOTTOMUP)); - commands.add(new ValidateWSImpl(model)); + commands.add(new ValidateWSImplCommand(model)); commands.add(new WSProviderInvokeCommand(model)); commands.add(new MergeWebXMLCommand(model)); //commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project))); Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-26 05:28:13 UTC (rev 8950) @@ -26,5 +26,8 @@ org.eclipse.wst.server.core, org.eclipse.debug.core, org.jboss.tools.common, - org.jboss.ide.eclipse.as.core;bundle-version="1.0.0" + org.jboss.ide.eclipse.as.core;bundle-version="1.0.0", + org.eclipse.jdt.core, + org.eclipse.ui.console;bundle-version="3.3.0", + org.eclipse.jface.text;bundle-version="3.4.0" Eclipse-LazyStart: true Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.classpath =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.classpath (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.classpath 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="JBossWS_Runtime/testjbosswsruntime"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JAVA1.5"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.project =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.project (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.project 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>ClientTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/.jsdtscope =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/.jsdtscope (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/.jsdtscope 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jdt.core.prefs 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,12 @@ +#Wed Jun 25 17:14:18 CST 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,3 @@ +#Wed Jun 25 17:15:07 CST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:JAVA1.5/owners=jst.java\:5.0 +eclipse.preferences.version=1 Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.component 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="ClientTest"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> +<property name="context-root" value="ClientTest"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="org.jboss.ide.eclipse.as.runtime.42"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.web" version="2.4"/> + <installed facet="jbossws.core" version="2.0.1"/> + <installed facet="jst.java" version="5.0"/> +</faceted-project> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/META-INF/MANIFEST.MF 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/web.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/WebContent/WEB-INF/web.xml 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name> + ClientTest</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorld.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorld.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorldService.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/HelloWorldService.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/ObjectFactory.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/ObjectFactory.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2Response.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHello2Response.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHelloResponse.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/SayHelloResponse.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/clientsample/ClientSample.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/clientsample/ClientSample.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/package-info.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/build/classes/org/example/www/helloworld/package-info.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorld.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorld.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorld.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,50 @@ + +package org.example.www.helloworld; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- + * Generated source version: 2.0 + * + */ +@WebService(name = "HelloWorld", targetNamespace = "http://www.example.org/HelloWorld") +public interface HelloWorld { + + + /** + * + * @param sayHelloRequest + * @return + * returns java.lang.String + */ + @WebMethod(action = "http://www.example.org/HelloWorld/sayHello") + @WebResult(name = "sayHelloResponse", targetNamespace = "") + @RequestWrapper(localName = "sayHello", targetNamespace = "http://www.example.org/HelloWorld", className = "org.example.www.helloworld.SayHello") + @ResponseWrapper(localName = "sayHelloResponse", targetNamespace = "http://www.example.org/HelloWorld", className = "org.example.www.helloworld.SayHelloResponse") + public String sayHello( + @WebParam(name = "sayHelloRequest", targetNamespace = "") + String sayHelloRequest); + + /** + * + * @param sayHelloRequest2 + * @return + * returns java.lang.String + */ + @WebMethod(action = "http://www.example.org/HelloWorld/sayHello2") + @WebResult(name = "sayHelloResponse2", targetNamespace = "") + @RequestWrapper(localName = "sayHello2", targetNamespace = "http://www.example.org/HelloWorld", className = "org.example.www.helloworld.SayHello2") + @ResponseWrapper(localName = "sayHello2Response", targetNamespace = "http://www.example.org/HelloWorld", className = "org.example.www.helloworld.SayHello2Response") + public String sayHello2( + @WebParam(name = "sayHelloRequest2", targetNamespace = "") + String sayHelloRequest2); + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,53 @@ + +package org.example.www.helloworld; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "HelloWorldService", targetNamespace = "http://www.example.org/HelloWorld", wsdlLocation = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl") +public class HelloWorldService + extends Service +{ + + private final static URL HELLOWORLDSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + HELLOWORLDSERVICE_WSDL_LOCATION = url; + } + + public HelloWorldService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public HelloWorldService() { + super(HELLOWORLDSERVICE_WSDL_LOCATION, new QName("http://www.example.org/HelloWorld";, "HelloWorldService")); + } + + /** + * + * @return + * returns HelloWorld + */ + @WebEndpoint(name = "HelloWorldPort") + public HelloWorld getHelloWorldPort() { + return (HelloWorld)super.getPort(new QName("http://www.example.org/HelloWorld";, "HelloWorldPort"), HelloWorld.class); + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/ObjectFactory.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/ObjectFactory.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/ObjectFactory.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,107 @@ + +package org.example.www.helloworld; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.example.www.helloworld package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _SayHello2_QNAME = new QName("http://www.example.org/HelloWorld";, "sayHello2"); + private final static QName _SayHello_QNAME = new QName("http://www.example.org/HelloWorld";, "sayHello"); + private final static QName _SayHello2Response_QNAME = new QName("http://www.example.org/HelloWorld";, "sayHello2Response"); + private final static QName _SayHelloResponse_QNAME = new QName("http://www.example.org/HelloWorld";, "sayHelloResponse"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.example.www.helloworld + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link SayHello2Response } + * + */ + public SayHello2Response createSayHello2Response() { + return new SayHello2Response(); + } + + /** + * Create an instance of {@link SayHello } + * + */ + public SayHello createSayHello() { + return new SayHello(); + } + + /** + * Create an instance of {@link SayHelloResponse } + * + */ + public SayHelloResponse createSayHelloResponse() { + return new SayHelloResponse(); + } + + /** + * Create an instance of {@link SayHello2 } + * + */ + public SayHello2 createSayHello2() { + return new SayHello2(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SayHello2 }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.example.org/HelloWorld", name = "sayHello2") + public JAXBElement<SayHello2> createSayHello2(SayHello2 value) { + return new JAXBElement<SayHello2>(_SayHello2_QNAME, SayHello2 .class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SayHello }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.example.org/HelloWorld", name = "sayHello") + public JAXBElement<SayHello> createSayHello(SayHello value) { + return new JAXBElement<SayHello>(_SayHello_QNAME, SayHello.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SayHello2Response }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.example.org/HelloWorld", name = "sayHello2Response") + public JAXBElement<SayHello2Response> createSayHello2Response(SayHello2Response value) { + return new JAXBElement<SayHello2Response>(_SayHello2Response_QNAME, SayHello2Response.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SayHelloResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.example.org/HelloWorld", name = "sayHelloResponse") + public JAXBElement<SayHelloResponse> createSayHelloResponse(SayHelloResponse value) { + return new JAXBElement<SayHelloResponse>(_SayHelloResponse_QNAME, SayHelloResponse.class, null, value); + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,60 @@ + +package org.example.www.helloworld; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for sayHello complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="sayHello"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="sayHelloRequest" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", propOrder = { + "sayHelloRequest" +}) +public class SayHello { + + protected String sayHelloRequest; + + /** + * Gets the value of the sayHelloRequest property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSayHelloRequest() { + return sayHelloRequest; + } + + /** + * Sets the value of the sayHelloRequest property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSayHelloRequest(String value) { + this.sayHelloRequest = value; + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,60 @@ + +package org.example.www.helloworld; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for sayHello2 complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="sayHello2"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="sayHelloRequest2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello2", propOrder = { + "sayHelloRequest2" +}) +public class SayHello2 { + + protected String sayHelloRequest2; + + /** + * Gets the value of the sayHelloRequest2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSayHelloRequest2() { + return sayHelloRequest2; + } + + /** + * Sets the value of the sayHelloRequest2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSayHelloRequest2(String value) { + this.sayHelloRequest2 = value; + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2Response.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2Response.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHello2Response.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,60 @@ + +package org.example.www.helloworld; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for sayHello2Response complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="sayHello2Response"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="sayHelloResponse2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello2Response", propOrder = { + "sayHelloResponse2" +}) +public class SayHello2Response { + + protected String sayHelloResponse2; + + /** + * Gets the value of the sayHelloResponse2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSayHelloResponse2() { + return sayHelloResponse2; + } + + /** + * Sets the value of the sayHelloResponse2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSayHelloResponse2(String value) { + this.sayHelloResponse2 = value; + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHelloResponse.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHelloResponse.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/SayHelloResponse.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,60 @@ + +package org.example.www.helloworld; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for sayHelloResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="sayHelloResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="sayHelloResponse" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", propOrder = { + "sayHelloResponse" +}) +public class SayHelloResponse { + + protected String sayHelloResponse; + + /** + * Gets the value of the sayHelloResponse property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSayHelloResponse() { + return sayHelloResponse; + } + + /** + * Sets the value of the sayHelloResponse property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSayHelloResponse(String value) { + this.sayHelloResponse = value; + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/clientsample/ClientSample.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/clientsample/ClientSample.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/clientsample/ClientSample.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,19 @@ +package org.example.www.helloworld.clientsample; + +import org.example.www.helloworld.*; + +public class ClientSample { + + public static void main(String[] args) { + System.out.println("***********************"); + System.out.println("Create Web Service Client..."); + HelloWorldService service1 = new HelloWorldService(); + System.out.println("Create Web Service..."); + HelloWorld port1 = service1.getHelloWorldPort(); + System.out.println("Create Web Service Operation..."); + System.out.println("Server said: " + port1.sayHello(args[0])); + System.out.println("Server said: " + port1.sayHello2(args[0])); + System.out.println("***********************"); + System.out.println("Call Over!"); + } +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/package-info.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/package-info.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/src/org/example/www/helloworld/package-info.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.example.org/HelloWorld") +package org.example.www.helloworld; Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JAVA1.5"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.project =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.project (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.project 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JavaFirstTestProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + </natures> +</projectDescription> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,4 @@ +#Tue Jun 24 15:57:11 CST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:JAVA1.5/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_15/owners=jst.java\:5.0 +eclipse.preferences.version=1 Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.component 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="JavaFirstTestProject"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> +<property name="context-root" value="JavaFirstTestProject"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.4"/> +</faceted-project> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/META-INF/MANIFEST.MF 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/web.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/WebContent/WEB-INF/web.xml 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name> + JavaFirstTestProject</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/www/helloworld/HelloWorld.class =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/build/classes/org/example/www/helloworld/HelloWorld.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/helloworld/HelloWorld.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/helloworld/HelloWorld.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/src/org/example/www/helloworld/HelloWorld.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,25 @@ + +package org.example.www.helloworld; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; + +@WebService(name = "HelloWorld", targetNamespace = "http://www.example.org/HelloWorld") +public class HelloWorld{ + + + @WebMethod(action = "http://www.example.org/HelloWorld/sayHello") + @WebResult(name = "sayHelloResponse", partName = "sayHelloResponse") + public String sayHello(@WebParam(name = "sayHelloRequest", partName = "sayHelloRequest") String str){ + return "Hello World"; + } + + @WebMethod(action = "http://www.example.org/HelloWorld/sayHello2") + @WebResult(name = "sayHelloResponse2", partName = "sayHelloResponse2") + public String sayHello2(@WebParam(name = "sayHelloRequest2", partName = "sayHelloRequest2") String str){ + return "Hello qq"; + } + +} Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JbossWSCoreAllTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JbossWSCoreAllTests.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JbossWSCoreAllTests.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -14,12 +14,9 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jboss.tools.common.reporting.test.ProblemReportingHelperTest; -import org.jboss.tools.common.util.test.HttpUtilTest; -import org.jboss.tools.common.xml.test.SAXValidatorTest; -import org.jboss.tools.common.xml.test.XMLUtilitiesTest; import org.jboss.tools.ws.core.test.classpath.JbossWSRuntimeManagerTest; -import org.jboss.tools.ws.core.test.command.AbstractJBossWSCommandTest; +import org.jboss.tools.ws.core.test.command.JavaFirstCommandTest; +import org.jboss.tools.ws.core.test.command.WSClientCommandTest; public class JbossWSCoreAllTests extends TestCase { public static final String PLUGIN_ID = "org.jboss.tools.common.test"; @@ -27,7 +24,8 @@ { TestSuite suite = new TestSuite(JbossWSCoreAllTests.class.getName()); suite.addTestSuite(JbossWSRuntimeManagerTest.class); - suite.addTestSuite(AbstractJBossWSCommandTest.class); + suite.addTestSuite(JavaFirstCommandTest.class); + suite.addTestSuite(WSClientCommandTest.class); return suite; } Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-06-25 20:58:50 UTC (rev 8949) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -59,8 +59,6 @@ import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; -import org.jboss.tools.ws.core.classpath.JbossWSRuntime; -import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; import org.jboss.tools.ws.creation.core.data.ServiceModel; public abstract class AbstractJBossWSCommandTest extends TestCase { @@ -70,7 +68,7 @@ protected static final int DEFAULT_STARTUP_TIME = 150000; protected static final int DEFAULT_SHUTDOWN_TIME = 90000; - protected static final String JBOSSWS_HOME_DEFAULT = "/home/fugang/jboss-all/jboss-4.2.2.GA"; + protected static final String JBOSSWS_HOME_DEFAULT = "/home/grid/Software/jboss-4.2.2.GA"; public static final String JBOSS_RUNTIME_42 = "org.jboss.ide.eclipse.as.runtime.42"; public static final String JBOSS_AS_42_HOME = System.getProperty(JBOSS_RUNTIME_42, JBOSSWS_HOME_DEFAULT); public static final String JBOSS_SERVER_42 = "org.jboss.ide.eclipse.as.42"; @@ -114,7 +112,7 @@ EditorTestHelper.runEventQueue(3000); } - private IProject createProject(String prjName) throws CoreException { + public IProject createProject(String prjName) throws CoreException { provider = new TestProjectProvider(BUNDLE,"/projects/"+prjName , prjName, true); IProject prj = provider.getProject(); EditorTestHelper.joinBackgroundActivities(); Added: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JavaFirstCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JavaFirstCommandTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JavaFirstCommandTest.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,305 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.ws.core.test.command; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.console.AbstractConsole; +import org.eclipse.ui.console.ConsolePlugin; +import org.eclipse.ui.console.IConsole; +import org.eclipse.ui.console.IConsoleListener; +import org.eclipse.ui.console.IConsoleManager; +import org.eclipse.ui.console.TextConsole; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.ws.internal.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.jboss.tools.ws.core.classpath.JbossWSRuntime; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; +import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties; +import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider; +import org.jboss.tools.ws.creation.core.commands.InitialCommand; +import org.jboss.tools.ws.creation.core.commands.MergeWebXMLCommand; +import org.jboss.tools.ws.creation.core.commands.RemoveClientJarsCommand; +import org.jboss.tools.ws.creation.core.commands.ValidateWSImplCommand; +import org.jboss.tools.ws.creation.core.commands.WSProviderInvokeCommand; +import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; +import org.jboss.tools.ws.creation.ui.wsrt.JBossWebService; + +/** + * @author Grid Qian + */ +public class JavaFirstCommandTest extends AbstractJBossWSCommandTest { + protected static final IWorkspace ws = ResourcesPlugin.getWorkspace(); + protected static final IWorkbench wb = PlatformUI.getWorkbench(); + + protected static final String JBOSSWS_HOME_DEFAULT = "/home/grid/Software/jboss-4.2.2.GA"; + private static final String RuntimeName; + private static final boolean isDeployed; + + static { + RuntimeName = "testjbosswsruntime"; + isDeployed = false; + } + + public JavaFirstCommandTest() { + } + + protected void setUp() throws Exception { + super.setUp(); + + JbossWSRuntimeManager.getInstance().addRuntime(RuntimeName, + getJBossWSHomeFolder().toString(), "", true); + // create jbossws web project + fproject = createJBossWSProject("JavaFirstTestProject", + isServerSupplied()); + + } + + protected void tearDown() throws Exception { + super.tearDown(); + + resourcesToCleanup.clear(); + JbossWSRuntime runtime = JbossWSRuntimeManager.getInstance() + .findRuntimeByName(RuntimeName); + JbossWSRuntimeManager.getInstance().removeRuntime(runtime); + } + + public void testInitialCommand() throws CoreException, ExecutionException { + + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + WebServiceInfo info = new WebServiceInfo(); + info.setImplURL("org.example.www.helloworld.HelloWorld"); + IWebService ws = new JBossWebService(info); + + // test initial command + InitialCommand cmdInitial = new InitialCommand(model, ws, + WebServiceScenario.BOTTOMUP); + IStatus status = cmdInitial.execute(null, null); + + assertTrue(status.getMessage(), status.isOK()); + assertTrue(model.getServiceClasses().get(0).equals( + "org.example.www.helloworld.HelloWorld")); + } + + public void testValidateWSImplCommand() throws ExecutionException { + + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + model.addServiceClasses("org.example.www.helloworld.HelloWorld"); + + ValidateWSImplCommand command = new ValidateWSImplCommand(model); + IStatus status = command.execute(null, null); + + assertTrue(status.getMessage(), status.isOK()); + + } + + public void testWSProviderInvokeCommand() throws ExecutionException, CoreException { + + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + model.addServiceClasses("org.example.www.helloworld.HelloWorld"); + model.setGenWSDL(true); + IProject project = fproject.getProject(); + + fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null); + fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); + + WSProviderInvokeCommand command = new WSProviderInvokeCommand(model); + IStatus status = command.execute(null, null); + + assertTrue(status.getMessage(), status.isOK()); + assertTrue(project.getFile( + "src/org/example/www/helloworld/jaxws/SayHello.java").exists()); + assertTrue(project.getFile("WebContent/wsdl/HelloWorldService.wsdl") + .exists()); + } + + public void testDeployResult() throws ExecutionException, CoreException, + IOException { + + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + + WebServiceInfo info = new WebServiceInfo(); + info.setImplURL("org.example.www.helloworld.HelloWorld"); + IWebService ws = new JBossWebService(info); + + // test initial command + AbstractDataModelOperation cmd = new InitialCommand(model, ws, + WebServiceScenario.BOTTOMUP); + IStatus status = cmd.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + + fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null); + fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); + + cmd = new WSProviderInvokeCommand(model); + status = cmd.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + + cmd = new MergeWebXMLCommand(model); + status = cmd.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + + fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null); + fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); + publishWebProject(); + + assertTrue(currentServer.getModules().length > 0); + String webServiceUrl = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl"; + URL url = new URL(webServiceUrl); + URLConnection conn = url.openConnection(); + + startup(); + + assertEquals("unable to start JBoss server", IServer.STATE_STARTED, + currentServer.getServerState()); + + conn.connect(); + conn.getContent(); + + IProject pro = createProject("ClientTest"); + model = new ServiceModel(); + model.setWebProjectName("ClientTest"); + + cmd = new RemoveClientJarsCommand(model); + status = cmd.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + + pro.open(null); + pro.refreshLocal(IResource.DEPTH_INFINITE, null); + + ILaunchManager launchManager = DebugPlugin.getDefault() + .getLaunchManager(); + ILaunchConfigurationType launchConfigurationType = launchManager + .getLaunchConfigurationType("org.eclipse.jdt.launching.localJavaApplication"); + ILaunchConfigurationWorkingCopy wc = launchConfigurationType + .newInstance(null, "ClientSample"); + wc.setAttribute("org.eclipse.debug.core.MAPPED_RESOURCE_TYPES", "1"); + wc.setAttribute("org.eclipse.jdt.launching.MAIN_TYPE", + "org.example.www.helloworld.clientsample.ClientSample"); + wc.setAttribute("org.eclipse.jdt.launching.PROGRAM_ARGUMENTS", "Test"); + wc.setAttribute("org.eclipse.jdt.launching.PROJECT_ATTR", "ClientTest"); + wc.doSave(); + wc.launch(ILaunchManager.RUN_MODE, null); + IConsoleManager consolemanager = getConsoleManager(); + checkText(consolemanager.getConsoles()); + } + + private void checkText(IConsole[] consoles) { + // test run result + for (IConsole console : consoles) { + if (console.getName().contains("ClientSample")) { + int i = 0; + while (i < 10 + && !isContainString( + console, + JBossWSCreationCoreMessages.Client_Sample_Run_Over)) { + delay(1000); + i++; + } + assertTrue("Sample run over!", isContainString(console, + JBossWSCreationCoreMessages.Client_Sample_Run_Over)); + } + } + } + + public static boolean isContainString(IConsole console, String str) { + return ((TextConsole) console).getDocument().get().contains(str); + } + + public static void delay(long durationInMilliseconds) { + Display display = Display.getCurrent(); + if (display != null) { + long t2 = System.currentTimeMillis() + durationInMilliseconds; + while (System.currentTimeMillis() < t2) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + display.update(); + } else { + try { + Thread.sleep(durationInMilliseconds); + } catch (InterruptedException e) { + } + } + } + + public static IConsoleManager getConsoleManager() { + IConsoleManager consolemanager = ConsolePlugin.getDefault() + .getConsoleManager(); + + consolemanager.addConsoleListener(new IConsoleListener() { + public void consolesAdded(IConsole[] consoles) { + for (int i = 0; i < consoles.length; i++) { + ((AbstractConsole) consoles[i]).activate(); + } + + } + + public void consolesRemoved(IConsole[] consoles) { + for (int i = 0; i < consoles.length; i++) { + ((AbstractConsole) consoles[i]).destroy(); + } + + } + }); + return consolemanager; + } + + @Override + IDataModel createJBossWSDataModel(boolean isServerSupplied) { + IDataModel config = (IDataModel) new JBossWSFacetInstallDataModelProvider() + .create(); + if (isServerSupplied) { + config + .setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, + true); + } else { + config.setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, + isDeployed); + config.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, + RuntimeName); + config.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, + getJBossWSHomeFolder().toString()); + } + return config; + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/WSClientCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/WSClientCommandTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/WSClientCommandTest.java 2008-06-26 05:28:13 UTC (rev 8950) @@ -0,0 +1,207 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.ws.core.test.command; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jdt.core.IClasspathContainer; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaModel; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.core.internal.Server; +import org.eclipse.wst.server.core.internal.ServerWorkingCopy; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.jboss.tools.ws.core.classpath.JbossWSRuntime; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeClassPathInitializer.JbossWSRuntimeClasspathContainer; +import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties; +import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; +import org.jboss.tools.ws.creation.core.commands.ClientSampleCreationCommand; +import org.jboss.tools.ws.creation.core.commands.InitialClientCommand; +import org.jboss.tools.ws.creation.core.commands.RemoveClientJarsCommand; +import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand; +import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.ui.wsrt.JBossWebServiceClient; + +/** + * @author Grid Qian + */ +public class WSClientCommandTest extends AbstractJBossWSCommandTest { + + protected static final String JBOSSWS_HOME_DEFAULT = "/home/grid/Software/jboss-4.2.2.GA"; + private static final String RuntimeName; + private static final boolean isDeployed; + + static { + RuntimeName = "testjbosswsruntime"; + isDeployed = false; + } + + public WSClientCommandTest() { + } + + protected void setUp() throws Exception { + super.setUp(); + JbossWSRuntimeManager.getInstance().addRuntime(RuntimeName, + getJBossWSHomeFolder().toString(), "", true); + + // create jbossws web project + fproject = createJBossWSProject("JBossWSTestProject", + isServerSupplied()); + IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); + + assertTrue(wsdlFile.exists()); + } + + protected void tearDown() throws Exception { + super.tearDown(); + resourcesToCleanup.clear(); + JbossWSRuntime runtime = JbossWSRuntimeManager.getInstance() + .findRuntimeByName(RuntimeName); + JbossWSRuntimeManager.getInstance().removeRuntime(runtime); + } + + public void testInitialClientCommand() throws CoreException, + ExecutionException { + + IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + // model.setWsdlURI(wsdlFile.getLocation().toOSString()); + + WebServiceClientInfo info = new WebServiceClientInfo(); + info.setWsdlURL(wsdlFile.getLocation().toOSString()); + IWebServiceClient ws = new JBossWebServiceClient(info); + + // test initial command + InitialClientCommand cmdInitial = new InitialClientCommand(model, ws, + WebServiceScenario.CLIENT); + IStatus status = cmdInitial.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + + assertTrue(model.getServiceNames().contains("SOAPService")); + assertEquals(wsdlFile.getLocation().toOSString(), model.getWsdlURI()); + assertTrue(model.getPortTypes().contains("Greeter")); + assertEquals("org.apache.hello_world_soap_http", model + .getCustomPackage()); + + } + + public void testClientCodeGenerationCommand() throws ExecutionException { + + ServiceModel model = createServiceModel(); + IProject project = fproject.getProject(); + // test wsdl2Javacommand + WSDL2JavaCommand cmdW2j = new WSDL2JavaCommand(model); + IStatus status = cmdW2j.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + assertTrue(project.getFile( + "src/org/apache/hello_world_soap_http/Greeter.java").exists()); + + // test ClientSampleCreationCommand + ClientSampleCreationCommand cmdImpl = new ClientSampleCreationCommand( + model); + status = cmdImpl.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + assertTrue( + "failed to generate sample class", + project + .getFile( + "src/org/apache/hello_world_soap_http/clientsample/ClientSample.java") + .exists()); + + } + + public void testRemoveClientJarsCommand() throws ExecutionException { + + ServiceModel model = new ServiceModel(); + model.setWebProjectName(fproject.getProject().getName()); + + RemoveClientJarsCommand command = new RemoveClientJarsCommand(model); + IStatus status = command.execute(null, null); + assertTrue(status.getMessage(), status.isOK()); + try { + IClasspathEntry[] entries = getJavaProjectByName( + fproject.getProject().getName()).getRawClasspath(); + + for (IClasspathEntry entry : entries) { + IClasspathContainer container = JavaCore.getClasspathContainer( + entry.getPath(), getJavaProjectByName(fproject + .getProject().getName())); + if (container instanceof JbossWSRuntimeClasspathContainer) { + boolean nojar = true; + for (IClasspathEntry jar : ((JbossWSRuntimeClasspathContainer) container) + .getClasspathEntries()) { + if (jar.getPath().toString().contains("jaxws-rt.jar")) { + nojar = false; + } + } + assertTrue(nojar); + } + } + } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); + } + + } + + public static IJavaProject getJavaProjectByName(String projectName) + throws JavaModelException { + + IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace() + .getRoot()); + model.open(null); + + IJavaProject[] projects = model.getJavaProjects(); + + for (IJavaProject proj : projects) { + if (proj.getProject().getName().equals(projectName)) { + return proj; + } + } + + return null; + } + + @Override + IDataModel createJBossWSDataModel(boolean isServerSupplied) { + IDataModel config = (IDataModel) new JBossWSFacetInstallDataModelProvider() + .create(); + if (isServerSupplied) { + config + .setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, + true); + } else { + config.setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, + isDeployed); + config.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, + RuntimeName); + config.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, + getJBossWSHomeFolder().toString()); + } + return config; + } + +}