JBossWS SVN: r6635 - in stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro: log and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-23 11:57:09 -0400 (Wed, 23 Apr 2008)
New Revision: 6635
Removed:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java
Log:
optimization + removing useless JBossWS Injection class
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-04-23 15:27:15 UTC (rev 6634)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-04-23 15:57:09 UTC (rev 6635)
@@ -41,14 +41,12 @@
* @author Kohsuke Kawaguchi
* @author Heiko Braun
*/
-public class DumpPipe extends AbstractFilterPipeImpl {
-
+public class DumpPipe extends AbstractFilterPipeImpl
+{
private static Logger msgLog = Logger.getLogger("org.jboss.wsf.spi.MessageTrace");
private final String name;
-
private final PrintStream out;
-
private final XMLOutputFactory staxOut;
/**
@@ -58,114 +56,112 @@
* dumps messages, and allows people to distinguish which
* pipe instance is dumping a message when multiple
* {@link DumpPipe}s print messages out.
- * @param out
- * The output to send dumps to.
- * @param next
- * The next {@link Pipe} in the pipeline.
+ * @param out the output to send dumps to.
+ * @param next the next {@link Pipe} in the pipeline.
*/
- public DumpPipe(String name, PrintStream out, Pipe next) {
+ public DumpPipe(String name, PrintStream out, Pipe next)
+ {
super(next);
this.name = name;
this.out = out;
this.staxOut = XMLOutputFactory.newInstance();
- //staxOut.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES,true);
}
/**
- * @param out
- * The output to send dumps to.
- * @param next
- * The next {@link Pipe} in the pipeline.
- *
- * @deprecated
- * use {@link #DumpPipe(String, PrintStream, Pipe)}
+ * @param out the output to send dumps to.
+ * @param next the next {@link Pipe} in the pipeline.
+ * @deprecated use {@link #DumpPipe(String, PrintStream, Pipe)} instead
*/
- public DumpPipe(PrintStream out, Pipe next) {
+ public DumpPipe(PrintStream out, Pipe next)
+ {
this("DumpPipe",out,next);
}
/**
* Copy constructor.
*/
- private DumpPipe(DumpPipe that, PipeCloner cloner) {
+ private DumpPipe(DumpPipe that, PipeCloner cloner)
+ {
super(that,cloner);
this.name = that.name;
this.out = that.out;
this.staxOut = that.staxOut;
}
- public Packet process(Packet packet) {
+ public Packet process(Packet packet)
+ {
dump("request",packet);
Packet reply = next.process(packet);
dump("response",reply);
return reply;
}
- private void dump(String header, Packet packet) {
-
+ private void dump(String header, Packet packet)
+ {
if(!msgLog.isTraceEnabled())
return;
- msgLog.trace("====["+name+":"+header+"]====");
- if(packet.getMessage()==null)
+ msgLog.trace("====[" + name + ":" + header + "]====");
+ if(packet.getMessage() == null)
{
msgLog.trace("(none)");
}
else
{
ByteArrayOutputStream bout = new ByteArrayOutputStream();
-
- try {
-
- XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout) {
- public void close() {
- // noop
+ try
+ {
+ XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout)
+ {
+ public void close()
+ {
+ // does nothing
}
});
writer = createIndenter(writer);
packet.getMessage().copy().writeTo(writer);
writer.close();
-
- } catch (XMLStreamException e) {
+ }
+ catch (XMLStreamException e)
+ {
e.printStackTrace(new PrintStream(bout));
}
msgLog.trace(new String(bout.toByteArray()));
}
-
msgLog.trace("============");
}
/**
- * Wraps {@link XMLStreamWriter} by an indentation engine if possible.
- *
+ * Wraps {@link XMLStreamWriter} by an indentation engine if available.
* <p>
- * We can do this only when we have <tt>stax-utils.jar</tt> in the classpath.
+ * We can do this only if we have <tt>stax-utils.jar</tt> on the classpath.
+ * </p>
*/
- private XMLStreamWriter createIndenter(XMLStreamWriter writer) {
- try {
+ @SuppressWarnings("unchecked")
+ private XMLStreamWriter createIndenter(XMLStreamWriter writer)
+ {
+ try
+ {
Class clazz = getClass().getClassLoader().loadClass("javanet.staxutils.IndentingXMLStreamWriter");
Constructor c = clazz.getConstructor(XMLStreamWriter.class);
writer = (XMLStreamWriter)c.newInstance(writer);
- } catch (Exception e) {
- // if stax-utils.jar is not in the classpath, this will fail
- // so, we'll just have to do without indentation
- if(!warnStaxUtils) {
- warnStaxUtils = true;
- msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent the dump output");
- }
}
+ catch (Exception e)
+ {
+ msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent dumped output");
+ }
return writer;
}
-
- public Pipe copy(PipeCloner cloner) {
- return new DumpPipe(this,cloner);
+ public Pipe copy(PipeCloner cloner)
+ {
+ return new DumpPipe(this, cloner);
}
- public void preDestroy() {
- // noop
+ public void preDestroy()
+ {
+ // does nothing
}
- private static boolean warnStaxUtils;
}
18 years
- 1
- 0
JBossWS SVN: r6634 - in stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-23 11:27:15 -0400 (Wed, 23 Apr 2008)
New Revision: 6634
Added:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
Removed:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
fixed imports + refactoring - no functional change
Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java 2008-04-23 13:32:55 UTC (rev 6633)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java 2008-04-23 15:27:15 UTC (rev 6634)
@@ -1,164 +0,0 @@
-package org.jboss.wsf.stack.metro;
-
-import com.sun.xml.ws.transport.http.ResourceLoader;
-
-import javax.servlet.ServletContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.Set;
-import java.util.Enumeration;
-import java.io.InputStream;
-import java.io.IOException;
-
-public class FakeServletContext implements ServletContext
-{
- private ResourceLoader resourceLoader;
-
-
- public FakeServletContext(ResourceLoader resourceLoader)
- {
- this.resourceLoader = resourceLoader;
- }
-
-
- public ServletContext getContext(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public String getContextPath()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public int getMajorVersion()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public int getMinorVersion()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public String getMimeType(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Set getResourcePaths(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public URL getResource(String name)
- {
- try
- {
- return resourceLoader.getResource(name);
-
- } catch (Throwable e)
- {
- return null;
- }
- }
-
- public InputStream getResourceAsStream(String string)
- {
- try
- {
- return getResource(string).openStream();
- } catch (Throwable e)
- {
- return null;
- }
- }
-
- public RequestDispatcher getRequestDispatcher(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public RequestDispatcher getNamedDispatcher(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Servlet getServlet(String string) throws ServletException
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Enumeration getServlets()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Enumeration getServletNames()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public void log(String string)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void log(Exception exception, String string)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void log(String string, Throwable throwable)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public String getRealPath(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public String getServerInfo()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public String getInitParameter(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Enumeration getInitParameterNames()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Object getAttribute(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public Enumeration getAttributeNames()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public void setAttribute(String string, Object object)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public void removeAttribute(String string)
- {
- throw new IllegalArgumentException("Not implemented");
- }
-
- public String getServletContextName()
- {
- throw new IllegalArgumentException("Not implemented");
- }
-}
Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java (rev 0)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java 2008-04-23 15:27:15 UTC (rev 6634)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wsf.stack.metro.metadata;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+
+import javax.servlet.ServletContext;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import java.net.URL;
+import java.util.Set;
+import java.util.Enumeration;
+import java.io.InputStream;
+
+/**
+ * This ServletContext implementation provides access to resources only.
+ * Other methods are not implemented at all.
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public class FakeServletContext implements ServletContext
+{
+ private ResourceLoader resourceLoader;
+
+ public FakeServletContext(ResourceLoader resourceLoader)
+ {
+ this.resourceLoader = resourceLoader;
+ }
+
+ public URL getResource(String name)
+ {
+ try
+ {
+ return resourceLoader.getResource(name);
+ }
+ catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public InputStream getResourceAsStream(String string)
+ {
+ try
+ {
+ return getResource(string).openStream();
+ }
+ catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public ServletContext getContext(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContextPath()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getMajorVersion()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getMinorVersion()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getMimeType(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set getResourcePaths(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public RequestDispatcher getRequestDispatcher(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public RequestDispatcher getNamedDispatcher(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Servlet getServlet(String string) throws ServletException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getServlets()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getServletNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void log(String string)
+ {
+ // does nothing
+ }
+
+ public void log(Exception exception, String string)
+ {
+ // does nothing
+ }
+
+ public void log(String string, Throwable throwable)
+ {
+ // does nothing
+ }
+
+ public String getRealPath(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getServerInfo()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getInitParameter(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getInitParameterNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object getAttribute(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getAttributeNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAttribute(String string, Object object)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void removeAttribute(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getServletContextName()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-23 13:32:55 UTC (rev 6633)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-23 15:27:15 UTC (rev 6634)
@@ -31,13 +31,17 @@
import com.sun.xml.ws.transport.http.ResourceLoader;
import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
+
import org.jboss.logging.Logger;
import org.jboss.wsf.common.ResourceLoaderAdapter;
-import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
-import org.jboss.wsf.stack.metro.FakeServletContext;
import org.jboss.wsf.stack.metro.MessageStreamAdapter;
import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook;
@@ -47,7 +51,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Map;
import java.util.List;
/**
@@ -68,9 +72,7 @@
public class RuntimeModelDeploymentAspect extends DeploymentAspect
{
private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class);
-
protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
-
public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
public void start(Deployment deployment, WSFRuntime runtime)
@@ -80,7 +82,6 @@
throw new IllegalArgumentException("Null runtimeLoader");
ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
-
try
{
// Metro uses the thread context classloader in several places
@@ -93,7 +94,7 @@
}
else
{
- vfsRoot = new ResourceLoaderAdapter(runtimeLoader);
+ vfsRoot = new ResourceLoaderAdapter(runtimeLoader);
}
ResourceLoader resourceLoader = new VFSResourceLoader(vfsRoot);
@@ -106,62 +107,63 @@
DeploymentDescriptorParserExt<ServletAdapter> parser =
createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
- //URL sunJaxWsXml = getDDUrlFromResourceLoader(resourceLoaderAdapter);
URL sunJaxWsXml = getDDUrlFromContext(deployment);
List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
for(ServletAdapter adapter : adapters)
{
- for(Endpoint ep : deployment.getService().getEndpoints() )
+ for(Endpoint ep : deployment.getService().getEndpoints())
{
// TODO matching need to be improved
- if(ep.getShortName().equals(adapter.getName())&&
- ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass()))
+ boolean nameEquals = ep.getShortName().equals(adapter.getName());
+ boolean beanEquals = ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass());
+ if(nameEquals && beanEquals)
{
+ MessageStreamAdapter msgStreamAdapter = MessageStreamAdapter.FACTORY.createAdapter(adapter.getName(), null, adapter.getEndpoint());
+ // TODO JBWS-1869: Support stream based RequestHandler API
+ ep.addAttachment(MessageStreamAdapter.class, msgStreamAdapter);
ep.addAttachment(ServletAdapter.class, adapter);
-
- // JBWS-1869: Support stream based RequestHandler API
- ep.addAttachment(
- MessageStreamAdapter.class,
- MessageStreamAdapter.FACTORY.createAdapter(adapter.getName(), null, adapter.getEndpoint())
- );
break;
}
}
}
-
}
catch (Throwable e)
{
throw new WebServiceException("Failed to build METRO runtime model", e);
}
- finally{
+ finally
+ {
Thread.currentThread().setContextClassLoader(origClassLoader);
}
-
}
- private URL getDDUrlFromContext(Deployment deployment)
- throws MalformedURLException
+ @SuppressWarnings("unchecked")
+ private URL getDDUrlFromContext(Deployment deployment) throws MalformedURLException
{
- HashMap<String, String> contextProperties =
- (HashMap<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
- URL sunJaxWsXml = new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
- return sunJaxWsXml;
+ Map<String, String> contextProperties =
+ (Map<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
+
+ return new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
}
/**
* Externalized for integration
*/
- protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(
- ClassLoader classLoader, JBossWSContainer container,
- ResourceLoader resourceLoader, DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList)
- throws MalformedURLException
+ protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser
+ (
+ ClassLoader classLoader,
+ JBossWSContainer container,
+ ResourceLoader resourceLoader,
+ DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList
+ )
+ throws MalformedURLException
{
- DeploymentDescriptorParserExt<ServletAdapter> parser =
- new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList);
- return parser;
+ return new DeploymentDescriptorParserJBWS<ServletAdapter>
+ (
+ classLoader, resourceLoader, container, adapterList
+ );
}
/**
@@ -169,20 +171,17 @@
*/
protected URL getDDUrlFromResourceLoader(UnifiedVirtualFile vfsRoot) throws IOException
{
- URL sunJaxWsXml = vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL();
- return sunJaxWsXml;
+ return vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL();
}
-
/**
* Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}.
* Pipes can get ServletContext from Container and use it to load some resources.
*/
- static class JBossWSContainer extends Container
+ private static class JBossWSContainer extends Container
{
private ResourceLoader resourceLoader;
-
- private final Module module = new Module()
+ private Module module = new Module()
{
private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
@@ -198,21 +197,22 @@
this.resourceLoader = loader;
}
+ @SuppressWarnings("unchecked")
public <T> T getSPI(Class<T> spiType)
{
if (spiType == Module.class)
{
return spiType.cast(module);
}
- else if(spiType == ResourceInjector.class)
+ if(spiType == ResourceInjector.class)
{
return (T)ResourceInjector.STANDALONE;
}
- else if (spiType == ServerPipelineHook.class)
+ if (spiType == ServerPipelineHook.class)
{
return (T)new MessageLogPipelineHook();
}
- else if(spiType == ServletContext.class)
+ if(spiType == ServletContext.class)
{
return (T)new FakeServletContext(resourceLoader);
}
18 years
- 1
- 0
JBossWS SVN: r6633 - in stack/cxf/branches/tdiesler/trunk: modules/server and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 09:32:55 -0400 (Wed, 23 Apr 2008)
New Revision: 6633
Added:
stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/
stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/tdiesler/trunk/src/main/scripts/
stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml
Removed:
stack/cxf/branches/tdiesler/trunk/ant-import-tests/
stack/cxf/branches/tdiesler/trunk/modules/server/scripts/
stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/tdiesler/trunk/scripts/
stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml
Modified:
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
Log:
Move scripts to src/main
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 13:21:26 UTC (rev 6632)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -155,7 +155,7 @@
</goals>
<configuration>
<tasks>
- <ant antfile="scripts/antrun-beans-config.xml"/>
+ <ant antfile="src/main/scripts/antrun-beans-config.xml"/>
</tasks>
</configuration>
</execution>
Copied: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts (from rev 6626, stack/cxf/branches/tdiesler/trunk/modules/server/scripts)
Deleted: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 08:31:03 UTC (rev 6626)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main">
-
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
- </target>
-
- <!-- Compile resource files -->
- <target name="main" depends="init">
-
- <!-- concat jbossws-cxf50-beans.xml -->
- <echo message="Concat jbossws-cxf50-beans.xml"/>
- <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-cxf42-beans.xml -->
- <echo message="Concat jbossws-cxf42-beans.xml"/>
- <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- </target>
-
-</project>
Copied: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml)
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main">
+
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+
+ <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="main" depends="init">
+
+ <!-- concat jbossws-cxf50-beans.xml -->
+ <echo message="Concat jbossws-cxf50-beans.xml"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-cxf42-beans.xml -->
+ <echo message="Concat jbossws-cxf42-beans.xml"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+</project>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 13:21:26 UTC (rev 6632)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -216,7 +216,7 @@
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>scripts/assembly-install-jboss422.xml</descriptor>
+ <descriptor>src/main/scripts/assembly-install-jboss422.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts (from rev 6626, stack/cxf/branches/tdiesler/trunk/scripts)
Deleted: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 08:31:03 UTC (rev 6626)
+++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -1,184 +0,0 @@
-<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>deploy-structure-jboss422</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- server/default/lib -->
- <!--
- outputFileNameMapping in dependencySet uses pom's artifactid
- http://jira.codehaus.org/browse/MASSEMBLY-315
- <dependencySet>
- <outputDirectory>server/default/lib</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>false</unpack>
- <includes>
- <include>*:jaxws-api:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:saaj-api:jar</include>
- </includes>
- </dependencySet>
- -->
- </dependencySets>
-
- <moduleSets>
- <!-- client -->
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- </includes>
- <binaries>
- <outputDirectory>client</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- <include>*:geronimo-javamail*</include>
- <include>*:geronimo-ws-metadata*</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jaxb-impl:jar</include>
- <include>*:jaxb-xjc:jar</include>
- <include>*:jaxws-api:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:neethi:jar</include>
- <include>*:saaj-api:jar</include>
- <include>*:saaj-impl:jar</include>
- <include>*:spring-beans:jar</include>
- <include>*:spring-context:jar</include>
- <include>*:spring-core:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xml-resolver:jar</include>
- <include>*:XmlSchema:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:wstx-asl:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
-
- <!-- server/default/lib -->
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <!--
- useProjectArtifact is documented but not in schema
- http://jira.codehaus.org/browse/MASSEMBLY-316
- <useProjectArtifact>false</useProjectArtifact>
- -->
- <includes>
- <include>*:jaxws-api:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:saaj-api:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
-
- <!-- server/default/deploy/jbossws.sar -->
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-server</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- <include>*:geronimo-javamail*</include>
- <include>*:geronimo-ws-metadata*</include>
- <include>*:jaxrpc-api*</include>
- <include>*:jaxws-api*</include>
- <include>*:neethi*</include>
- <include>*:saaj-api*</include>
- <include>*:saaj-impl*</include>
- <include>*:spring-beans*</include>
- <include>*:spring-context*</include>
- <include>*:spring-core*</include>
- <include>*:wsdl4j*</include>
- <include>*:xml-resolver*</include>
- <include>*:XmlSchema*</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-management</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
\ No newline at end of file
Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml)
===================================================================
--- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 13:32:55 UTC (rev 6633)
@@ -0,0 +1,205 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>deploy-structure-jboss422</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+
+ <!-- bin -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+
+ <!-- server/default/lib -->
+ <!--
+ outputFileNameMapping in dependencySet uses pom's artifactid
+ http://jira.codehaus.org/browse/MASSEMBLY-315
+ <dependencySet>
+ <outputDirectory>server/default/lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:saaj-api:jar</include>
+ </includes>
+ </dependencySet>
+ -->
+ </dependencySets>
+
+ <moduleSets>
+ <!-- client -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>client</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:cxf-*</include>
+ <include>*:geronimo-javamail*</include>
+ <include>*:geronimo-ws-metadata*</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:jbossws-jboss42:jar</include>
+ <include>*:neethi:jar</include>
+ <include>*:saaj-api:jar</include>
+ <include>*:saaj-impl:jar</include>
+ <include>*:spring-beans:jar</include>
+ <include>*:spring-context:jar</include>
+ <include>*:spring-core:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:xml-resolver:jar</include>
+ <include>*:XmlSchema:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx-asl:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+
+ <!-- server/default/lib -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <!--
+ useProjectArtifact is documented but not in schema
+ http://jira.codehaus.org/browse/MASSEMBLY-316
+ <useProjectArtifact>false</useProjectArtifact>
+ -->
+ <includes>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:jbossws-jboss42:jar</include>
+ <include>*:saaj-api:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+
+ <!-- server/default/deploy/jbossws.sar -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-server</include>
+ <include>org.jboss.ws:jbossws-cxf-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:cxf-*</include>
+ <include>*:geronimo-javamail*</include>
+ <include>*:geronimo-ws-metadata*</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxrpc-api*</include>
+ <include>*:jaxws-api*</include>
+ <include>*:neethi*</include>
+ <include>*:saaj-api*</include>
+ <include>*:saaj-impl*</include>
+ <include>*:spring-beans*</include>
+ <include>*:spring-context*</include>
+ <include>*:spring-core*</include>
+ <include>*:stax-api*</include>
+ <include>*:wsdl4j*</include>
+ <include>*:xml-resolver*</include>
+ <include>*:XmlSchema*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx-asl:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <!-- server/default/deploy/jbossws.sar/jbossws-context.war -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <fileSets>
+ <!-- server/default/deploy/jbossws.sar/META-INF -->
+ <fileSet>
+ <directory>modules/server/target/resources/jbossws-cxf.sar</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/server/target/resources/jbossws-jboss42.sar</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
+ </fileSet>
+ <!-- server/default/deploy/jbossws.sar/jbossws.beans -->
+ <fileSet>
+ <directory>modules/server/target/resources/jbossws-beans42</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
18 years
- 1
- 0
JBossWS SVN: r6632 - in stack/cxf/branches/tdiesler/trunk: modules/testsuite and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 09:21:26 -0400 (Wed, 23 Apr 2008)
New Revision: 6632
Modified:
stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml
stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
Log:
tests all good
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 13:21:26 UTC (rev 6632)
@@ -24,6 +24,7 @@
<arg value="package"/>
<arg value="assembly:directory"/>
</exec>
+ <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 11:49:47 UTC (rev 6631)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 13:21:26 UTC (rev 6632)
@@ -55,7 +55,7 @@
super.setUp();
SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = new File("resources/jaxws/samples/wsrm/wsrm-client-config.xml").toURL();
+ URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml");
bus = busFactory.createBus(cxfConfig);
busFactory.setDefaultBus(bus);
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 11:49:47 UTC (rev 6631)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 13:21:26 UTC (rev 6632)
@@ -107,7 +107,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
- <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
<!--argLine>${surefire.jdpw.args}</argLine-->
<systemProperties>
<property>
@@ -171,6 +170,16 @@
<artifactId>jbossws-jboss42</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!--
Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 11:49:47 UTC (rev 6631)
+++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 13:21:26 UTC (rev 6632)
@@ -137,6 +137,8 @@
<include>*:cxf-*</include>
<include>*:geronimo-javamail*</include>
<include>*:geronimo-ws-metadata*</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
<include>*:jaxrpc-api*</include>
<include>*:jaxws-api*</include>
<include>*:neethi*</include>
@@ -145,11 +147,19 @@
<include>*:spring-beans*</include>
<include>*:spring-context*</include>
<include>*:spring-core*</include>
+ <include>*:stax-api*</include>
<include>*:wsdl4j*</include>
<include>*:xml-resolver*</include>
<include>*:XmlSchema*</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx-asl:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
18 years
- 1
- 0
JBossWS SVN: r6631 - in stack/cxf/branches/tdiesler/trunk: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 07:49:47 -0400 (Wed, 23 Apr 2008)
New Revision: 6631
Removed:
stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
Modified:
stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
Log:
deploy-jboss422 ok
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -17,7 +17,7 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars,prepare-deploy" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
<property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -17,14 +17,13 @@
<!-- Prepare Deployment Structure JBoss-4.2.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <target name="deploy-structure-jboss42" depends="prepare">
<delete dir="${deploy.structure.jboss42}"/>
- <antcall target="deploy-jbossws-cxf42" inheritall="false">
- <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-Denv=jboss422"/>
+ <arg value="package"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
<!-- ================================================================== -->
@@ -36,84 +35,63 @@
<copy todir="${jboss422.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss42}"/>
</copy>
- <unzip dest="${jboss422.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss42}"/>
</copy>
- <unzip dest="${jboss423.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss50" depends="prepare-deploy">
- <delete dir="${deploy.structure.jboss50}"/>
- <antcall target="deploy-jbossws-cxf50" inheritall="false">
- <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss50}"/>
</copy>
- <unzip dest="${jboss500.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
<fileset dir="${deploy.structure.jboss50}"/>
</copy>
- <unzip dest="${jboss501.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
<target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
- <delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
</target>
<!-- ================================================================== -->
Deleted: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment Source -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy" depends="jars">
-
- <delete dir="${deploy.artifacts.dir}"/>
-
- <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${thirdparty.dir}/wstx.jar"/>
- <copy todir="${deploy.artifacts.dir}/lib">
- <fileset dir="${thirdparty.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="juddi-service.sar"/>
- </fileset>
- <fileset dir="${cxf.management.dir}/target">
- <include name="jbossws-cxf-management-${version.id}.war"/>
- </fileset>
- <fileset dir="${cxf.client.dir}/target">
- <include name="jbossws-cxf-client-${version.id}.jar"/>
- </fileset>
- <fileset dir="${cxf.server.dir}/target">
- <include name="jbossws-cxf-server-${version.id}.jar"/>
- </fileset>
- </copy>
- <copy todir="${deploy.artifacts.dir}/resources">
- <fileset dir="${cxf.server.dir}/target/resources">
- <include name="jbossws-cxf42-beans.xml"/>
- <include name="jbossws-cxf50-beans.xml"/>
- <include name="jbossws-jboss42.sar/**"/>
- <include name="jbossws-cxf.sar/**"/>
- </fileset>
- </copy>
- </target>
-
-</project>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -17,7 +17,6 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
<import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
@@ -39,13 +38,11 @@
<property name="cxf.java.dir" value="${cxf.src.dir}/java"/>
<property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/>
<property name="cxf.output.dir" value="${cxf.dir}/target"/>
- <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/>
<property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/>
<property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/>
- <property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/>
+ <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/>
+ <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss50"/>
<property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -126,11 +126,20 @@
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/thirdparty</outputDirectory>
- <stripVersion>true</stripVersion>
+ <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>${jbossws.jboss42.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -31,7 +31,7 @@
<!-- concat jbossws-cxf50-beans.xml -->
<echo message="Concat jbossws-cxf50-beans.xml"/>
- <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml">
+ <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
@@ -41,8 +41,7 @@
<!-- Concat jbossws-cxf42-beans.xml -->
<echo message="Concat jbossws-cxf42-beans.xml"/>
- <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml">
+ <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -212,7 +212,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>deploy-structure-jboss422</finalName>
+ <finalName>deploy-jboss422</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:56:14 UTC (rev 6630)
+++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 11:49:47 UTC (rev 6631)
@@ -184,10 +184,10 @@
</fileSet>
<!-- server/default/deploy/jbossws.sar/jbossws.beans -->
<fileSet>
- <directory>modules/server/target/resources/</directory>
- <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans/META-INF</outputDirectory>
+ <directory>modules/server/target/resources/jbossws-beans42</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory>
<includes>
- <include>jbossws-cxf42-beans.xml</include>
+ <include>META-INF/**</include>
</includes>
</fileSet>
</fileSets>
18 years
- 1
- 0
JBossWS SVN: r6630 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 06:56:14 -0400 (Wed, 23 Apr 2008)
New Revision: 6630
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
Log:
Fix test regression due to changed Test* classes
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-23 10:52:34 UTC (rev 6629)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-23 10:56:14 UTC (rev 6630)
@@ -70,8 +70,8 @@
while (elements.hasNext())
{
Element e = (Element)elements.next();
- boolean nameEquals = e.getAttribute("name").equals("ExceptionFault");
- boolean typeEquals = e.getAttribute("type").endsWith(":TestException");
+ boolean nameEquals = e.getAttribute("name").equals("UserExceptionFault");
+ boolean typeEquals = e.getAttribute("type").endsWith(":UserException");
if (nameEquals && typeEquals)
{
firstTypeFound = true;
@@ -84,7 +84,7 @@
while (elements.hasNext())
{
Element e = (Element)elements.next();
- boolean nameEquals = e.getAttribute("name").equals("Exception");
+ boolean nameEquals = e.getAttribute("name").equals("UserException");
if (nameEquals)
{
secondTypeFound = true;
18 years
- 1
- 0
JBossWS SVN: r6629 - in stack/cxf/branches/tdiesler/trunk: modules/client and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 06:52:34 -0400 (Wed, 23 Apr 2008)
New Revision: 6629
Modified:
stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/profiles-example.xml
stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
Log:
deploy structure ok
Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -63,12 +63,39 @@
<artifactId>stax-api</artifactId>
</dependency>
+ <!--
+ useStrictFiltering requires dependency in all included modules
+ http://jira.codehaus.org/browse/MASSEMBLY-317
+ -->
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ </dependency>
+
<!-- jboss provided -->
<dependency>
<groupId>jboss.common</groupId>
<artifactId>jboss-common</artifactId>
</dependency>
-
</dependencies>
+ <!-- Profiles -->
+ <profiles>
+ <profile>
+ <id>jboss422-client-profile</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>jboss422</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -12,4 +12,14 @@
<version>3.0.2-SNAPSHOT</version>
</parent>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -38,11 +38,6 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -160,4 +155,23 @@
</plugins>
</build>
+ <!-- Profiles -->
+ <profiles>
+ <profile>
+ <id>jboss422-profile</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>jboss422</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -200,30 +200,10 @@
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
<classifier>scripts</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- </dependency>
</dependencies>
<!-- Plugins -->
Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -1,8 +1,8 @@
<profilesXml 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/xsd/profiles-1.0.0.xsd">
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
<profiles>
+
+ <!-- Defines the required integration properties -->
<profile>
<id>user-profile-cxf</id>
<activation>
@@ -10,6 +10,16 @@
</activation>
<properties>
<jbossws.integration.target>jboss422</jbossws.integration.target>
+ </properties>
+ </profile>
+
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <profile>
+ <id>user-profile-jboss</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
@@ -17,6 +27,6 @@
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home>
</properties>
</profile>
+
</profiles>
-
</profilesXml>
\ No newline at end of file
Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:09:32 UTC (rev 6628)
+++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:52:34 UTC (rev 6629)
@@ -64,6 +64,7 @@
<include>*:jbossws-common:jar</include>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
+ <include>*:jbossws-jboss42:jar</include>
<include>*:neethi:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
@@ -90,7 +91,7 @@
<!-- server/default/lib -->
<moduleSet>
<includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
+ <include>org.jboss.ws:jbossws-cxf-server</include>
</includes>
<binaries>
<outputDirectory>server/default/lib</outputDirectory>
@@ -110,6 +111,7 @@
<include>*:jbossws-common:jar</include>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
+ <include>*:jbossws-jboss42:jar</include>
<include>*:saaj-api:jar</include>
</includes>
</dependencySet>
@@ -121,6 +123,7 @@
<moduleSet>
<includes>
<include>org.jboss.ws:jbossws-cxf-server</include>
+ <include>org.jboss.ws:jbossws-cxf-client</include>
</includes>
<binaries>
<outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
@@ -150,35 +153,43 @@
</dependencySets>
</binaries>
</moduleSet>
+ <!-- server/default/deploy/jbossws.sar/jbossws-context.war -->
<moduleSet>
<includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
<include>org.jboss.ws:jbossws-cxf-management</include>
</includes>
<binaries>
<outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
<unpack>true</unpack>
</binaries>
</moduleSet>
</moduleSets>
+ <fileSets>
+ <!-- server/default/deploy/jbossws.sar/META-INF -->
+ <fileSet>
+ <directory>modules/server/target/resources/jbossws-cxf.sar</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/server/target/resources/jbossws-jboss42.sar</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <includes>
+ <include>META-INF/**</include>
+ </includes>
+ </fileSet>
+ <!-- server/default/deploy/jbossws.sar/jbossws.beans -->
+ <fileSet>
+ <directory>modules/server/target/resources/</directory>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans/META-INF</outputDirectory>
+ <includes>
+ <include>jbossws-cxf42-beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
18 years
- 1
- 0
JBossWS SVN: r6628 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-23 06:09:32 -0400 (Wed, 23 Apr 2008)
New Revision: 6628
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
fixing typo + removing obsolete method
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-23 09:58:14 UTC (rev 6627)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-23 10:09:32 UTC (rev 6628)
@@ -157,23 +157,10 @@
return getInitialContext("jbossws-client");
}
- public boolean hasJDK15()
- {
- try
- {
- Class.forName("java.lang.Enum");
- return true;
- }
- catch (ClassNotFoundException ex)
- {
- return false;
- }
- }
-
public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace)
{
- normalizeWhitspace(expElement, ignoreWhitespace);
- normalizeWhitspace(wasElement, ignoreWhitespace);
+ normalizeWhitespace(expElement, ignoreWhitespace);
+ normalizeWhitespace(wasElement, ignoreWhitespace);
String expStr = DOMWriter.printNode(expElement, false);
String wasStr = DOMWriter.printNode(wasElement, false);
if (expStr.equals(wasStr) == false)
@@ -279,7 +266,7 @@
/** Removes whitespace text nodes if they have an element sibling.
*/
- private static void normalizeWhitspace(Element element, boolean ignoreWhitespace)
+ private static void normalizeWhitespace(Element element, boolean ignoreWhitespace)
{
boolean hasChildElement = false;
ArrayList toDetach = new ArrayList();
@@ -297,7 +284,7 @@
}
if (node.getNodeType() == Node.ELEMENT_NODE)
{
- normalizeWhitspace((Element)node, ignoreWhitespace);
+ normalizeWhitespace((Element)node, ignoreWhitespace);
hasChildElement = true;
}
}
18 years
- 1
- 0
JBossWS SVN: r6627 - in stack/native/trunk/src/test: resources/tools/enums and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-23 05:58:14 -0400 (Wed, 23 Apr 2008)
New Revision: 6627
Removed:
stack/native/trunk/src/test/resources/tools/enums/EnumService14.wsdl
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
Log:
our target JVM is always java15 or higher
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-04-23 09:58:14 UTC (rev 6627)
@@ -32,32 +32,15 @@
* Test Enum Support
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @version $Revision$
*/
public class EnumTestCase extends JBossWSTest
{
-
- //Set up the test
- protected void setUp()
- {
- }
-
public final void testEnumWsdl() throws Exception
{
String config = getResourceFile("tools/enums/wstools-config.xml").getPath();
- String[] args= new String[]{"-dest", "tools/enums", "-config", config};
- new WSTools().generate(args);
+ new WSTools().generate(new String[] {"-dest", "tools/enums", "-config", config});
- Element exp;
- if (hasJDK15())
- {
- exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getPath()));
- }
- else
- {
- exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService14.wsdl").getPath()));
- }
-
+ Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getPath()));
Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl"));
assertEquals(exp, was);
}
Deleted: stack/native/trunk/src/test/resources/tools/enums/EnumService14.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/enums/EnumService14.wsdl 2008-04-23 08:31:03 UTC (rev 6626)
+++ stack/native/trunk/src/test/resources/tools/enums/EnumService14.wsdl 2008-04-23 09:58:14 UTC (rev 6627)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='EnumService' targetNamespace='http://org.jboss.ws/enum' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/enum/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/enum' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.ws/enum/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/enum/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <simpleType name='EyeColor'>
- <restriction base='string'>
- <enumeration value='green'/>
- <enumeration value='blue'/>
- <enumeration value='hazel'/>
- <enumeration value='brown'/>
- </restriction>
- </simpleType>
- <simpleType name='PlanetMass'>
- <restriction base='double'>
- <enumeration value='3.303E23'/>
- <enumeration value='4.869E24'/>
- <enumeration value='5.976E24'/>
- <enumeration value='6.421E23'/>
- <enumeration value='1.9E27'/>
- <enumeration value='5.688E26'/>
- <enumeration value='8.686E25'/>
- <enumeration value='1.0239999999999999E26'/>
- <enumeration value='1.2700000000000001E22'/>
- </restriction>
- </simpleType>
- <simpleType name='PlanetRadius'>
- <restriction base='decimal'>
- <enumeration value='2439700'/>
- <enumeration value='6051800'/>
- <enumeration value='6378140'/>
- <enumeration value='3397200'/>
- <enumeration value='71492000'/>
- <enumeration value='60268000'/>
- <enumeration value='25559000'/>
- <enumeration value='24746000'/>
- <enumeration value='1137000'/>
- </restriction>
- </simpleType>
- </schema>
- </types>
- <message name='EnumEndpoint_echoEnum'>
- <part name='EyeColor_1' type='ns1:EyeColor'/>
- </message>
- <message name='EnumEndpoint_echoEnumResponse'>
- <part name='result' type='ns1:EyeColor'/>
- </message>
- <message name='EnumEndpoint_echoPlanetMass'>
- <part name='PlanetMass_1' type='ns1:PlanetMass'/>
- </message>
- <message name='EnumEndpoint_echoPlanetMassResponse'>
- <part name='result' type='ns1:PlanetMass'/>
- </message>
- <message name='EnumEndpoint_echoPlanetRadius'>
- <part name='PlanetRadius_1' type='ns1:PlanetRadius'/>
- </message>
- <message name='EnumEndpoint_echoPlanetRadiusResponse'>
- <part name='result' type='ns1:PlanetMass'/>
- </message>
- <portType name='EnumEndpoint'>
- <operation name='echoEnum' parameterOrder='EyeColor_1'>
- <input message='tns:EnumEndpoint_echoEnum'/>
- <output message='tns:EnumEndpoint_echoEnumResponse'/>
- </operation>
- <operation name='echoPlanetMass' parameterOrder='PlanetMass_1'>
- <input message='tns:EnumEndpoint_echoPlanetMass'/>
- <output message='tns:EnumEndpoint_echoPlanetMassResponse'/>
- </operation>
- <operation name='echoPlanetRadius' parameterOrder='PlanetRadius_1'>
- <input message='tns:EnumEndpoint_echoPlanetRadius'/>
- <output message='tns:EnumEndpoint_echoPlanetRadiusResponse'/>
- </operation>
- </portType>
- <binding name='EnumEndpointBinding' type='tns:EnumEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoEnum'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </output>
- </operation>
- <operation name='echoPlanetMass'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </output>
- </operation>
- <operation name='echoPlanetRadius'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/enum' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='EnumService'>
- <port binding='tns:EnumEndpointBinding' name='EnumEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
18 years
- 1
- 0
JBossWS SVN: r6626 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel and 37 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 04:31:03 -0400 (Wed, 23 Apr 2008)
New Revision: 6626
Modified:
stack/native/trunk/.classpath
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
Log:
Fix test regression due to changed test output dirs
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/.classpath 2008-04-23 08:31:03 UTC (rev 6626)
@@ -38,7 +38,7 @@
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/>
<classpathentry kind="lib" path="thirdparty/jettison.jar" sourcepath="thirdparty/jettison-src.jar"/>
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -66,7 +66,7 @@
String processFileName = processFiles[i];
// check file exists before dispatching to server
- File processFile = new File(processFileName);
+ File processFile = getArchiveFile(processFileName);
if (!processFile.exists())
throw new FileNotFoundException(processFileName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -44,7 +44,7 @@
public static Test suite()
{
JBossWSTestSetup wsTestSetup = new JBossWSTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar");
- return new JbpmBpelTestSetup(wsTestSetup, new String[] { "libs/jaxrpc-samples-wsbpel-hello-process.zip" });
+ return new JbpmBpelTestSetup(wsTestSetup, new String[] { "jaxrpc-samples-wsbpel-hello-process.zip" });
}
protected void setUp() throws Exception
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -64,7 +64,7 @@
// Setup the classpath - do not modify this lightheartedly.
// Maybe you should extend the Class-Path in the MANIFEST instead.
- StringBuffer cp = new StringBuffer("./classes");
+ StringBuffer cp = new StringBuffer("./test-classes");
cp.append(":" + jbc + "/jbossws-client.jar");
if (isTargetJBoss50())
{
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -99,7 +99,7 @@
private WSDLDefinitions getWSDLDefinitions(Class seiClass, String wsdlFileName) throws Exception
{
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + wsdlFileName);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + wsdlFileName);
assertTrue(wsdlFile.exists());
WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -93,7 +93,7 @@
//Match the Service File
String fname = "HelloWsService.java";
- File file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/service/").getPath() + fname);
+ File file1 = getResourceFile("tools/jbws-160/wscompile/simple/service/" + fname);
File file2 = new File("tools/jbws-160/jbossws/simple/service/org/jboss/types/" + fname);
try
@@ -107,7 +107,7 @@
//Match the SEI
fname = "HelloWs.java";
- file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/sei/").getPath() + fname);
+ file1 = getResourceFile("tools/jbws-160/wscompile/simple/sei/" + fname);
file2 = new File("tools/jbws-160/jbossws/simple/sei/org/jboss/types/" + fname);
try
@@ -158,7 +158,7 @@
//Match the Service File
String fname = "HelloCustomService.java";
- File file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/service/").getPath() + fname);
+ File file1 = getResourceFile("tools/jbws-160/wscompile/custom/service/" + fname);
File file2 = new File("tools/jbws-160/jbossws/custom/service/org/jboss/types/" + fname);
try
@@ -172,7 +172,7 @@
//Match the SEI
fname = "HelloCustomRemote.java";
- file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/sei/").getPath() + fname);
+ file1 = getResourceFile("tools/jbws-160/wscompile/custom/sei/" + fname);
file2 = new File("tools/jbws-160/jbossws/custom/sei/org/jboss/types/" + fname);
/*try
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -60,7 +60,7 @@
generateSEI(wsdlDefinitions);
//Now validate the SEI
String fname="HoldersServiceInterface.java";
- File file1 = new File(getResourceFile("tools/holders/java/org/jboss/test/").getPath() + fname);
+ File file1 = getResourceFile("tools/holders/java/org/jboss/test/"+ fname);
File file2 = new File("tools/org/jboss/test/" + fname);
try
@@ -134,7 +134,7 @@
private WSDLDefinitions getWSDLDefinitions(String wsdlFileName) throws Exception
{
- File wsdlFile = new File(getResourceFile("tools/holders/wsdl/").getPath() + wsdlFileName);
+ File wsdlFile = getResourceFile("tools/holders/wsdl/" + wsdlFileName);
assertTrue("WSDL File exists?",wsdlFile.exists());
WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -76,7 +76,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1184/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1184/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1184/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -129,7 +129,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1259/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1259/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1259/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -871,7 +871,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1260/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1260/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1260/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1278/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1278/" + scenario).getPath();
String toolsDir = "tools/jbws1278/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -122,7 +122,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1450/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1450/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1450/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -61,7 +61,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1534/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1534/" + scenario).getPath();
String toolsDir = "tools/jbws1534/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -79,7 +79,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1597/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1597/" + scenario).getPath();
String toolsDir = "tools/jbws1597/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -48,7 +48,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1691/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1691/" + scenario).getPath();
String toolsDir = "tools/jbws1691/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -64,7 +64,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1697/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1697/" + scenario).getPath();
String toolsDir = "tools/jbws1697/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -59,7 +59,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1698/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1698/" + scenario).getPath();
String toolsDir = "tools/jbws1698/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -51,7 +51,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1723/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1723/" + scenario).getPath();
String toolsDir = "tools/jbws1723/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -51,7 +51,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1801/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1801/" + scenario).getPath();
String toolsDir = "tools/jbws1801/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1873/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1873/" + scenario).getPath();
String toolsDir = "tools/jbws1873/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1881/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1881/" + scenario).getPath();
String toolsDir = "tools/jbws1881/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws2019/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws2019/" + scenario).getPath();
String toolsDir = "tools/jbws2019/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -75,7 +75,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws429/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws429/" + scenario).getPath();
String toolsDir = "tools/jbws429/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -59,7 +59,7 @@
public void checkServiceEndpointInterface() throws Exception
{
String out_dir = "tools/jbws-206/jbossws/" + getBase();
- String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase();
String seiName = getSEIName() + ".java";
@@ -72,7 +72,7 @@
public void checkServiceInterface() throws Exception
{
String out_dir = "tools/jbws-206/jbossws/" + getBase();
- String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase();
String serviceName = getServiceName();
@@ -85,7 +85,7 @@
public final void checkUserType(String name) throws Exception
{
String out_dir = "tools/jbws-206/jbossws/" + getBase();
- String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase();
// Check User Types
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -57,7 +57,7 @@
return;
}
String out_dir = "tools/jbws-211/jbossws/" + getBase();
- String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/").getPath() + getWSDLName();
+ String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getPath();
String configStr = getBase().replaceAll("/", "");
String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getPath();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -44,8 +44,8 @@
public void testExactSourceFiles() throws Exception
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/actual/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/actual/" + fname);
sc= new JBossSourceComparator(file1,file2);
assertTrue("Source Files Match:",sc.validate());
sc.validateImports();
@@ -57,8 +57,8 @@
public void testMissingMethod()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingmethod/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingmethod/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -83,8 +83,8 @@
public void testMissingParam()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingparam/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingparam/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -109,8 +109,8 @@
public void testMissingImports()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingimport/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingimport/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -135,8 +135,8 @@
public void testDifferentMethodOrder()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/diffmethodorder/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/diffmethodorder/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -45,7 +45,7 @@
public void testXMLTypeReturned()
{
String filename = "StandardJavaTypesService_DOC_11.wsdl";
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
{
@@ -69,7 +69,7 @@
public void testXMLSchemaReturned()
{
String filename = "StandardJavaTypesService_DOC_11.wsdl";
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
{
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -46,7 +46,7 @@
public void testXMLTypeReturned() throws MalformedURLException
{
String filename = "CustomInterface20.xsd";
- File xsdFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/wsdlfixture/" + filename);
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
XSNamedMap xsmap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, "http://org.jboss.ws/types");
@@ -60,7 +60,7 @@
public void testXSDInclude() throws MalformedURLException
{
String filename = "SchemaMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemainclude/" + filename);
assertTrue("Does Schema file exist?", xsdFile.exists());
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
@@ -76,7 +76,7 @@
public void testBadXSDInclude()
{
String filename = "SchemaBadMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemainclude/" + filename);
try
{
XSModel xsmodel = parseSchema(xsdFile.toURL());
@@ -96,7 +96,7 @@
public void testXSDImport() throws MalformedURLException
{
String filename = "SchemaMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemaimport/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemaimport/" + filename);
//Create an Hashmap of <namespace,URL>
Map schemaMap = new HashMap();
schemaMap.put("http://org.jboss.ws/types", xsdFile.toURL());
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -49,7 +49,7 @@
{
String filename = "AnonTypes.xsd";
String packagename = "org.jboss.ws.types";
- String schemaFile = getResourceFile("tools/xsd/anontypes/").getPath() + filename;
+ String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getPath();
String genPath = "tools/xsd-java-checker/jbossws/anontypes/";
this.mkdirs(genPath);
@@ -59,9 +59,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Items.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/anontypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -69,7 +68,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "ItemsItem.java";
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/anontypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -56,18 +56,16 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "USAddress.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Country.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/complextypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
sc.validateImports();
@@ -90,9 +88,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Address.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -114,9 +111,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "GlobalPrice.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -138,9 +134,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Price.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/emptycontent/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/emptycontent/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -161,9 +156,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "President.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/occurrence/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/occurrence/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/occurrence/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -185,9 +179,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "AwardEmployee.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/inheritance/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -195,7 +188,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/complextypes/inheritance/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -221,9 +214,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Teacher.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/groups" + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/groups/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/groups/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -60,9 +60,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "NillableType.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/nillabletypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/nillabletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -58,27 +58,24 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "ElemAttribRef.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/references/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::ElemAttribRef.java::", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Address.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File( genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/references/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::Address.java::", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/references/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:Employee.java::", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -46,7 +46,7 @@
public void testXSDAnnotations() throws MalformedURLException
{
String filename = "xsdAnnotation.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/annotations/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/annotations/" + filename);
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
XSObjectList xsobjlist = xsmodel.getAnnotations();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -58,9 +58,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "TypicalPerson.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/simpletypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
@@ -70,9 +69,8 @@
//Compare the generated Java type against the one generated by wscompile
fname = "USMidwest.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/simpletypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @tests.output.dir(a)/resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @tests.output.dir(a)/test-resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
+ <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
<config>
<sign type="x509v3" alias="wsse"/>
<encrypt type="x509v3" alias="wsse"/>
Modified: stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @tests.output.dir(a)/resources/jaxrpc/wsse/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @tests.output.dir(a)/test-resources/jaxrpc/wsse/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/resources/jaxrpc/wsse/keystore.password</trust-store-password>
+ <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/wsse/keystore.password</trust-store-password>
<config>
<sign type="x509v3" alias="wsse"/>
<encrypt type="x509v3" alias="wsse"/>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.attachment" namespace="http://org.jboss.ws/attachment"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.inoutparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.oneway" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.outparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.usertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimport" namespace="http://jboss.org/wsdlimport"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimportwithusertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
18 years
- 1
- 0