[jbossws-commits] JBossWS SVN: r1485 - in trunk/src: main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxrpc/handler main/java/org/jboss/ws/metadata main/java/org/jboss/ws/tools/metadata test/ant test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler test/java/org/jboss/test/ws/jaxrpc/wsse test/resources/jaxrpc/jbws1121/WEB-INF test/resources/jaxrpc/samples/wssecurity/WEB-INF test/resources/jaxrpc/wsse/rpc test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Nov 21 06:15:53 EST 2006
Author: thomas.diesler at jboss.com
Date: 2006-11-21 06:15:14 -0500 (Tue, 21 Nov 2006)
New Revision: 1485
Added:
trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/
trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml
Removed:
trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml
Modified:
trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaDataJAXRPC.java
trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java
trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java
trunk/src/test/ant/build-jars-jaxrpc.xml
trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
Log:
[JBWS-979] Security config not in sync with handler config
Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -291,8 +291,6 @@
HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
- Class hClass = jaxrpcMetaData.getHandlerClass();
-
HashMap hConfig = new HashMap();
for (HandlerInitParam param : jaxrpcMetaData.getInitParams())
{
@@ -303,6 +301,7 @@
QName[] headerArr = new QName[headers.size()];
headers.toArray(headerArr);
+ Class hClass = jaxrpcMetaData.getHandlerClass();
hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -23,23 +23,27 @@
// $Id$
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.HandlerChain;
+import javax.xml.rpc.handler.HandlerInfo;
+
import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.xop.XOPContext;
import org.jboss.ws.metadata.HandlerMetaData;
-import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
-import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.ServerEndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.server.HandlerDelegate;
import org.jboss.ws.server.ServiceEndpointInfo;
import org.jboss.ws.soap.MessageContextAssociation;
+import org.jboss.ws.xop.XOPContext;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.HandlerChain;
-import javax.xml.rpc.handler.HandlerInfo;
-import java.util.*;
-
/** Delegates to JAXRPC handlers
*
* @author Thomas.Diesler at jboss.org
@@ -153,19 +157,6 @@
HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
- Class hClass;
- String handlerClass = jaxrpcMetaData.getHandlerClassName();
- try
- {
- // Load the handler class using the deployments top level CL
- ClassLoader classLoader = sepMetaData.getClassLoader();
- hClass = classLoader.loadClass(handlerClass);
- }
- catch (ClassNotFoundException e)
- {
- throw new WSException("Cannot load handler class: " + handlerClass);
- }
-
HashMap<String, Object> hConfig = new HashMap<String, Object>();
for (HandlerInitParam param : jaxrpcMetaData.getInitParams())
{
@@ -176,6 +167,7 @@
QName[] headerArr = new QName[headers.size()];
headers.toArray(headerArr);
+ Class hClass = jaxrpcMetaData.getHandlerClass();
hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
Modified: trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -492,7 +492,7 @@
for (OperationMetaData opMetaData : operations)
opMetaData.validate();
}
-
+
/**
* @see UnifiedMetaData#eagerInitialize()
*/
@@ -503,6 +503,10 @@
private void initializeInternal()
{
+ // Initialize handlers
+ for (HandlerMetaData handler : handlers)
+ handler.eagerInitialize();
+
eagerInitializeOperations();
eagerInitializeTypes();
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -125,6 +125,16 @@
return tmpJavaType;
}
+ public String getFaultBeanName()
+ {
+ return faultBeanName;
+ }
+
+ public void setFaultBeanName(String faultBeanName)
+ {
+ this.faultBeanName = faultBeanName;
+ }
+
public Class getFaultBean()
{
Class tmpFaultBean = faultBean;
@@ -143,16 +153,11 @@
return tmpFaultBean;
}
- public String getFaultBeanName()
+ public void validate()
{
- return faultBeanName;
+ // nothing to do
}
-
- public void setFaultBeanName(String faultBeanName)
- {
- this.faultBeanName = faultBeanName;
- }
-
+
public void eagerInitialize()
{
ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
Modified: trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.metadata;
-// $Id$
+// $Id:HandlerMetaData.java 915 2006-09-08 08:40:45Z thomas.diesler at jboss.com $
import java.io.Serializable;
import java.util.ArrayList;
@@ -43,7 +43,7 @@
public abstract class HandlerMetaData implements Serializable
{
// provide logging
- private static final Logger log = Logger.getLogger(HandlerMetaData.class);
+ private final Logger log = Logger.getLogger(HandlerMetaData.class);
public enum HandlerType
{
@@ -126,7 +126,7 @@
{
return handlerType;
}
-
+
public void setSoapHeaders(Set<QName> soapHeaders)
{
this.soapHeaders = soapHeaders;
Modified: trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaDataJAXRPC.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaDataJAXRPC.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/HandlerMetaDataJAXRPC.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.metadata;
-//$Id$
+//$Id:HandlerMetaDataJAXRPC.java 915 2006-09-08 08:40:45Z thomas.diesler at jboss.com $
import java.util.HashSet;
import java.util.Set;
@@ -73,7 +73,7 @@
StringBuffer buffer = new StringBuffer("\nHandlerMetaDataJAXRPC:");
buffer.append("\n type=" + getHandlerType());
buffer.append("\n name=" + getHandlerName());
- buffer.append("\n class=" + getHandlerClass());
+ buffer.append("\n class=" + getHandlerClassName());
buffer.append("\n params=" + getInitParams());
buffer.append("\n headers=" + getSoapHeaders());
buffer.append("\n roles=" + getSoapRoles());
Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -389,11 +389,6 @@
assertOneWayOperation();
}
- public void validate()
- {
- assertBare();
- }
-
// A JSR-181 processor is REQUIRED to report an error if an
// operation marked @Oneway has a return value, declares any checked exceptions or has any
// INOUT or OUT parameters.
@@ -415,7 +410,7 @@
}
}
- private void assertBare()
+ public void assertDocumentBare()
{
if (isDocumentBare())
{
@@ -443,6 +438,15 @@
}
}
+ public void validate()
+ {
+ for (ParameterMetaData parameter : parameters)
+ parameter.validate();
+
+ for (FaultMetaData fault : faults)
+ fault.validate();
+ }
+
/**
* @see UnifiedMetaData#eagerInitialize()
*/
@@ -490,7 +494,9 @@
buffer.append("\n javaName=" + javaName);
buffer.append("\n style=" + getStyle() + "/" + getUse());
if (getStyle() == Style.DOCUMENT)
+ {
buffer.append("/" + getParameterStyle());
+ }
buffer.append("\n oneWay=" + oneWay);
buffer.append("\n soapAction=" + soapAction);
for (ParameterMetaData param : parameters)
Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -336,6 +336,11 @@
this.partName = partName;
}
+ public void validate()
+ {
+ // nothing to do
+ }
+
/**
* @see UnifiedMetaData#eagerInitialize()
*/
Modified: trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -40,6 +40,10 @@
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.jaxrpc.Use;
+import org.jboss.ws.jaxrpc.encoding.SOAPArrayDeserializerFactory;
+import org.jboss.ws.jaxrpc.encoding.SOAPArraySerializerFactory;
+import org.jboss.ws.jbossxb.JBossXBDeserializerFactory;
+import org.jboss.ws.jbossxb.JBossXBSerializerFactory;
import org.jboss.ws.jbossxb.SchemaBindingBuilder;
import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -50,6 +54,7 @@
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import org.jboss.ws.utils.JavaUtils;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
/**
@@ -381,11 +386,57 @@
// Initialize jaxrpc-mapping data
getJavaWsdlMapping();
- // init the endpoints
+ // Initialize types
+ TypeMappingImpl typeMapping = getTypeMapping();
+ for (TypeMappingMetaData tmMetaData : types.getTypeMappings())
+ {
+ String javaTypeName = tmMetaData.getJavaTypeName();
+ QName xmlType = tmMetaData.getXmlType();
+ if (xmlType != null)
+ {
+ List<Class> registeredTypes = typeMapping.getJavaTypes(xmlType);
+
+ boolean registered = false;
+ for (Class current : registeredTypes) {
+ if (current.getName().equals(javaTypeName))
+ {
+ registered = true;
+ break;
+ }
+ }
+
+ if (registered == false)
+ {
+ try
+ {
+ ClassLoader classLoader = wsMetaData.getClassLoader();
+ Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader);
+
+ if (JavaUtils.isPrimitive(javaTypeName))
+ javaType = JavaUtils.getWrapperType(javaType);
+
+ if (getEncodingStyle() == Use.ENCODED && javaType.isArray())
+ {
+ typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory());
+ }
+ else
+ {
+ typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory());
+ }
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.warn("Cannot load class for type: " + xmlType + "," + javaTypeName);
+ }
+ }
+ }
+ }
+
+ // Initialize endpoints
for (EndpointMetaData epMetaData : endpoints.values())
epMetaData.eagerInitialize();
- // init schema binding
+ // Initialize schema binding
getSchemaBinding();
}
Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -236,7 +236,7 @@
if (! remoteExceptionFound)
throw new WSException(m.getName() + " does not throw RemoteException.");
- om.validate();
+ om.assertDocumentBare();
tmd.addOperation(om);
}
}
Modified: trunk/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 11:15:14 UTC (rev 1485)
@@ -600,8 +600,9 @@
<webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/*"/>
- <include name="jboss-wsse-server.xml"/>
</webinf>
<webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
@@ -716,7 +717,7 @@
</metainf>
</jar>
- <!-- jbossws-jbws1186 -->
+ <!-- jaxrpcws-jbws1186 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/>
@@ -730,7 +731,7 @@
</webinf>
</war>
- <!-- jbossws-jbws1205 -->
+ <!-- jaxrpcws-jbws1205 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/>
@@ -1382,6 +1383,7 @@
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
@@ -1418,6 +1420,7 @@
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
@@ -1612,7 +1615,7 @@
</webinf>
</war>
- <!-- jboss-wsse-account-signup-client.jar -->
+ <!-- jaxrpc-wsse-account-signup-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
@@ -1652,7 +1655,7 @@
</webinf>
</war>
- <!-- jboss-wsse-rpc-client.jar -->
+ <!-- jaxrpc-wsse-rpc-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
@@ -1670,8 +1673,8 @@
</metainf>
</jar>
- <!-- jboss-wsse-rpc-noconfig-client -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-noconfig-client.jar">
+ <!-- jaxrpc-wsse-rpc-none-client -->
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
@@ -1679,6 +1682,8 @@
</fileset>
<metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
<include name="jboss-client.xml"/>
</metainf>
<metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
@@ -1710,7 +1715,7 @@
</webinf>
</war>
- <!-- jboss-wsse-simple-encrypt-client.jar -->
+ <!-- jaxrpc-wsse-simple-encrypt-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
@@ -1753,7 +1758,7 @@
</webinf>
</war>
- <!-- jboss-wsse-sign-fault-client.jar -->
+ <!-- jaxrpc-wsse-sign-fault-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
@@ -1796,7 +1801,7 @@
</webinf>
</war>
- <!-- jboss-wsse-sign-encrypt-fault-client.jar -->
+ <!-- jaxrpc-wsse-sign-encrypt-fault-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
@@ -1841,7 +1846,7 @@
</webinf>
</war>
- <!-- jboss-wsse-store-pass-encrypt-class-cmd-client.jar -->
+ <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar -->
<jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -33,11 +33,11 @@
import junit.framework.Test;
-import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.jaxrpc.ServiceExt;
import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* Test dynamic handlers
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2006-11-21 10:49:43 UTC (rev 1484)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2006-11-21 11:15:14 UTC (rev 1485)
@@ -45,7 +45,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-noconfig-client.jar");
+ return JBossWSTestSetup.newTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar");
}
/**
Copied: trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml (from rev 1187, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml)
Copied: trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml (from rev 1187, branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml)
Copied: trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse (from rev 1187, branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse)
Deleted: trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2006-10-10 13:47:37 UTC (rev 1187)
+++ trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2006-11-21 11:15:14 UTC (rev 1485)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/HelloService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml (from rev 1187, branches/jbossws-1.0/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml)
More information about the jbossws-commits
mailing list