JBossWS SVN: r4928 - in stack/native/branches/ropalka/trunk/src: main/java/org/jboss/ws/core/jaxws/client and 9 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-29 17:10:36 -0400 (Mon, 29 Oct 2007)
New Revision: 4928
Added:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/OneWayService.wsdl
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/terminateSequenceResponse.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/OneWayTestCase.properties
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/client_api/RMSequence.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
Log:
synchronizing local working copy with SVN
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -54,7 +54,6 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -23,11 +23,8 @@
// $Id$
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -76,12 +73,10 @@
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.utils.MimeUtils;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.TypesMetaData;
-import org.jboss.ws.metadata.wsrm.ReliableMessagingMetaData;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.JavaUtils;
import org.jboss.xb.binding.NamespaceRegistry;
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -112,6 +112,11 @@
{
this.wsrmSequence = wsrmSequence;
}
+
+ public final RMSequence getWSRMSequence()
+ {
+ return this.wsrmSequence;
+ }
public ClientImpl(EndpointMetaData epMetaData, HandlerResolver handlerResolver)
{
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -28,7 +28,6 @@
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -49,9 +48,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.wsrm.client_api.RMProvider;
-import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.wsf.common.JavaUtils;
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -47,6 +47,7 @@
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse;
import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable;
+import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence;
/**
* TODO: add comment
@@ -108,10 +109,6 @@
RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
Sequence sequence = rmProvider.getMessageFactory().newSequence();
sequence.setIdentifier(sequenceImpl.getId());
- if (sequenceImpl.isLastMessage())
- {
- sequence.setLastMessage();
- }
sequence.setMessageNumber(sequenceImpl.newMessageNumber());
sequence.serializeTo(soapMessage);
@@ -132,6 +129,21 @@
return true;
}
+
+ if (RMConstant.TERMINATE_SEQUENCE.equals(operation))
+ {
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ TerminateSequence terminateSequence = rmProvider.getMessageFactory().newTerminateSequence();
+ terminateSequence.setIdentifier(sequenceImpl.getId());
+ terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
+ terminateSequence.serializeTo(soapMessage);
+
+ List<Serializable> data = new LinkedList<Serializable>();
+ data.add(terminateSequence);
+ rmRequestContext.put(RMConstant.DATA, data);
+
+ return true;
+ }
}
else
{
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -24,10 +24,11 @@
public static final String REQUEST_CONTEXT = PREFIX + ".requestContext";
public static final String RESPONSE_CONTEXT = PREFIX + ".responseContext";
public static final String SEQUENCE_REFERENCE = PREFIX + ".sequenceReference";
- // TODO: separate this to enum - START
+ // TODO: use RMProvider.getConstants().getXXX() instead - START
public static final String CREATE_SEQUENCE = PREFIX + ".createSequence";
public static final String CREATE_SEQUENCE_RESPONSE = PREFIX + ".createSequenceResponse";
public static final String SEQUENCE = PREFIX + ".sequence";
+ public static final String TERMINATE_SEQUENCE = PREFIX + ".terminateSequence";
// TODO: separate this to enum - END
public static final String DATA = PREFIX + ".data";
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -21,12 +21,22 @@
*/
package org.jboss.ws.extensions.wsrm;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.xml.namespace.QName;
+
import org.jboss.ws.core.jaxws.client.ClientImpl;
import org.jboss.ws.extensions.wsrm.client_api.RMException;
import org.jboss.ws.extensions.wsrm.client_api.RMSequence;
+import org.jboss.ws.extensions.wsrm.spi.Provider;
+import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse;
+import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable;
/**
* Reliable messaging sequence implementation
@@ -40,11 +50,10 @@
private final String id;
private final ClientImpl client;
// object states variables
- private boolean closed = false;
private boolean terminated = false;
private boolean discarded = false;
- private boolean lastMessage = false;
- private AtomicLong messageNo = new AtomicLong();
+ private AtomicLong messageNumber = new AtomicLong();
+ private final Lock objectLock = new ReentrantLock();
public RMSequenceImpl(ClientImpl client, String id)
{
@@ -53,38 +62,89 @@
this.id = id;
}
- public final void close() throws RMException
- {
- this.closed = true;
- }
-
public final long newMessageNumber()
{
- return this.messageNo.incrementAndGet();
+ this.objectLock.lock();
+ try
+ {
+ return this.messageNumber.incrementAndGet();
+ }
+ finally
+ {
+ this.objectLock.unlock();
+ }
}
public final long getLastMessageNumber()
{
- return this.messageNo.get();
+ this.objectLock.lock();
+ try
+ {
+ return this.messageNumber.get();
+ }
+ finally
+ {
+ this.objectLock.unlock();
+ }
}
public final void discard() throws RMException
{
- this.client.getWSRMLock().lock();
+ this.objectLock.lock();
try
{
- this.client.setWSRMSequence(null);
- this.discarded = true;
+ this.client.getWSRMLock().lock();
+ try
+ {
+ this.client.setWSRMSequence(null);
+ this.discarded = true;
+ }
+ finally
+ {
+ this.client.getWSRMLock().unlock();
+ }
}
finally
{
- this.client.getWSRMLock().unlock();
+ this.objectLock.unlock();
}
}
public final void terminate() throws RMException
{
- this.terminated = true;
+ this.objectLock.lock();
+ try
+ {
+ if (this.terminated)
+ return;
+
+ this.terminated = true;
+
+ client.getWSRMLock().lock();
+ try
+ {
+ try
+ {
+ QName terminateSequenceQN = Provider.get().getConstants().getTerminateSequenceQName();
+ Map<String, Object> rmRequestContext = new HashMap<String, Object>();
+ rmRequestContext.put(RMConstant.OPERATION_TYPE, RMConstant.TERMINATE_SEQUENCE);
+ rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, client.getWSRMSequence());
+ this.client.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
+ this.client.invoke(terminateSequenceQN, new Object[] {}, this.client.getBindingProvider().getResponseContext());
+ }
+ catch (Exception e) {
+ throw new RMException("Unable to create WSRM sequence", e);
+ }
+ }
+ finally
+ {
+ this.client.getWSRMLock().unlock();
+ }
+ }
+ finally
+ {
+ this.objectLock.unlock();
+ }
}
public final boolean isCompleted()
@@ -102,28 +162,13 @@
return id;
}
- public final void setLastMessage()
- {
- this.lastMessage = true;
- }
-
- public final boolean isLastMessage()
- {
- return this.lastMessage;
- }
-
public final boolean isTerminated()
{
return this.terminated;
}
- public final boolean isClosed()
+ public final boolean isDiscarded()
{
- return this.closed;
- }
-
- public boolean isDiscarded()
- {
return this.discarded;
}
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/client_api/RMSequence.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/client_api/RMSequence.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/client_api/RMSequence.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -25,16 +25,11 @@
public interface RMSequence
{
- void close() throws RMException;
void discard() throws RMException;
+ boolean isDiscarded() throws RMException;
void terminate() throws RMException;
+ boolean isTerminated() throws RMException;
String getId() throws RMException;
- void setLastMessage() throws RMException;
boolean isCompleted() throws RMException;
boolean isCompleted(int timeAmount, TimeUnit timeUnit) throws RMException;
- boolean isClosed() throws RMException;
- boolean isLastMessage() throws RMException;
- long getLastMessageNumber() throws RMException;
- boolean isDiscarded() throws RMException;
- boolean isTerminated() throws RMException;
}
Added: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -0,0 +1,52 @@
+/*
+ * 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.test.ws.jaxws.wsrm;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
+
+import org.jboss.ws.extensions.addressing.AddressingClientUtil;
+
+/**
+ * Test helper
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Oct 29, 2007
+ */
+public final class Helper
+{
+
+ private Helper()
+ {
+ // no instances
+ }
+
+ public static void setAddrProps(Object proxy, String wsaAction, String serviceURL)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+ AddressingProperties props = AddressingClientUtil.createAnonymousProps(wsaAction, serviceURL);
+ bp.getRequestContext().put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props);
+ }
+
+}
Property changes on: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -1,6 +1,8 @@
package org.jboss.test.ws.jaxws.wsrm;
+import javax.jws.Oneway;
import javax.jws.WebService;
+import javax.xml.ws.addressing.Action;
import org.jboss.ws.annotation.EndpointConfig;
@@ -8,9 +10,15 @@
@EndpointConfig(configName = "Standard WSRM Client", configFile = "META-INF/wsrm-jaxws-client-config.xml")
public interface OneWayServiceIface
{
+ @Oneway
+ @Action(input="http://wsrm.example/oneway/method1")
void method1();
+ @Action(input="http://wsrm.example/oneway/method2")
+ @Oneway
void method2(String s);
+ @Action(input="http://wsrm.example/oneway/method3")
+ @Oneway
void method3(String[] sa);
}
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -1,6 +1,9 @@
package org.jboss.test.ws.jaxws.wsrm;
+import javax.jws.Oneway;
import javax.jws.WebService;
+import javax.xml.ws.addressing.Action;
+
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.annotation.Policy;
@@ -26,16 +29,22 @@
{
private Logger log = Logger.getLogger(OneWayServiceImpl.class);
+ @Action(input="http://wsrm.example/oneway/method1")
+ @Oneway
public void method1()
{
log.info("method1()");
}
+ @Action(input="http://wsrm.example/oneway/method2")
+ @Oneway
public void method2(String s)
{
log.info("method2(" + s + ")");
}
+ @Action(input="http://wsrm.example/oneway/method3")
+ @Oneway
public void method3(String[] sa)
{
log.info("method3(" + Arrays.asList(sa) + ")");
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -9,6 +9,7 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.addressing.Action;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
@@ -20,12 +21,15 @@
public interface ReqResServiceIface
{
@WebMethod(operationName = "echo")
+ @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
public Response<String> echoAsync(@WebParam(name = "String_1") String string1);
@WebMethod(operationName = "echo")
+ @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler);
@WebMethod
@WebResult(name = "result")
+ @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
public String echo(@WebParam(name = "String_1") String string1);
}
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -6,6 +6,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
@@ -36,6 +37,7 @@
@WebMethod
@WebResult(name = "result")
+ @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
public String echo(@WebParam(name = "String_1") String msg)
{
log.info("echo: " + msg);
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -75,10 +75,18 @@
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException
{
+ String pathInfo = req.getPathInfo();
+ System.out.println(pathInfo);
resp.setContentType("text/xml");
PrintWriter writer = resp.getWriter();
- String wsdlFile = getResource("WEB-INF/resources/ReqResService.wsdl");
- writer.print(wsdlFile);
+ if (pathInfo.equals("/OneWayService"))
+ {
+ writer.print(getResource("WEB-INF/resources/OneWayService.wsdl"));
+ }
+ else
+ {
+ writer.print(getResource("WEB-INF/resources/ReqResService.wsdl"));
+ }
writer.flush();
writer.close();
}
@@ -93,6 +101,8 @@
String response = getResource("WEB-INF/resources/echoResponse.xml");
if (properties.get("addressing.action").equals(CREATE_SEQUENCE_ACTION))
response = getResource("WEB-INF/resources/createSequenceResponse.xml");
+ if (properties.get("addressing.action").equals(TERMINATE_SEQUENCE_ACTION))
+ response = getResource("WEB-INF/resources/terminateSequenceResponse.xml");
response = modifyResponse(response, properties);
writer.print(response);
writer.flush();
@@ -164,6 +174,13 @@
.getElementsByTagNameNS(WSRM_NS, "MessageNumber").item(0).getTextContent().trim();
retVal.put("messaging.messagenumber", messageNumber);
}
+ NodeList terminateSequence = document.getElementsByTagNameNS(WSRM_NS, "TerminateSequence");
+ if (terminateSequence != null && terminateSequence.getLength() != 0)
+ {
+ String sequenceId = ((Element)terminateSequence.item(0))
+ .getElementsByTagNameNS(WSRM_NS, "Identifier").item(0).getTextContent().trim();
+ retVal.put("messaging.identifier", sequenceId);
+ }
System.out.println("Properties from message: " + retVal);
return retVal;
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -21,7 +21,13 @@
*/
package org.jboss.test.ws.jaxws.wsrm.oneway;
+import static org.jboss.test.ws.jaxws.wsrm.Helper.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.net.URL;
+import java.util.Properties;
import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;
@@ -43,12 +49,29 @@
*/
public class OneWayTestCase extends JBossWSTest
{
+ private static final Properties props = new Properties();
private String targetNS = "http://wsrm.jaxws.ws.test.jboss.org/";
private OneWayServiceIface proxy;
+ private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator"));
+ private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
+ static
+ {
+ // load test properties
+ File propertiesFile = new File("resources/jaxws/wsrm/properties/OneWayTestCase.properties");
+ try
+ {
+ props.load(new FileInputStream(propertiesFile));
+ }
+ catch (IOException ignore)
+ {
+ ignore.printStackTrace();
+ }
+ }
+
public static Test suite()
{
- return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-wsrm.war, jaxws-wsrm-client.jar");
+ return new JBossWSTestSetup(OneWayTestCase.class, props.getProperty("archives"));
}
@Override
@@ -56,7 +79,7 @@
{
super.setUp();
QName serviceName = new QName(targetNS, "OneWayService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsrm/OneWayService?wsdl");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (OneWayServiceIface)service.getPort(OneWayServiceIface.class);
}
@@ -64,17 +87,28 @@
public void testOneWayMethods() throws Exception
{
System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
- RMProvider wsrmProvider = (RMProvider)proxy;
- RMSequence sequence = wsrmProvider.createSequence();
- System.out.println("Created sequence with id=" + sequence.getId());
+ setAddrProps(proxy, "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence", serviceURL);
+ RMSequence sequence = null;
+ if (emulatorOn)
+ {
+ RMProvider wsrmProvider = (RMProvider)proxy;
+ sequence = wsrmProvider.createSequence();
+ System.out.println("Created sequence with id=" + sequence.getId());
+ }
+ setAddrProps(proxy, "http://useless/action1", serviceURL);
proxy.method1();
+ setAddrProps(proxy, "http://useless/action2", serviceURL);
proxy.method2("Hello World");
- sequence.setLastMessage();
+ setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
- fail("Sequence not completed within specified time amount");
- } else {
- sequence.terminate();
+ if (emulatorOn)
+ {
+ if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
+ fail("Sequence not completed within specified time amount");
+ } else {
+ setAddrProps(proxy, "http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequence", serviceURL);
+ sequence.terminate();
+ }
}
}
}
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-10-29 21:10:36 UTC (rev 4928)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.wsrm.reqres;
+import static org.jboss.test.ws.jaxws.wsrm.Helper.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -31,11 +33,8 @@
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import junit.framework.Test;
@@ -43,7 +42,6 @@
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.test.ws.jaxws.wsrm.ReqResServiceIface;
-import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.wsrm.client_api.RMProvider;
import org.jboss.ws.extensions.wsrm.client_api.RMSequence;
@@ -62,6 +60,7 @@
private Exception handlerException;
private boolean asyncHandlerCalled;
private ReqResServiceIface proxy;
+ private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator"));
static
{
@@ -170,30 +169,33 @@
private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
{
- setAddressingProperties("http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence");
+ // TODO: do not set this Action here, do it in the JAX-WS WS-RM core code instead
System.out.println("FIXME [JBWS-515] Provide an initial implementation for WS-ReliableMessaging");
- RMProvider wsrmProvider = (RMProvider)proxyObject;
- RMSequence sequence = wsrmProvider.createSequence();
- System.out.println("Created sequence with id=" + sequence.getId());
- setAddressingProperties("http://useless/action");
+ setAddrProps(proxy, "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence", serviceURL);
+ RMSequence sequence = null;
+ if (emulatorOn)
+ {
+ RMProvider wsrmProvider = (RMProvider)proxyObject;
+ sequence = wsrmProvider.createSequence();
+ System.out.println("Created sequence with id=" + sequence.getId());
+ }
+ setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- setAddressingProperties("http://useless/action");
+ setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- sequence.setLastMessage();
- setAddressingProperties("http://useless/action");
+ setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
- sequence.discard();
- fail("Sequence not completed within specified time amount");
- } else {
- sequence.terminate();
+ if (emulatorOn)
+ {
+ if (!sequence.isCompleted(1000, TimeUnit.MILLISECONDS)) {
+ sequence.discard();
+ fail("Sequence not completed within specified time amount");
+ } else {
+ // TODO: do not set this Action here, do it in the JAX-WS WS-RM core code instead
+ setAddrProps(proxy, "http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequence", serviceURL);
+ sequence.terminate();
+ }
}
}
- private void setAddressingProperties(String wsaAction) {
- BindingProvider bp = (BindingProvider)proxy;
- AddressingProperties props = AddressingClientUtil.createAnonymousProps(wsaAction, serviceURL);
- bp.getRequestContext().put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props);
- }
-
}
Modified: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml 2007-10-29 21:10:36 UTC (rev 4928)
@@ -11,7 +11,7 @@
<servlet-mapping>
<servlet-name>EndpointEmulator</servlet-name>
- <url-pattern>/ReqResService</url-pattern>
+ <url-pattern>/*</url-pattern>
</servlet-mapping>
</web-app>
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/OneWayService.wsdl
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/OneWayService.wsdl (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/OneWayService.wsdl 2007-10-29 21:10:36 UTC (rev 4928)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="OneWayService" targetNamespace="http://wsrm.jaxws.ws.test.jboss.org/" xmlns:tns="http://wsrm.jaxws.ws.test.jboss.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xs:schema targetNamespace="http://wsrm.jaxws.ws.test.jboss.org/" version="1.0" xmlns:tns="http://wsrm.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="method1" type="tns:method1"/>
+ <xs:element name="method2" type="tns:method2"/>
+ <xs:element name="method3" type="tns:method3"/>
+ <xs:complexType name="method1">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="method2">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="method3">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="OneWayServiceIface_method3">
+ <part name="method3" element="tns:method3">
+ </part>
+ </message>
+ <message name="OneWayServiceIface_method2">
+ <part name="method2" element="tns:method2">
+ </part>
+ </message>
+ <message name="OneWayServiceIface_method1">
+ <part name="method1" element="tns:method1">
+ </part>
+ </message>
+ <portType name="OneWayServiceIface">
+ <operation name="method1">
+ <input message="tns:OneWayServiceIface_method1">
+ </input>
+ </operation>
+ <operation name="method2">
+ <input message="tns:OneWayServiceIface_method2">
+ </input>
+ </operation>
+ <operation name="method3">
+ <input message="tns:OneWayServiceIface_method3">
+ </input>
+ </operation>
+ </portType>
+ <binding name="OneWayServiceIfaceBinding" type="tns:OneWayServiceIface">
+ <wsp:PolicyReference URI="#exactly_one_in_order_rm_delivery"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="method1">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method2">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method3">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ </binding>
+ <service name="OneWayService">
+ <port name="OneWayPort" binding="tns:OneWayServiceIfaceBinding">
+ <soap:address location="http://127.0.0.1:8080/jaxws-wsrm-emulator/OneWayService"/>
+ </port>
+ </service>
+ <wsp:Policy wsu:Id="exactly_one_in_order_rm_delivery" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+ </wsp:All>
+ </wsp:Policy>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/OneWayService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/terminateSequenceResponse.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/terminateSequenceResponse.xml (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/terminateSequenceResponse.xml 2007-10-29 21:10:36 UTC (rev 4928)
@@ -0,0 +1,15 @@
+<env:Envelope
+ xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'
+ xmlns:wsrm11='http://docs.oasis-open.org/ws-rx/wsrm/200702'
+ xmlns:wsa='http://www.w3.org/2005/08/addressing'>
+ <env:Header>
+ <wsa:To>${addressing.to}</wsa:To>
+ <wsa:RelatesTo>${addressing.relatesto}</wsa:RelatesTo>
+ <wsa:Action>${addressing.action}</wsa:Action>
+ </env:Header>
+ <env:Body xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <wsrm11:TerminateSequenceResponse>
+ <wsrm11:Identifier>${messaging.identifier}</wsrm11:Identifier>
+ </wsrm11:TerminateSequenceResponse>
+ </env:Body>
+</env:Envelope>
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/terminateSequenceResponse.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/OneWayTestCase.properties
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/OneWayTestCase.properties (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/OneWayTestCase.properties 2007-10-29 21:10:36 UTC (rev 4928)
@@ -0,0 +1,6 @@
+port=8080
+#path=/jaxws-wsrm/OneWayService
+path=/jaxws-wsrm-emulator/OneWayService
+#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
+archives=jaxws-wsrm-emulator.war, jaxws-wsrm-client.jar
+emulator=true
\ No newline at end of file
Modified: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties 2007-10-29 18:44:57 UTC (rev 4927)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties 2007-10-29 21:10:36 UTC (rev 4928)
@@ -2,4 +2,5 @@
#path=/jaxws-wsrm/ReqResService
path=/jaxws-wsrm-emulator/ReqResService
#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
-archives=jaxws-wsrm-emulator.war, jaxws-wsrm-client.jar
\ No newline at end of file
+archives=jaxws-wsrm-emulator.war, jaxws-wsrm-client.jar
+emulator=true
\ No newline at end of file
17 years
JBossWS SVN: r4927 - in stack/native/trunk/src: main/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-10-29 14:44:57 -0400 (Mon, 29 Oct 2007)
New Revision: 4927
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1873/
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1873 - WSDL to Java - Incorrect case of generated type for anonymous type.
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-29 17:40:36 UTC (rev 4926)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -555,7 +555,7 @@
XSElementDeclaration element = (XSElementDeclaration)term;
XSTypeDefinition type = element.getTypeDefinition();
- String tempContainingElement = containingElement + element.getName();
+ String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName());
QName xmlType = null;
if (type.getAnonymous() == false)
@@ -711,7 +711,7 @@
if (unwrapper.xmlType != null)
xmlType = unwrapper.xmlType;
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
if (unwrapper.array)
arraySuffix = "[]";
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 17:40:36 UTC (rev 4926)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -298,7 +298,7 @@
xt = element.getTypeDefinition();
primitive = unwrapper.primitive;
partName = element.getName();
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
array = unwrapper.array;
if (xt.getAnonymous())
{
@@ -632,7 +632,8 @@
QName xmlType;
if (type.getAnonymous())
{
- xmlType = new QName(type.getNamespace(), containingElement + element.getName());
+ String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName());
+ xmlType = new QName(type.getNamespace(), tempName);
}
else
{
@@ -715,7 +716,8 @@
// Anonymous
if (localName == null)
{
- javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true);
+ String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name);
+ javaType = getJavaTypeAsString(null, new QName(tempName), false, true);
StringBuilder temp = new StringBuilder();
if (containingType != null && containingType.length() > 0)
temp.append(">").append(containingType);
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873 (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873)
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.test.ws.tools.jbws1873;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case to test the following fix: -
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1873
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Oct 29, 2007
- */
-public class JBWS1873TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1873/" + scenario;
- String toolsDir = "tools/jbws1873/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.test.ws.tools.jbws1873;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1873
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 29, 2007
+ */
+public class JBWS1873TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1873/" + scenario;
+ String toolsDir = "tools/jbws1873/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873 (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873)
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit)
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1873;
-
-
-public class LookupRequest
-{
-
-protected java.lang.String surname;
-public LookupRequest(){}
-
-public LookupRequest(java.lang.String surname){
-this.surname=surname;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class LookupRequest
+{
+
+protected java.lang.String surname;
+public LookupRequest(){}
+
+public LookupRequest(java.lang.String surname){
+this.surname=surname;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1873;
-
-
-public class LookupResponseResponse
-{
-
-protected java.lang.String number;
-public LookupResponseResponse(){}
-
-public LookupResponseResponse(java.lang.String number){
-this.number=number;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class LookupResponseResponse
+{
+
+protected java.lang.String number;
+public LookupResponseResponse(){}
+
+public LookupResponseResponse(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1873;
-
-
-public class Person
-{
-
-protected org.jboss.test.ws.jbws1873.LookupRequest request;
-public Person(){}
-
-public Person(org.jboss.test.ws.jbws1873.LookupRequest request){
-this.request=request;
-}
-public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;}
-
-public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class Person
+{
+
+protected org.jboss.test.ws.jbws1873.LookupRequest request;
+public Person(){}
+
+public Person(org.jboss.test.ws.jbws1873.LookupRequest request){
+this.request=request;
+}
+public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;}
+
+public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1873'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1873/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1873'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1873/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name="request" minOccurs="0">
- <complexType>
- <all>
- <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
- </all>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name="response" minOccurs="0">
- <complexType>
- <all>
- <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
- </all>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1873'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name="request" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name="response" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1873;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException;
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1873;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException;
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Oct 29 15:50:46 GMT 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1873;
-
-
-public class TelephoneNumber
-{
-
-protected org.jboss.test.ws.jbws1873.LookupResponseResponse response;
-public TelephoneNumber(){}
-
-public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){
-this.response=response;
-}
-public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;}
-
-public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class TelephoneNumber
+{
+
+protected org.jboss.test.ws.jbws1873.LookupResponseResponse response;
+public TelephoneNumber(){}
+
+public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){
+this.response=response;
+}
+public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;}
+
+public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,78 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1873</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1873</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>request</java-variable-name>
- <xml-element-name>request</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>response</java-variable-name>
- <xml-element-name>response</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>request</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>response</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>request</java-variable-name>
+ <xml-element-name>request</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>response</java-variable-name>
+ <xml-element-name>response</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>request</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>response</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 18:44:57 UTC (rev 4927)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl"
- parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (from rev 4922, stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 18:44:57 UTC (rev 4927)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl"
+ parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
JBossWS SVN: r4926 - legacy/branches.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-10-29 13:40:36 -0400 (Mon, 29 Oct 2007)
New Revision: 4926
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1875/
Log:
JBWS-1875 - Branch for patch.
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1875 (from rev 4925, legacy/branches/jbossws-1.2.1.GA_JBWS-1788)
17 years
JBossWS SVN: r4925 - in stack/native/branches/rest: src/main/java/org/jboss/rs/model and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-29 13:03:50 -0400 (Mon, 29 Oct 2007)
New Revision: 4925
Added:
stack/native/branches/rest/rest.iml
Modified:
stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/RegexQualifier.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Specification.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Widget.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
Log:
Improved resource resolver algorithm
Added: stack/native/branches/rest/rest.iml
===================================================================
--- stack/native/branches/rest/rest.iml (rev 0)
+++ stack/native/branches/rest/rest.iml 2007-10-29 17:03:50 UTC (rev 4925)
@@ -0,0 +1,655 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/xmlunit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/serializer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/commons-collections.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs-sources.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbosssx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/xml-apis.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/resolver.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jsr311-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting-src.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/mail.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/xmlsec.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/stax-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-jaxb-intros.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/hibernate3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/xalan.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-client.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/qdox.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-resources.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-j2ee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/concurrent.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j-src.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/policy.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -84,7 +84,7 @@
RegexQualifier qualifier = null;
Matcher matcher = regexPattern.matcher(input);
- if(! matcher.find() )
+ if(! matcher.matches() )
return qualifier;
String lastGroup = matcher.group( matcher.groupCount() );
@@ -98,7 +98,7 @@
}
qualifier = new RegexQualifier(
- matcher.groupCount(),
+ getMatchingGroups(matcher),
regexPattern.pattern().length(),
lastGroup
);
@@ -106,6 +106,17 @@
return qualifier;
}
+ private static int getMatchingGroups(Matcher m)
+ {
+ int matchingGroups = 0;
+ for(int i=1; i<=m.groupCount(); i++)
+ {
+ String s = m.group(i);
+ if(s!=null && !"".equals(s)) matchingGroups++;
+ }
+ return matchingGroups;
+ }
+
private String regexFromPathSegment(String tok)
{
return "(\\b"+tok+"\\b)";
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/RegexQualifier.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/RegexQualifier.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/RegexQualifier.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -53,9 +53,17 @@
else if(to.numGroups >this.numGroups)
return 1;
else
- return 0;
+ {
+ // bigger pattern but same number of matching groups
+ // means it's less accurate
+ if(to.patternLength<this.patternLength)
+ return 1;
+ else if(to.patternLength>this.patternLength)
+ return -1;
+ else
+ return 0;
+ }
- // todo: compare by second key
}
public String toString()
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -59,17 +59,7 @@
while(it2.hasNext() && null==resourceMethod)
{
ResourceMatch rootResource = it2.next();
-
- // a root resource may be a final resource match already
- resourceMethod = resolveResourceMethod(rootResource, rootResource.qualifier.nextUriToken);
-
- // root didn't match, so recurse locators to find a resource
- if(null == resourceMethod)
- {
- ResourceMatch subResource = resolveByLocator(rootResource);
- if(subResource!=null)
- resourceMethod = resolveResourceMethod(subResource, rootResource.qualifier.nextUriToken);
- }
+ resourceMethod = dfsResourceMatch(rootResource);
}
if(null == resourceMethod)
@@ -79,6 +69,28 @@
return resourceMethod;
}
+ /**
+ * Recursive scan for resource methods.
+ * Inspect a resource match for methods and it fails try the locators.
+ *
+ * @param dfsEntry
+ * @return
+ */
+ private ResourceMethod dfsResourceMatch(ResourceMatch dfsEntry)
+ {
+ ResourceMethod resourceMethod = null;
+ resourceMethod = resolveResourceMethod(dfsEntry, dfsEntry.qualifier.nextUriToken);
+
+ // root didn't match, so recurse locators to find a resource
+ if(null == resourceMethod)
+ {
+ ResourceMatch subResource = resolveByLocator(dfsEntry);
+ if(subResource!=null)
+ resourceMethod = dfsResourceMatch(subResource);
+ }
+ return resourceMethod;
+ }
+
private ResourceMatch resolveByLocator(ResourceMatch<ResourceModel> resourceMatch)
{
ResourceMatch match = null;
@@ -93,15 +105,12 @@
weightedResults.add( new ResourceMatch( bridge.field(), qualifier) );
}
- Collections.sort(weightedResults);
- ResourceMatch next = weightedResults.get(0);
- String nextUriToken = next.qualifier.nextUriToken;
-
- if("".equals(nextUriToken) || "/".equals(nextUriToken))
- match = next;
- else
- match = resolveByLocator(next);
-
+ if(!weightedResults.isEmpty())
+ {
+ Collections.sort(weightedResults);
+ match = weightedResults.get(0);
+ }
+
return match;
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -54,7 +54,7 @@
ResourceMethod method = resolver.resolve(rootModels, "widgets/Id/spec");
assertNotNull(method);
- assertEquals(method.getUriTemplate(), "spec");
+ assertEquals("spec", method.getUriTemplate());
}
public void testRegexResolver2() throws Exception
@@ -64,7 +64,7 @@
ResourceMethod method = resolver.resolve(rootModels, "widgets/special");
assertNotNull(method);
- assertEquals(method.getUriTemplate(), "special");
+ assertEquals("special", method.getUriTemplate());
}
public void testRegexResolver3() throws Exception
@@ -74,7 +74,7 @@
ResourceMethod method = resolver.resolve(rootModels, "widgets/offers");
assertNotNull(method);
- assertEquals(method.getUriTemplate(), "offers");
+ assertEquals("offers", method.getUriTemplate());
assertTrue(method.getEntityModel().getImplementation().equals(WidgetList.class));
}
@@ -85,7 +85,7 @@
ResourceMethod method = resolver.resolve(rootModels, "widgets/Id/spec/SpecName");
assertNotNull(method);
- assertEquals(method.getUriTemplate(), "spec/{name}");
+ assertEquals("spec/{name}", method.getUriTemplate());
assertTrue(method.getEntityModel().getImplementation().equals(Specification.class));
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -32,19 +32,24 @@
{
public static void main(String[] args)
{
- String s = "special";
+ String s = "spec";
System.out.println("> " +s);
- Pattern p = Pattern.compile("(\\bspec\\b)(/)?");//Pattern.compile("(.*?)(/.*)?");
+ Pattern p = Pattern.compile("(\\bspec\\b)(.*?)(/)?");
+ //Pattern p = Pattern.compile("(\\bspec\\b)(/)?");
Matcher m = p.matcher(s);
- System.out.println("? " + m.find());
- System.out.println("! "+m.groupCount());
- System.out.println("# " + s.substring(m.end()));
- for(int i=0; i<=m.groupCount(); i++)
+ System.out.println("? " + m.matches());
+
+ int matchingGroups = 0;
+ for(int i=1; i<=m.groupCount(); i++)
{
- System.out.println("g '" + m.group(i) + "'");
+ String s1 = m.group(i);
+ System.out.println("g '" + s1 + "'");
+ if(s1!=null && "".equals(s1)==false)
+ matchingGroups++;
}
+ System.out.println("! "+matchingGroups);
System.out.println("< "+m.group(m.groupCount()));
System.out.println("---");
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Specification.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Specification.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Specification.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -27,4 +27,14 @@
*/
public class Specification
{
+ public String name = "Unknown";
+
+ public Specification()
+ {
+ }
+
+ public Specification(String name)
+ {
+ this.name = name;
+ }
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Widget.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Widget.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/Widget.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -48,6 +48,6 @@
@UriTemplate("spec/{name}")
Specification getSpecByName(@UriParam("name")String name)
{
- return new Specification();
+ return new Specification(name);
}
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-29 16:54:19 UTC (rev 4924)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-29 17:03:50 UTC (rev 4925)
@@ -24,6 +24,7 @@
import javax.ws.rs.GET;
import javax.ws.rs.UriParam;
import javax.ws.rs.UriTemplate;
+import javax.ws.rs.POST;
@UriTemplate("widgets")
public class WidgetList
@@ -34,7 +35,7 @@
return null;
}
- @GET
+ @POST
@UriTemplate("special")
void getDiscounted(Widget special) {
17 years
JBossWS SVN: r4924 - in stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt: WEB-INF and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-29 12:54:19 -0400 (Mon, 29 Oct 2007)
New Revision: 4924
Modified:
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/WEB-INF/jboss-wsse-server.xml
Log:
WCF interop tests, wsse scenario 3.3 usign RSA-OAEP. Also test for [JBWS-1874].
Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/jboss-wsse-client.xml 2007-10-29 16:52:50 UTC (rev 4923)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/jboss-wsse-client.xml 2007-10-29 16:54:19 UTC (rev 4924)
@@ -5,7 +5,7 @@
<config>
<timestamp ttl="300"/>
<sign type="x509v3" alias="1" includeTimestamp="true"/>
- <encrypt type="x509v3" alias="bob" algorithm="aes-256"/>
+ <encrypt type="x509v3" alias="bob" algorithm="aes-256" keyWrapAlgorithm="rsa_oaep"/>
<requires>
<signature/>
<encryption/>
Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/WEB-INF/jboss-wsse-server.xml 2007-10-29 16:52:50 UTC (rev 4923)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/WEB-INF/jboss-wsse-server.xml 2007-10-29 16:54:19 UTC (rev 4924)
@@ -11,7 +11,7 @@
<config>
<timestamp ttl="300"/>
<sign type="x509v3" alias="1" includeTimestamp="true"/>
- <encrypt type="x509v3" alias="alice" algorithm="aes-256"/>
+ <encrypt type="x509v3" alias="alice" algorithm="aes-256" keyWrapAlgorithm="rsa_oaep"/>
<requires>
<signature/>
<encryption/>
17 years
JBossWS SVN: r4923 - in stack/native/branches/asoldano/trunk/src/main: java/org/jboss/ws/extensions/security/element and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-29 12:52:50 -0400 (Mon, 29 Oct 2007)
New Revision: 4923
Modified:
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncodingOperation.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/OperationDescription.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
stack/native/branches/asoldano/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd
Log:
[JBWS-1874] Allow configuration of secret key wrap algorithm
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncodingOperation.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncodingOperation.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncodingOperation.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -36,5 +36,5 @@
*/
public interface EncodingOperation extends Operation
{
- public void process(Document message, List<Target> targets, String alias, String credential, String algorithm) throws WSSecurityException;
+ public void process(Document message, List<Target> targets, String alias, String credential, String algorithm, String wrap) throws WSSecurityException;
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -128,7 +128,7 @@
}
}
- public void process(Document message, List<Target> targets, String alias, String credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String credential, String algorithm, String wrap) throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
algorithm = DEFAULT_ALGORITHM;
@@ -169,7 +169,7 @@
header.addToken(token);
}
- EncryptedKey eKey = new EncryptedKey(message, secretKey, token, list);
+ EncryptedKey eKey = new EncryptedKey(message, secretKey, token, list, wrap);
header.addSecurityProcess(eKey);
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/OperationDescription.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/OperationDescription.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/OperationDescription.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -39,14 +39,17 @@
private String credential;
private String algorithm;
+
+ private String keyWrapAlgorithm;
- public OperationDescription(Class<? extends T> operation, List<Target> targets, String certicateAlias, String credential, String algorithm)
+ public OperationDescription(Class<? extends T> operation, List<Target> targets, String certicateAlias, String credential, String algorithm, String keyWrapAlgorithm)
{
this.operation = operation;
this.targets = targets;
this.certificateAlias = certicateAlias;
this.credential = credential;
this.algorithm = algorithm;
+ this.keyWrapAlgorithm = keyWrapAlgorithm;
}
public Class<? extends T> getOperation()
@@ -102,4 +105,14 @@
this.algorithm = algorithm;
}
+ public String getKeyWrapAlgorithm()
+ {
+ return keyWrapAlgorithm;
+ }
+
+ public void setKeyWrapAlgorithm(String keyWrapAlgorithm)
+ {
+ this.keyWrapAlgorithm = keyWrapAlgorithm;
+ }
+
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -80,7 +80,7 @@
throw new WSSecurityException("Error constructing operation: " + op.getOperation());
}
- operation.process(message, op.getTargets(), op.getCertificateAlias(), op.getCredential(), op.getAlgorithm());
+ operation.process(message, op.getTargets(), op.getCertificateAlias(), op.getCredential(), op.getAlgorithm(), op.getKeyWrapAlgorithm());
}
attachHeader(header, message);
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SendUsernameOperation.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -40,7 +40,7 @@
this.store = store;
}
- public void process(Document message, List<Target> targets, String username, String credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String username, String credential, String algorithm, String keyWrapAlgorithm) throws WSSecurityException
{
header.addToken(new UsernameToken(username, credential, message));
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureOperation.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -120,7 +120,7 @@
}
}
- public void process(Document message, List<Target> targets, String alias, String credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String credential, String algorithm, String keyWrapAlgorithm) throws WSSecurityException
{
Element envelope = message.getDocumentElement();
XMLSignature sig;
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/TimestampOperation.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -40,7 +40,7 @@
this.store = store;
}
- public void process(Document message, List<Target> targets, String alias, String credential, String algorithm) throws WSSecurityException
+ public void process(Document message, List<Target> targets, String alias, String credential, String algorithm, String keyWrapAlgorithm) throws WSSecurityException
{
Integer ttl = null;
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -208,20 +208,20 @@
ArrayList<OperationDescription<RequireOperation>> operations = new ArrayList<OperationDescription<RequireOperation>>();
RequireTimestamp requireTimestamp = requires.getRequireTimestamp();
if (requireTimestamp != null)
- operations.add(new OperationDescription<RequireOperation>(RequireTimestampOperation.class, null, requireTimestamp.getMaxAge(), null, null));
+ operations.add(new OperationDescription<RequireOperation>(RequireTimestampOperation.class, null, requireTimestamp.getMaxAge(), null, null, null));
RequireSignature requireSignature = requires.getRequireSignature();
if (requireSignature != null)
{
List<Target> targets = convertTargets(requireSignature.getTargets());
- operations.add(new OperationDescription<RequireOperation>(RequireSignatureOperation.class, targets, null, null, null));
+ operations.add(new OperationDescription<RequireOperation>(RequireSignatureOperation.class, targets, null, null, null, null));
}
RequireEncryption requireEncryption = requires.getRequireEncryption();
if (requireEncryption != null)
{
List<Target> targets = convertTargets(requireEncryption.getTargets());
- operations.add(new OperationDescription<RequireOperation>(RequireEncryptionOperation.class, targets, null, null, null));
+ operations.add(new OperationDescription<RequireOperation>(RequireEncryptionOperation.class, targets, null, null, null, null));
}
return operations;
@@ -251,7 +251,7 @@
Timestamp timestamp = opConfig.getTimestamp();
if (timestamp != null)
{
- operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, timestamp.getTtl(), null));
+ operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, timestamp.getTtl(), null, null));
}
if (opConfig.getUsername() != null)
@@ -267,7 +267,7 @@
if (user != null && pass != null)
{
- operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user.toString(), pass.toString(), null));
+ operations.add(new OperationDescription<EncodingOperation>(SendUsernameOperation.class, null, user.toString(), pass.toString(), null, null));
ctx.put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE);
}
}
@@ -279,20 +279,20 @@
if (sign.isIncludeTimestamp())
{
if (timestamp == null)
- operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, null, null));
+ operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, null, null, null));
if (targets != null && targets.size() > 0)
targets.add(new WsuIdTarget("timestamp"));
}
- operations.add(new OperationDescription<EncodingOperation>(SignatureOperation.class, targets, sign.getAlias(), null, null));
+ operations.add(new OperationDescription<EncodingOperation>(SignatureOperation.class, targets, sign.getAlias(), null, null, null));
}
Encrypt encrypt = opConfig.getEncrypt();
if (encrypt != null)
{
List<Target> targets = convertTargets(encrypt.getTargets());
- operations.add(new OperationDescription<EncodingOperation>(EncryptionOperation.class, targets, encrypt.getAlias(), null, encrypt.getAlgorithm()));
+ operations.add(new OperationDescription<EncodingOperation>(EncryptionOperation.class, targets, encrypt.getAlias(), null, encrypt.getAlgorithm(), encrypt.getWrap()));
}
if (operations.size() == 0)
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -22,6 +22,7 @@
package org.jboss.ws.extensions.security.element;
import java.security.PrivateKey;
+import java.util.HashMap;
import javax.crypto.SecretKey;
@@ -51,20 +52,34 @@
private X509Token token;
private ReferenceList list;
+
+ private String wrapAlgorithm;
private Element cachedElement;
+
+ private static HashMap<String, String> keyWrapAlgorithms;
+ private static final String DEFAULT_ALGORITHM = "rsa_15";
+ static
+ {
+ keyWrapAlgorithms = new HashMap<String, String>(2);
+ keyWrapAlgorithms.put("rsa_15", XMLCipher.RSA_v1dot5);
+ keyWrapAlgorithms.put("rsa_oaep", XMLCipher.RSA_OAEP);
+ }
- public EncryptedKey(Document document, SecretKey secretKey, X509Token token)
+ public EncryptedKey(Document document, SecretKey secretKey, X509Token token, String wrap)
{
- this(document, secretKey, token, new ReferenceList());
+ this(document, secretKey, token, new ReferenceList(), wrap);
}
- public EncryptedKey(Document document, SecretKey secretKey, X509Token token, ReferenceList list)
+ public EncryptedKey(Document document, SecretKey secretKey, X509Token token, ReferenceList list, String wrap)
{
this.document = document;
this.secretKey = secretKey;
this.token = token;
this.list = list;
+ this.wrapAlgorithm = keyWrapAlgorithms.get(wrap);
+ if (wrapAlgorithm ==null)
+ wrapAlgorithm = keyWrapAlgorithms.get(DEFAULT_ALGORITHM);
}
public EncryptedKey(Element element, KeyResolver resolver) throws WSSecurityException
@@ -154,7 +169,7 @@
try
{
- cipher = XMLCipher.getInstance(XMLCipher.RSA_v1dot5);
+ cipher = XMLCipher.getInstance(wrapAlgorithm);
cipher.init(XMLCipher.WRAP_MODE, token.getCert().getPublicKey());
key = cipher.encryptKey(document, secretKey);
}
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -37,12 +37,14 @@
private String type;
private String alias;
private String algorithm;
+ private String keyWrapAlgorithm;
- public Encrypt(String type, String alias, String algorithm)
+ public Encrypt(String type, String alias, String algorithm, String wrap)
{
this.type = type;
this.alias = alias;
this.algorithm = algorithm;
+ this.keyWrapAlgorithm = wrap;
}
public String getAlias()
@@ -74,4 +76,14 @@
{
this.algorithm = algorithm;
}
+
+ public String getWrap()
+ {
+ return keyWrapAlgorithm;
+ }
+
+ public void setWrap(String wrap)
+ {
+ this.keyWrapAlgorithm = wrap;
+ }
}
\ No newline at end of file
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-10-29 16:52:50 UTC (rev 4923)
@@ -232,7 +232,7 @@
}
else if ("encrypt".equals(localName))
{
- return new Encrypt(attrs.getValue("", "type"), attrs.getValue("", "alias"), attrs.getValue("", "algorithm"));
+ return new Encrypt(attrs.getValue("", "type"), attrs.getValue("", "alias"), attrs.getValue("", "algorithm"), attrs.getValue("", "keyWrapAlgorithm"));
}
else if ("timestamp".equals(localName))
{
Modified: stack/native/branches/asoldano/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd 2007-10-29 16:40:18 UTC (rev 4922)
+++ stack/native/branches/asoldano/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd 2007-10-29 16:52:50 UTC (rev 4923)
@@ -183,6 +183,17 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="keyWrapAlgorithm">
+ <xs:annotation>
+ <xs:documentation>The algorithm to use to encrypt the symmetric secret key. If not specified rsa_15 will be used.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="rsa_15"/>
+ <xs:enumeration value="rsa_oaep"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
<xs:complexType name="signType">
<xs:sequence>
17 years
JBossWS SVN: r4922 - stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-10-29 12:40:18 -0400 (Mon, 29 Oct 2007)
New Revision: 4922
Modified:
stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Fix minor regression.
Modified: stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 15:53:50 UTC (rev 4921)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 16:40:18 UTC (rev 4922)
@@ -716,7 +716,7 @@
// Anonymous
if (localName == null)
{
- String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(name);
+ String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name);
javaType = getJavaTypeAsString(null, new QName(tempName), false, true);
StringBuilder temp = new StringBuilder();
if (containingType != null && containingType.length() > 0)
17 years
JBossWS SVN: r4921 - in stack/native/branches/dlofthouse/JBWS-1873/src: main/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-10-29 11:53:50 -0400 (Mon, 29 Oct 2007)
New Revision: 4921
Added:
stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/
stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
Modified:
stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Test case and fix.
Modified: stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-29 14:55:20 UTC (rev 4920)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -555,7 +555,7 @@
XSElementDeclaration element = (XSElementDeclaration)term;
XSTypeDefinition type = element.getTypeDefinition();
- String tempContainingElement = containingElement + element.getName();
+ String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName());
QName xmlType = null;
if (type.getAnonymous() == false)
@@ -711,7 +711,7 @@
if (unwrapper.xmlType != null)
xmlType = unwrapper.xmlType;
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
if (unwrapper.array)
arraySuffix = "[]";
Modified: stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 14:55:20 UTC (rev 4920)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -298,7 +298,7 @@
xt = element.getTypeDefinition();
primitive = unwrapper.primitive;
partName = element.getName();
- containingElement = containingElement + unwrapper.unwrappedElement.getName();
+ containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName());
array = unwrapper.array;
if (xt.getAnonymous())
{
@@ -632,7 +632,8 @@
QName xmlType;
if (type.getAnonymous())
{
- xmlType = new QName(type.getNamespace(), containingElement + element.getName());
+ String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName());
+ xmlType = new QName(type.getNamespace(), tempName);
}
else
{
@@ -715,7 +716,8 @@
// Anonymous
if (localName == null)
{
- javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true);
+ String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(name);
+ javaType = getJavaTypeAsString(null, new QName(tempName), false, true);
StringBuilder temp = new StringBuilder();
if (containingType != null && containingType.length() > 0)
temp.append(">").append(containingType);
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.test.ws.tools.jbws1873;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1873
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Oct 29, 2007
+ */
+public class JBWS1873TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1873/" + scenario;
+ String toolsDir = "tools/jbws1873/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class LookupRequest
+{
+
+protected java.lang.String surname;
+public LookupRequest(){}
+
+public LookupRequest(java.lang.String surname){
+this.surname=surname;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupRequest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class LookupResponseResponse
+{
+
+protected java.lang.String number;
+public LookupResponseResponse(){}
+
+public LookupResponseResponse(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class Person
+{
+
+protected org.jboss.test.ws.jbws1873.LookupRequest request;
+public Person(){}
+
+public Person(org.jboss.test.ws.jbws1873.LookupRequest request){
+this.request=request;
+}
+public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;}
+
+public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1873'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1873/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name="request" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name="response" minOccurs="0">
+ <complexType>
+ <all>
+ <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/>
+ </all>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1873;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException;
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Oct 29 15:50:46 GMT 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1873;
+
+
+public class TelephoneNumber
+{
+
+protected org.jboss.test.ws.jbws1873.LookupResponseResponse response;
+public TelephoneNumber(){}
+
+public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){
+this.response=response;
+}
+public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;}
+
+public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1873</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>request</java-variable-name>
+ <xml-element-name>request</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>response</java-variable-name>
+ <xml-element-name>response</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>request</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>response</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 15:53:50 UTC (rev 4921)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl"
+ parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: stack/native/branches/dlofthouse/JBWS-1873/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years
JBossWS SVN: r4920 - in stack/native/branches/jbossws-native-2.0.2/src/test: java/org/jboss/test/ws/jaxrpc/jbws124 and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-29 10:55:20 -0400 (Mon, 29 Oct 2007)
New Revision: 4920
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws128/META-INF/application.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
More work on AS50 tests
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-10-29 14:38:43 UTC (rev 4919)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-10-29 14:55:20 UTC (rev 4920)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1010;
+// $Id$
+
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
@@ -30,7 +32,10 @@
import org.jboss.wsf.test.JBossWSTestSetup;
/**
+ * [JBWS-1010] - Support for inherited service endpoint interfaces - JAX-RPC 5.5.4
*
+ * http://jira.jboss.org/jira/browse/JBWS-1010
+ *
* @author darran.lofthouse(a)jboss.com
* @since 27-June-2006
*/
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-10-29 14:38:43 UTC (rev 4919)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-10-29 14:55:20 UTC (rev 4920)
@@ -29,8 +29,8 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-/** Test that we can deploy an already modified web.xml
- * This also allows for redeployment of an expanded *.war
+/**
+ * [JBWS-124] Redeployment of an unpackaged war causes a NoSuchMethodException at runtime
*
* http://jira.jboss.com/jira/browse/JBWS-124
*
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml 2007-10-29 14:38:43 UTC (rev 4919)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml 2007-10-29 14:55:20 UTC (rev 4920)
@@ -7,6 +7,18 @@
<display-name>JAXRPC simple tests</display-name>
+ <env-entry>
+ <env-entry-name>jsr109/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>appclient</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>jsr109/entry2</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>8</env-entry-value>
+ </env-entry>
+
<service-ref>
<service-ref-name>service/TestService</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
@@ -21,17 +33,5 @@
</handler>
</service-ref>
- <env-entry>
- <env-entry-name>jsr109/entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>appclient</env-entry-value>
- </env-entry>
-
- <env-entry>
- <env-entry-name>jsr109/entry2</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>8</env-entry-value>
- </env-entry>
-
</application-client>
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws128/META-INF/application.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws128/META-INF/application.xml 2007-10-29 14:38:43 UTC (rev 4919)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws128/META-INF/application.xml 2007-10-29 14:55:20 UTC (rev 4920)
@@ -10,11 +10,13 @@
<module>
<web>
<web-uri>jaxrpc-jbws128-service.war</web-uri>
+ <context-root>/jaxrpc-jbws128-service</context-root>
</web>
</module>
<module>
<web>
<web-uri>jaxrpc-jbws128-client.war</web-uri>
+ <context-root>/jaxrpc-jbws128-client</context-root>
</web>
</module>
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-29 14:38:43 UTC (rev 4919)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-29 14:55:20 UTC (rev 4920)
@@ -1,7 +1,9 @@
# [JBAS-4901] Reverse paths are not allowed (containing a . or ..)
org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxrpc/jbws153/**
# [JBAS-4902] nested jar not deployed
+org/jboss/test/ws/jaxrpc/jbws128/**
org/jboss/test/ws/jaxrpc/jbws165/**
org/jboss/test/ws/jaxws/jbws1813/**
17 years
JBossWS SVN: r4919 - in stack/native/branches/asoldano/trunk: src/test/java/org/jboss/test/ws/interop/nov2007/wsse and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-29 10:38:43 -0400 (Mon, 29 Oct 2007)
New Revision: 4919
Added:
stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java
stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/jboss-wsse-client.xml
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-web.xml
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-wsse-server.xml
stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml
Modified:
stack/native/branches/asoldano/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
WCF interoperability tests, wsse scenario 3.4
Modified: stack/native/branches/asoldano/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/asoldano/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-29 14:15:56 UTC (rev 4918)
+++ stack/native/branches/asoldano/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -823,6 +823,36 @@
</jar>
+ <!-- jbossws-interop-nov2007-wsseEncrypt3DES.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt3DES.war"
+ webxml="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF">
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/WEB-INF">
+ <include name="wsdl/**.*"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/META-INF">
+ <include name="bob-sign_enc.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+
+ <fileset dir="${tests.output.dir}/resources/interop/nov2007/wsse/">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+ <!-- jbossws-interop-nov2007-wsseEncrypt3DES.jar -->
+ <jar destfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt3DES-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/META-INF"/>
+ </jar>
+
+
<!-- jbossws-interop-nov2007-wsseSign.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseSign.war"
webxml="${tests.output.dir}/resources/interop/nov2007/wsse/sign/WEB-INF/web.xml">
Added: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,97 @@
+/*
+ * 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.test.ws.interop.nov2007.wsse;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WCF Interoperability Plug-fest - November 2007
+ *
+ * Scenario 3.4: X509 Mutual Authentication, Sign Then Encrypt, RSA1.5+TripleDes
+ *
+ * Client and Server are authenticated and messages integrity and confidentiality are provided by using
+ * Asymmetric Binding from Security Policy with server X509 certificate used as Recipient Token and
+ * client X509 certificate used as Initiator Token. SignedParts and EncryptedParts assertions are
+ * present in the corresponding policy, indicating that the Body of the message must be signed and
+ * encrypted. Protection Order property of the binding is set to SignBeforeEncrypt.
+ *
+ * SOAP Version: 1.1
+ * Addressing: No
+ * Client Certificate: Alice
+ * Server Certificate: Bob
+ * Timestamp: Yes
+ * Protection Order: Sign then Encrypt
+ * Signed parts: Timestamp, Body
+ * Encrypted parts: Body
+ * Key Wrap: RSA-1_5
+ * Encryption: 3DES
+ * Canonicalization: XML-EXC-C14N
+ * Signature: SHA1
+ *
+ *
+ * @author Alessio Soldano <alessio.soldano(a)jboss.com>
+ *
+ * @version $Id$
+ * @since 29-Oct-2007
+ */
+public class Encrypt3DESTestCase extends AbstractWSSEBase
+{
+
+ public static Test suite()
+ {
+ addClientConfToClasspath("jbossws-interop-nov2007-wsseEncrypt3DES-client.jar");
+ return new JBossWSTestSetup(Encrypt3DESTestCase.class, "jbossws-interop-nov2007-wsseEncrypt3DES.war");
+ }
+
+ public void testScenario() throws Exception
+ {
+ String text = "Hello!";
+ String result = port.ping(text);
+ assertNotNull(result);
+ assertEquals(text, result);
+ }
+
+ @Override
+ protected void scenarioSetup(IPingService port)
+ {
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ System.setProperty("org.jboss.ws.wsse.keyStore", "resources/interop/nov2007/wsse/shared/META-INF/alice-sign_enc.jks");
+ System.setProperty("org.jboss.ws.wsse.trustStore", "resources/interop/nov2007/wsse/shared/META-INF/wsse10.truststore");
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+ }
+
+ @Override
+ protected QName getScenarioPortQName()
+ {
+ return new QName("http://tempuri.org/", "MutualCertificate10SignEncryptRsa15TripleDes_IPingService_port");
+ }
+
+}
Property changes on: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,56 @@
+/*
+ * 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.test.ws.interop.nov2007.wsse;
+
+import javax.jws.WebService;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+
+/**
+ * WCF Interoperability Plug-fest - November 2007
+ *
+ * IPingService test implementation
+ *
+ * @author Alessio Soldano <alessio.soldano(a)jboss.com>
+ *
+ * @version $Id$
+ * @since 29-Oct-2007
+ */
+@WebService(
+ wsdlLocation = "WEB-INF/wsdl/WSSecurty10.wsdl",
+ serviceName = "PingService10",
+ name = "IPingService",
+ targetNamespace = "http://tempuri.org/",
+ endpointInterface = "org.jboss.test.ws.interop.nov2007.wsse.IPingService",
+ portName = "MutualCertificate10SignEncryptRsa15TripleDes_IPingService_port")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class Encrypt3DESTestService implements IPingService
+{
+
+ public String ping(String ping)
+ {
+ System.out.println("ping: "+ping);
+ return ping;
+ }
+
+}
Property changes on: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/jboss-wsse-client.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,14 @@
+<?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">
+ <config>
+ <timestamp ttl="300"/>
+ <sign type="x509v3" alias="1" includeTimestamp="true"/>
+ <encrypt type="x509v3" alias="bob" algorithm="tripledes"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,8 @@
+<client-scenarios>
+ <scenario name="default" description="Testing local endpoint">
+ <target-endpoint>http://localhost:8080/nov2007/wsseEncrypt3DES/endpoint</target-endpoint>
+ </scenario>
+ <scenario name="default-munich" description="Testing Munich endpoint">
+ <target-endpoint>http://jbossws.demo.jboss.com:8080/nov2007/wsseEncrypt3DES/endpoint</target-endpoint>
+ </scenario>
+</client-scenarios>
Property changes on: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-web.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/nov2007/wsseEncrypt3DES</context-root>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-wsse-server.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,21 @@
+<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/bob-sign_enc.jks</key-store-file>
+ <key-store-password>password</key-store-password>
+ <key-store-type>jks</key-store-type>
+ <trust-store-file>WEB-INF/wsse10.truststore</trust-store-file>
+ <trust-store-password>password</trust-store-password>
+
+ <config>
+ <timestamp ttl="300"/>
+ <sign type="x509v3" alias="1" includeTimestamp="true"/>
+ <encrypt type="x509v3" alias="alice" algorithm="tripledes"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+
+</jboss-ws-security>
Property changes on: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml 2007-10-29 14:38:43 UTC (rev 4919)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>wsseEncrypt3DESService App</display-name>
+
+ <servlet>
+ <servlet-name>Encrypt3DESEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.interop.nov2007.wsse.Encrypt3DESTestService</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Encrypt3DESEndpoint</servlet-name>
+ <url-pattern>/endpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years