JBossWS SVN: r12990 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-17 13:56:02 -0400 (Fri, 17 Sep 2010)
New Revision: 12990
Added:
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java
Removed:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/invoker.properties
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
Log:
[JBWS-3129] Simplifying dependencies, preventing plugin from loading anything that would later be used by the tools, temporarly moving to using jbossws-cxf-3.4.0-SNAPSHOT for embedded tests
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-17 17:56:02 UTC (rev 12990)
@@ -32,10 +32,6 @@
<!-- For test -->
<junit.version>4.7</junit.version>
<maven.plugin.testing.harness.version>1.1</maven.plugin.testing.harness.version>
- <jbossws.cxf.client.version>3.3.1.GA</jbossws.cxf.client.version>
- <jbossws.metro.client.version>3.3.1.GA</jbossws.metro.client.version>
- <jbossws.native.client.version>3.3.1.GA</jbossws.native.client.version>
- <jbossxb.version>2.0.1.GA</jbossxb.version>
</properties>
<!-- Dependencies -->
@@ -70,57 +66,9 @@
<version>${maven.plugin.testing.harness.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- The following are declared here just to prepare the local maven repo and use that in the embedded tests, making them faster and with simpler pom.xml files -->
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <version>${jbossws.native.client.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- <version>${jbossws.cxf.client.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.metro</groupId>
- <artifactId>jbossws-metro-client</artifactId>
- <version>${jbossws.metro.client.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${jbossxb.version}</version>
- <optional>true</optional>
- <!-- <scope>test</scope> --> <!-- TODO Move this to test scope instead of making it optional; currently messes up classloader in wsprovide test with Native stack -->
- </dependency>
+
</dependencies>
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
<reporting>
<plugins>
<plugin>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-17 17:56:02 UTC (rev 12990)
@@ -28,7 +28,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
/**
* Generic mojo for wsconsume tool
@@ -113,14 +112,29 @@
ClassLoader origLoader = Thread.currentThread().getContextClassLoader();
try
{
- Thread.currentThread().setContextClassLoader(getMavenClasspathAwareClassLoader(origLoader));
- WSContractConsumer consumer = WSContractConsumer.newInstance();
- setupConsumer(consumer);
+ ClassLoader loader = getMavenClasspathAwareClassLoader(null);
+ Thread.currentThread().setContextClassLoader(loader);
+
+ WSContractConsumerParams params = new WSContractConsumerParams();
+ params.setAdditionalCompilerClassPath(new LinkedList<String>(getClasspathElements()));
+ params.setBindingFiles(bindingFiles);
+ params.setCatalog(catalog);
+ params.setExtension(extension);
+ params.setGenerateSource(generateSource);
+ params.setLoader(loader);
+ params.setNoCompile(noCompile);
+ params.setOutputDirectory(getOutputDirectory());
+ params.setSourceDirectory(sourceDirectory);
+ params.setTarget(target);
+ params.setTargetPackage(targetPackage);
+ params.setWsdlLocation(wsdlLocation);
+ WSContractDelegate delegate = new WSContractDelegate();
+
for (String wsdl : wsdls)
{
try
{
- consumer.consume(wsdl);
+ delegate.runConsumer(params, wsdl);
}
catch (MalformedURLException mue)
{
@@ -139,49 +153,6 @@
}
}
- private void setupConsumer(WSContractConsumer consumer)
- {
- consumer.setAdditionalCompilerClassPath(new LinkedList<String>(getClasspathElements()));
- consumer.setMessageStream(System.out);
- if (bindingFiles != null && !bindingFiles.isEmpty())
- {
- List<File> files = new LinkedList<File>();
- for (String bf : bindingFiles)
- {
- files.add(new File(bf));
- }
- consumer.setBindingFiles(files);
- }
- if (catalog != null)
- {
- consumer.setCatalog(catalog);
- }
- consumer.setExtension(extension);
- consumer.setGenerateSource(generateSource);
- consumer.setNoCompile(noCompile);
- File outputDir = getOutputDirectory();
- if (outputDir != null)
- {
- consumer.setOutputDirectory(outputDir);
- }
- if (sourceDirectory != null)
- {
- consumer.setSourceDirectory(sourceDirectory);
- }
- if (target != null)
- {
- consumer.setTarget(target);
- }
- if (targetPackage != null)
- {
- consumer.setTargetPackage(targetPackage);
- }
- if (wsdlLocation != null)
- {
- consumer.setWsdlLocation(wsdlLocation);
- }
- }
-
public List<String> getWsdls()
{
return wsdls;
Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-09-17 17:56:02 UTC (rev 12990)
@@ -25,7 +25,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
-import org.jboss.wsf.spi.tools.WSContractProvider;
/**
* Generic mojo for wsprovide tool
@@ -86,13 +85,23 @@
}
ClassLoader origLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader loader = getMavenClasspathAwareClassLoader(origLoader);
+ ClassLoader loader = getMavenClasspathAwareClassLoader(null);
Thread.currentThread().setContextClassLoader(loader);
try
{
- WSContractProvider provider = WSContractProvider.newInstance();
- setupProvider(provider, loader);
- provider.provide(endpointClass);
+ WSContractProviderParams params = new WSContractProviderParams();
+ params.setEndpointClass(endpointClass);
+ params.setExtension(extension);
+ params.setGenerateSource(generateSource);
+ params.setGenerateWsdl(generateWsdl);
+ params.setLoader(loader);
+ params.setOutputDirectory(getOutputDirectory());
+ params.setResourceDirectory(resourceDirectory);
+ params.setSourceDirectory(sourceDirectory);
+
+ WSContractDelegate delegate = new WSContractDelegate();
+ delegate.runProvider(params);
+
updateProjectSourceRoots();
}
catch (Exception e)
@@ -104,28 +113,6 @@
Thread.currentThread().setContextClassLoader(origLoader);
}
}
-
- private void setupProvider(WSContractProvider provider, ClassLoader loader)
- {
- provider.setClassLoader(loader);
- provider.setExtension(extension);
- provider.setGenerateSource(generateSource);
- provider.setGenerateWsdl(generateWsdl);
- provider.setMessageStream(System.out);
- File outputDir = getOutputDirectory();
- if (outputDir != null)
- {
- provider.setOutputDirectory(outputDir);
- }
- if (resourceDirectory != null)
- {
- provider.setResourceDirectory(resourceDirectory);
- }
- if (sourceDirectory != null)
- {
- provider.setSourceDirectory(sourceDirectory);
- }
- }
public boolean isGenerateWsdl()
{
Added: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java (rev 0)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2010-09-17 17:56:02 UTC (rev 12990)
@@ -0,0 +1,138 @@
+package org.jboss.ws.plugins.tools;
+
+import java.io.File;
+import java.util.List;
+
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+public class WSContractConsumerParams
+{
+ private ClassLoader loader;
+ private List<String> additionalCompilerClassPath;
+ private List<String> bindingFiles;
+ private File catalog;
+ private boolean extension;
+ private boolean generateSource;
+ private boolean noCompile;
+ private File outputDirectory;
+ private File sourceDirectory;
+ private String target;
+ private String targetPackage;
+ private String wsdlLocation;
+
+ public void setLoader(ClassLoader loader)
+ {
+ this.loader = loader;
+ }
+ public ClassLoader getLoader()
+ {
+ return loader;
+ }
+ public List<String> getAdditionalCompilerClassPath()
+ {
+ return additionalCompilerClassPath;
+ }
+ public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath)
+ {
+ this.additionalCompilerClassPath = additionalCompilerClassPath;
+ }
+ public List<String> getBindingFiles()
+ {
+ return bindingFiles;
+ }
+ public void setBindingFiles(List<String> bindingFiles)
+ {
+ this.bindingFiles = bindingFiles;
+ }
+ public File getCatalog()
+ {
+ return catalog;
+ }
+ public void setCatalog(File catalog)
+ {
+ this.catalog = catalog;
+ }
+ public boolean isNoCompile()
+ {
+ return noCompile;
+ }
+ public void setNoCompile(boolean noCompile)
+ {
+ this.noCompile = noCompile;
+ }
+ public String getTarget()
+ {
+ return target;
+ }
+ public void setTarget(String target)
+ {
+ this.target = target;
+ }
+ public String getTargetPackage()
+ {
+ return targetPackage;
+ }
+ public void setTargetPackage(String targetPackage)
+ {
+ this.targetPackage = targetPackage;
+ }
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+ public boolean isExtension()
+ {
+ return extension;
+ }
+ public boolean isGenerateSource()
+ {
+ return generateSource;
+ }
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+ public File getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+ public void setOutputDirectory(File outputDirectory)
+ {
+ this.outputDirectory = outputDirectory;
+ }
+ public File getSourceDirectory()
+ {
+ return sourceDirectory;
+ }
+ public void setSourceDirectory(File sourceDirectory)
+ {
+ this.sourceDirectory = sourceDirectory;
+ }
+}
Added: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java (rev 0)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2010-09-17 17:56:02 UTC (rev 12990)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.plugins.tools;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.List;
+
+public class WSContractDelegate
+{
+ public void runProvider(WSContractProviderParams params) throws Exception
+ {
+ ClassLoader loader = params.getLoader();
+ Class<?> providerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractProvider");
+ Object provider = providerClass.getMethod("newInstance").invoke(null);
+ setupProvider(providerClass, provider, params);
+ Method m = providerClass.getMethod("provide", new Class<?>[]{String.class});
+ m.invoke(provider, new Object[]{params.getEndpointClass()});
+ }
+
+ public void runConsumer(WSContractConsumerParams params, String wsdl) throws Exception
+ {
+ ClassLoader loader = params.getLoader();
+ Class<?> consumerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractConsumer");
+ Object consumer = consumerClass.getMethod("newInstance").invoke(null);
+ setupConsumer(consumerClass, consumer, params);
+ Method m = consumerClass.getMethod("consume", new Class<?>[]{String.class});
+ m.invoke(consumer, new Object[]{wsdl});
+ }
+
+ private static void setupConsumer(Class<?> consumerClass, Object consumer, WSContractConsumerParams params) throws Exception
+ {
+ callMethod(consumerClass, consumer, "setAdditionalCompilerClassPath", params.getAdditionalCompilerClassPath());
+ Method m = consumerClass.getMethod("setMessageStream", new Class<?>[]{PrintStream.class});
+ m.invoke(consumer, new Object[]{System.out});
+ List<String> bindingFiles = params.getBindingFiles();
+ if (bindingFiles != null && !bindingFiles.isEmpty())
+ {
+ List<File> files = new LinkedList<File>();
+ for (String bf : bindingFiles)
+ {
+ files.add(new File(bf));
+ }
+ callMethod(consumerClass, consumer, "setBindingFiles", files);
+ }
+ if (params.getCatalog() != null)
+ {
+ callMethod(consumerClass, consumer, "setCatalog", params.getCatalog());
+ }
+ callMethod(consumerClass, consumer, "setExtension", params.isExtension());
+ callMethod(consumerClass, consumer, "setGenerateSource", params.isGenerateSource());
+ callMethod(consumerClass, consumer, "setNoCompile", params.isNoCompile());
+ if (params.getOutputDirectory() != null)
+ {
+ callMethod(consumerClass, consumer, "setOutputDirectory", params.getOutputDirectory());
+ }
+ if (params.getSourceDirectory() != null)
+ {
+ callMethod(consumerClass, consumer, "setSourceDirectory", params.getSourceDirectory());
+ }
+ if (params.getTarget() != null)
+ {
+ callMethod(consumerClass, consumer, "setTarget", params.getTarget());
+ }
+ if (params.getTargetPackage() != null)
+ {
+ callMethod(consumerClass, consumer, "setTargetPackage", params.getTargetPackage());
+ }
+ if (params.getWsdlLocation() != null)
+ {
+ callMethod(consumerClass, consumer, "setWsdlLocation", params.getWsdlLocation());
+ }
+ }
+
+ private static Object callMethod(Class<?> clazz, Object obj, String name, boolean param) throws Exception
+ {
+ Method m = clazz.getMethod(name, new Class<?>[]{boolean.class});
+ return m.invoke(obj, new Object[]{param});
+ }
+
+ private static <T> Object callMethod(Class<?> clazz, Object obj, String name, T param) throws Exception
+ {
+ Method m = clazz.getMethod(name, new Class<?>[]{param.getClass()});
+ return m.invoke(obj, new Object[]{param});
+ }
+
+ @SuppressWarnings("rawtypes")
+ private static Object callMethod(Class<?> clazz, Object obj, String name, List param) throws Exception
+ {
+ Method m = clazz.getMethod(name, new Class<?>[]{List.class});
+ return m.invoke(obj, new Object[]{param});
+ }
+
+ private static void setupProvider(Class<?> providerClass, Object provider, WSContractProviderParams params) throws Exception
+ {
+ Method m = providerClass.getMethod("setClassLoader", new Class<?>[]{ClassLoader.class});
+ m.invoke(provider, new Object[]{params.getLoader()});
+ callMethod(providerClass, provider, "setExtension", params.isExtension());
+ callMethod(providerClass, provider, "setGenerateSource", params.isGenerateSource());
+ callMethod(providerClass, provider, "setGenerateWsdl", params.isGenerateWsdl());
+ Method m2 = providerClass.getMethod("setMessageStream", new Class<?>[]{PrintStream.class});
+ m2.invoke(provider, new Object[]{System.out});
+ if (params.getOutputDirectory() != null)
+ {
+ callMethod(providerClass, provider, "setOutputDirectory", params.getOutputDirectory());
+ }
+ if (params.getResourceDirectory() != null)
+ {
+ callMethod(providerClass, provider, "setResourceDirectory", params.getResourceDirectory());
+ }
+ if (params.getSourceDirectory() != null)
+ {
+ callMethod(providerClass, provider, "setSourceDirectory", params.getSourceDirectory());
+ }
+ }
+
+}
Added: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java (rev 0)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2010-09-17 17:56:02 UTC (rev 12990)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.plugins.tools;
+
+import java.io.File;
+
+public class WSContractProviderParams
+{
+ private String endpointClass;
+ private ClassLoader loader;
+ private boolean extension;
+ private boolean generateSource;
+ private boolean generateWsdl;
+ private File outputDirectory;
+ private File resourceDirectory;
+ private File sourceDirectory;
+
+ public String getEndpointClass()
+ {
+ return endpointClass;
+ }
+ public void setEndpointClass(String endpointClass)
+ {
+ this.endpointClass = endpointClass;
+ }
+ public ClassLoader getLoader()
+ {
+ return loader;
+ }
+ public void setLoader(ClassLoader loader)
+ {
+ this.loader = loader;
+ }
+ public boolean isExtension()
+ {
+ return extension;
+ }
+ public boolean isGenerateSource()
+ {
+ return generateSource;
+ }
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+ public boolean isGenerateWsdl()
+ {
+ return generateWsdl;
+ }
+ public void setGenerateWsdl(boolean generateWsdl)
+ {
+ this.generateWsdl = generateWsdl;
+ }
+ public File getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+ public void setOutputDirectory(File outputDirectory)
+ {
+ this.outputDirectory = outputDirectory;
+ }
+ public File getResourceDirectory()
+ {
+ return resourceDirectory;
+ }
+ public void setResourceDirectory(File resourceDirectory)
+ {
+ this.resourceDirectory = resourceDirectory;
+ }
+ public File getSourceDirectory()
+ {
+ return sourceDirectory;
+ }
+ public void setSourceDirectory(File sourceDirectory)
+ {
+ this.sourceDirectory = sourceDirectory;
+ }
+}
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/invoker.properties
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/invoker.properties 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/invoker.properties 2010-09-17 17:56:02 UTC (rev 12990)
@@ -1 +1 @@
-invoker.goals = clean package
+invoker.goals = -e clean package
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-09-17 17:56:02 UTC (rev 12990)
@@ -96,5 +96,10 @@
<artifactId>jbossws-native-client</artifactId>
<version>3.3.1.GA</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties 2010-09-17 17:56:02 UTC (rev 12990)
@@ -1 +1 @@
-invoker.goals = clean package
+invoker.goals = -e clean package
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-09-17 17:56:02 UTC (rev 12990)
@@ -9,6 +9,14 @@
<packaging>jar</packaging>
<version>@pom.version@</version>
+ <repositories>
+ <repository>
+ <id>JBoss Nexus Repository</id>
+ <name>JBoss Nexus Repository</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ </repository>
+ </repositories>
+
<build>
<pluginManagement>
<plugins>
@@ -63,7 +71,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-09-17 17:56:02 UTC (rev 12990)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>testWsProvide</name>
- <groupId>org.jboss.ws.plugins.maven.tests</groupId>
- <artifactId>testWsProvide</artifactId>
- <packaging>jar</packaging>
- <version>@pom.version@</version>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <maxmem>256M</maxmem>
- <fork>${compiler.fork}</fork>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jboss.ws.plugins</groupId>
- <artifactId>maven-jaxws-tools-plugin</artifactId>
- <version>@pom.version@</version>
- <configuration>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <id>First execution</id>
- <goals>
- <goal>wsprovide</goal>
- </goals>
- <configuration>
- <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass>
- <generateWsdl>true</generateWsdl>
- </configuration>
- </execution>
- <execution>
- <id>Second execution</id>
- <goals>
- <goal>wsprovide-test</goal>
- </goals>
- <configuration>
- <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass>
- <generateWsdl>true</generateWsdl>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws.metro</groupId>
- <artifactId>jbossws-metro-client</artifactId>
- <version>3.3.1.GA</version>
- </dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
-
-
- </dependencies>
-</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-09-16 18:05:28 UTC (rev 12989)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-09-17 17:56:02 UTC (rev 12990)
@@ -8,6 +8,14 @@
<artifactId>testWsProvide</artifactId>
<packaging>jar</packaging>
<version>@pom.version@</version>
+
+ <repositories>
+ <repository>
+ <id>JBoss Nexus Repository</id>
+ <name>JBoss Nexus Repository</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ </repository>
+ </repositories>
<build>
<pluginManagement>
13 years, 7 months
JBossWS SVN: r12989 - in framework/trunk/testsuite/test: resources/jaxws/jbws2999/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 14:05:28 -0400 (Thu, 16 Sep 2010)
New Revision: 12989
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml
Log:
[JBWS-3000] Modifying JBWS2999TestCase for testing handlers support too
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/CustomHandler.java 2010-09-16 18:05:28 UTC (rev 12989)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2999;
+
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+
+public class CustomHandler extends GenericSOAPHandler {
+
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
+ if(soapBodyElement.getChildElements().hasNext())
+ {
+ SOAPElement payload = (SOAPElement)soapBodyElement.getChildElements().next();
+ String value = payload.getValue();
+ payload.setValue(value + "World");
+ }
+ }
+ catch (SOAPException e)
+ {
+ throw new WebServiceException(e);
+ }
+ return true;
+ }
+}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2010-09-16 18:04:50 UTC (rev 12988)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2010-09-16 18:05:28 UTC (rev 12989)
@@ -55,8 +55,8 @@
public void testCall() throws Exception
{
- String message = "Hi";
+ String message = "Hello";
String response = getPort().helloEcho(message);
- assertEquals(message, response);
+ assertEquals(message + "World", response);
}
}
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml 2010-09-16 18:04:50 UTC (rev 12988)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml 2010-09-16 18:05:28 UTC (rev 12989)
@@ -11,6 +11,14 @@
<service-impl-bean>
<ejb-link>jbws2999Test</ejb-link>
</service-impl-bean>
+ <handler-chains>
+ <handler-chain>
+ <handler>
+ <handler-name>CustomHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2999.CustomHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </handler-chains>
</port-component>
</webservice-description>
</webservices>
\ No newline at end of file
13 years, 7 months
JBossWS SVN: r12988 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 14:04:50 -0400 (Thu, 16 Sep 2010)
New Revision: 12988
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-3000] Add handlers provided through webservices.xml
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-09-16 11:03:11 UTC (rev 12987)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-09-16 18:04:50 UTC (rev 12988)
@@ -24,6 +24,7 @@
import java.util.LinkedList;
import java.util.List;
+import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -99,6 +100,7 @@
endpoint.setEndpointName(dde.getPortName());
endpoint.setServiceName(dde.getServiceName());
endpoint.setWsdlLocation(dde.getWsdlLocation());
+ setHandlers(endpoint, dde.getHandlers());
endpoint.publish();
endpoints.add(endpoint);
if (dde.isMtomEnabled())
@@ -110,6 +112,20 @@
configured = true;
}
+ @SuppressWarnings("rawtypes")
+ private static void setHandlers(EndpointImpl endpoint, List<String> handlers)
+ {
+ if (handlers != null && !handlers.isEmpty())
+ {
+ List<Handler> handlerInstances = new LinkedList<Handler>();
+ for (String handler : handlers)
+ {
+ handlerInstances.add((Handler)newInstance(handler));
+ }
+ endpoint.setHandlers(handlerInstances);
+ }
+ }
+
@Override
public void close()
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-09-16 11:03:11 UTC (rev 12987)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-09-16 18:04:50 UTC (rev 12988)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.stack.cxf.metadata;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Stack;
import java.util.StringTokenizer;
@@ -35,8 +37,11 @@
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
@@ -136,7 +141,31 @@
endpoint.setServiceName(portComp.getWsdlService());
}
- //TODO implement handler chain override
+ //HandlerChain contributions
+ UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains();
+ if (chainWrapper != null)
+ {
+ List<String> handlers = new LinkedList<String>();
+ for (UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains())
+ {
+ if (handlerChain.getPortNamePattern() != null || handlerChain.getProtocolBindings() != null
+ || handlerChain.getServiceNamePattern() != null)
+ {
+ log.warn("PortNamePattern, ServiceNamePattern and ProtocolBindings filters not supported; adding handlers anyway.");
+ }
+ for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
+ {
+ if (log.isDebugEnabled())
+ log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName());
+ if (uhmd.getInitParams() != null && !uhmd.getInitParams().isEmpty())
+ {
+ log.warn("Init params not supported.");
+ }
+ handlers.add(uhmd.getHandlerClass());
+ }
+ }
+ endpoint.setHandlers(handlers);
+ }
// MTOM settings
if (portComp.isEnableMtom())
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-09-16 11:03:11 UTC (rev 12987)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-09-16 18:04:50 UTC (rev 12988)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.List;
import javax.xml.namespace.QName;
@@ -49,6 +50,8 @@
private QName portName;
private QName serviceName;
+ private List<String> handlers;
+
//additional fields
private Class<?> epClass;
@@ -128,6 +131,11 @@
{
return invoker;
}
+
+ public List<String> getHandlers()
+ {
+ return handlers;
+ }
public boolean isMtomEnabled()
{
@@ -138,6 +146,11 @@
{
this.invoker = invoker;
}
+
+ public void setHandlers(List<String> handlers)
+ {
+ this.handlers = handlers;
+ }
public void setMtomEnabled(boolean mtomEnabled)
{
@@ -174,6 +187,16 @@
{
writer.write("<jaxws:invoker><bean class='" + this.invoker + "'/></jaxws:invoker>");
}
+
+ if (this.handlers != null && !this.handlers.isEmpty())
+ {
+ writer.write("<jaxws:handlers>");
+ for (String handler : this.handlers)
+ {
+ writer.write("<bean class='" + handler + "'/>");
+ }
+ writer.write("</jaxws:handlers>");
+ }
writer.write("</jaxws:endpoint>");
}
13 years, 7 months
JBossWS SVN: r12987 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 07:03:11 -0400 (Thu, 16 Sep 2010)
New Revision: 12987
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[CXF-1521] Enabling test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-16 10:59:50 UTC (rev 12986)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-16 11:03:11 UTC (rev 12987)
@@ -4,9 +4,6 @@
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-16 10:59:50 UTC (rev 12986)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-16 11:03:11 UTC (rev 12987)
@@ -4,9 +4,6 @@
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-16 10:59:50 UTC (rev 12986)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-16 11:03:11 UTC (rev 12987)
@@ -4,9 +4,6 @@
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 10:59:50 UTC (rev 12986)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 11:03:11 UTC (rev 12987)
@@ -4,9 +4,6 @@
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
13 years, 7 months
JBossWS SVN: r12986 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 06:59:50 -0400 (Thu, 16 Sep 2010)
New Revision: 12986
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java
Log:
[CXF-1521] - Do not hide default constructors of Exception, as that prevents instantiation through reflection; - add @XmlTransient annotation on getter method too, being the corresponding attribute private
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java 2010-09-16 10:53:01 UTC (rev 12985)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java 2010-09-16 10:59:50 UTC (rev 12986)
@@ -37,6 +37,11 @@
@XmlTransient
private String transientString;
+ public CustomException()
+ {
+ super();
+ }
+
public CustomException(String message, Integer number)
{
super(message);
@@ -60,6 +65,7 @@
this.number = number;
}
+ @XmlTransient
public String getTransientString()
{
return transientString;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java 2010-09-16 10:53:01 UTC (rev 12985)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java 2010-09-16 10:59:50 UTC (rev 12986)
@@ -34,6 +34,11 @@
{
private Integer number;
+ public SimpleException()
+ {
+ super();
+ }
+
public SimpleException(String message, Integer number)
{
super(message);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2010-09-16 10:53:01 UTC (rev 12985)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2010-09-16 10:59:50 UTC (rev 12986)
@@ -62,6 +62,12 @@
*/
public void testWebFaultElement() throws Exception
{
+ if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1519] Explicitely set the namespace of a WebFault");
+ return;
+ }
+
Document doc = DOMUtils.getDocumentBuilder().parse(new URL(endpointURL + "?wsdl").toString());
NodeList schemas = ((Element)doc.getDocumentElement()
.getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0))
@@ -76,7 +82,7 @@
Element schema = (Element)schemas.item(i);
if (schema.getAttribute("targetNamespace").equals("org.jboss.test.ws.jaxws.webfault.exceptions"))
{
- Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
+ Iterator<Element> elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
while (elements.hasNext())
{
Element e = (Element)elements.next();
@@ -90,7 +96,7 @@
}
if (schema.getAttribute("targetNamespace").equals("http://webfault.jaxws.ws.test.jboss.org/"))
{
- Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
+ Iterator<Element> elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
while (elements.hasNext())
{
Element e = (Element)elements.next();
13 years, 7 months
JBossWS SVN: r12985 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-16 06:53:01 -0400 (Thu, 16 Sep 2010)
New Revision: 12985
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBAS-8403] enabling test for AS trunk
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 09:04:03 UTC (rev 12984)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 10:53:01 UTC (rev 12985)
@@ -30,6 +30,3 @@
# [JBAS-8363] Virtual host issue in JBossWeb
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBAS-8403] excluding test until jboss-web.xml override is fixed
-org/jboss/test/ws/jaxws/jbws3123/JBWS3123TestCase.*
13 years, 7 months
JBossWS SVN: r12984 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 05:04:03 -0400 (Thu, 16 Sep 2010)
New Revision: 12984
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
Enabling passing testacase
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-16 09:01:34 UTC (rev 12983)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-16 09:04:03 UTC (rev 12984)
@@ -1,9 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-16 09:01:34 UTC (rev 12983)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-16 09:04:03 UTC (rev 12984)
@@ -1,9 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-16 09:01:34 UTC (rev 12983)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-16 09:04:03 UTC (rev 12984)
@@ -1,9 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 09:01:34 UTC (rev 12983)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-16 09:04:03 UTC (rev 12984)
@@ -1,9 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
# [CXF-1519] Explicitly set the namespace of a WebFault
org/jboss/test/ws/jaxws/jbws1904/**
13 years, 7 months
JBossWS SVN: r12983 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1807.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-16 05:01:34 -0400 (Thu, 16 Sep 2010)
New Revision: 12983
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java
Log:
Fixing broken testcase
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2010-09-16 04:22:15 UTC (rev 12982)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2010-09-16 09:01:34 UTC (rev 12983)
@@ -67,10 +67,9 @@
String targetNS = "http://ws.com/";
QName serviceName = new QName(targetNS, "Provider");
QName portName = new QName(targetNS, "ProviderPort");
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
Service service = Service.create(serviceName);
- service.addPort(portName, HTTPBinding.HTTP_BINDING, wsdlURL.toExternalForm());
+ service.addPort(portName, HTTPBinding.HTTP_BINDING, TARGET_ENDPOINT_ADDRESS);
Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse("<input>hello</input>")));
13 years, 7 months
JBossWS SVN: r12982 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-09-16 00:22:15 -0400 (Thu, 16 Sep 2010)
New Revision: 12982
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-3127]:Enable JMSEndpointTestCase since CXF-2994 is fixed
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-15 17:58:23 UTC (rev 12981)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-16 04:22:15 UTC (rev 12982)
@@ -30,6 +30,3 @@
# [JBAS-8403] excluding test until jboss-web.xml override is fixed
org/jboss/test/ws/jaxws/jbws3123/JBWS3123TestCase.*
-
-# [JBWS-3127] review it after SoapJMSInInterceptor is fixed in CXF
-org/jboss/test/ws/jaxws/samples/jmsendpoints/**
13 years, 7 months
JBossWS SVN: r12981 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-15 13:58:23 -0400 (Wed, 15 Sep 2010)
New Revision: 12981
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[CXF-1252] Enabling tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-15 17:56:09 UTC (rev 12980)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-15 17:58:23 UTC (rev 12981)
@@ -1,10 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-15 17:56:09 UTC (rev 12980)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-15 17:58:23 UTC (rev 12981)
@@ -1,10 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-15 17:56:09 UTC (rev 12980)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-15 17:58:23 UTC (rev 12981)
@@ -1,10 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-15 17:56:09 UTC (rev 12980)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-15 17:58:23 UTC (rev 12981)
@@ -1,10 +1,6 @@
# UsernameTestCase requires trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
# [CXF-1517] HTTP bindings for Provider
org/jboss/test/ws/jaxws/jbws1807/**
13 years, 7 months