[jboss-svn-commits] JBL Code SVN: r23426 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product: etc/schemas/xml and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 10 10:16:31 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-10-10 10:16:31 -0400 (Fri, 10 Oct 2008)
New Revision: 23426
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/BaseWebServiceUnitTest.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/cert-example.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/no-security-properties.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/publicKeyStore
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/security-properties.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-keys-example.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-userpass-example.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/publicKeyStore
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/error-soap-message.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/readme.txt
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/soap-userpass-message.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
Log:
remove security/addressing from EBWS: JBESB-2111
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2008-10-10 14:16:31 UTC (rev 23426)
@@ -352,16 +352,6 @@
</xsd:restriction>
</xsd:simpleType>
- <xsd:simpleType name="webserviceType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="disabled" />
- <xsd:enumeration value="none" />
- <xsd:enumeration value="addressing" />
- <xsd:enumeration value="security" />
- <xsd:enumeration value="all" />
- </xsd:restriction>
- </xsd:simpleType>
-
<xsd:element name="actions">
<xsd:annotation>
<xsd:documentation xml:lang="en">
@@ -377,8 +367,8 @@
<xsd:attribute name="inXsd" type="xsd:string" />
<xsd:attribute name="outXsd" type="xsd:string" />
<xsd:attribute name="faultXsd" type="xsd:string" />
- <xsd:attribute name="webservice" type="jesb:webserviceType" />
- <xsd:attribute name="validate" type="xsd:boolean" />
+ <xsd:attribute name="webservice" type="xsd:boolean" default="true"/>
+ <xsd:attribute name="validate" type="xsd:boolean" default="false"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="action">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -24,7 +24,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.io.StringWriter;
import java.util.Iterator;
@@ -51,11 +50,6 @@
import org.jboss.soa.esb.message.Fault;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.services.security.PublicCryptoUtil;
-import org.jboss.soa.esb.services.security.SecurityService;
-import org.jboss.soa.esb.services.security.SecurityServiceException;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.ws.WSSecuritySoapExtractor;
import org.w3c.dom.Document;
import com.arjuna.common.util.propertyservice.PropertyManager;
@@ -74,13 +68,10 @@
protected final ServiceInvoker serviceInvoker ;
- private final WSSecuritySoapExtractor securityExtractor;
-
protected BaseWebService(final String category, final String name)
throws MessageDeliverException
{
serviceInvoker = new ServiceInvoker(category, name) ;
- securityExtractor = new WSSecuritySoapExtractor();
}
public SOAPMessage invoke(final SOAPMessage request)
@@ -118,9 +109,6 @@
throw new SOAPException("Could not find SOAPElement in SOAPBody") ;
}
- // extract security information from SOAP and set on esb message
- addAuthRequestToMessage(request, esbReq);
-
final Message esbRes = deliverMessage(esbReq) ;
if (esbRes != null)
{
@@ -223,23 +211,6 @@
return faultMsg ;
}
- private void addAuthRequestToMessage(final SOAPMessage from, final Message to) throws SecurityServiceException
- {
- final AuthenticationRequest authRequest = securityExtractor.extractSecurityInfo(from);
- if (authRequest != null)
- {
- byte[] encrypted = PublicCryptoUtil.INSTANCE.encrypt((Serializable) authRequest);
- if (encrypted != null)
- {
- to.getProperties().setProperty(SecurityService.AUTH_REQUEST, encrypted);
- }
- else
- {
- LOGGER.warn("No public keystore has been configured which means that the authentication request cannot be encrypted. Please configure jbossesb-properties.xml with a publickey store.");
- }
- }
- }
-
protected abstract Message deliverMessage(final Message request)
throws Exception ;
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -52,7 +52,7 @@
}
}
- public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo, final boolean includeHandlers)
+ public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo)
throws WebServicePublishException {
try {
pool.get(epInfo.getClassName());
@@ -100,15 +100,6 @@
annotation2.addMemberValue("value", enumValue);
attribute.addAnnotation(annotation2);
- if (includeHandlers)
- {
- final Annotation handlerChainAnnotation = new Annotation("javax.jws.HandlerChain", constantPool) ;
- final StringMemberValue handlerValue = new StringMemberValue(constantPool) ;
- handlerValue.setValue("esb-jaxws-handlers.xml") ;
- handlerChainAnnotation.addMemberValue("file", handlerValue) ;
- attribute.addAnnotation(handlerChainAnnotation) ;
- }
-
seiClass.getClassFile().addAttribute(attribute);
final String constructorStr = "super(\"" + category + "\"," + "\"" + service + "\");";
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -61,13 +61,11 @@
import org.jboss.mx.util.ObjectNameConverter;
import org.jboss.soa.esb.lifecycle.LifecycleResourceManager;
import org.jboss.soa.esb.listeners.config.xbeanmodel.JbossesbDocument;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.WebserviceType;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionDocument.Action;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionsDocument.Actions;
import org.jboss.soa.esb.listeners.config.xbeanmodel.JbossesbDocument.Jbossesb;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ServicesDocument.Services;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.WebserviceType.Enum;
import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.system.ServiceControllerMBean;
import org.jboss.system.server.ServerConfig;
@@ -94,21 +92,6 @@
private static final String PREFIX_CANONICAL_NAME = "jboss.esb:deployment=" ;
private static final String ESB_ARTIFACT_NAME = "jbossesb.esb" ;
- private final String HANDLER_CHAIN_PREFIX = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<handler-chains xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
- " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd\">" +
- "<handler-chain><protocol-bindings>##SOAP11_HTTP</protocol-bindings>" ;
- private final String HANDLER_CHAIN_POSTFIX = "</handler-chain></handler-chains>" ;
- private final String HANDLER_PREFIX = "<handler><handler-name>" ;
- private final String HANDLER_MIDDLE = "</handler-name><handler-class>" ;
- private final String HANDLER_POSTFIX = "</handler-class></handler>" ;
-
- private final String WSADDR_NAME = "WSAddressing Handler" ;
- private final String WSADDR_HANDLER = "org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler" ;
-
- private final String WSSEC_NAME = "WSSecurity Handler" ;
- private final String WSSEC_HANDLER = "org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer" ;
-
/**
* Default CTOR used to set default values to the Suffixes and RelativeOrder
* attributes. Those are read at subdeployer registration time by the MainDeployer
@@ -493,7 +476,7 @@
final Actions actions = service.getActions() ;
if (actions != null)
{
- if (!WebserviceType.DISABLED.equals(actions.getWebservice()))
+ if (!actions.isSetWebservice() || actions.getWebservice())
{
final String inXsd = actions.getInXsd() ;
if (inXsd != null)
@@ -522,16 +505,8 @@
final String wsdl = ESBContractGenerator.generateWSDL(service, serviceInfo) ;
addFile(zos, serviceInfo.getWSDLFileName(), wsdl) ;
- final String handlers = getHandlers(service.getActions().getWebservice()) ;
- final boolean includeHandlers = (handlers != null) ;
- if (includeHandlers)
- {
- final String wsHandlerName = "WEB-INF/classes/" + serviceInfo.getPackageName().replace('.', '/') + "/esb-jaxws-handlers.xml" ;
- addFile(zos, wsHandlerName, handlers) ;
- }
-
final byte[] wsClass = generator.generate(service.getCategory(),
- service.getName(), serviceInfo, includeHandlers) ;
+ service.getName(), serviceInfo) ;
final String wsClassName = serviceInfo.getClassName().replace('.', '/') + ".class" ;
addFile(zos, "WEB-INF/classes/" + wsClassName, wsClass) ;
@@ -697,35 +672,4 @@
{
esbNames.remove(deploymentName) ;
}
-
- private String getHandlers(final Enum webservice)
- {
- final int type = (webservice == null ? WebserviceType.INT_NONE : webservice.intValue()) ;
- final String result ;
-
- if ((type == WebserviceType.INT_DISABLED) || (type == WebserviceType.INT_NONE))
- {
- result = null ;
- }
- else
- {
- final StringBuilder sb = new StringBuilder(HANDLER_CHAIN_PREFIX) ;
- switch (type)
- {
- case WebserviceType.INT_ALL:
- sb.append(HANDLER_PREFIX).append(WSADDR_NAME).append(HANDLER_MIDDLE).append(WSADDR_HANDLER).append(HANDLER_POSTFIX) ;
- sb.append(HANDLER_PREFIX).append(WSSEC_NAME).append(HANDLER_MIDDLE).append(WSSEC_HANDLER).append(HANDLER_POSTFIX) ;
- break ;
- case WebserviceType.INT_ADDRESSING:
- sb.append(HANDLER_PREFIX).append(WSADDR_NAME).append(HANDLER_MIDDLE).append(WSADDR_HANDLER).append(HANDLER_POSTFIX) ;
- break ;
- case WebserviceType.INT_SECURITY:
- sb.append(HANDLER_PREFIX).append(WSSEC_NAME).append(HANDLER_MIDDLE).append(WSSEC_HANDLER).append(HANDLER_POSTFIX) ;
- break ;
- }
- sb.append(HANDLER_CHAIN_POSTFIX) ;
- result = sb.toString() ;
- }
- return result ;
- }
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -29,7 +29,6 @@
import org.jboss.soa.esb.dom.YADOMUtil;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.config.xbeanmodel.MepType;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.WebserviceType;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionDocument.Action;
import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionsDocument.Actions;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
@@ -84,11 +83,6 @@
{
listenerConfigTree.setAttribute(ListenerTagNames.VALIDATE_ATTRIBUTE_TAG, Boolean.toString(actions.getValidate())) ;
}
- final WebserviceType.Enum webservice = actions.getWebservice() ;
- if (webservice != null)
- {
- listenerConfigTree.setAttribute(ListenerTagNames.WEBSERVICE_ATTRIBUTE_TAG, webservice.toString()) ;
- }
SecurityMapper.map(listenerConfigTree, listenerService);
List<Action> actionList = actions.getActionList();
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/BaseWebServiceUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/BaseWebServiceUnitTest.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/BaseWebServiceUnitTest.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,165 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
- * LLC, and individual contributors 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.internal.soa.esb.webservice;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.internal.soa.esb.couriers.MockCourier;
-import org.jboss.internal.soa.esb.couriers.MockCourierFactory;
-import org.jboss.internal.soa.esb.services.registry.MockRegistry;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.security.PublicCryptoUtil;
-import org.jboss.soa.esb.services.security.SecurityService;
-import org.jboss.soa.esb.services.security.SecurityServiceException;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.ws.WSTestUtil;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-/**
- * Unittest for {@link BaseWebService}
- *
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class BaseWebServiceUnitTest
-{
- private static String serviceCategory = "cat";
- private static String serviceName = "name";
- private static MockCourier mockCourier;
- private String jbossEsbProperties;
-
- @Test
- public void invokeWithBinarySecurityTokenHeader() throws ParserConfigurationException, SAXException, IOException, SOAPException, MessageDeliverException, SecurityServiceException
- {
- SOAPMessage soap = WSTestUtil.createMessage("soap-keys-example.xml", BaseWebServiceUnitTest.class);
- MockBaseWebService service = new MockBaseWebService(serviceCategory, serviceName);
- service.invoke(soap);
-
- Message esbMessage = service.getEsbMessage();
- byte[] encrypted = (byte[]) esbMessage.getProperties().getProperty( SecurityService.AUTH_REQUEST );
- assertNotNull("AuthRequest should have been encrypted", encrypted );
-
- AuthenticationRequest authRequest = (AuthenticationRequest) PublicCryptoUtil.INSTANCE.decrypt(encrypted);
- assertNotNull( authRequest );
- assertTrue(authRequest.getCredentials().size() == 1 );
- assertTrue(authRequest.getCredentials().iterator().next() instanceof X509Certificate );
- }
-
- @Test
- public void invokeWithUsernameTokenHeader() throws ParserConfigurationException, SAXException, IOException, SOAPException, MessageDeliverException, SecurityServiceException
- {
- SOAPMessage soap = WSTestUtil.createMessage("soap-userpass-example.xml", BaseWebServiceUnitTest.class);
- MockBaseWebService service = new MockBaseWebService(serviceCategory, serviceName);
- service.invoke(soap);
-
- Message esbMessage = service.getEsbMessage();
- byte[] encrypted = (byte[]) esbMessage.getProperties().getProperty( SecurityService.AUTH_REQUEST );
- assertNotNull("AuthRequest should have been encrypted", encrypted );
-
- AuthenticationRequest authRequest = (AuthenticationRequest) PublicCryptoUtil.INSTANCE.decrypt(encrypted);
- assertNotNull( authRequest );
- assertEquals("Clark", authRequest.getPrincipal().getName());
- assertTrue(authRequest.getCredentials().size() == 1 );
- assertTrue(authRequest.getCredentials().iterator().next() instanceof char[] );
- }
-
- @BeforeClass
- public static void classSetup() throws ConfigurationException, URISyntaxException
- {
- MockCourierFactory.install();
- MockRegistry.install();
- EPR epr = new EPR(new URI("test1"));
- mockCourier = new MockCourier(true);
- MockRegistry.register(serviceCategory, serviceName, epr, mockCourier);
- }
-
- @AfterClass
- public static void classTearDown()
- {
- MockRegistry.uninstall();
- MockCourierFactory.uninstall();
- }
-
- @Before
- public void setup() throws ConfigurationException
- {
- jbossEsbProperties = System.getProperty(Environment.PROPERTIES_FILE);
- URL resource = ClassUtil.getResource("security-properties.xml", getClass());
- System.setProperty(Environment.PROPERTIES_FILE, "abs://" + resource.getFile());
- }
-
- @After
- public void tearDown()
- {
- if ( jbossEsbProperties != null )
- System.setProperty(Environment.PROPERTIES_FILE, jbossEsbProperties);
- }
-
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(BaseWebServiceUnitTest.class);
- }
-
- private class MockBaseWebService extends BaseWebService
- {
- private Message esbMessage;
-
- public Message getEsbMessage()
- {
- return esbMessage;
- }
-
- protected MockBaseWebService(String category, String name) throws MessageDeliverException
- {
- super(category, name);
- }
-
- @Override
- protected Message deliverMessage(Message request) throws Exception
- {
- this.esbMessage = request;
-
- return request;
- }
- }
-}
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/cert-example.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/cert-example.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/cert-example.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,11 +0,0 @@
-MIICQjCCAasCBEif0tUwDQYJKoZIhvcNAQEEBQAwaDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0
-b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVK
-Qm9zczEPMA0GA1UEAxMGRGFuaWVsMB4XDTA4MDgxMTA1NDkwOVoXDTA4MTEwOTA1NDkwOVowaDEL
-MAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYD
-VQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVKQm9zczEPMA0GA1UEAxMGRGFuaWVsMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCdSh96Xyt4LeZbXz9pk4eaHrj2sGFmI9lkLQiW/DbF9ETXFvWYCS4N
-lsONmPx63KSbzJZQZRlJSAW2y6hQO18G9NMFQpn2W/jtPSw61kH3dXDQ+kZ2UMk9K93nt4XLvGm6
-dMQAGZAjzpz4lzhcYrDJI4NMw5LpeljDawkradtuiwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAHi2
-S1zC8jIqncSeMRwOvPOEQIcsZJELYFUCiTwPrAg5hNkp/oewm6uCkgqmry09+3+ZXg2KLQ+RgeuV
-8yfeBvk7TFjtOWeHWnBOaxKiAyLibxGchVfMPl847MZ2w4d6vu776cqb1NKghAE53dn9AzUHIWwx
-OizXyDaDiBMj5xgs
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/no-security-properties.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/no-security-properties.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/no-security-properties.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
- by the @authors tag. All rights reserved.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/>
- <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
- <property name="jboss.esb.invm.scope.default" value="NONE"/>
- </properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
- <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
- <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/>
- <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/>
- <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
- <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/>
- <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/>
- </properties>
- <properties name="connection">
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
- <properties name="dbstore">
-
- <!-- connection manager type -->
- <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
-
- <!-- this property is only used if using the j2ee connection manager -->
- <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/>
-
- <!-- standalone connection pooling settings -->
- <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
- <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
- <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
- <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
- <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
- <!--table managed by pool to test for valid connections - created by pool automatically -->
- <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
-
- </properties>
- <properties name="filters">
- <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
- <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
- </properties>
-</esb>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/publicKeyStore
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/security-properties.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/security-properties.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/security-properties.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
- by the @authors tag. All rights reserved.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/>
- <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
- <property name="jboss.esb.invm.scope.default" value="NONE"/>
- </properties>
- <properties name="security">
- <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/>
- <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
- <property name="org.jboss.soa.esb.services.security.configUrl" value="jaas.login"/>
-
- <property name="org.jboss.soa.esb.services.security.publicKeystore" value="publicKeyStore"/>
- <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/>
- </properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
- <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
- <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/>
- <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/>
- <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
- <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/>
- <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/>
- </properties>
- <properties name="connection">
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
- <properties name="dbstore">
-
- <!-- connection manager type -->
- <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
-
- <!-- this property is only used if using the j2ee connection manager -->
- <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/>
-
- <!-- standalone connection pooling settings -->
- <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
- <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
- <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
- <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
- <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
- <!--table managed by pool to test for valid connections - created by pool automatically -->
- <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
-
- </properties>
- <properties name="filters">
- <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
- <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
- </properties>
-</esb>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-keys-example.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-keys-example.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-keys-example.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,21 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <soap:Header>
- <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
- <wsse:BinarySecurityToken EncodingType="wsse:Base64Binary" ValueType="wsse:X509v3">MIICVDCCAb0CBEii4NgwDQYJKoZIhvcNAQEEBQAwcTELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0
-b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVK
-Qm9zczEYMBYGA1UEAxMPRGFuaWVsIEJldmVuaXVzMB4XDTA4MDgxMzEzMjU0NFoXDTM1MTIyOTEz
-MjU0NFowcTELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2to
-b2xtMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVKQm9zczEYMBYGA1UEAxMPRGFuaWVsIEJl
-dmVuaXVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJRSE6wHkF5DK6DkHTMPnP4dNZXeon
-cCP7Ufn5hjXWLdsq9dAEbuiRLAE4HoNxxqgCHdoKjMO9N1/CIn5dmWw4DBWLp8OHx8Wnyp0MYmCz
-B31jHJpuXkkRq50vRYtKN0NIOyw7eF+XWf4u0dXNgFtXHuUxhAyEm/kTxO1SNVUTwwIDAQABMA0G
-CSqGSIb3DQEBBAUAA4GBADCzl0gXAY0xysdHkKNdwaBDzlibLPz2zmaHcit841qVn05p/I1gsbUV
-vEPh6i/Dj57vdE+X66sPbI36uZiqyWqEr6wvCJDtaTbhSLmckk7ioXwLvdKEQ150MPBsjWRRnFGN
-tZhrQfjo0q8seLh0kgconbfN4pHllfNkJPcdSBvi</wsse:BinarySecurityToken>
- </wsse:Security>
- </soap:Header>
- <soap:Body>
- <dummyBody>hello</dummyBody>
- </soap:Body>
-</soap:Envelope>
-
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-userpass-example.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-userpass-example.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/soap-userpass-example.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -1,19 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <soap:Header>
- <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
- <wsse:UsernameToken>
- <wsse:Username>Clark</wsse:Username>
- <wsse:Password>griswald</wsse:Password>
- </wsse:UsernameToken>
- </wsse:Security>
- </soap:Header>
-
- <soap:Body>
- <dummyBody>some content...</dummyBody>
- </soap:Body>
-
-</soap:Envelope>
-
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/build.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/build.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -31,8 +31,6 @@
<arg value="ESBServiceSample"/> <!-- service category -->
<arg value="HelloWorldPubService"/> <!-- service name -->
<arg value="HelloWorld"/> <!-- Message text -->
- <arg value="esbuser"/> <!-- username text -->
- <arg value="esbpassword"/> <!-- password text -->
<classpath refid="exec-classpath"/>
</java>
<echo>Send esb message to esb service and get error</echo>
@@ -40,8 +38,6 @@
<arg value="ESBServiceSample"/> <!-- service category -->
<arg value="HelloWorldPubService"/> <!-- service name -->
<arg value="Error"/> <!-- Message text -->
- <arg value="esbuser"/> <!-- username text -->
- <arg value="esbpassword"/> <!-- password text -->
<classpath refid="exec-classpath"/>
</java>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/error-soap-message.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/error-soap-message.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/error-soap-message.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -2,18 +2,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:say="http://www.jboss.org/sayHi">
-
- <soap:Header>
- <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
- <wsse:UsernameToken>
- <wsse:Username>esbuser</wsse:Username>
- <wsse:Password>esbpassword</wsse:Password>
- </wsse:UsernameToken>
- </wsse:Security>
- </soap:Header>
-
<soap:Body>
- <say:sayHi><say:Error>Error</say:Error></say:sayHi>
+ <say:sayHi><say:arg0>Error</say:arg0></say:sayHi>
</soap:Body>
</soap:Envelope>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -19,15 +19,13 @@
category="ESBServiceSample"
name="HelloWorldPubService"
description="Hello world ESB Service">
- <security moduleName="messaging" rolesAllowed="adminRole,esbrole" />
-
<listeners>
<jms-listener name="helloWorld"
busidref="quickstartEsbChannel"
maxThreads="1"
/>
</listeners>
- <actions inXsd="/request.xsd" outXsd="/response.xsd" faultXsd="/fault.xsd" webservice="none">
+ <actions inXsd="/request.xsd" outXsd="/response.xsd" faultXsd="/fault.xsd">
<action name="action" class="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.ESBWSListenerAction" process="displayMessage"/>
</actions>
</service>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -36,13 +36,6 @@
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
- <properties name="security">
- <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/>
- <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/>
- <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/>
- </properties>
<properties name="registry">
<property name="org.jboss.soa.esb.registry.queryManagerURI"
value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/publicKeyStore
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/readme.txt
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/readme.txt 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/readme.txt 2008-10-10 14:16:31 UTC (rev 23426)
@@ -2,8 +2,6 @@
=========
The purpose of the publish_as_webservice quickstart sample is to demonstrate how to
publish a esb service as a web service.
- This quickstart also demonstrates web service security using a UsernameToken in the
- SOAP header.
Running this quickstart:
========================
@@ -26,43 +24,10 @@
3. Exceute the web service call from soapui.
======================================
- 1. soap-userpass-message.xml
- This is the SOAP Envelope that is sent to the Web Service.
- Take a look at the header:
- <soap:Header>
- <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
- <wsse:UsernameToken>
- <wsse:Username>esbuser</wsse:Username>
- <wsse:Password>esbpassword</wsse:Password>
- </wsse:UsernameToken>
- </wsse:Security>
- </soap:Header>
- The above is using the UsernameToken element to specify a username and password.
- Try changing the username or password to se what happens. Notice the response you
- get when incorrect username or password is specified.
-
- 2. jboss-esb.xml
- First we'll take a look at the service security configuration:
- <service category="ESBServiceSample" name="HelloWorldPubService" description="Hello world ESB Service">
- <security moduleName="messaging" />
- ...
- </service>
- This is simply specifying that we want to use the 'messaging' login module. This is defined in conf/login-config.xml
- of the jbossesb-server. You can see that this definition point to two files:
- * conf/props/messaging-users.properties - username and password are specified here
- * conf/props/messaging-roles.properties
- Also notice how the the actions element contains additional attributes:
- <actions inXsd="/request.xsd" outXsd="/response.xsd" faultXsd="/fault.xsd" webservice="security">
-
- 3. runtest ant target
+ 1. runtest ant target
This target will call the SOAPTest client twice, first call will be with a valid SOAP message
and the second call will generate a SOAPFault to be retured.
- 4. sendesb ant target
+ 2. sendesb ant target
This target will call the SendEsbMessage twice. The first call will be with a valid message body content
and the second will generate a FaultMessageException.
- In this case the username and password are being passed to the SendEsbMessage's main method. The username
- and password are set in build.xml.
-
-
-
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/soap-userpass-message.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/soap-userpass-message.xml 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/soap-userpass-message.xml 2008-10-10 14:16:31 UTC (rev 23426)
@@ -2,19 +2,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:say="http://www.jboss.org/sayHi">
-
- <soap:Header>
- <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
- <wsse:UsernameToken>
- <wsse:Username>esbuser</wsse:Username>
- <wsse:Password>esbpassword</wsse:Password>
- </wsse:UsernameToken>
- </wsse:Security>
- </soap:Header>
-
<soap:Body>
<say:sayHi>
- <say:HelloWorld>HelloWorld</say:HelloWorld>
+ <say:arg0>HelloWorld</say:arg0>
</say:sayHi>"
</soap:Body>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java 2008-10-10 14:13:21 UTC (rev 23425)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java 2008-10-10 14:16:31 UTC (rev 23426)
@@ -40,8 +40,6 @@
* <p/> arg0 - service category
* <br/>arg1 - service name
* <br/>arg2 - Text of message to send
- * <br/>arg3 - username
- * <br/>arg4 - password
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
* @since Version 4.0
@@ -54,18 +52,12 @@
// Setting the ConnectionFactory such that it will use scout
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
- if (args.length < 5)
+ if (args.length < 3)
{
- System.out.println("Usage SendEsbMessage <category> <name> <text to send> <username> <password>");
+ System.out.println("Usage SendEsbMessage <category> <name> <text to send>");
}
Message esbMessage = MessageFactory.getInstance().getMessage();
- // create an AuthenticationRequest
- AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder().username(args[3]).password(args[4].toCharArray()).build();
-
- // set the authentication request on the message
- esbMessage.getProperties().setProperty(SecurityService.AUTH_REQUEST, PublicCryptoUtil.INSTANCE.encrypt((Serializable) authRequest));
-
final String message = "<say:sayHi xmlns:say=\"http://www.jboss.org/sayHi\"><say:arg0>" + args[2] + "</say:arg0></say:sayHi>" ;
esbMessage.getBody().add(message);
More information about the jboss-svn-commits
mailing list