[jboss-svn-commits] JBL Code SVN: r21613 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA: product and 102 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Aug 18 18:35:11 EDT 2008


Author: kevin.conner at jboss.com
Date: 2008-08-18 18:35:07 -0400 (Mon, 18 Aug 2008)
New Revision: 21613

Added:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-jaxws.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-saaj.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-security-spi.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jbosssx.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jbossws-spi.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/servlet-api.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/wsdl4j-1.6.2.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ContractReferencePublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ServletContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/jaas/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/ActionProcessingDetailFaultException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeploymentMetaData.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapper.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageValidationException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_06.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapperUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_config_security.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/request.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/response.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/keystore
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/listener.log
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/keystore
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/lib/soap-xmlbeans-1.2.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/helloworld.wsdl
Removed:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/jaas/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/keystore
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/business_ruleservice_ruleAgent/src/org/jboss/soa/esb/samples/quickstart/businessrules/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/listener.log
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/keystore
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/lib/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/lib/ext/build-time/jboss-saaj.jar
Modified:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/ProgrammersGuide.odt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/ServicesGuide.odt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/etc/schemas/xml/jbossesb-1.0.1.xsd
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/install/conf/jbossesb-properties.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivysettings.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/util/XMLHelper.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/errors/Factory.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/message/Fault.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/readme.txt
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Mapping.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/RuleServiceCallHelper.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelperUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/contract.jsp
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/index.jsp
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-esb/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml
Log:
Pull over IR1 release of JBESB_4_4_GA_CP1


Property changes on: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA
___________________________________________________________________
Name: svn:ignore
   - .settings
.classpath
.project
bin
.packaging
build
junit
ObjectToFileWriter.tst
null
classes
ESB.ipr
ESB.iws
runci.bat

   + .settings
.classpath
.project
bin
.packaging
build
junit
ObjectToFileWriter.tst
null
classes
ESB.ipr
ESB.iws
runci.bat
kev


Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/ServicesGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -261,6 +261,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
+				<xsd:element maxOccurs="1" minOccurs="0" ref="jesb:security" />
                 <xsd:element maxOccurs="unbounded" minOccurs="0"
                     ref="jesb:property" />
 				<xsd:element maxOccurs="1" minOccurs="0"
@@ -306,6 +307,13 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:attribute>
+            <xsd:attribute name="invmTransacted" type="xsd:boolean">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Should the InVM listener execute in a transacted environment?
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -329,6 +337,16 @@
 		</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">
@@ -341,6 +359,11 @@
 					ref="jesb:action" />
 			</xsd:sequence>
 			<xsd:attribute name="mep" type="jesb:mepType" />
+                        <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:complexType>
 	</xsd:element>
 	<xsd:element name="action">
@@ -386,6 +409,48 @@
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:element name="security">
+		<xsd:annotation>
+			<xsd:documentation xml:lang="en">
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element maxOccurs="unbounded" minOccurs="0" ref="jesb:property" />
+			</xsd:sequence>
+			<xsd:attribute name="runAs" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">
+					 Is used to specify that a specific security role given by the role-name value should be used 
+					 as the security identity for this service.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="moduleName" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="useCallerIdentity" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">
+					Is used to indicate that the current caller's identity should be propagated as the security identity
+					this service.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="callbackHandler" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">
+					CallbackHandler implementation class. This will override the global callbackhandler 
+					which can be specified in jbossesb-properties.xml
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
 	<!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
 		Listener base types.
 		88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/install/conf/jbossesb-properties.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/install/conf/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -63,6 +63,13 @@
     	<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"/>
+    	
+    	<!--  Uncomment this to return stack traces when exposing an ESB service through WS
+    	<property name="org.jboss.soa.esb.ws.returnStackTrace" value="true"/>
+    	-->
+    	<!--  Uncomment this to specify the WS response timeout when exposing an ESB service through WS
+    	<property name="org.jboss.soa.esb.ws.timeout" value="30000"/>
+    	-->
     </properties>
     <properties name="connection">
     	<property name="min-pool-size" value="5"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivy.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -60,5 +60,10 @@
         <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.2.2"/>
         <dependency org="apache-bsf" name="bsf" rev="2.3.0"/>
         <dependency org="beanshell" name="bsh" rev="1.3.0"/>
+	
+		<!-- Smooks dependencies -->
+        <dependency org="milyn" name="milyn-smooks-core" 		rev="1.0.1"/>
+        <dependency org="milyn" name="milyn-commons" 			rev="1.0"/>
+        <dependency org="milyn" name="milyn-smooks-javabean" 	rev="1.0.1"/>
     </dependencies>
 </ivy-module>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivysettings.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivysettings.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/ivysettings.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -6,6 +6,9 @@
                 <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
             </url>
             <ibiblio name="ibiblio" m2compatible="true" />
+            <url name="milyn" m2compatible="true">
+                <artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+            </url>
         </chain>
     </resolvers>
-</ivysettings>
\ No newline at end of file
+</ivysettings>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-jaxws.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/jboss-jaxws.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-saaj.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/jboss-saaj.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jboss-security-spi.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/jboss-security-spi.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jbosssx.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/jbosssx.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/jbossws-spi.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/jbossws-spi.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/servlet-api.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/servlet-api.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/lib/ext/wsdl4j-1.6.2.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/lib/ext/wsdl4j-1.6.2.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/build.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -91,6 +91,7 @@
                 >
         	<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="**/*.groovy"/>
             <fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="**/*.properties"/>
+			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml"/>
        	</jar>
     	
         <jar destfile="${org.jboss.esb.rosetta.distrib.dir}/lib/test-util.jar" manifest="${org.jboss.esb.rosetta.classes.dir}/MANIFEST.MF">

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -223,6 +223,9 @@
         try
         {
             millis = Math.max(millis, 100);
+            
+            Object messageObj = null;
+            
             synchronized (messageQueue) {
                 if (messageQueue.isEmpty()) {
                     try {
@@ -232,20 +235,20 @@
                     }
                 }
                 if (!messageQueue.isEmpty()) {
-                    Object messageObj = messageQueue.remove();
-
-                    if(messageObj instanceof byte[]) {
-                        message = MessageSerializer.deserialize((byte[]) messageObj);
-                    } else {
-                        message = (Message) messageObj;
-                    }
+                    messageObj = messageQueue.remove();
                 }
 
                 // Notify 1 waiting delivery thread of the pickup...
                 messageQueue.notify();
             }
 
-            if (isTransactional())
+            if(messageObj instanceof byte[]) {
+                message = MessageSerializer.deserialize((byte[]) messageObj);
+            } else {
+                message = (Message) messageObj;
+            }
+            
+            if ((message != null) && isTransactional())
             {
                 /*
                  * Return the message, but don't remove it from the queue until the transaction

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -80,16 +80,10 @@
 	public void setToEpr(EPR toEPR) throws CourierException,
 			MalformedEPRException
 	{
-		DeliverOnlyCourier old = _deliverCourier;
-                try
-                {
-                    _deliverCourier = getDeliverCourier(toEPR);
-                    _toEPR = toEPR ;
-                }
-                finally
-                {
-                    CourierUtil.cleanCourier(old) ;
-                }
+		CourierUtil.cleanCourier(_deliverCourier) ;
+		_deliverCourier = null ;
+		_deliverCourier = getDeliverCourier(toEPR);
+		_toEPR = toEPR ;
 	}
 
 	/**
@@ -98,15 +92,9 @@
 	public void setReplyToEpr(EPR replyToEPR) throws CourierException,
 			MalformedEPRException
 	{
-		PickUpOnlyCourier old = _pickupCourier;
-                try
-                {
-                    _pickupCourier = getPickupCourier(replyToEPR);
-                }
-                finally
-                {
-                    CourierUtil.cleanCourier(old) ;
-                }
+		CourierUtil.cleanCourier(_pickupCourier);
+		_pickupCourier = null ;
+		_pickupCourier = getPickupCourier(replyToEPR);
 	}
 
     public PickUpOnlyCourier getPickupCourier() {

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/message/filter/MetaDataFilter.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -23,7 +23,7 @@
 package org.jboss.internal.soa.esb.message.filter;
 
 import java.io.File;
-import java.util.Calendar;
+import java.util.Date; 
 import java.util.Map;
 
 import org.jboss.soa.esb.addressing.EPR;
@@ -131,15 +131,14 @@
         final Properties props = msg.getProperties();
         setProperty(props, Environment.TRANSPORT_TYPE, type);
         setProperty(props, Environment.MESSAGE_SOURCE, name);
-        props.setProperty(Environment.MESSAGE_ENTRY_TIME, Calendar
-                .getInstance().getTime().toString());
+        props.setProperty(Environment.MESSAGE_ENTRY_TIME, new Date().toString());
         return msg;
     }
 
     public Message onInput (Message msg, Map<String, Object> params) throws CourierException
     {
         msg.getProperties().setProperty(Environment.MESSAGE_EXIT_TIME,
-                Calendar.getInstance().getTime().toString());
+                new Date().toString());
 
         return msg;
     }

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ContractReferencePublisher.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/publish/ContractReferencePublisher.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ContractReferencePublisher.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ContractReferencePublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,37 @@
+package org.jboss.internal.soa.esb.publish;
+
+import java.net.URI;
+
+import org.jboss.soa.esb.Service;
+
+/**
+ * Contract Publisher which represents a referenced contract.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public interface ContractReferencePublisher extends Publisher
+{
+    /**
+     * Get the service represented by this contract configuration.
+     * @return The service.
+     */
+    public Service getService() ;
+    
+    /**
+     * Get the service description represented by this contract configuration.
+     * @return The service description.
+     */
+    public String getDescription() ;
+    
+    /**
+     * Get the URI of the service.
+     * @return The service URI.
+     */
+    public URI getServiceURI() ;
+    
+    /**
+     * Get the URI of the contract.
+     * @return The contract URI.
+     */
+    public URI getServiceContractURI() ;
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ServletContractPublisher.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/publish/ServletContractPublisher.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ServletContractPublisher.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/publish/ServletContractPublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.internal.soa.esb.publish;
+
+import org.jboss.soa.esb.addressing.EPR;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Action contract Publisher.
+ *
+ * @author
+ */
+public interface ServletContractPublisher extends ContractPublisher {
+
+    /**
+     * Get the contract information within a servlet context.
+     * <p/>
+     * A Service may publish a number of addressable endpoints. The publisher
+     * will likely return different contract info depending on the endpoint EPR.
+     * <p/>
+     * This info can be stored and published from a global registry of some sort.
+     *
+     * @param epr Endpoint EPR.
+     * @param servletRequest The servlet request context.
+     * @return Contract information.
+     */
+    public ContractInfo getContractInfo(final EPR epr, final HttpServletRequest servletRequest) ;
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,429 +0,0 @@
-#
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-#
-# You can obtain a copy of the License at
-# https://opensso.dev.java.net/public/CDDLv1.0.html or
-# opensso/legal/CDDLv1.0.txt
-# See the License for the specific language governing
-# permission and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at opensso/legal/CDDLv1.0.txt.
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# $Id: AMClient.properties,v 1.12 2008/03/04 00:25:12 beomsuk Exp $
-#
-# Copyright 2006 Sun Microsystems Inc. All Rights Reserved
-#
-
-/* The following keys are used to configure the Debug service.
- * Possible values for the key 'level' are: off | error | warning | message. 
- * The key 'directory' specifies the output directory where the debug files 
- * will be created.
- * Trailing spaces are significant.
- * Windows: Use forward slashes "/" separate directories, not backslash "\".
- * Windows: Spaces in the file name are allowed for Windows.
- */
-com.iplanet.services.debug.level=message
-com.iplanet.services.debug.directory=/tmp
-
-/*
- * Server mode should be 'false'
- */
-com.iplanet.am.serverMode=false
-
-/*
- * Cache enable / disable properties
- */
-com.iplanet.am.sdk.caching.enabled=false
-com.sun.identity.idm.cache.enabled=false
-com.sun.identity.sm.cache.enabled=true
-
-/*
- * Configure remote plugin classes for configuration (SMS)
- */
-com.sun.identity.sm.sms_object_class_name=com.sun.identity.sm.jaxrpc.SMSJAXRPCObject
-
-/*
- * Naming URL
- */
-com.iplanet.am.naming.url=http://localhost:8080/opensso/namingservice
-
-/*
- * Notification URL
- */
-com.iplanet.am.notification.url=
-
-/*
- * Security Credentails to read the configuration data
- */
-com.sun.identity.agents.app.username=UrlAccessAgent
-com.iplanet.am.service.password=
-com.iplanet.am.service.secret=AQIC24u86rq9RRbx13mx0nb0uAGpxLdxGBY9
-
-/*
- * Encryption key that will be used to encrypt and decypt
- * data to communicate with the server.
- * This key is needed to decrypt passwords stored
- * in the SMS configuration.
- */
-am.encryption.pwd=SAMPLE_RAND
-
-/*
- * Encryption key that will be used to encrypt and decypt
- * data used locally within the client.
- */
-com.sun.identity.client.encryptionKey=SAMPLE_RAND
-
-/*
- * Encryption: The key "com.iplanet.security.encryptor" specifies
- * the encrypting class implementation.
- * Available classes are:
- *    com.iplanet.services.util.JCEEncryption
- *    com.iplanet.services.util.JSSEncryption
- */
-com.iplanet.security.encryptor=com.iplanet.services.util.JCEEncryption
-
-/*
- * Property to enable/disable the notifications for am.sdk and IdRepo Caches. 
- * If set to "true" notifications are enabled and disabled if set to "false".
- */
-com.sun.identity.idm.remote.notification.enabled=true
-
-/*
- * Cache update time (in minutes) for am.sdk & IdRepo Caches
- * if notification URL is not provided or if notifications are disabled.
- * Note: 
- * 1. This property is applicable only if 'com.iplanet.am.notification.url'
- *    is not provided or if 'com.sun.identity.idm.remote.notification.enabled'
- *    is set to 'false'.
- * 2. If the polling time is set as 0, then polling is disabled. 
- */
-com.iplanet.am.sdk.remote.pollingTime=1
-
-/*
- * Property to enable/disable the notifications for service management caches.
- * If set to "true" notifications are enabled and disabled if set to "false".
- */
-com.sun.identity.sm.notification.enabled=true
-
-/*
- * Cache update time (in minutes) for service configutation data,
- * if notification URL is not provided or if notifications are disabled.
- * Note: 
- * 1. This property is applicable only if 'com.iplanet.am.notification.url'
- *    is not provided or if 'com.sun.identity.sm.notification.enabled' is 
- *    set to 'false'.
- * 2. If the cache time is set as 0, then no cache updates will occur.
- */
-com.sun.identity.sm.cacheTime=1
-
-/*
- * Server protocol, host and port to be used by Client Services
- */
-com.iplanet.am.server.protocol=http
-com.iplanet.am.server.host=localhost
-com.iplanet.am.server.port=8080
-com.iplanet.am.services.deploymentDescriptor=opensso
-com.iplanet.am.console.protocol=@CONSOLE_PROTOCOL@
-com.iplanet.am.console.host=@CONSOLE_HOST@
-com.iplanet.am.console.port=@CONSOLE_PORT@
-com.iplanet.am.console.deploymentDescriptor=@CONSOLE_DEPLOY_URI@
-com.iplanet.am.console.remote=@CONSOLE_REMOTE@
-
-com.iplanet.am.cookie.name=iPlanetDirectoryPro
-
-/*
- * Session related properties.
- */
-com.iplanet.am.session.client.polling.enable=true
-com.iplanet.am.session.client.polling.period=180
-
-/*
- * Identify cert db directory path, prefix and password file
- * to initialize JSS Socket Factory when Web Container is configured SSL
- */
-com.iplanet.am.admin.cli.certdb.dir=
-com.iplanet.am.admin.cli.certdb.prefix=
-com.iplanet.am.admin.cli.certdb.passfile=//config/.wtpass
-
-/*
- * Identify property value for SSL ApprovalCallback / HostnameVerifier
- *    If com.iplanet.services.comm is configured as protocol handler
- *    and the checkSubjectAltName or resolveIPAddress feature is enabled, 
- *    cert8.db and key3.db with the prefix value of 
- *    com.iplanet.am.admin.cli.certdb.prefix will have to be created under 
- *    the directory of com.iplanet.am.admin.cli.certdb.dir before server is 
- *    restarted.
- */
-com.iplanet.am.jssproxy.trustAllServerCerts=false
-com.iplanet.am.jssproxy.checkSubjectAltName=false
-com.iplanet.am.jssproxy.resolveIPAddress=false
-com.iplanet.am.jssproxy.SSLTrustHostList=false
-
-/**************************************************************
- *              Policy Client parameters
- **************************************************************/
-/* Policy decision log parameters. Possible values for logging.level
- * are NONE, ALLOW, DENY, BOTH, and DECISION */
-com.sun.identity.agents.server.log.file.name=amRemotePolicyLog
-com.sun.identity.agents.logging.level=NONE
-
-/* Notification URL for updating cache */
-com.sun.identity.agents.notification.enabled=false
-com.sun.identity.agents.notification.url=
-
-/* Cache time in minutes */
-com.sun.identity.agents.polling.interval=3
-
-/* Information to cache. Possible value are "subtree" or "self" */
-com.sun.identity.policy.client.cacheMode=subtree
-
-/* Policy client clock skew value in seconds */
-com.sun.identity.policy.client.clockSkew=10 
-
-/*
-* Explicitly disable monitoring services in the client applications.
-*/
-com.sun.identity.monitoring=off
-
-/*
-* Specify if allow to use cached data for HttpURLConnection 
-*/
-com.sun.identity.urlconnection.useCache=false
-
-#
-# Specify implementation class for
-# com.sun.identity.plugin.configuration.ConfigurationInstance interface.
-com.sun.identity.plugin.configuration.class=com.sun.identity.plugin.configuration.impl.ConfigurationInstanceImpl
-
-#
-# Specify implementation class for 
-# com.sun.identity.plugin.datastore.DataStoreProvider interface.
-# This property defines the default datastore provider.
-com.sun.identity.plugin.datastore.class.default=com.sun.identity.plugin.datastore.impl.IdRepoDataStoreProvider
-
-#
-# Specify implementation class for
-# com.sun.identity.plugin.session.SessionProvider interface.
-com.sun.identity.plugin.session.class=com.sun.identity.plugin.session.impl.FMSessionProvider
-
-#
-# Specify XML signature provider class  
-com.sun.identity.saml.xmlsig.signatureprovider.class=com.sun.identity.saml.xmlsig.AMSignatureProvider
-
-#
-# Specify XML key provider implementation class 
-com.sun.identity.saml.xmlsig.keyprovider.class=com.sun.identity.saml.xmlsig.JKSKeyProvider
-
-#
-# Identify SAML XML signature keystore file, keystore password file
-# and key password file
-com.sun.identity.saml.xmlsig.keystore=@BASE_DIR@/keystore.jks
-com.sun.identity.saml.xmlsig.storepass=@BASE_DIR@/.storepass
-com.sun.identity.saml.xmlsig.keypass=@BASE_DIR@/.keypass
-com.sun.identity.saml.xmlsig.certalias=test
-
-#
-# Specify type of KeyStore used for saml xml signature. Default is JKS.
-# com.sun.identity.saml.xmlsig.storetype=JKS
-
-#
-# Flag for checking the Certificate which is embedded in the 
-# KeyInfo against the certificates in the keystore (specified
-# by the "com.sun.identity.saml.xmlsig.keystore" property). 
-# Possible values for the key are: on|off. If the flag is "on",
-# the certification must be presented in the keystore for 
-# XML signature validation. If the flag is "off", skip
-# the presence checking.
-com.sun.identity.saml.checkcert=on
-
-#
-# XML cannonicalization algorithm. Used for SAML XML signature generation
-# and verification. When not specified, or value is empty, default value
-# will be used. The following is the list of supported algorithms:
-# http://www.w3.org/2001/10/xml-exc-c14n#	(default)
-# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
-com.sun.identity.saml.xmlsig.c14nMethod=http://www.w3.org/2001/10/xml-exc-c14n#
-
-#
-# XML signature algorithm. Used for SAML XML Signature generation and
-# verification. When not specified, or value is empty, default value will be
-# used. The following is the list of supported algorithms:
-# http://www.w3.org/2000/09/xmldsig#rsa-sha1	(default)
-# http://www.w3.org/2000/09/xmldsig#hmac-sha1
-# http://www.w3.org/2000/09/xmldsig#dsa-sha1
-# http://www.w3.org/2001/04/xmldsig-more#rsa-md5
-# http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha256
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha384
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha512
-# http://www.w3.org/2001/04/xmldsig-more#hmac-md5
-# http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha256
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha384
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha512
-com.sun.identity.saml.xmlsig.xmlSigAlgorithm=
-
-#
-# XML transformation algorithm. Used for SAML XML signature generation
-# and verification. When not specified, or value is empty, default value
-# will be used. The following is the list of supported algorithms:
-# http://www.w3.org/2001/10/xml-exc-c14n#      (default)
-# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
-# http://www.w3.org/TR/1999/REC-xslt-19991116
-# http://www.w3.org/2000/09/xmldsig#base64
-# http://www.w3.org/TR/1999/REC-xpath-19991116
-# http://www.w3.org/2000/09/xmldsig#enveloped-signature
-# http://www.w3.org/TR/2001/WD-xptr-20010108
-# http://www.w3.org/2002/04/xmldsig-filter2
-# http://www.w3.org/2002/06/xmldsig-filter2
-# http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter
-com.sun.identity.saml.xmlsig.transformAlg=http://www.w3.org/2001/10/xml-exc-c14n#
- 
-
-#
-# SAML2 XML Encryption Provider Implementation class 
-com.sun.identity.saml2.xmlenc.EncryptionProvider=com.sun.identity.saml2.xmlenc.FMEncProvider
-
-
-#
-# SAML2 XML Signing Provider Implementation class. 
-com.sun.identity.saml2.xmlsig.SignatureProvider=com.sun.identity.saml2.xmlsig.FMSigProvider
-
-#
-# SAML2 XML Signing Certificate Validation. 
-com.sun.identity.saml2.crl.check=false
-
-#
-# SAML2 XML Signing Certificate Validation. 
-com.sun.identity.saml2.crl.check.ca=false
-
-#
-# Client ceritificate alias that will be used in SSL connection for Liberty
-# SOAP Binding
-com.sun.identity.liberty.ws.soap.certalias=
-
-#
-# If the message timestamp is before current timestamp by this amount
-# (millisec), it is considered a stale message.
-com.sun.identity.liberty.ws.soap.staleTimeLimit=300000
-
-#
-# All the messageID of a valid message will be stored in a cache with the it
-# is received to avoid duplicate messages. If the current time minus the
-# received time is greater than the above staleTimeLimit, it should be removed
-# from the cache. The is property specify the interval(millisec) that a 
-# cleanup thread should check the cache and remove those messageID.
-com.sun.identity.liberty.ws.soap.messageIDCacheCleanupInterval=60000
-
-#
-# Supported SOAP actors. Each actor must be seperated by '|'
-com.sun.identity.liberty.ws.soap.supportedActors=http://schemas.xmlsoap.org/soap/actor/next
-
-#
-# Namespace prefix mapping used when marshalling a JAXB content tree to a
-# DOM tree. The syntax is
-# <prefix>=<namespace>|<prefix>=<namespace>|..........
-com.sun.identity.liberty.ws.jaxb.namespacePrefixMappingList=S=http://schemas.xmlsoap.org/soap/envelope/|sb=urn:liberty:sb:2003-08|pp=urn:liberty:id-sis-pp:2003-08|ispp=http://www.sun.com/identity/liberty/pp|is=urn:liberty:is:2003-08
-
-#
-# JAXB package list used when constructing JAXBContext. Each package must be
-# seperated by ':'.
-com.sun.identity.liberty.ws.jaxb.packageList=
-
-#
-# Liberty ID-WSF security profile,
-# com.sun.identity.liberty.ws.wsc.certalias specifies default certificate
-#     alias for issuing web service security token for this web service client
-# com.sun.identity.liberty.ws.ta.certalias specifies certificate
-#     alias for trusted authority that will be used to sign SAML or SAML
-#     BEARER token of response message.
-# com.sun.identity.liberty.ws.trustedca.certaliases specifies certificate
-#     aliases for trusted CA. SAML or SAML BEARER token of incoming request
-#     message needs to be signed by a trusted CA in this list. The syntax is
-#     <cert alias 1>[:<issuer 1>]|<cert alias 2>[:<issuer 2>]|.....
-#     For example, 'myalias1:myissuer1|myalias2|myalias3:myissuer3
-#     'issuer' is used when the token doesn't have a KeyInfo inside the
-#     signature. The 'issuer' of the token needs to be in this list and the
-#     corresponding cert alias will be used to verify signature. If KeyInfo
-#     exists, the keystore needs to contain a cert alias that matches the
-#     KeyInfo and the cert alias needs to be in this list.
-# com.sun.identity.liberty.ws.security.TokenProviderImpl specifies
-#     implementation for security token provider
-com.sun.identity.liberty.ws.wsc.certalias=
-com.sun.identity.liberty.ws.ta.certalias=
-com.sun.identity.liberty.ws.trustedca.certaliases=
-com.sun.identity.liberty.ws.security.TokenProviderImpl=com.sun.identity.liberty.ws.security.LibSecurityTokenProvider
-
-
-#
-# URL for WSPRedirectHandlerServlet to handle Liberty WSF WSP-resource owner
-# interactions based on user agent redirects. This should be running in 
-# the same JVM where Liberty SP is running
-com.sun.identity.liberty.interaction.wspRedirectHandler=http://localhost:8080/opensso/WSPRedirectHandler
-
-
-#
-# indicates whether WSC would participate in interaction
-# valid values are interactIfNeeded | doNotInteract | doNotInteractForData
-# default value:interactIfNeeded
-# value used if an invalid value is specified:interactIfNeeded
-com.sun.identity.liberty.interaction.wscSpecifiedInteractionChoice=interactIfNeeded
-
-
-#
-# indicates whether WSC would include userInteractionHeader
-# valid values are yes|no (case ignored)
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillInlcudeUserInteractionHeader=yes
-
-
-#
-# indicates whether WSC would redirect user for interaction
-# valid values are yes|no
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillRedirect=yes
-
-
-#
-# WSC's preference on the acceptable duration for interaction(in seconds)
-# default value if the value is not specified or a non integer value is
-# specified : 60
-com.sun.identity.liberty.interaction.wscSpecifiedMaxInteractionTime=80
-
-
-#
-# indicates whether WSC would enforce that redirected to URL is https
-# valid values are yes|no (case ignored)
-# liberty specification require the value to be yes
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillEnforceHttpsCheck=no
-
-
-#
-# This property is used to determine the Liberty identity web services framework
-# to be used when the framework can not determine from the in-bound message or
-# from the resource offering when AM is acting as the WSC.
-# The default version is 1.1, but the possible values are 1.0 or 1.1
-# com.sun.identity.liberty.wsf.version=1.1
-
-#
-# Login URL and Authentication web service URL for Liberty use cases
-com.sun.identity.loginurl=http://localhost:8080/opensso/UI/Login
-com.sun.identity.liberty.authnsvc.url=http://localhost:8080/opensso/Liberty/authnsvc
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/AMConfig.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,429 @@
+#
+# The contents of this file are subject to the terms
+# of the Common Development and Distribution License
+# (the License). You may not use this file except in
+# compliance with the License.
+#
+# You can obtain a copy of the License at
+# https://opensso.dev.java.net/public/CDDLv1.0.html or
+# opensso/legal/CDDLv1.0.txt
+# See the License for the specific language governing
+# permission and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL
+# Header Notice in each file and include the License file
+# at opensso/legal/CDDLv1.0.txt.
+# If applicable, add the following below the CDDL Header,
+# with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# $Id: AMClient.properties,v 1.12 2008/03/04 00:25:12 beomsuk Exp $
+#
+# Copyright 2006 Sun Microsystems Inc. All Rights Reserved
+#
+
+/* The following keys are used to configure the Debug service.
+ * Possible values for the key 'level' are: off | error | warning | message. 
+ * The key 'directory' specifies the output directory where the debug files 
+ * will be created.
+ * Trailing spaces are significant.
+ * Windows: Use forward slashes "/" separate directories, not backslash "\".
+ * Windows: Spaces in the file name are allowed for Windows.
+ */
+com.iplanet.services.debug.level=message
+com.iplanet.services.debug.directory=/tmp
+
+/*
+ * Server mode should be 'false'
+ */
+com.iplanet.am.serverMode=false
+
+/*
+ * Cache enable / disable properties
+ */
+com.iplanet.am.sdk.caching.enabled=false
+com.sun.identity.idm.cache.enabled=false
+com.sun.identity.sm.cache.enabled=true
+
+/*
+ * Configure remote plugin classes for configuration (SMS)
+ */
+com.sun.identity.sm.sms_object_class_name=com.sun.identity.sm.jaxrpc.SMSJAXRPCObject
+
+/*
+ * Naming URL
+ */
+com.iplanet.am.naming.url=http://localhost:8080/opensso/namingservice
+
+/*
+ * Notification URL
+ */
+com.iplanet.am.notification.url=
+
+/*
+ * Security Credentails to read the configuration data
+ */
+com.sun.identity.agents.app.username=UrlAccessAgent
+com.iplanet.am.service.password=
+com.iplanet.am.service.secret=AQIC24u86rq9RRbx13mx0nb0uAGpxLdxGBY9
+
+/*
+ * Encryption key that will be used to encrypt and decypt
+ * data to communicate with the server.
+ * This key is needed to decrypt passwords stored
+ * in the SMS configuration.
+ */
+am.encryption.pwd=SAMPLE_RAND
+
+/*
+ * Encryption key that will be used to encrypt and decypt
+ * data used locally within the client.
+ */
+com.sun.identity.client.encryptionKey=SAMPLE_RAND
+
+/*
+ * Encryption: The key "com.iplanet.security.encryptor" specifies
+ * the encrypting class implementation.
+ * Available classes are:
+ *    com.iplanet.services.util.JCEEncryption
+ *    com.iplanet.services.util.JSSEncryption
+ */
+com.iplanet.security.encryptor=com.iplanet.services.util.JCEEncryption
+
+/*
+ * Property to enable/disable the notifications for am.sdk and IdRepo Caches. 
+ * If set to "true" notifications are enabled and disabled if set to "false".
+ */
+com.sun.identity.idm.remote.notification.enabled=true
+
+/*
+ * Cache update time (in minutes) for am.sdk & IdRepo Caches
+ * if notification URL is not provided or if notifications are disabled.
+ * Note: 
+ * 1. This property is applicable only if 'com.iplanet.am.notification.url'
+ *    is not provided or if 'com.sun.identity.idm.remote.notification.enabled'
+ *    is set to 'false'.
+ * 2. If the polling time is set as 0, then polling is disabled. 
+ */
+com.iplanet.am.sdk.remote.pollingTime=1
+
+/*
+ * Property to enable/disable the notifications for service management caches.
+ * If set to "true" notifications are enabled and disabled if set to "false".
+ */
+com.sun.identity.sm.notification.enabled=true
+
+/*
+ * Cache update time (in minutes) for service configutation data,
+ * if notification URL is not provided or if notifications are disabled.
+ * Note: 
+ * 1. This property is applicable only if 'com.iplanet.am.notification.url'
+ *    is not provided or if 'com.sun.identity.sm.notification.enabled' is 
+ *    set to 'false'.
+ * 2. If the cache time is set as 0, then no cache updates will occur.
+ */
+com.sun.identity.sm.cacheTime=1
+
+/*
+ * Server protocol, host and port to be used by Client Services
+ */
+com.iplanet.am.server.protocol=http
+com.iplanet.am.server.host=localhost
+com.iplanet.am.server.port=8080
+com.iplanet.am.services.deploymentDescriptor=opensso
+com.iplanet.am.console.protocol=@CONSOLE_PROTOCOL@
+com.iplanet.am.console.host=@CONSOLE_HOST@
+com.iplanet.am.console.port=@CONSOLE_PORT@
+com.iplanet.am.console.deploymentDescriptor=@CONSOLE_DEPLOY_URI@
+com.iplanet.am.console.remote=@CONSOLE_REMOTE@
+
+com.iplanet.am.cookie.name=iPlanetDirectoryPro
+
+/*
+ * Session related properties.
+ */
+com.iplanet.am.session.client.polling.enable=true
+com.iplanet.am.session.client.polling.period=180
+
+/*
+ * Identify cert db directory path, prefix and password file
+ * to initialize JSS Socket Factory when Web Container is configured SSL
+ */
+com.iplanet.am.admin.cli.certdb.dir=
+com.iplanet.am.admin.cli.certdb.prefix=
+com.iplanet.am.admin.cli.certdb.passfile=//config/.wtpass
+
+/*
+ * Identify property value for SSL ApprovalCallback / HostnameVerifier
+ *    If com.iplanet.services.comm is configured as protocol handler
+ *    and the checkSubjectAltName or resolveIPAddress feature is enabled, 
+ *    cert8.db and key3.db with the prefix value of 
+ *    com.iplanet.am.admin.cli.certdb.prefix will have to be created under 
+ *    the directory of com.iplanet.am.admin.cli.certdb.dir before server is 
+ *    restarted.
+ */
+com.iplanet.am.jssproxy.trustAllServerCerts=false
+com.iplanet.am.jssproxy.checkSubjectAltName=false
+com.iplanet.am.jssproxy.resolveIPAddress=false
+com.iplanet.am.jssproxy.SSLTrustHostList=false
+
+/**************************************************************
+ *              Policy Client parameters
+ **************************************************************/
+/* Policy decision log parameters. Possible values for logging.level
+ * are NONE, ALLOW, DENY, BOTH, and DECISION */
+com.sun.identity.agents.server.log.file.name=amRemotePolicyLog
+com.sun.identity.agents.logging.level=NONE
+
+/* Notification URL for updating cache */
+com.sun.identity.agents.notification.enabled=false
+com.sun.identity.agents.notification.url=
+
+/* Cache time in minutes */
+com.sun.identity.agents.polling.interval=3
+
+/* Information to cache. Possible value are "subtree" or "self" */
+com.sun.identity.policy.client.cacheMode=subtree
+
+/* Policy client clock skew value in seconds */
+com.sun.identity.policy.client.clockSkew=10 
+
+/*
+* Explicitly disable monitoring services in the client applications.
+*/
+com.sun.identity.monitoring=off
+
+/*
+* Specify if allow to use cached data for HttpURLConnection 
+*/
+com.sun.identity.urlconnection.useCache=false
+
+#
+# Specify implementation class for
+# com.sun.identity.plugin.configuration.ConfigurationInstance interface.
+com.sun.identity.plugin.configuration.class=com.sun.identity.plugin.configuration.impl.ConfigurationInstanceImpl
+
+#
+# Specify implementation class for 
+# com.sun.identity.plugin.datastore.DataStoreProvider interface.
+# This property defines the default datastore provider.
+com.sun.identity.plugin.datastore.class.default=com.sun.identity.plugin.datastore.impl.IdRepoDataStoreProvider
+
+#
+# Specify implementation class for
+# com.sun.identity.plugin.session.SessionProvider interface.
+com.sun.identity.plugin.session.class=com.sun.identity.plugin.session.impl.FMSessionProvider
+
+#
+# Specify XML signature provider class  
+com.sun.identity.saml.xmlsig.signatureprovider.class=com.sun.identity.saml.xmlsig.AMSignatureProvider
+
+#
+# Specify XML key provider implementation class 
+com.sun.identity.saml.xmlsig.keyprovider.class=com.sun.identity.saml.xmlsig.JKSKeyProvider
+
+#
+# Identify SAML XML signature keystore file, keystore password file
+# and key password file
+com.sun.identity.saml.xmlsig.keystore=@BASE_DIR@/keystore.jks
+com.sun.identity.saml.xmlsig.storepass=@BASE_DIR@/.storepass
+com.sun.identity.saml.xmlsig.keypass=@BASE_DIR@/.keypass
+com.sun.identity.saml.xmlsig.certalias=test
+
+#
+# Specify type of KeyStore used for saml xml signature. Default is JKS.
+# com.sun.identity.saml.xmlsig.storetype=JKS
+
+#
+# Flag for checking the Certificate which is embedded in the 
+# KeyInfo against the certificates in the keystore (specified
+# by the "com.sun.identity.saml.xmlsig.keystore" property). 
+# Possible values for the key are: on|off. If the flag is "on",
+# the certification must be presented in the keystore for 
+# XML signature validation. If the flag is "off", skip
+# the presence checking.
+com.sun.identity.saml.checkcert=on
+
+#
+# XML cannonicalization algorithm. Used for SAML XML signature generation
+# and verification. When not specified, or value is empty, default value
+# will be used. The following is the list of supported algorithms:
+# http://www.w3.org/2001/10/xml-exc-c14n#	(default)
+# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
+com.sun.identity.saml.xmlsig.c14nMethod=http://www.w3.org/2001/10/xml-exc-c14n#
+
+#
+# XML signature algorithm. Used for SAML XML Signature generation and
+# verification. When not specified, or value is empty, default value will be
+# used. The following is the list of supported algorithms:
+# http://www.w3.org/2000/09/xmldsig#rsa-sha1	(default)
+# http://www.w3.org/2000/09/xmldsig#hmac-sha1
+# http://www.w3.org/2000/09/xmldsig#dsa-sha1
+# http://www.w3.org/2001/04/xmldsig-more#rsa-md5
+# http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha256
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha384
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha512
+# http://www.w3.org/2001/04/xmldsig-more#hmac-md5
+# http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha256
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha384
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha512
+com.sun.identity.saml.xmlsig.xmlSigAlgorithm=
+
+#
+# XML transformation algorithm. Used for SAML XML signature generation
+# and verification. When not specified, or value is empty, default value
+# will be used. The following is the list of supported algorithms:
+# http://www.w3.org/2001/10/xml-exc-c14n#      (default)
+# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
+# http://www.w3.org/TR/1999/REC-xslt-19991116
+# http://www.w3.org/2000/09/xmldsig#base64
+# http://www.w3.org/TR/1999/REC-xpath-19991116
+# http://www.w3.org/2000/09/xmldsig#enveloped-signature
+# http://www.w3.org/TR/2001/WD-xptr-20010108
+# http://www.w3.org/2002/04/xmldsig-filter2
+# http://www.w3.org/2002/06/xmldsig-filter2
+# http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter
+com.sun.identity.saml.xmlsig.transformAlg=http://www.w3.org/2001/10/xml-exc-c14n#
+ 
+
+#
+# SAML2 XML Encryption Provider Implementation class 
+com.sun.identity.saml2.xmlenc.EncryptionProvider=com.sun.identity.saml2.xmlenc.FMEncProvider
+
+
+#
+# SAML2 XML Signing Provider Implementation class. 
+com.sun.identity.saml2.xmlsig.SignatureProvider=com.sun.identity.saml2.xmlsig.FMSigProvider
+
+#
+# SAML2 XML Signing Certificate Validation. 
+com.sun.identity.saml2.crl.check=false
+
+#
+# SAML2 XML Signing Certificate Validation. 
+com.sun.identity.saml2.crl.check.ca=false
+
+#
+# Client ceritificate alias that will be used in SSL connection for Liberty
+# SOAP Binding
+com.sun.identity.liberty.ws.soap.certalias=
+
+#
+# If the message timestamp is before current timestamp by this amount
+# (millisec), it is considered a stale message.
+com.sun.identity.liberty.ws.soap.staleTimeLimit=300000
+
+#
+# All the messageID of a valid message will be stored in a cache with the it
+# is received to avoid duplicate messages. If the current time minus the
+# received time is greater than the above staleTimeLimit, it should be removed
+# from the cache. The is property specify the interval(millisec) that a 
+# cleanup thread should check the cache and remove those messageID.
+com.sun.identity.liberty.ws.soap.messageIDCacheCleanupInterval=60000
+
+#
+# Supported SOAP actors. Each actor must be seperated by '|'
+com.sun.identity.liberty.ws.soap.supportedActors=http://schemas.xmlsoap.org/soap/actor/next
+
+#
+# Namespace prefix mapping used when marshalling a JAXB content tree to a
+# DOM tree. The syntax is
+# <prefix>=<namespace>|<prefix>=<namespace>|..........
+com.sun.identity.liberty.ws.jaxb.namespacePrefixMappingList=S=http://schemas.xmlsoap.org/soap/envelope/|sb=urn:liberty:sb:2003-08|pp=urn:liberty:id-sis-pp:2003-08|ispp=http://www.sun.com/identity/liberty/pp|is=urn:liberty:is:2003-08
+
+#
+# JAXB package list used when constructing JAXBContext. Each package must be
+# seperated by ':'.
+com.sun.identity.liberty.ws.jaxb.packageList=
+
+#
+# Liberty ID-WSF security profile,
+# com.sun.identity.liberty.ws.wsc.certalias specifies default certificate
+#     alias for issuing web service security token for this web service client
+# com.sun.identity.liberty.ws.ta.certalias specifies certificate
+#     alias for trusted authority that will be used to sign SAML or SAML
+#     BEARER token of response message.
+# com.sun.identity.liberty.ws.trustedca.certaliases specifies certificate
+#     aliases for trusted CA. SAML or SAML BEARER token of incoming request
+#     message needs to be signed by a trusted CA in this list. The syntax is
+#     <cert alias 1>[:<issuer 1>]|<cert alias 2>[:<issuer 2>]|.....
+#     For example, 'myalias1:myissuer1|myalias2|myalias3:myissuer3
+#     'issuer' is used when the token doesn't have a KeyInfo inside the
+#     signature. The 'issuer' of the token needs to be in this list and the
+#     corresponding cert alias will be used to verify signature. If KeyInfo
+#     exists, the keystore needs to contain a cert alias that matches the
+#     KeyInfo and the cert alias needs to be in this list.
+# com.sun.identity.liberty.ws.security.TokenProviderImpl specifies
+#     implementation for security token provider
+com.sun.identity.liberty.ws.wsc.certalias=
+com.sun.identity.liberty.ws.ta.certalias=
+com.sun.identity.liberty.ws.trustedca.certaliases=
+com.sun.identity.liberty.ws.security.TokenProviderImpl=com.sun.identity.liberty.ws.security.LibSecurityTokenProvider
+
+
+#
+# URL for WSPRedirectHandlerServlet to handle Liberty WSF WSP-resource owner
+# interactions based on user agent redirects. This should be running in 
+# the same JVM where Liberty SP is running
+com.sun.identity.liberty.interaction.wspRedirectHandler=http://localhost:8080/opensso/WSPRedirectHandler
+
+
+#
+# indicates whether WSC would participate in interaction
+# valid values are interactIfNeeded | doNotInteract | doNotInteractForData
+# default value:interactIfNeeded
+# value used if an invalid value is specified:interactIfNeeded
+com.sun.identity.liberty.interaction.wscSpecifiedInteractionChoice=interactIfNeeded
+
+
+#
+# indicates whether WSC would include userInteractionHeader
+# valid values are yes|no (case ignored)
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillInlcudeUserInteractionHeader=yes
+
+
+#
+# indicates whether WSC would redirect user for interaction
+# valid values are yes|no
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillRedirect=yes
+
+
+#
+# WSC's preference on the acceptable duration for interaction(in seconds)
+# default value if the value is not specified or a non integer value is
+# specified : 60
+com.sun.identity.liberty.interaction.wscSpecifiedMaxInteractionTime=80
+
+
+#
+# indicates whether WSC would enforce that redirected to URL is https
+# valid values are yes|no (case ignored)
+# liberty specification require the value to be yes
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillEnforceHttpsCheck=no
+
+
+#
+# This property is used to determine the Liberty identity web services framework
+# to be used when the framework can not determine from the in-bound message or
+# from the resource offering when AM is acting as the WSC.
+# The default version is 1.1, but the possible values are 1.0 or 1.1
+# com.sun.identity.liberty.wsf.version=1.1
+
+#
+# Login URL and Authentication web service URL for Liberty use cases
+com.sun.identity.loginurl=http://localhost:8080/opensso/UI/Login
+com.sun.identity.liberty.authnsvc.url=http://localhost:8080/opensso/Liberty/authnsvc
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,85 +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.services.security;
-
-import java.io.IOException;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.ConfirmationCallback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.jboss.soa.esb.services.security.SecurityConfig;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class CertCallbackHandler implements EsbCallbackHandler
-{
-	private String keyStoreAlias;
-	private char[] keyPassword;
-	
-	public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException
-	{
-		for (int i = 0; i < callbacks.length; i++) 
-		{
-            if (callbacks[i] instanceof NameCallback) 
-            {
-                NameCallback nc = (NameCallback) callbacks[i];
-                nc.setName(keyStoreAlias);
-            }
-            if ( callbacks[i] instanceof ConfirmationCallback ) 
-            {
-                ConfirmationCallback cb = (ConfirmationCallback) callbacks[i];
-                cb.setSelectedIndex(ConfirmationCallback.OK);
-            }
-            else if (callbacks[i] instanceof PasswordCallback) 
-            {
-            	PasswordCallback passcb = (PasswordCallback) callbacks[i];
-            	passcb.setPassword(keyPassword);
-            }
-        }
-	}
-
-	public void setAuthenticationRequest(AuthenticationRequest authRequest) { }
-
-	public void setSecurityConfig(final SecurityConfig config)
-	{
-		if ( config != null )
-		{
-			Map<String, String> properties = config.getProperties();
-			//	get the alias for the certificate to look for.
-			this.keyStoreAlias = properties.get("alias");
-			
-			//	get password for key in keystore(this is the keys password, not the keystores.
-			String keyPass = properties.get("keyPassword");
-			if ( keyPass != null )
-    			this.keyPassword = keyPass.toCharArray();
-			
-			keyPass = null;
-		}
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/CertCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,85 @@
+/*
+ * 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.services.security;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.ConfirmationCallback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class CertCallbackHandler implements EsbCallbackHandler
+{
+	private String keyStoreAlias;
+	private char[] keyPassword;
+	
+	public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException
+	{
+		for (int i = 0; i < callbacks.length; i++) 
+		{
+            if (callbacks[i] instanceof NameCallback) 
+            {
+                NameCallback nc = (NameCallback) callbacks[i];
+                nc.setName(keyStoreAlias);
+            }
+            if ( callbacks[i] instanceof ConfirmationCallback ) 
+            {
+                ConfirmationCallback cb = (ConfirmationCallback) callbacks[i];
+                cb.setSelectedIndex(ConfirmationCallback.OK);
+            }
+            else if (callbacks[i] instanceof PasswordCallback) 
+            {
+            	PasswordCallback passcb = (PasswordCallback) callbacks[i];
+            	passcb.setPassword(keyPassword);
+            }
+        }
+	}
+
+	public void setAuthenticationRequest(AuthenticationRequest authRequest) { }
+
+	public void setSecurityConfig(final SecurityConfig config)
+	{
+		if ( config != null )
+		{
+			Map<String, String> properties = config.getProperties();
+			//	get the alias for the certificate to look for.
+			this.keyStoreAlias = properties.get("alias");
+			
+			//	get password for key in keystore(this is the keys password, not the keystores.
+			String keyPass = properties.get("keyPassword");
+			if ( keyPass != null )
+    			this.keyPassword = keyPass.toCharArray();
+			
+			keyPass = null;
+		}
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,44 +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.services.security;
-
-import javax.security.auth.callback.CallbackHandler;
-
-import org.jboss.soa.esb.services.security.SecurityConfig;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-
-/**
- * EsbCallbackHandler extends CallbackHandler to proved access to 
- * an AuthenticationRequest instance, and SecurityConfig instance. 
- * <p/>
- * This can be used to access security information, like principals and credentials
- * needed by a callbacks.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- *
- */
-public interface EsbCallbackHandler extends CallbackHandler
-{
-	void setAuthenticationRequest(final AuthenticationRequest authRequest);
-	
-	void setSecurityConfig(final SecurityConfig config);
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/EsbCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,44 @@
+/*
+ * 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.services.security;
+
+import javax.security.auth.callback.CallbackHandler;
+
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+
+/**
+ * EsbCallbackHandler extends CallbackHandler to proved access to 
+ * an AuthenticationRequest instance, and SecurityConfig instance. 
+ * <p/>
+ * This can be used to access security information, like principals and credentials
+ * needed by a callbacks.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ *
+ */
+public interface EsbCallbackHandler extends CallbackHandler
+{
+	void setAuthenticationRequest(final AuthenticationRequest authRequest);
+	
+	void setSecurityConfig(final SecurityConfig config);
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,356 +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.services.security;
-
-import java.net.URL;
-import java.security.Principal;
-import java.security.Security;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.services.security.SecurityConfig;
-import org.jboss.soa.esb.services.security.SecurityContext;
-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.principals.Group;
-import org.jboss.soa.esb.services.security.principals.Role;
-import org.jboss.soa.esb.util.ClassUtil;
-
-import com.sun.security.auth.login.ConfigFile;
-
-/**
- * Concrete impl of a SecurityService in JBoss ESB that uses JAAS.
- * <p/>
- * This class is indented to be specified as the security implementation
- * to be used with JBoss ESB. <br>
- * This would be specified in jbossesb-properties.xml:
- * <pre>
- * {@literal
- * <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"/>
- * </properties>
- * </pre>} 
- * 
- * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- * @Since 4.4
- */
-public final class JaasSecurityService implements SecurityService
-{
-	/*
-	 * 	Property name for login config urls.
-	 */
-	private static final String LOGIN_CONFIG_URL_PREFIX = "login.config.url.";
-	
-	/*
-	 *	Callback handler implementation name
-	 */
-	private String callbackHandlerClassName;
-
-	/* 
-	 *	Original login configuration e.g JBoss AS login configuration 
-	 */
-	private javax.security.auth.login.Configuration containerConfig;
-	
-	/*
-	 *	Custom login configuration
-	 */
-	private javax.security.auth.login.Configuration configuration;
-	
-	private final Logger log = Logger.getLogger(JaasSecurityService.class);
-
-	/**
-	 * Performs authentication of the passed in SecurityContext.
-	 * </p>
-	 * 
-	 * This method will first try to authenticate the authRequest by using a custom <br>
-	 * javax.security.auth.login.Configuration, which would be the case where the <br>
-	 * login module name specified exists in a jaas.login file. 
-	 * <br>
-	 * If the login module name cannot be found in jaas.login then this method will <br>
-	 * fall back and try to authenticate using a an underlying Configuration. This would <br>
-	 * be the case when running in an appserver for instance.
-	 * 
-	 * @param config - the security configuration. Properties from jboss-esb.xml
-	 * @param securityContext - the security context to be used.
-	 * @param authRequest - the authentication request to be processed.
-	 * @throws SecurityServiceException 
-	 * @throws LoginException	if the authentication fails
-	 */
-	public void authenticate(final SecurityConfig config, SecurityContext securityContext, final AuthenticationRequest authRequest) throws SecurityServiceException
-	{
-		AssertArgument.isNotNull(securityContext, "securityContext");
-		AssertArgument.isNotNull(config, "config");
-		
-		LoginContext loginContext;
-		final String runAs = config.getRunAs();
-		try
-		{
-			final EsbCallbackHandler callbackHandler = createCallbackHandler(config, authRequest);
-			try
-			{
-				// try to login with a standalone jaas login configuration file(for example jaas.login file)
-    			loginContext = new LoginContext(config.getModuleName(), securityContext.getSubject(), callbackHandler, getConfiguration());
-			}
-			catch (final LoginException ignore)
-			{
-				// fall back and try using the orginal configuration(for example jboss login-config.xml)
-    			loginContext = new LoginContext(config.getModuleName(), securityContext.getSubject(), callbackHandler, containerConfig);
-			}
-			
-			//	invoke the login process 
-    		loginContext.login();
-    		
-    		//	add a runAs group if specified
-    		addRunAs(runAs, securityContext.getSubject());
-		} 
-		catch (final LoginException e)
-		{
-			throw new SecurityServiceException("Exception while trying to login:", e);
-		} 
-		
-		final Subject subject = securityContext.getSubject();
-		final Principal principal = getPrincipal(subject);
-		//	associate the subject with jboss security
-		SecurityAssociation.pushSubjectContext(subject, principal, subject.getPublicCredentials());
-		
-		//	associate the runAs role with jboss security
-		if ( runAs != null )
-		{
-    		SecurityAssociation.pushRunAsIdentity(new RunAsIdentity(runAs, principal.getName()));
-		}
-	}
-	
-	/**
-	 * Determines if the passed in Subject has the role specified in the context.
-	 * @return true	- if the callers has the role
-	 */
-	public boolean isCallerInRole( final Subject subject, final Principal role)
-	{
-        Set<java.security.acl.Group> principals = subject.getPrincipals(java.security.acl.Group.class);
-        for (java.security.acl.Group group : principals)
-		{
-    		if ( group.isMember(role) )
-    			return true;
-        }
-        return false;
-    }
-	
-	/**
-	 * Configures by reading the value of the property 'org.jboss.soa.esb.services.security.configUrl'
-	 * from jbossesb-properties, is one exists.
-	 */
-	public void configure() throws ConfigurationException
-	{
-		try
-		{
-    		containerConfig = javax.security.auth.login.Configuration.getConfiguration();
-		}
-		catch(final SecurityException ignore)
-		{
-			log.warn("Could not locate a security configuration");
-		}
-		
-		final Properties securityProperties = Configuration.getSecurityServiceProperies();
-		final String loginConfigUrl = securityProperties.getProperty(Environment.SECURITY_SERVICE_CONFIG_URL);
-		if ( loginConfigUrl != null )
-		{
-    		final URL loginUrl = ClassUtil.getResource(loginConfigUrl, getClass());
-    		if ( loginUrl == null )
-    		{
-            	final String invalidPropertyMsg =  "The value for property [" + Environment.SECURITY_SERVICE_CONFIG_URL +
-            	"] must be a valid URL. This property should point to a file on the local file system or on the classpath.";
-    			throw new ConfigurationException(invalidPropertyMsg);
-    		}
-    		addLoginConfig(loginUrl);
-		}
-		
-		//	get a EsbCallbackHandler if one is configured in jbossesb-properties.xml
-		callbackHandlerClassName = securityProperties.getProperty(Environment.SECURITY_SERVICE_CALLBACK_HANLDER_CLASS);
-	}
-	
-	public void logout(SecurityConfig config)
-	{
-		//	NoOp
-	}
-
-	public synchronized void refreshSecurityConfig()
-	{
-		if ( configuration != null )
-		{
-			log.info("Refreshing Security configuration");
-			configuration.refresh();
-		}
-	}
-
-	private Principal getPrincipal( final Subject subject)
-	{
-		for (Principal principal : subject.getPrincipals())
-		{
-			return principal;
-		}
-		return null;
-	}
-
-	/**
-	 * Creates an instance of EsbCallbackHandler specified in either jboss-esb.xml:
-	 * <pre>
-	 * {@literal
-	 * <security moduleName="OpenSSOLogin" runAs="adminRole" callbackHandler="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
-	 * }</pre><br>
-	 * or if one was not specified in jboss-esb.xml but one has been specified in jbossesb-properties.xml:
-	 * <pre>
-	 * {@literal
-	 * <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
-	 * }</pre><br>
-	 * After an instance has been created its {@link EsbCallbackHandler#setAuthenticationRequest(AuthenticationRequest)} method is called
-	 * which gives the callback handler access to the authentication information.
-	 * 
-	 * @param config - the security configuration information(from jboss-esb.xml)
-	 * @param authRequest - the authentication request information
-	 * @return EsbCallbackHandler - new instance with authReqeust set or null if no callback handler has been specified in either jboss-esb.xml or jbossesb-properties.xml
-	 * @throws SecurityServiceException  - if an EsbCallbackHandler has specified in the configuration but the implementation cannot be created.
-	 */
-	private EsbCallbackHandler createCallbackHandler( final SecurityConfig config, final AuthenticationRequest authRequest ) throws SecurityServiceException 
-	{
-		EsbCallbackHandler callbackHandler = null;
-		
-		//	check if a callbackhandler was specified in jboss-esb.xml
-		String callbackImpl = config.getCallbackHandler();
-		if ( callbackImpl == null )
-		{
-			//	use the global callbackhandler that can be specified in jbossesb-properties.xml(optional)
-			callbackImpl = callbackHandlerClassName;
-		}
-		
-		if ( callbackImpl != null )
-		{
-			callbackHandler = createNewInstance(callbackImpl);
-			//	set the authReqeust so that the callback handler has access to the authentication information(Principals, Credentials)
-			callbackHandler.setAuthenticationRequest(authRequest);
-			//	set the SecurityConfig so that the callbakc handler has access to the configuration information
-			callbackHandler.setSecurityConfig(config);
-		}
-		return callbackHandler;
-	}
-
-	private void addLoginConfig(final URL loginConfigUrl) throws ConfigurationException
-	{
-		if (loginConfigUrl == null)
-		{
-			throw new ConfigurationException("Could not locate the login config file at Url [" + loginConfigUrl + "]");
-		}
-		
-		int urlIndex = 1;
-		boolean loginUrlRegistered = false;
-		String registeredLoginUrl;
-        while ((registeredLoginUrl = Security.getProperty(LOGIN_CONFIG_URL_PREFIX + urlIndex)) != null)
-        {
-        	loginUrlRegistered = registeredLoginUrl.equals(loginConfigUrl.toString());
-        	if (loginUrlRegistered)
-        	{
-        		break;
-        	}
-        	else
-        	{
-        		urlIndex++;
-        	}
-        }
-        
-        if (!loginUrlRegistered)
-        {
-    		log.info("Adding file [ " + loginConfigUrl + "] as [" + LOGIN_CONFIG_URL_PREFIX + urlIndex + "]");
-        	Security.setProperty(LOGIN_CONFIG_URL_PREFIX + urlIndex, loginConfigUrl.toExternalForm());
-        	setConfiguration(new ConfigFile());
-        }
-	}
-	
-	private synchronized javax.security.auth.login.Configuration getConfiguration()
-	{
-		return configuration;
-	}
-	
-	private synchronized void setConfiguration(final javax.security.auth.login.Configuration configuration)
-	{
-		this.configuration = configuration;
-	}
-
-	private void addRunAs( final String runAs, final Subject subject )
-	{
-		if ( runAs != null )
-		{
-			final Role runAsRole = new Role(runAs);
-			Set<Group> principals = subject.getPrincipals(Group.class);
-			if ( principals.isEmpty() )
-			{
-        		final Group group = new Group("Roles");
-    			group.addMember(runAsRole);
-    			subject.getPrincipals().add(group);
-			}
-			else
-			{
-				for (Group groups : principals)
-				{
-					if ( "Roles".equals(groups.getName()) )
-					{
-						groups.addMember(runAsRole);
-					}
-				}
-			}
-		}
-	}
-
-	private <T extends EsbCallbackHandler> T createNewInstance( final String className ) throws SecurityServiceException 
-	{
-		try
-		{
-			@SuppressWarnings("unchecked")
-			Class<T> forName = ClassUtil.forName(className, getClass());
-			return forName.newInstance();
-		} 
-		catch (final ClassNotFoundException e)
-		{
-			throw new SecurityServiceException("ClassNotFoundException while trying to create an impl of [" + className + "]", e);
-		} 
-		catch (final InstantiationException e)
-		{
-			throw new SecurityServiceException("InstantiationException while trying to create an impl of [" + className + "]", e);
-		} 
-		catch (final IllegalAccessException e)
-		{
-			throw new SecurityServiceException("IllegalAccess while trying to create an impl of [" + className + "]", e);
-		}
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/JaasSecurityService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,356 @@
+/*
+ * 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.services.security;
+
+import java.net.URL;
+import java.security.Principal;
+import java.security.Security;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.security.RunAsIdentity;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.SecurityContext;
+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.principals.Group;
+import org.jboss.soa.esb.services.security.principals.Role;
+import org.jboss.soa.esb.util.ClassUtil;
+
+import com.sun.security.auth.login.ConfigFile;
+
+/**
+ * Concrete impl of a SecurityService in JBoss ESB that uses JAAS.
+ * <p/>
+ * This class is indented to be specified as the security implementation
+ * to be used with JBoss ESB. <br>
+ * This would be specified in jbossesb-properties.xml:
+ * <pre>
+ * {@literal
+ * <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"/>
+ * </properties>
+ * </pre>} 
+ * 
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ * @Since 4.4
+ */
+public final class JaasSecurityService implements SecurityService
+{
+	/*
+	 * 	Property name for login config urls.
+	 */
+	private static final String LOGIN_CONFIG_URL_PREFIX = "login.config.url.";
+	
+	/*
+	 *	Callback handler implementation name
+	 */
+	private String callbackHandlerClassName;
+
+	/* 
+	 *	Original login configuration e.g JBoss AS login configuration 
+	 */
+	private javax.security.auth.login.Configuration containerConfig;
+	
+	/*
+	 *	Custom login configuration
+	 */
+	private javax.security.auth.login.Configuration configuration;
+	
+	private final Logger log = Logger.getLogger(JaasSecurityService.class);
+
+	/**
+	 * Performs authentication of the passed in SecurityContext.
+	 * </p>
+	 * 
+	 * This method will first try to authenticate the authRequest by using a custom <br>
+	 * javax.security.auth.login.Configuration, which would be the case where the <br>
+	 * login module name specified exists in a jaas.login file. 
+	 * <br>
+	 * If the login module name cannot be found in jaas.login then this method will <br>
+	 * fall back and try to authenticate using a an underlying Configuration. This would <br>
+	 * be the case when running in an appserver for instance.
+	 * 
+	 * @param config - the security configuration. Properties from jboss-esb.xml
+	 * @param securityContext - the security context to be used.
+	 * @param authRequest - the authentication request to be processed.
+	 * @throws SecurityServiceException 
+	 * @throws LoginException	if the authentication fails
+	 */
+	public void authenticate(final SecurityConfig config, SecurityContext securityContext, final AuthenticationRequest authRequest) throws SecurityServiceException
+	{
+		AssertArgument.isNotNull(securityContext, "securityContext");
+		AssertArgument.isNotNull(config, "config");
+		
+		LoginContext loginContext;
+		final String runAs = config.getRunAs();
+		try
+		{
+			final EsbCallbackHandler callbackHandler = createCallbackHandler(config, authRequest);
+			try
+			{
+				// try to login with a standalone jaas login configuration file(for example jaas.login file)
+    			loginContext = new LoginContext(config.getModuleName(), securityContext.getSubject(), callbackHandler, getConfiguration());
+			}
+			catch (final LoginException ignore)
+			{
+				// fall back and try using the orginal configuration(for example jboss login-config.xml)
+    			loginContext = new LoginContext(config.getModuleName(), securityContext.getSubject(), callbackHandler, containerConfig);
+			}
+			
+			//	invoke the login process 
+    		loginContext.login();
+    		
+    		//	add a runAs group if specified
+    		addRunAs(runAs, securityContext.getSubject());
+		} 
+		catch (final LoginException e)
+		{
+			throw new SecurityServiceException("Exception while trying to login:", e);
+		} 
+		
+		final Subject subject = securityContext.getSubject();
+		final Principal principal = getPrincipal(subject);
+		//	associate the subject with jboss security
+		SecurityAssociation.pushSubjectContext(subject, principal, subject.getPublicCredentials());
+		
+		//	associate the runAs role with jboss security
+		if ( runAs != null )
+		{
+    		SecurityAssociation.pushRunAsIdentity(new RunAsIdentity(runAs, principal.getName()));
+		}
+	}
+	
+	/**
+	 * Determines if the passed in Subject has the role specified in the context.
+	 * @return true	- if the callers has the role
+	 */
+	public boolean isCallerInRole( final Subject subject, final Principal role)
+	{
+        Set<java.security.acl.Group> principals = subject.getPrincipals(java.security.acl.Group.class);
+        for (java.security.acl.Group group : principals)
+		{
+    		if ( group.isMember(role) )
+    			return true;
+        }
+        return false;
+    }
+	
+	/**
+	 * Configures by reading the value of the property 'org.jboss.soa.esb.services.security.configUrl'
+	 * from jbossesb-properties, is one exists.
+	 */
+	public void configure() throws ConfigurationException
+	{
+		try
+		{
+    		containerConfig = javax.security.auth.login.Configuration.getConfiguration();
+		}
+		catch(final SecurityException ignore)
+		{
+			log.warn("Could not locate a security configuration");
+		}
+		
+		final Properties securityProperties = Configuration.getSecurityServiceProperies();
+		final String loginConfigUrl = securityProperties.getProperty(Environment.SECURITY_SERVICE_CONFIG_URL);
+		if ( loginConfigUrl != null )
+		{
+    		final URL loginUrl = ClassUtil.getResource(loginConfigUrl, getClass());
+    		if ( loginUrl == null )
+    		{
+            	final String invalidPropertyMsg =  "The value for property [" + Environment.SECURITY_SERVICE_CONFIG_URL +
+            	"] must be a valid URL. This property should point to a file on the local file system or on the classpath.";
+    			throw new ConfigurationException(invalidPropertyMsg);
+    		}
+    		addLoginConfig(loginUrl);
+		}
+		
+		//	get a EsbCallbackHandler if one is configured in jbossesb-properties.xml
+		callbackHandlerClassName = securityProperties.getProperty(Environment.SECURITY_SERVICE_CALLBACK_HANLDER_CLASS);
+	}
+	
+	public void logout(SecurityConfig config)
+	{
+		//	NoOp
+	}
+
+	public synchronized void refreshSecurityConfig()
+	{
+		if ( configuration != null )
+		{
+			log.info("Refreshing Security configuration");
+			configuration.refresh();
+		}
+	}
+
+	private Principal getPrincipal( final Subject subject)
+	{
+		for (Principal principal : subject.getPrincipals())
+		{
+			return principal;
+		}
+		return null;
+	}
+
+	/**
+	 * Creates an instance of EsbCallbackHandler specified in either jboss-esb.xml:
+	 * <pre>
+	 * {@literal
+	 * <security moduleName="OpenSSOLogin" runAs="adminRole" callbackHandler="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
+	 * }</pre><br>
+	 * or if one was not specified in jboss-esb.xml but one has been specified in jbossesb-properties.xml:
+	 * <pre>
+	 * {@literal
+	 * <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
+	 * }</pre><br>
+	 * After an instance has been created its {@link EsbCallbackHandler#setAuthenticationRequest(AuthenticationRequest)} method is called
+	 * which gives the callback handler access to the authentication information.
+	 * 
+	 * @param config - the security configuration information(from jboss-esb.xml)
+	 * @param authRequest - the authentication request information
+	 * @return EsbCallbackHandler - new instance with authReqeust set or null if no callback handler has been specified in either jboss-esb.xml or jbossesb-properties.xml
+	 * @throws SecurityServiceException  - if an EsbCallbackHandler has specified in the configuration but the implementation cannot be created.
+	 */
+	private EsbCallbackHandler createCallbackHandler( final SecurityConfig config, final AuthenticationRequest authRequest ) throws SecurityServiceException 
+	{
+		EsbCallbackHandler callbackHandler = null;
+		
+		//	check if a callbackhandler was specified in jboss-esb.xml
+		String callbackImpl = config.getCallbackHandler();
+		if ( callbackImpl == null )
+		{
+			//	use the global callbackhandler that can be specified in jbossesb-properties.xml(optional)
+			callbackImpl = callbackHandlerClassName;
+		}
+		
+		if ( callbackImpl != null )
+		{
+			callbackHandler = createNewInstance(callbackImpl);
+			//	set the authReqeust so that the callback handler has access to the authentication information(Principals, Credentials)
+			callbackHandler.setAuthenticationRequest(authRequest);
+			//	set the SecurityConfig so that the callbakc handler has access to the configuration information
+			callbackHandler.setSecurityConfig(config);
+		}
+		return callbackHandler;
+	}
+
+	private void addLoginConfig(final URL loginConfigUrl) throws ConfigurationException
+	{
+		if (loginConfigUrl == null)
+		{
+			throw new ConfigurationException("Could not locate the login config file at Url [" + loginConfigUrl + "]");
+		}
+		
+		int urlIndex = 1;
+		boolean loginUrlRegistered = false;
+		String registeredLoginUrl;
+        while ((registeredLoginUrl = Security.getProperty(LOGIN_CONFIG_URL_PREFIX + urlIndex)) != null)
+        {
+        	loginUrlRegistered = registeredLoginUrl.equals(loginConfigUrl.toString());
+        	if (loginUrlRegistered)
+        	{
+        		break;
+        	}
+        	else
+        	{
+        		urlIndex++;
+        	}
+        }
+        
+        if (!loginUrlRegistered)
+        {
+    		log.info("Adding file [ " + loginConfigUrl + "] as [" + LOGIN_CONFIG_URL_PREFIX + urlIndex + "]");
+        	Security.setProperty(LOGIN_CONFIG_URL_PREFIX + urlIndex, loginConfigUrl.toExternalForm());
+        	setConfiguration(new ConfigFile());
+        }
+	}
+	
+	private synchronized javax.security.auth.login.Configuration getConfiguration()
+	{
+		return configuration;
+	}
+	
+	private synchronized void setConfiguration(final javax.security.auth.login.Configuration configuration)
+	{
+		this.configuration = configuration;
+	}
+
+	private void addRunAs( final String runAs, final Subject subject )
+	{
+		if ( runAs != null )
+		{
+			final Role runAsRole = new Role(runAs);
+			Set<Group> principals = subject.getPrincipals(Group.class);
+			if ( principals.isEmpty() )
+			{
+        		final Group group = new Group("Roles");
+    			group.addMember(runAsRole);
+    			subject.getPrincipals().add(group);
+			}
+			else
+			{
+				for (Group groups : principals)
+				{
+					if ( "Roles".equals(groups.getName()) )
+					{
+						groups.addMember(runAsRole);
+					}
+				}
+			}
+		}
+	}
+
+	private <T extends EsbCallbackHandler> T createNewInstance( final String className ) throws SecurityServiceException 
+	{
+		try
+		{
+			@SuppressWarnings("unchecked")
+			Class<T> forName = ClassUtil.forName(className, getClass());
+			return forName.newInstance();
+		} 
+		catch (final ClassNotFoundException e)
+		{
+			throw new SecurityServiceException("ClassNotFoundException while trying to create an impl of [" + className + "]", e);
+		} 
+		catch (final InstantiationException e)
+		{
+			throw new SecurityServiceException("InstantiationException while trying to create an impl of [" + className + "]", e);
+		} 
+		catch (final IllegalAccessException e)
+		{
+			throw new SecurityServiceException("IllegalAccess while trying to create an impl of [" + className + "]", e);
+		}
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,84 +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.services.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.services.security.SecurityConfig;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class UserPassCallbackHandler implements EsbCallbackHandler
-{
-	private Logger log = Logger.getLogger(UserPassCallbackHandler.class);
-	
-	private AuthenticationRequest authRequest;
-	
-	public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException
-	{
-		log.debug("Nr of callback to handle : " + callbacks.length);
-		for (int i = 0; i < callbacks.length; i++) 
-		{
-    		log.debug("Callback" + callbacks[i].getClass().getName());
-            if (callbacks[i] instanceof NameCallback) 
-            {
-                NameCallback nc = (NameCallback) callbacks[i];
-                nc.setName(authRequest.getPrincipal().getName());
-            }
-            else if (callbacks[i] instanceof PasswordCallback) 
-            {
-                PasswordCallback pc = (PasswordCallback) callbacks[i];
-                for (Object object : authRequest.getCredentials() )
-				{
-                	if ( object instanceof char[] )
-                	{
-                        pc.setPassword((char[]) object);
-                	}
-                	else if ( object instanceof String )
-                	{
-                        pc.setPassword( ((String) object).toCharArray() );
-                	}
-				}
-            } 
-            else 
-            {
-            	throw new UnsupportedCallbackException(callbacks[i], "UserPassCallbackHandler");
-            }
-        }
-	}
-
-	public void setAuthenticationRequest(AuthenticationRequest authRequest)
-	{
-		this.authRequest = authRequest;
-	}
-
-	public void setSecurityConfig(SecurityConfig config) { }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/UserPassCallbackHandler.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,84 @@
+/*
+ * 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.services.security;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class UserPassCallbackHandler implements EsbCallbackHandler
+{
+	private Logger log = Logger.getLogger(UserPassCallbackHandler.class);
+	
+	private AuthenticationRequest authRequest;
+	
+	public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException
+	{
+		log.debug("Nr of callback to handle : " + callbacks.length);
+		for (int i = 0; i < callbacks.length; i++) 
+		{
+    		log.debug("Callback" + callbacks[i].getClass().getName());
+            if (callbacks[i] instanceof NameCallback) 
+            {
+                NameCallback nc = (NameCallback) callbacks[i];
+                nc.setName(authRequest.getPrincipal().getName());
+            }
+            else if (callbacks[i] instanceof PasswordCallback) 
+            {
+                PasswordCallback pc = (PasswordCallback) callbacks[i];
+                for (Object object : authRequest.getCredentials() )
+				{
+                	if ( object instanceof char[] )
+                	{
+                        pc.setPassword((char[]) object);
+                	}
+                	else if ( object instanceof String )
+                	{
+                        pc.setPassword( ((String) object).toCharArray() );
+                	}
+				}
+            } 
+            else 
+            {
+            	throw new UnsupportedCallbackException(callbacks[i], "UserPassCallbackHandler");
+            }
+        }
+	}
+
+	public void setAuthenticationRequest(AuthenticationRequest authRequest)
+	{
+		this.authRequest = authRequest;
+	}
+
+	public void setSecurityConfig(SecurityConfig config) { }
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/services/security/jaas (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/services/security/jaas)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/util/XMLHelper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/util/XMLHelper.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/util/XMLHelper.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -20,9 +20,11 @@
  */
 package org.jboss.internal.soa.esb.util;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
+import java.io.StringReader;
 import java.io.Writer;
 
 import javax.xml.namespace.QName;
@@ -31,10 +33,16 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
 
 import org.jboss.internal.soa.esb.util.stax.ParsingSupport;
 import org.jboss.internal.soa.esb.util.stax.StreamHelper;
+import org.jboss.soa.esb.util.ClassUtil;
 import org.jboss.util.StringPropertyReplacer;
+import org.xml.sax.SAXException;
 
 /**
  * Helper class for manipulating XML documents.
@@ -51,6 +59,10 @@
      * The XML output factory.
      */
     private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance() ;
+    /**
+     * The schema factory.
+     */
+    private static final SchemaFactory SCHEMA_FACTORY = SchemaFactory.newInstance( "http://www.w3.org/2001/XMLSchema" );
 
     /**
      * Get the XML stream reader.
@@ -149,6 +161,39 @@
         streamWriter.writeEndDocument() ;
         streamWriter.flush() ;
     }
+    
+    /**
+     * Get the schema for the specified resource.
+     * @param resource The schema resource to parse.
+     * @return The resource schema for validation. 
+     * @throws SAXException For errors during parsing.
+     */
+    public static Schema getSchema(final String resource)
+        throws SAXException
+    {
+        final InputStream resourceIS = ClassUtil.getResourceAsStream(resource, XMLHelper.class) ;
+        return SCHEMA_FACTORY.newSchema(new StreamSource(resourceIS)) ;
+    }
+    
+    /**
+     * Validate the specified xml against the schema.
+     * @param schema The resource schema for validation.
+     * @param xml The XML to validate.
+     * @return true if valid, false otherwise.
+     */
+    public static boolean validate(final Schema schema, final String xml)
+    {
+        final Validator validator = schema.newValidator() ;
+        try
+        {
+            validator.validate(new StreamSource(new StringReader(xml))) ;
+            return true ;
+        }
+        catch (final IOException ioe) {} // fall through
+        catch (final SAXException saxe) {} // fall through
+        
+        return false ;
+    }
 
     /**
      * Create the XML input factory.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,211 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.internal.soa.esb.webservice;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.Detail;
-import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.couriers.FaultMessageException;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.message.Fault;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.w3c.dom.Document;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-
-/**
- * This is the abstract base class for a SOAP messages
- * @author kevin
- */
-public abstract class BaseWebService
-{
-    private static final QName SERVER_FAULT_QN = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Server") ;
-    
-    private static final boolean RETURN_STACK_TRACES ;
-    private static final Logger LOGGER = Logger.getLogger(BaseWebService.class);
-    
-    protected final ServiceInvoker serviceInvoker ;
-    
-    protected BaseWebService(final String category, final String name)
-        throws MessageDeliverException
-    {
-        serviceInvoker = new ServiceInvoker(category, name) ;
-    }
-    
-    public Object invoke(final Object obj)
-        throws SOAPException
-    {
-        final SOAPMessage request = (SOAPMessage)obj;
-        final Message esbReq = MessageFactory.getInstance().getMessage() ;
-        try
-        {
-            final SOAPBody soapBody = request.getSOAPBody() ;
-            if (soapBody == null)
-            {
-                throw new SOAPException("Missing SOAP body from request") ;
-            }
-            // There is a bug in JBossWS extractContentAsDocument so we do this ourselves
-            final Iterator children = soapBody.getChildElements() ;
-            boolean found = false ;
-            while(children.hasNext())
-            {
-                final Node node = (Node)children.next() ;
-                if (node instanceof SOAPElement)
-                {
-                    if (found)
-                    {
-                        throw new SOAPException("Found multiple SOAPElements in SOAPBody") ;
-                    }
-                    final ByteArrayOutputStream byteStream = new ByteArrayOutputStream() ;
-                    YADOMUtil.serialize(node, new StreamResult(byteStream), true);
-                    byteStream.close();
-                    esbReq.getBody().add(byteStream.toString()) ;
-                    found = true ;
-                }
-            }
-            
-            if (!found)
-            {
-                throw new SOAPException("Could not find SOAPElement in SOAPBody") ;
-            }
-            
-            final Message esbRes = deliverMessage(esbReq) ;
-            if (esbRes != null)
-            {
-                final Object input = esbRes.getBody().get() ;
-                if (input == null)
-                {
-                    throw new SOAPException("Null response from service") ;
-                }
-                final String soapRes = input.toString();
-                
-                final Document respDoc = YADOMUtil.parseStream(new ByteArrayInputStream(soapRes.getBytes()),
-                        false, false, true);
-                final SOAPMessage response = javax.xml.soap.MessageFactory.newInstance().createMessage();
-                response.getSOAPBody().addDocument(respDoc) ;
-                return response ;
-            }
-            else
-            {
-                return null ;
-            }
-         }
-        catch (final Exception ex)
-        {
-            SOAPMessage faultMsg = null;
-            if (ex instanceof FaultMessageException)
-            {
-                final FaultMessageException fme = (FaultMessageException) ex ;
-                final Message faultMessage = fme.getReturnedMessage() ;
-                if (faultMessage != null)
-                {
-                    final Body body = faultMessage.getBody() ;
-                    final QName faultCode = (QName)body.get(Fault.DETAIL_CODE_CONTENT) ;
-                    final String faultDescription = (String)body.get(Fault.DETAIL_DESCRIPTION_CONTENT) ;
-                    final String faultDetail = (String)body.get(Fault.DETAIL_DETAIL_CONTENT) ;
-                    
-                    if (faultCode != null)
-                    {
-                        faultMsg = javax.xml.soap.MessageFactory.newInstance().createMessage() ;
-                        final SOAPFault fault = faultMsg.getSOAPBody().addFault(faultCode, faultDescription) ;
-                        if (faultDetail != null)
-                        {
-                            try
-                            {
-                                final Document detailDoc = YADOMUtil.parseStream(new ByteArrayInputStream(faultDetail.getBytes()),
-                                        false, false, true);
-                                final Detail detail = fault.addDetail() ;
-                                detail.appendChild(detailDoc.getDocumentElement()) ;
-                            }
-                            catch (final Exception ex2)
-                            {
-                                LOGGER.warn("Failed to parse fault detail", ex2) ;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        final Throwable cause = fme.getCause() ;
-                        faultMsg = (cause != null) ? generateFault(cause) : generateFault(ex) ;
-                    }
-                }
-            }
-            
-            if (faultMsg == null)
-            {
-                faultMsg = generateFault(ex) ;
-            }
-            return faultMsg ;
-        }
-    }
-    
-    private SOAPMessage generateFault(final Throwable th)
-        throws SOAPException
-    {
-        final SOAPMessage faultMsg = javax.xml.soap.MessageFactory.newInstance().createMessage() ;
-        if (RETURN_STACK_TRACES)
-        {
-            final StringWriter sw = new StringWriter() ;
-            final PrintWriter pw = new PrintWriter(sw) ;
-            th.printStackTrace(pw) ;
-            pw.flush() ;
-            pw.close() ;
-            faultMsg.getSOAPBody().addFault(SERVER_FAULT_QN, sw.toString());
-        }
-        else
-        {
-            faultMsg.getSOAPBody().addFault(SERVER_FAULT_QN, th.getMessage());
-        }
-        return faultMsg ;
-    }
-    
-    protected abstract Message deliverMessage(final Message request)
-        throws Exception ;
-    
-    static
-    {
-        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE) ;
-        final String returnStackTraces = propertyManager.getProperty(Environment.WS_RETURN_STACK_TRACE);
-        RETURN_STACK_TRACES = Boolean.parseBoolean(returnStackTraces) ;
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,211 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.internal.soa.esb.webservice;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.Detail;
+import javax.xml.soap.Node;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.couriers.FaultMessageException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Fault;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.w3c.dom.Document;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+
+/**
+ * This is the abstract base class for a SOAP messages
+ * @author kevin
+ */
+public abstract class BaseWebService
+{
+    private static final QName SERVER_FAULT_QN = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Server") ;
+    
+    private static final boolean RETURN_STACK_TRACES ;
+    private static final Logger LOGGER = Logger.getLogger(BaseWebService.class);
+    
+    protected final ServiceInvoker serviceInvoker ;
+    
+    protected BaseWebService(final String category, final String name)
+        throws MessageDeliverException
+    {
+        serviceInvoker = new ServiceInvoker(category, name) ;
+    }
+    
+    public Object invoke(final Object obj)
+        throws SOAPException
+    {
+        final SOAPMessage request = (SOAPMessage)obj;
+        final Message esbReq = MessageFactory.getInstance().getMessage() ;
+        try
+        {
+            final SOAPBody soapBody = request.getSOAPBody() ;
+            if (soapBody == null)
+            {
+                throw new SOAPException("Missing SOAP body from request") ;
+            }
+            // There is a bug in JBossWS extractContentAsDocument so we do this ourselves
+            final Iterator children = soapBody.getChildElements() ;
+            boolean found = false ;
+            while(children.hasNext())
+            {
+                final Node node = (Node)children.next() ;
+                if (node instanceof SOAPElement)
+                {
+                    if (found)
+                    {
+                        throw new SOAPException("Found multiple SOAPElements in SOAPBody") ;
+                    }
+                    final ByteArrayOutputStream byteStream = new ByteArrayOutputStream() ;
+                    YADOMUtil.serialize(node, new StreamResult(byteStream), true);
+                    byteStream.close();
+                    esbReq.getBody().add(byteStream.toString()) ;
+                    found = true ;
+                }
+            }
+            
+            if (!found)
+            {
+                throw new SOAPException("Could not find SOAPElement in SOAPBody") ;
+            }
+            
+            final Message esbRes = deliverMessage(esbReq) ;
+            if (esbRes != null)
+            {
+                final Object input = esbRes.getBody().get() ;
+                if (input == null)
+                {
+                    throw new SOAPException("Null response from service") ;
+                }
+                final String soapRes = input.toString();
+                
+                final Document respDoc = YADOMUtil.parseStream(new ByteArrayInputStream(soapRes.getBytes()),
+                        false, false, true);
+                final SOAPMessage response = javax.xml.soap.MessageFactory.newInstance().createMessage();
+                response.getSOAPBody().addDocument(respDoc) ;
+                return response ;
+            }
+            else
+            {
+                return null ;
+            }
+         }
+        catch (final Exception ex)
+        {
+            SOAPMessage faultMsg = null;
+            if (ex instanceof FaultMessageException)
+            {
+                final FaultMessageException fme = (FaultMessageException) ex ;
+                final Message faultMessage = fme.getReturnedMessage() ;
+                if (faultMessage != null)
+                {
+                    final Body body = faultMessage.getBody() ;
+                    final QName faultCode = (QName)body.get(Fault.DETAIL_CODE_CONTENT) ;
+                    final String faultDescription = (String)body.get(Fault.DETAIL_DESCRIPTION_CONTENT) ;
+                    final String faultDetail = (String)body.get(Fault.DETAIL_DETAIL_CONTENT) ;
+                    
+                    if (faultCode != null)
+                    {
+                        faultMsg = javax.xml.soap.MessageFactory.newInstance().createMessage() ;
+                        final SOAPFault fault = faultMsg.getSOAPBody().addFault(faultCode, faultDescription) ;
+                        if (faultDetail != null)
+                        {
+                            try
+                            {
+                                final Document detailDoc = YADOMUtil.parseStream(new ByteArrayInputStream(faultDetail.getBytes()),
+                                        false, false, true);
+                                final Detail detail = fault.addDetail() ;
+                                detail.appendChild(detailDoc.getDocumentElement()) ;
+                            }
+                            catch (final Exception ex2)
+                            {
+                                LOGGER.warn("Failed to parse fault detail", ex2) ;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        final Throwable cause = fme.getCause() ;
+                        faultMsg = (cause != null) ? generateFault(cause) : generateFault(ex) ;
+                    }
+                }
+            }
+            
+            if (faultMsg == null)
+            {
+                faultMsg = generateFault(ex) ;
+            }
+            return faultMsg ;
+        }
+    }
+    
+    private SOAPMessage generateFault(final Throwable th)
+        throws SOAPException
+    {
+        final SOAPMessage faultMsg = javax.xml.soap.MessageFactory.newInstance().createMessage() ;
+        if (RETURN_STACK_TRACES)
+        {
+            final StringWriter sw = new StringWriter() ;
+            final PrintWriter pw = new PrintWriter(sw) ;
+            th.printStackTrace(pw) ;
+            pw.flush() ;
+            pw.close() ;
+            faultMsg.getSOAPBody().addFault(SERVER_FAULT_QN, sw.toString());
+        }
+        else
+        {
+            faultMsg.getSOAPBody().addFault(SERVER_FAULT_QN, th.getMessage());
+        }
+        return faultMsg ;
+    }
+    
+    protected abstract Message deliverMessage(final Message request)
+        throws Exception ;
+    
+    static
+    {
+        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE) ;
+        final String returnStackTraces = propertyManager.getProperty(Environment.WS_RETURN_STACK_TRACE);
+        RETURN_STACK_TRACES = Boolean.parseBoolean(returnStackTraces) ;
+    }
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,324 +0,0 @@
-/*
- * 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, JBoss Inc.
- */
-package org.jboss.internal.soa.esb.webservice;
-
-import java.io.StringWriter;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.PortType;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.extensions.schema.SchemaImpl;
-import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBindingImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBodyImpl;
-import com.ibm.wsdl.extensions.soap.SOAPFaultImpl;
-
-public class ESBContractGenerator {
-	private static final QName XSD_QN = new QName("http://www.w3.org/2001/XMLSchema", "schema");
-	private static WSDLFactory wsdlFactory ;
- 
-	public static String generateWSDL(final Service serviceConfig, final ESBServiceEndpointInfo serviceInfo)
-			throws ConfigurationException {
-		final Definition def = getWSDLFactory().newDefinition() ;
-		final String namespace = serviceInfo.getNamespace() ;
-		def.setTargetNamespace(namespace);
-		def.addNamespace("tns", namespace);
-		def.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-		// add types
-		Types types = def.createTypes();
-		def.setTypes(types);
-
-		Message reqMessage = null;
-		Message resMessage = null;
-		List<Message> faultMessages = null;
-
-		String inXsd = serviceConfig.getActions().getInXsd();
-		String outXsd = serviceConfig.getActions().getOutXsd();
-		String faultXsd = serviceConfig.getActions().getFaultXsd();
-
-		int nsSuffixCounter = 0 ;
-		if (inXsd != null) {
-			try {
-				Document doc = YADOMUtil.parseStream(ClassUtil
-						.getResourceAsStream(inXsd, ESBContractGenerator.class),
-						false, false);
-				if (doc != null) {
-					reqMessage = addMessage(def, doc.getDocumentElement(),
-							serviceInfo.getRequestName(), "in", ++nsSuffixCounter);
-				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in inXsd attribute '" + serviceConfig.getActions().getInXsd() + "' not found in classpath.", e);
-			} 
-		}
-
-		if (outXsd != null) {
-			try {
-				Document doc = YADOMUtil.parseStream(ClassUtil
-						.getResourceAsStream(outXsd, ESBContractGenerator.class),
-						false, false);
-				if (doc != null) {
-					resMessage = addMessage(def, doc.getDocumentElement(),
-							serviceInfo.getResponseName(), "out", ++nsSuffixCounter);
-				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in outXsd attribute '" + serviceConfig.getActions().getOutXsd() + "' not found in classpath.", e);
-			} 
-
-		}
-
-		if ((faultXsd != null) && !serviceInfo.isOneWay()) {
-			try {
-				final String[] xsds = faultXsd.split(",") ;
-				faultMessages = new ArrayList<Message>();
-				for(String xsd: xsds) {
-					Document doc = YADOMUtil.parseStream(ClassUtil
-						.getResourceAsStream(xsd, ESBContractGenerator.class),
-						false, false);
-					if (doc != null) {
-						addFaultMessage(faultMessages, def, doc.getDocumentElement(),
-							serviceInfo.getFaultName(), "fault", ++nsSuffixCounter);
-					}
-				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in faultXsd attribute '" + serviceConfig.getActions().getFaultXsd() + "' not found in classpath.", e);
-			} 
-
-		}
-
-		PortType portType = addPortType(def, serviceInfo, reqMessage,
-			resMessage, faultMessages);
-		Binding binding = addBinding(def, serviceInfo, portType);
-		addService(def, serviceInfo, binding);
-		StringWriter sw = new java.io.StringWriter();
-		try {
-			getWSDLFactory().newWSDLWriter().writeWSDL(def, sw);
-		} catch (WSDLException e) {
-			new ConfigurationException("Failed to generate wsdl for service:" + serviceConfig.getCategory() + "/" + serviceConfig.getName() , e);
-		}
-		return sw.toString();
-	}
-
-	private static void addSchema(Types types, Element xsdElement) {
-		SchemaImpl schemaImpl = new SchemaImpl();
-		schemaImpl.setElement(xsdElement);
-		schemaImpl.setElementType(XSD_QN);
-		types.addExtensibilityElement(schemaImpl);
-	}
-
-	private static Message addMessage(Definition def, Element element, String msgName, String partName, int nsSuffixCounter) {
-		String schemaNs = YADOMUtil
-				.getAttribute(element, "targetNamespace", "");
-		addSchema(def.getTypes(), element);
-		if (def.getNamespace(schemaNs) == null) {
-			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
-		}
-		// add request message
-		Node node = YADOMUtil.getNode(element, "/schema/element");
-		Message msg = def.createMessage();
-		msg.setQName(new QName(def.getTargetNamespace(), msgName));
-		msg.setUndefined(false);
-		Part part = def.createPart();
-		part.setName(partName);
-		part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
-				(Element) node, "name", "")));
-		msg.addPart(part);
-		def.addMessage(msg);
-		return msg;
-	}
-
-	private static void addFaultMessage(final List<Message> faultMessages,
-			Definition def, Element element, String msgName, String partName,
-			int nsSuffixCounter) {
-		String schemaNs = YADOMUtil
-				.getAttribute(element, "targetNamespace", "");
-		addSchema(def.getTypes(), element);
-		if (def.getNamespace(schemaNs) == null) {
-			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
-		}
-		// add request message
-		NodeList nodes = YADOMUtil.getNodeList(element, "/schema/element");
-		for (int i = 0; i < nodes.getLength(); i++) {
-			final int nameIndex = i + 1;
-			Node node = nodes.item(0);
-			Message msg = def.createMessage();
-			msg.setQName(new QName(def.getTargetNamespace(), msgName
-					+ nameIndex));
-			msg.setUndefined(false);
-			Part part = def.createPart();
-			part.setName(partName + nameIndex);
-			part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
-					(Element) node, "name", "")));
-			msg.addPart(part);
-			def.addMessage(msg);
-			faultMessages.add(msg);
-		}
-	}
-
-	private static PortType addPortType(Definition def, final ESBServiceEndpointInfo serviceInfo,
-			Message inMessage, Message outMessage, List<Message> faultMessages) {
-		// add port type
-		PortType portType = def.createPortType();
-		portType.setQName(new QName(def.getTargetNamespace(), serviceInfo.getPortName())) ;
-		Operation op = def.createOperation();
-		op.setUndefined(false);
-		op.setName(serviceInfo.getOperationName());
-		if (inMessage != null) {
-			Input in = def.createInput();
-			in.setMessage(inMessage);
-			in.setName(inMessage.getQName().getLocalPart());
-			op.setInput(in);
-		}
-		if (outMessage != null) {
-			Output out = def.createOutput();
-			out.setMessage(outMessage);
-			out.setName(outMessage.getQName().getLocalPart());
-			op.setOutput(out);
-		}
-
-		int count = 1 ;
-		for (Message message : faultMessages) {
-			Fault fault = def.createFault();
-			fault.setMessage(message);
-			fault.setName("fault" + (count++));
-			op.addFault(fault);
-		}
-		portType.addOperation(op);
-		portType.setUndefined(false);
-		def.addPortType(portType);
-		return portType;
-	}
-
-	private static Binding addBinding(Definition def, final ESBServiceEndpointInfo serviceInfo, PortType portType) {
-		// add binding
-		Binding binding = def.createBinding();
-		binding.setUndefined(false);
-		binding.setPortType(portType);
-		binding.setQName(new QName(def.getTargetNamespace(), serviceInfo.getBindingName())) ;
-		SOAPBindingImpl soapBinding = new SOAPBindingImpl();
-		soapBinding.setStyle("document");
-		soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
-		binding.addExtensibilityElement(soapBinding);
-
-		BindingOperation bop = def.createBindingOperation();
-
-		bop.setName(serviceInfo.getOperationName());
-		Operation op = (Operation) portType.getOperations().get(0);
-		bop.setOperation(op);
-		if (op.getInput() != null) {
-			BindingInput binput = def.createBindingInput();
-			bop.setBindingInput(binput);
-			SOAPBodyImpl soapBody = new SOAPBodyImpl();
-			soapBody.setUse("literal");
-			binput.addExtensibilityElement(soapBody);
-		}
-		if (op.getOutput() != null) {
-			BindingOutput boutput = def.createBindingOutput();
-			bop.setBindingOutput(boutput);
-			SOAPBodyImpl soapBody = new SOAPBodyImpl();
-			soapBody.setUse("literal");
-			boutput.addExtensibilityElement(soapBody);
-		}
-		final Map faults = op.getFaults() ;
-		if (faults != null) {
-			Iterator iterator = op.getFaults().values().iterator();
-			while (iterator.hasNext()) {
-				Fault fault = (Fault) iterator.next();
-				BindingFault bfault = def.createBindingFault();
-				bfault.setName(fault.getName());
-				bop.addBindingFault(bfault);
-				SOAPFaultImpl soapFault = new SOAPFaultImpl();
-				soapFault.setName(fault.getName());
-				soapFault.setUse("literal");
-				bfault.addExtensibilityElement(soapFault);
-			}
-		}
-		binding.addBindingOperation(bop);
-		def.addBinding(binding);
-		return binding;
-
-	}
-
-	private static void addService(Definition def, final ESBServiceEndpointInfo serviceInfo, Binding binding) {
-		// create service
-		javax.wsdl.Service service = def.createService();
-		service.setQName(new QName(def.getTargetNamespace(), serviceInfo.getServiceName()));
-		javax.wsdl.Port port = def.createPort();
-		port.setBinding(binding);
-		port.setName(serviceInfo.getPortName());
-		SOAPAddressImpl soapAddress = new SOAPAddressImpl();
-		soapAddress.setLocationURI("http://change_this_URI/"+serviceInfo.getServletPath());
-		port.addExtensibilityElement(soapAddress);
-		service.addPort(port);
-		def.addService(service);
-	}
-	
-	private synchronized static WSDLFactory getWSDLFactory()
-	    throws ConfigurationException
-	{
-	    if (wsdlFactory == null)
-	    {
-	        try
-	        {
-	            wsdlFactory = AccessController.doPrivileged(new PrivilegedExceptionAction<WSDLFactory>() {
-	                public WSDLFactory run() throws WSDLException
-	                {
-	                    return WSDLFactory.newInstance();
-	                }
-	            }) ;
-	        }
-	        catch (final PrivilegedActionException pae)
-	        {
-	            throw new ConfigurationException("Failed to instantiate the WSDL factory", pae.getCause()) ;
-	        }
-	    }
-	    return wsdlFactory ;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,324 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.internal.soa.esb.webservice;
+
+import java.io.StringWriter;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.PortType;
+import javax.wsdl.Types;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.ibm.wsdl.extensions.schema.SchemaImpl;
+import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
+import com.ibm.wsdl.extensions.soap.SOAPBindingImpl;
+import com.ibm.wsdl.extensions.soap.SOAPBodyImpl;
+import com.ibm.wsdl.extensions.soap.SOAPFaultImpl;
+
+public class ESBContractGenerator {
+	private static final QName XSD_QN = new QName("http://www.w3.org/2001/XMLSchema", "schema");
+	private static WSDLFactory wsdlFactory ;
+ 
+	public static String generateWSDL(final Service serviceConfig, final ESBServiceEndpointInfo serviceInfo)
+			throws ConfigurationException {
+		final Definition def = getWSDLFactory().newDefinition() ;
+		final String namespace = serviceInfo.getNamespace() ;
+		def.setTargetNamespace(namespace);
+		def.addNamespace("tns", namespace);
+		def.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
+		// add types
+		Types types = def.createTypes();
+		def.setTypes(types);
+
+		Message reqMessage = null;
+		Message resMessage = null;
+		List<Message> faultMessages = null;
+
+		String inXsd = serviceConfig.getActions().getInXsd();
+		String outXsd = serviceConfig.getActions().getOutXsd();
+		String faultXsd = serviceConfig.getActions().getFaultXsd();
+
+		int nsSuffixCounter = 0 ;
+		if (inXsd != null) {
+			try {
+				Document doc = YADOMUtil.parseStream(ClassUtil
+						.getResourceAsStream(inXsd, ESBContractGenerator.class),
+						false, false);
+				if (doc != null) {
+					reqMessage = addMessage(def, doc.getDocumentElement(),
+							serviceInfo.getRequestName(), "in", ++nsSuffixCounter);
+				}
+			} catch (Exception e) {
+				throw new ConfigurationException("File defined in inXsd attribute '" + serviceConfig.getActions().getInXsd() + "' not found in classpath.", e);
+			} 
+		}
+
+		if (outXsd != null) {
+			try {
+				Document doc = YADOMUtil.parseStream(ClassUtil
+						.getResourceAsStream(outXsd, ESBContractGenerator.class),
+						false, false);
+				if (doc != null) {
+					resMessage = addMessage(def, doc.getDocumentElement(),
+							serviceInfo.getResponseName(), "out", ++nsSuffixCounter);
+				}
+			} catch (Exception e) {
+				throw new ConfigurationException("File defined in outXsd attribute '" + serviceConfig.getActions().getOutXsd() + "' not found in classpath.", e);
+			} 
+
+		}
+
+		if ((faultXsd != null) && !serviceInfo.isOneWay()) {
+			try {
+				final String[] xsds = faultXsd.split(",") ;
+				faultMessages = new ArrayList<Message>();
+				for(String xsd: xsds) {
+					Document doc = YADOMUtil.parseStream(ClassUtil
+						.getResourceAsStream(xsd, ESBContractGenerator.class),
+						false, false);
+					if (doc != null) {
+						addFaultMessage(faultMessages, def, doc.getDocumentElement(),
+							serviceInfo.getFaultName(), "fault", ++nsSuffixCounter);
+					}
+				}
+			} catch (Exception e) {
+				throw new ConfigurationException("File defined in faultXsd attribute '" + serviceConfig.getActions().getFaultXsd() + "' not found in classpath.", e);
+			} 
+
+		}
+
+		PortType portType = addPortType(def, serviceInfo, reqMessage,
+			resMessage, faultMessages);
+		Binding binding = addBinding(def, serviceInfo, portType);
+		addService(def, serviceInfo, binding);
+		StringWriter sw = new java.io.StringWriter();
+		try {
+			getWSDLFactory().newWSDLWriter().writeWSDL(def, sw);
+		} catch (WSDLException e) {
+			new ConfigurationException("Failed to generate wsdl for service:" + serviceConfig.getCategory() + "/" + serviceConfig.getName() , e);
+		}
+		return sw.toString();
+	}
+
+	private static void addSchema(Types types, Element xsdElement) {
+		SchemaImpl schemaImpl = new SchemaImpl();
+		schemaImpl.setElement(xsdElement);
+		schemaImpl.setElementType(XSD_QN);
+		types.addExtensibilityElement(schemaImpl);
+	}
+
+	private static Message addMessage(Definition def, Element element, String msgName, String partName, int nsSuffixCounter) {
+		String schemaNs = YADOMUtil
+				.getAttribute(element, "targetNamespace", "");
+		addSchema(def.getTypes(), element);
+		if (def.getNamespace(schemaNs) == null) {
+			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
+		}
+		// add request message
+		Node node = YADOMUtil.getNode(element, "/schema/element");
+		Message msg = def.createMessage();
+		msg.setQName(new QName(def.getTargetNamespace(), msgName));
+		msg.setUndefined(false);
+		Part part = def.createPart();
+		part.setName(partName);
+		part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
+				(Element) node, "name", "")));
+		msg.addPart(part);
+		def.addMessage(msg);
+		return msg;
+	}
+
+	private static void addFaultMessage(final List<Message> faultMessages,
+			Definition def, Element element, String msgName, String partName,
+			int nsSuffixCounter) {
+		String schemaNs = YADOMUtil
+				.getAttribute(element, "targetNamespace", "");
+		addSchema(def.getTypes(), element);
+		if (def.getNamespace(schemaNs) == null) {
+			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
+		}
+		// add request message
+		NodeList nodes = YADOMUtil.getNodeList(element, "/schema/element");
+		for (int i = 0; i < nodes.getLength(); i++) {
+			final int nameIndex = i + 1;
+			Node node = nodes.item(0);
+			Message msg = def.createMessage();
+			msg.setQName(new QName(def.getTargetNamespace(), msgName
+					+ nameIndex));
+			msg.setUndefined(false);
+			Part part = def.createPart();
+			part.setName(partName + nameIndex);
+			part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
+					(Element) node, "name", "")));
+			msg.addPart(part);
+			def.addMessage(msg);
+			faultMessages.add(msg);
+		}
+	}
+
+	private static PortType addPortType(Definition def, final ESBServiceEndpointInfo serviceInfo,
+			Message inMessage, Message outMessage, List<Message> faultMessages) {
+		// add port type
+		PortType portType = def.createPortType();
+		portType.setQName(new QName(def.getTargetNamespace(), serviceInfo.getPortName())) ;
+		Operation op = def.createOperation();
+		op.setUndefined(false);
+		op.setName(serviceInfo.getOperationName());
+		if (inMessage != null) {
+			Input in = def.createInput();
+			in.setMessage(inMessage);
+			in.setName(inMessage.getQName().getLocalPart());
+			op.setInput(in);
+		}
+		if (outMessage != null) {
+			Output out = def.createOutput();
+			out.setMessage(outMessage);
+			out.setName(outMessage.getQName().getLocalPart());
+			op.setOutput(out);
+		}
+
+		int count = 1 ;
+		for (Message message : faultMessages) {
+			Fault fault = def.createFault();
+			fault.setMessage(message);
+			fault.setName("fault" + (count++));
+			op.addFault(fault);
+		}
+		portType.addOperation(op);
+		portType.setUndefined(false);
+		def.addPortType(portType);
+		return portType;
+	}
+
+	private static Binding addBinding(Definition def, final ESBServiceEndpointInfo serviceInfo, PortType portType) {
+		// add binding
+		Binding binding = def.createBinding();
+		binding.setUndefined(false);
+		binding.setPortType(portType);
+		binding.setQName(new QName(def.getTargetNamespace(), serviceInfo.getBindingName())) ;
+		SOAPBindingImpl soapBinding = new SOAPBindingImpl();
+		soapBinding.setStyle("document");
+		soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
+		binding.addExtensibilityElement(soapBinding);
+
+		BindingOperation bop = def.createBindingOperation();
+
+		bop.setName(serviceInfo.getOperationName());
+		Operation op = (Operation) portType.getOperations().get(0);
+		bop.setOperation(op);
+		if (op.getInput() != null) {
+			BindingInput binput = def.createBindingInput();
+			bop.setBindingInput(binput);
+			SOAPBodyImpl soapBody = new SOAPBodyImpl();
+			soapBody.setUse("literal");
+			binput.addExtensibilityElement(soapBody);
+		}
+		if (op.getOutput() != null) {
+			BindingOutput boutput = def.createBindingOutput();
+			bop.setBindingOutput(boutput);
+			SOAPBodyImpl soapBody = new SOAPBodyImpl();
+			soapBody.setUse("literal");
+			boutput.addExtensibilityElement(soapBody);
+		}
+		final Map faults = op.getFaults() ;
+		if (faults != null) {
+			Iterator iterator = op.getFaults().values().iterator();
+			while (iterator.hasNext()) {
+				Fault fault = (Fault) iterator.next();
+				BindingFault bfault = def.createBindingFault();
+				bfault.setName(fault.getName());
+				bop.addBindingFault(bfault);
+				SOAPFaultImpl soapFault = new SOAPFaultImpl();
+				soapFault.setName(fault.getName());
+				soapFault.setUse("literal");
+				bfault.addExtensibilityElement(soapFault);
+			}
+		}
+		binding.addBindingOperation(bop);
+		def.addBinding(binding);
+		return binding;
+
+	}
+
+	private static void addService(Definition def, final ESBServiceEndpointInfo serviceInfo, Binding binding) {
+		// create service
+		javax.wsdl.Service service = def.createService();
+		service.setQName(new QName(def.getTargetNamespace(), serviceInfo.getServiceName()));
+		javax.wsdl.Port port = def.createPort();
+		port.setBinding(binding);
+		port.setName(serviceInfo.getPortName());
+		SOAPAddressImpl soapAddress = new SOAPAddressImpl();
+		soapAddress.setLocationURI("http://change_this_URI/"+serviceInfo.getServletPath());
+		port.addExtensibilityElement(soapAddress);
+		service.addPort(port);
+		def.addService(service);
+	}
+	
+	private synchronized static WSDLFactory getWSDLFactory()
+	    throws ConfigurationException
+	{
+	    if (wsdlFactory == null)
+	    {
+	        try
+	        {
+	            wsdlFactory = AccessController.doPrivileged(new PrivilegedExceptionAction<WSDLFactory>() {
+	                public WSDLFactory run() throws WSDLException
+	                {
+	                    return WSDLFactory.newInstance();
+	                }
+	            }) ;
+	        }
+	        catch (final PrivilegedActionException pae)
+	        {
+	            throw new ConfigurationException("Failed to instantiate the WSDL factory", pae.getCause()) ;
+	        }
+	    }
+	    return wsdlFactory ;
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,97 +0,0 @@
-package org.jboss.internal.soa.esb.webservice;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
-import org.jboss.soa.esb.Service;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-public class ESBServiceContractPublisher implements ContractReferencePublisher {
-	private static String address;
-	private final String endpointName;
-	private final Service service ;
-	private final String description ;
-	
-	public ESBServiceContractPublisher(final Service service, final String description, final String jaxwsEndpoint) {
-		this.service = service ;
-		this.description = description ;
-		endpointName = jaxwsEndpoint;
-	}
-	
-    /**
-     * Get the service represented by this contract configuration.
-     * @return The service.
-     */
-    public Service getService() {
-        return service ;
-    }
-    
-    /**
-     * Get the service description represented by this contract configuration.
-     * @return The service description.
-     */
-    public String getDescription() {
-        return description ;
-    }
-    
-    /**
-     * Get the URI of the service.
-     * @return The service URI.
-     */
-    public URI getServiceURI() {
-        final String address = getEndpointAddress() ;
-        if (address != null) {
-            try {
-                return new URI(address) ;
-            } catch (final URISyntaxException urise) {} // fall through
-        }
-        return null ;
-    }
-    
-    /**
-     * Get the URI of the contract.
-     * @return The contract URI.
-     */
-    public URI getServiceContractURI() {
-        final String address = getEndpointAddress() ;
-        if (address != null) {
-            try {
-                return new URI(address+"?wsdl") ;
-            } catch (final URISyntaxException urise) {} // fall through
-        }
-        return null ;
-    }
-
-	private String getEndpointAddress() {
-		if (address != null) {
-			return address;
-		}
-		
-		SPIProvider spiProv = SPIProviderResolver.getInstance().getProvider();
-		EndpointRegistryFactory factory = spiProv
-				.getSPI(EndpointRegistryFactory.class);
-		EndpointRegistry registry = factory.getEndpointRegistry();
-		Set<ObjectName> objectNames = registry.getEndpoints();
-
-		for (ObjectName objectName : objectNames) {
-			String endpoint = objectName
-					.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
-
-			if (endpoint != null && endpoint.equals(endpointName)) {
-				Endpoint ep = registry.getEndpoint(objectName);
-				address = ep.getAddress();
-				return  address;
-			}
-		}
-
-		return null;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceContractPublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,97 @@
+package org.jboss.internal.soa.esb.webservice;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
+import org.jboss.soa.esb.Service;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+public class ESBServiceContractPublisher implements ContractReferencePublisher {
+	private static String address;
+	private final String endpointName;
+	private final Service service ;
+	private final String description ;
+	
+	public ESBServiceContractPublisher(final Service service, final String description, final String jaxwsEndpoint) {
+		this.service = service ;
+		this.description = description ;
+		endpointName = jaxwsEndpoint;
+	}
+	
+    /**
+     * Get the service represented by this contract configuration.
+     * @return The service.
+     */
+    public Service getService() {
+        return service ;
+    }
+    
+    /**
+     * Get the service description represented by this contract configuration.
+     * @return The service description.
+     */
+    public String getDescription() {
+        return description ;
+    }
+    
+    /**
+     * Get the URI of the service.
+     * @return The service URI.
+     */
+    public URI getServiceURI() {
+        final String address = getEndpointAddress() ;
+        if (address != null) {
+            try {
+                return new URI(address) ;
+            } catch (final URISyntaxException urise) {} // fall through
+        }
+        return null ;
+    }
+    
+    /**
+     * Get the URI of the contract.
+     * @return The contract URI.
+     */
+    public URI getServiceContractURI() {
+        final String address = getEndpointAddress() ;
+        if (address != null) {
+            try {
+                return new URI(address+"?wsdl") ;
+            } catch (final URISyntaxException urise) {} // fall through
+        }
+        return null ;
+    }
+
+	private String getEndpointAddress() {
+		if (address != null) {
+			return address;
+		}
+		
+		SPIProvider spiProv = SPIProviderResolver.getInstance().getProvider();
+		EndpointRegistryFactory factory = spiProv
+				.getSPI(EndpointRegistryFactory.class);
+		EndpointRegistry registry = factory.getEndpointRegistry();
+		Set<ObjectName> objectNames = registry.getEndpoints();
+
+		for (ObjectName objectName : objectNames) {
+			String endpoint = objectName
+					.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+
+			if (endpoint != null && endpoint.equals(endpointName)) {
+				Endpoint ep = registry.getEndpoint(objectName);
+				address = ep.getAddress();
+				return  address;
+			}
+		}
+
+		return null;
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,153 +0,0 @@
-/*
- * 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, JBoss Inc.
- */
-package org.jboss.internal.soa.esb.webservice;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.MepType;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionsDocument.Actions;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
-
-
-public class ESBServiceEndpointInfo {
-	private static final String DEFAULT_ENCODING ;
-	private static final Logger LOGGER = Logger.getLogger(ESBServiceEndpointInfo.class) ;
-
-	private final String requestName ;
-	private final String responseName ;
-	private final String faultName ;
-	private final String bindingName ;
-	private final String serviceName ;
-	private final String portName ;
-	private final String operationName ;
-	private final String servletName ;
-	private final String servletPath ;
-	private final String wsdlFileName ;
-	private final String packageName ;
-	private final String className ;
-	private final String namespace ;
-	private final boolean isOneWay ;
-	
-	public ESBServiceEndpointInfo(final Service service)
-			throws UnsupportedEncodingException {
-		final String name = service.getName() ;
-		requestName = name + "Req" ;
-		responseName = name + "Res" ;
-		faultName = name + "Fault" ;
-		bindingName = name + "Binding" ;
-		serviceName = name + "Service" ;
-		portName = name + "PortType" ;
-		operationName = name + "Op" ;
-		final String serviceCategory = service.getCategory().replace('/', '_') ;
-		final String serviceCategoryLower = serviceCategory.toLowerCase() ;
-		final String serviceName = service.getName().replace('/', '_') ;
-		final String serviceNameLower = serviceName.toLowerCase() ;
-		servletName = serviceCategory + "_" + serviceName ;
-		servletPath = "/" + serviceCategory + "/" + serviceName ;
-		wsdlFileName = "WEB-INF/wsdl/" + serviceCategoryLower + "_" + serviceNameLower + ".wsdl" ;
-		packageName = "org.jboss.internal.soa.esb.webservice.impl." + serviceCategoryLower + "." + serviceNameLower ;
-		className = packageName + ".Implementation" ;
-		namespace = "http://soa.jboss.org/" + URLEncoder.encode(service.getCategory(), DEFAULT_ENCODING) ;
-		
-		final Actions actions = service.getActions() ;
-		if (actions != null)
-		{
-			isOneWay = MepType.ONE_WAY.equals(actions.getMep()) ;
-		}
-		else
-		{
-			isOneWay = false ;
-		}
-		if (isOneWay && (actions.getFaultXsd() != null))
-		{
-			LOGGER.warn("Fault schemas ignored for OneWay service " + serviceCategory + ":" + serviceName) ;
-		}
-	}
-
-	public String getRequestName() {
-		return requestName ;
-	}
-	
-	public String getResponseName() {
-		return responseName ;
-	}
-	
-	public String getFaultName() {
-		return faultName ;
-	}
-	
-	public String getBindingName() {
-		return bindingName ;
-	}
-	
-	public String getServiceName() {
-		return serviceName ;
-	}
-	
-	public String getPortName() {
-		return portName ;
-	}
-	
-	public String getOperationName() {
-		return operationName ;
-	}
-	
-	public String getServletName() {
-		return servletName ;
-	}
-	
-	public String getServletPath() {
-		return servletPath ;
-	}
-	
-	public String getWSDLFileName() {
-		return wsdlFileName ;
-	}
-	
-	public String getPackageName() {
-		return packageName ;
-	}
-	
-	public String getClassName() {
-		return className ;
-	}
-	
-	public String getNamespace() {
-		return namespace ;
-	}
-	
-	public boolean isOneWay() {
-		return isOneWay ;
-	}
-	
-	static
-	{
-		DEFAULT_ENCODING = AccessController.doPrivileged(new PrivilegedAction<String>() {
-			public String run()
-			{
-				return System.getProperty("file.encoding");
-			}
-		}) ;
-	}
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,153 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.internal.soa.esb.webservice;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.MepType;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionsDocument.Actions;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+
+
+public class ESBServiceEndpointInfo {
+	private static final String DEFAULT_ENCODING ;
+	private static final Logger LOGGER = Logger.getLogger(ESBServiceEndpointInfo.class) ;
+
+	private final String requestName ;
+	private final String responseName ;
+	private final String faultName ;
+	private final String bindingName ;
+	private final String serviceName ;
+	private final String portName ;
+	private final String operationName ;
+	private final String servletName ;
+	private final String servletPath ;
+	private final String wsdlFileName ;
+	private final String packageName ;
+	private final String className ;
+	private final String namespace ;
+	private final boolean isOneWay ;
+	
+	public ESBServiceEndpointInfo(final Service service)
+			throws UnsupportedEncodingException {
+		final String name = service.getName() ;
+		requestName = name + "Req" ;
+		responseName = name + "Res" ;
+		faultName = name + "Fault" ;
+		bindingName = name + "Binding" ;
+		serviceName = name + "Service" ;
+		portName = name + "PortType" ;
+		operationName = name + "Op" ;
+		final String serviceCategory = service.getCategory().replace('/', '_') ;
+		final String serviceCategoryLower = serviceCategory.toLowerCase() ;
+		final String serviceName = service.getName().replace('/', '_') ;
+		final String serviceNameLower = serviceName.toLowerCase() ;
+		servletName = serviceCategory + "_" + serviceName ;
+		servletPath = "/" + serviceCategory + "/" + serviceName ;
+		wsdlFileName = "WEB-INF/wsdl/" + serviceCategoryLower + "_" + serviceNameLower + ".wsdl" ;
+		packageName = "org.jboss.internal.soa.esb.webservice.impl." + serviceCategoryLower + "." + serviceNameLower ;
+		className = packageName + ".Implementation" ;
+		namespace = "http://soa.jboss.org/" + URLEncoder.encode(service.getCategory(), DEFAULT_ENCODING) ;
+		
+		final Actions actions = service.getActions() ;
+		if (actions != null)
+		{
+			isOneWay = MepType.ONE_WAY.equals(actions.getMep()) ;
+		}
+		else
+		{
+			isOneWay = false ;
+		}
+		if (isOneWay && (actions.getFaultXsd() != null))
+		{
+			LOGGER.warn("Fault schemas ignored for OneWay service " + serviceCategory + ":" + serviceName) ;
+		}
+	}
+
+	public String getRequestName() {
+		return requestName ;
+	}
+	
+	public String getResponseName() {
+		return responseName ;
+	}
+	
+	public String getFaultName() {
+		return faultName ;
+	}
+	
+	public String getBindingName() {
+		return bindingName ;
+	}
+	
+	public String getServiceName() {
+		return serviceName ;
+	}
+	
+	public String getPortName() {
+		return portName ;
+	}
+	
+	public String getOperationName() {
+		return operationName ;
+	}
+	
+	public String getServletName() {
+		return servletName ;
+	}
+	
+	public String getServletPath() {
+		return servletPath ;
+	}
+	
+	public String getWSDLFileName() {
+		return wsdlFileName ;
+	}
+	
+	public String getPackageName() {
+		return packageName ;
+	}
+	
+	public String getClassName() {
+		return className ;
+	}
+	
+	public String getNamespace() {
+		return namespace ;
+	}
+	
+	public boolean isOneWay() {
+		return isOneWay ;
+	}
+	
+	static
+	{
+		DEFAULT_ENCODING = AccessController.doPrivileged(new PrivilegedAction<String>() {
+			public String run()
+			{
+				return System.getProperty("file.encoding");
+			}
+		}) ;
+	}
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,137 +0,0 @@
-/*
- * 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, JBoss Inc.
- */
-package org.jboss.internal.soa.esb.webservice;
-
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtConstructor;
-import javassist.LoaderClassPath;
-import javassist.NotFoundException;
-import javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.ConstPool;
-import javassist.bytecode.SignatureAttribute;
-import javassist.bytecode.annotation.Annotation;
-import javassist.bytecode.annotation.EnumMemberValue;
-import javassist.bytecode.annotation.StringMemberValue;
-
-public class JAXWSProviderClassGenerator {
-	private final ClassPool pool ;
-	private final CtClass oneWaySuperClass ;
-	private final CtClass requestResponseSuperClass ;
-	
-	public JAXWSProviderClassGenerator()
-			throws WebServicePublishException {
-		pool = new ClassPool() ;
-		final ClassLoader tccl = Thread.currentThread().getContextClassLoader() ;
-		if (tccl != null)
-		{
-			pool.appendClassPath(new LoaderClassPath(tccl)) ;
-		}
-		pool.appendClassPath(new LoaderClassPath(JAXWSProviderClassGenerator.class.getClassLoader())) ;
-		try {
-			oneWaySuperClass = pool.get(OneWayBaseWebService.class.getName());
-			requestResponseSuperClass = pool.get(RequestResponseBaseWebService.class.getName()) ;
-		} catch (final NotFoundException nfe) {
-			throw new WebServicePublishException("Failed to obtain superclasses", nfe) ;
-		}
-	}
-	
-	public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo, final boolean includeHandlers)
-			throws WebServicePublishException {
-		try {
-			pool.get(epInfo.getClassName());
-			throw new WebServicePublishException("Duplicate class within context: " + epInfo.getClassName()) ;
-		} catch (final NotFoundException nfe) {} // ignore
-		
-		final CtClass seiClass = pool.makeClass(epInfo.getClassName());
-
-		try {
-			if (epInfo.isOneWay())
-			{
-				seiClass.setSuperclass(oneWaySuperClass) ;
-			}
-			else
-			{
-				seiClass.setSuperclass(requestResponseSuperClass) ;
-			}
-			
-			CtClass providerClass = pool.get("javax.xml.ws.Provider");
-			seiClass.setInterfaces(new CtClass[] { providerClass });
-
-			ConstPool constantPool = seiClass.getClassFile().getConstPool();
-			AnnotationsAttribute attribute = new AnnotationsAttribute(
-					constantPool, AnnotationsAttribute.visibleTag);
-			Annotation annotation = new Annotation(
-					"javax.xml.ws.WebServiceProvider", constantPool);
-			StringMemberValue strValue1 = new StringMemberValue(constantPool);
-			strValue1.setValue(epInfo.getWSDLFileName());
-			annotation.addMemberValue("wsdlLocation", strValue1);
-			StringMemberValue strValue2 = new StringMemberValue(constantPool);
-			strValue2.setValue(epInfo.getServiceName());
-			annotation.addMemberValue("serviceName", strValue2);
-			StringMemberValue strValue3 = new StringMemberValue(constantPool);
-			strValue3.setValue(epInfo.getPortName());
-			annotation.addMemberValue("portName", strValue3);
-
-			StringMemberValue strValue4 = new StringMemberValue(constantPool);
-			strValue4.setValue(epInfo.getNamespace());
-			annotation.addMemberValue("targetNamespace", strValue4);
-
-			attribute.addAnnotation(annotation);
-
-			Annotation annotation2 = new Annotation("javax.xml.ws.ServiceMode",
-					constantPool);
-			EnumMemberValue enumValue = new EnumMemberValue(constantPool);
-			enumValue.setType("javax.xml.ws.Service$Mode");
-			enumValue.setValue("MESSAGE");
-			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 + "\");";
-			CtConstructor defaultConstructor = new CtConstructor(null, seiClass) ;
-			defaultConstructor.setBody(constructorStr) ;
-			seiClass.addConstructor(defaultConstructor) ;
-			
-			// add generics for class
-			SignatureAttribute signatureAttribute = new SignatureAttribute(
-					seiClass.getClassFile().getConstPool(),
-					"Ljava/lang/Object;Ljavax/xml/ws/Provider<Ljavax/xml/soap/SOAPMessage;>;");
-			seiClass.getClassFile().addAttribute(signatureAttribute);
-			
-			return seiClass.toBytecode();
-		} catch (Exception e) {
-
-			throw new WebServicePublishException(
-					"Failed to generate jaxws dispatch class for ESB service",
-					e);
-		}
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,137 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.internal.soa.esb.webservice;
+
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.LoaderClassPath;
+import javassist.NotFoundException;
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.SignatureAttribute;
+import javassist.bytecode.annotation.Annotation;
+import javassist.bytecode.annotation.EnumMemberValue;
+import javassist.bytecode.annotation.StringMemberValue;
+
+public class JAXWSProviderClassGenerator {
+	private final ClassPool pool ;
+	private final CtClass oneWaySuperClass ;
+	private final CtClass requestResponseSuperClass ;
+	
+	public JAXWSProviderClassGenerator()
+			throws WebServicePublishException {
+		pool = new ClassPool() ;
+		final ClassLoader tccl = Thread.currentThread().getContextClassLoader() ;
+		if (tccl != null)
+		{
+			pool.appendClassPath(new LoaderClassPath(tccl)) ;
+		}
+		pool.appendClassPath(new LoaderClassPath(JAXWSProviderClassGenerator.class.getClassLoader())) ;
+		try {
+			oneWaySuperClass = pool.get(OneWayBaseWebService.class.getName());
+			requestResponseSuperClass = pool.get(RequestResponseBaseWebService.class.getName()) ;
+		} catch (final NotFoundException nfe) {
+			throw new WebServicePublishException("Failed to obtain superclasses", nfe) ;
+		}
+	}
+	
+	public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo, final boolean includeHandlers)
+			throws WebServicePublishException {
+		try {
+			pool.get(epInfo.getClassName());
+			throw new WebServicePublishException("Duplicate class within context: " + epInfo.getClassName()) ;
+		} catch (final NotFoundException nfe) {} // ignore
+		
+		final CtClass seiClass = pool.makeClass(epInfo.getClassName());
+
+		try {
+			if (epInfo.isOneWay())
+			{
+				seiClass.setSuperclass(oneWaySuperClass) ;
+			}
+			else
+			{
+				seiClass.setSuperclass(requestResponseSuperClass) ;
+			}
+			
+			CtClass providerClass = pool.get("javax.xml.ws.Provider");
+			seiClass.setInterfaces(new CtClass[] { providerClass });
+
+			ConstPool constantPool = seiClass.getClassFile().getConstPool();
+			AnnotationsAttribute attribute = new AnnotationsAttribute(
+					constantPool, AnnotationsAttribute.visibleTag);
+			Annotation annotation = new Annotation(
+					"javax.xml.ws.WebServiceProvider", constantPool);
+			StringMemberValue strValue1 = new StringMemberValue(constantPool);
+			strValue1.setValue(epInfo.getWSDLFileName());
+			annotation.addMemberValue("wsdlLocation", strValue1);
+			StringMemberValue strValue2 = new StringMemberValue(constantPool);
+			strValue2.setValue(epInfo.getServiceName());
+			annotation.addMemberValue("serviceName", strValue2);
+			StringMemberValue strValue3 = new StringMemberValue(constantPool);
+			strValue3.setValue(epInfo.getPortName());
+			annotation.addMemberValue("portName", strValue3);
+
+			StringMemberValue strValue4 = new StringMemberValue(constantPool);
+			strValue4.setValue(epInfo.getNamespace());
+			annotation.addMemberValue("targetNamespace", strValue4);
+
+			attribute.addAnnotation(annotation);
+
+			Annotation annotation2 = new Annotation("javax.xml.ws.ServiceMode",
+					constantPool);
+			EnumMemberValue enumValue = new EnumMemberValue(constantPool);
+			enumValue.setType("javax.xml.ws.Service$Mode");
+			enumValue.setValue("MESSAGE");
+			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 + "\");";
+			CtConstructor defaultConstructor = new CtConstructor(null, seiClass) ;
+			defaultConstructor.setBody(constructorStr) ;
+			seiClass.addConstructor(defaultConstructor) ;
+			
+			// add generics for class
+			SignatureAttribute signatureAttribute = new SignatureAttribute(
+					seiClass.getClassFile().getConstPool(),
+					"Ljava/lang/Object;Ljavax/xml/ws/Provider<Ljavax/xml/soap/SOAPMessage;>;");
+			seiClass.getClassFile().addAttribute(signatureAttribute);
+			
+			return seiClass.toBytecode();
+		} catch (Exception e) {
+
+			throw new WebServicePublishException(
+					"Failed to generate jaxws dispatch class for ESB service",
+					e);
+		}
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.internal.soa.esb.webservice;
-
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * This is the base class for a OneWay SOAP message
- * @author kevin
- */
-public class OneWayBaseWebService extends BaseWebService
-{
-    protected OneWayBaseWebService(final String category, final String name)
-        throws MessageDeliverException
-    {
-        super(category, name) ;
-    }
-    
-    @Override
-    protected Message deliverMessage(final Message request)
-        throws Exception
-    {
-        serviceInvoker.deliverAsync(request) ;
-        return null ;
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.internal.soa.esb.webservice;
+
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * This is the base class for a OneWay SOAP message
+ * @author kevin
+ */
+public class OneWayBaseWebService extends BaseWebService
+{
+    protected OneWayBaseWebService(final String category, final String name)
+        throws MessageDeliverException
+    {
+        super(category, name) ;
+    }
+    
+    @Override
+    protected Message deliverMessage(final Message request)
+        throws Exception
+    {
+        serviceInvoker.deliverAsync(request) ;
+        return null ;
+    }
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.internal.soa.esb.webservice;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Message;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-
-/**
- * This is the base class for a RequestResponse SOAP message
- * @author kevin
- */
-public class RequestResponseBaseWebService extends BaseWebService
-{
-    private static final long DEFAULT_TIMEOUT = 30000L ;
-    private static final long TIMEOUT ;
-    private static final Logger LOGGER = Logger.getLogger(RequestResponseBaseWebService.class) ;
-    
-    protected RequestResponseBaseWebService(final String category, final String name)
-        throws MessageDeliverException
-    {
-        super(category, name) ;
-    }
-    
-    @Override
-    protected Message deliverMessage(final Message request)
-            throws Exception
-    {
-        return serviceInvoker.deliverSync(request, TIMEOUT);
-    }
-    
-    static
-    {
-        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE) ;
-        final String timeoutVal = propertyManager.getProperty(Environment.WS_TIMEOUT);
-        long timeout = DEFAULT_TIMEOUT ;
-        if (timeoutVal != null)
-        {
-            try
-            {
-                timeout = Long.parseLong(timeoutVal) ;
-            }
-            catch (final NumberFormatException nfe)
-            {
-                LOGGER.warn("Failed to parse specified timeout: " + timeoutVal, nfe) ;
-            }
-        }
-        TIMEOUT = timeout ;
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.internal.soa.esb.webservice;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Message;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+
+/**
+ * This is the base class for a RequestResponse SOAP message
+ * @author kevin
+ */
+public class RequestResponseBaseWebService extends BaseWebService
+{
+    private static final long DEFAULT_TIMEOUT = 30000L ;
+    private static final long TIMEOUT ;
+    private static final Logger LOGGER = Logger.getLogger(RequestResponseBaseWebService.class) ;
+    
+    protected RequestResponseBaseWebService(final String category, final String name)
+        throws MessageDeliverException
+    {
+        super(category, name) ;
+    }
+    
+    @Override
+    protected Message deliverMessage(final Message request)
+            throws Exception
+    {
+        return serviceInvoker.deliverSync(request, TIMEOUT);
+    }
+    
+    static
+    {
+        final PropertyManager propertyManager = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE) ;
+        final String timeoutVal = propertyManager.getProperty(Environment.WS_TIMEOUT);
+        long timeout = DEFAULT_TIMEOUT ;
+        if (timeoutVal != null)
+        {
+            try
+            {
+                timeout = Long.parseLong(timeoutVal) ;
+            }
+            catch (final NumberFormatException nfe)
+            {
+                LOGGER.warn("Failed to parse specified timeout: " + timeoutVal, nfe) ;
+            }
+        }
+        TIMEOUT = timeout ;
+    }
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,50 +0,0 @@
-/*
- * 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, JBoss Inc.
- */
-package org.jboss.internal.soa.esb.webservice;
-
-public class WebServicePublishException extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Public constructor.
-     * @param message Exception message.
-     */
-    public WebServicePublishException(String message) {
-        super(message);
-    }
-
-    /**
-     * Public constructor.
-     * @param message Exception message.
-     * @param cause Exception cause.
-     */
-    public WebServicePublishException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Public constructor.
-     * @param cause Exception cause.
-     */
-    public WebServicePublishException(Throwable cause) {
-        super(cause);
-    }
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/internal/soa/esb/webservice/WebServicePublishException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,50 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.internal.soa.esb.webservice;
+
+public class WebServicePublishException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Public constructor.
+     * @param message Exception message.
+     */
+    public WebServicePublishException(String message) {
+        super(message);
+    }
+
+    /**
+     * Public constructor.
+     * @param message Exception message.
+     * @param cause Exception cause.
+     */
+    public WebServicePublishException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Public constructor.
+     * @param cause Exception cause.
+     */
+    public WebServicePublishException(Throwable cause) {
+        super(cause);
+    }
+
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/ActionProcessingDetailFaultException.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/ActionProcessingDetailFaultException.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/ActionProcessingDetailFaultException.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/ActionProcessingDetailFaultException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions;
+
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.esb.listeners.message.errors.Factory;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Fault;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+
+/**
+ * Exception used to specify SOAP code/reason/detail equivalents in a fault.
+ * 
+ * @author <href='mailto:kevin.conner at jboss.com'>Kevin Conner</a>
+ */
+public class ActionProcessingDetailFaultException extends ActionProcessingFaultException
+{
+    /**
+     * The serial version UID for this class.
+     */
+    private static final long serialVersionUID = -2402515550073037696L ;
+
+    public ActionProcessingDetailFaultException(final QName code, final String description, final String detail)
+    {
+        this(code, description, detail, null) ;
+    }
+    
+    public ActionProcessingDetailFaultException(final QName code, final String description, final String detail, final Throwable th)
+    {
+        super(getFaultMessage(code, description, detail, th), description) ;
+    }
+    
+    private static Message getFaultMessage(final QName code, final String description, final String detail, final Throwable th)
+    {
+        final Message message = MessageFactory.getInstance().getMessage() ;
+        final Body body = message.getBody() ;
+        final Fault fault = message.getFault() ;
+        if (th != null)
+        {
+            fault.setCause(th);
+            fault.setReason(th.toString()) ;
+        }
+        fault.setCode(URI.create(Factory.PROCESSING_ERROR)) ;
+        
+        body.add(Fault.DETAIL_CODE_CONTENT, code) ;
+        if (description != null)
+        {
+            body.add(Fault.DETAIL_DESCRIPTION_CONTENT, description) ;
+        }
+        if (detail != null)
+        {
+            body.add(Fault.DETAIL_DETAIL_CONTENT, detail) ;
+        }
+        fault.setReason(description) ;
+        
+        return message ;
+    }
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.actions.monitoring;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Monitor store for any message that matches the MVEL pattern expression.     An ArrayList of 
- * MonitoringPatternBeans is stored, which can be reset.
- * 
- * @author tcunning
- * @since Version 4.4
- */
-public class MVELMonitor implements MVELMonitorMBean {
-	public ArrayList <MonitoringPatternBean> monitoredEvents; 
-	private ConfigTree m_config;
-	
-	public MVELMonitor(ConfigTree config) {
-		monitoredEvents = new ArrayList();
-		m_config = config;
-	}
-	
-	public ArrayList getMonitoredEvents() {
-		return (ArrayList) monitoredEvents;
-	}
-
-	public void reset() {
-		monitoredEvents = new ArrayList();
-	}
-
-	public void addEvent(Message message, MonitoringPatternBean mpb) {
-		mpb.setMessageString(message.toString());
-		monitoredEvents.add(mpb);
-	}
-	
-	protected void registerMBean() throws InstanceAlreadyExistsException, 
-		InstanceNotFoundException, MBeanRegistrationException, MBeanRegistrationException,
-		MalformedObjectNameException, NotCompliantMBeanException {
-        MBeanServer mbeanServer = null;
-        try {
-        	mbeanServer = MBeanServerLocator.locateJBoss();
-        } catch (IllegalStateException ise) {
-        	// If we can't find a JBoss MBeanServer, just return
-        	// Needed for unit tests
-        	return;
-        }
-
-        ObjectName listObjectName = getObjectName();
-
-        if (mbeanServer.isRegistered(listObjectName)) {
-        	mbeanServer.unregisterMBean(listObjectName);
-        }
-        
-        mbeanServer.registerMBean(this, listObjectName);
-	}
-	
-	protected ObjectName getObjectName() throws MalformedObjectNameException {
-		ObjectName listObjectName = null;
-
-		String deploymentName = m_config.getParent().getParent().getAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG);
-		String serviceName = m_config.getParent().getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
-
-		StringBuffer objectName = new StringBuffer("category=MVELMonitor");
-		if (deploymentName != null) {
-			objectName.append(",").append(ListenerTagNames.DEPLOYMENT_NAME_TAG).append("=").append(deploymentName);
-		}
-			
-		if (serviceName != null) {
-			if (objectName.length() > 0) {
-				objectName.append(",");
-			}
-			objectName.append(ListenerTagNames.SERVICE_NAME_TAG).append("=").append(serviceName);
-		}
-						
-		listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
-
-		return listObjectName;
-	}
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions.monitoring;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Monitor store for any message that matches the MVEL pattern expression.     An ArrayList of 
+ * MonitoringPatternBeans is stored, which can be reset.
+ * 
+ * @author tcunning
+ * @since Version 4.4
+ */
+public class MVELMonitor implements MVELMonitorMBean {
+	public ArrayList <MonitoringPatternBean> monitoredEvents; 
+	private ConfigTree m_config;
+	
+	public MVELMonitor(ConfigTree config) {
+		monitoredEvents = new ArrayList();
+		m_config = config;
+	}
+	
+	public ArrayList getMonitoredEvents() {
+		return (ArrayList) monitoredEvents;
+	}
+
+	public void reset() {
+		monitoredEvents = new ArrayList();
+	}
+
+	public void addEvent(Message message, MonitoringPatternBean mpb) {
+		mpb.setMessageString(message.toString());
+		monitoredEvents.add(mpb);
+	}
+	
+	protected void registerMBean() throws InstanceAlreadyExistsException, 
+		InstanceNotFoundException, MBeanRegistrationException, MBeanRegistrationException,
+		MalformedObjectNameException, NotCompliantMBeanException {
+        MBeanServer mbeanServer = null;
+        try {
+        	mbeanServer = MBeanServerLocator.locateJBoss();
+        } catch (IllegalStateException ise) {
+        	// If we can't find a JBoss MBeanServer, just return
+        	// Needed for unit tests
+        	return;
+        }
+
+        ObjectName listObjectName = getObjectName();
+
+        if (mbeanServer.isRegistered(listObjectName)) {
+        	mbeanServer.unregisterMBean(listObjectName);
+        }
+        
+        mbeanServer.registerMBean(this, listObjectName);
+	}
+	
+	protected ObjectName getObjectName() throws MalformedObjectNameException {
+		ObjectName listObjectName = null;
+
+		String deploymentName = m_config.getParent().getParent().getAttribute(ListenerTagNames.DEPLOYMENT_NAME_TAG);
+		String serviceName = m_config.getParent().getAttribute(ListenerTagNames.SERVICE_NAME_TAG);
+
+		StringBuffer objectName = new StringBuffer("category=MVELMonitor");
+		if (deploymentName != null) {
+			objectName.append(",").append(ListenerTagNames.DEPLOYMENT_NAME_TAG).append("=").append(deploymentName);
+		}
+			
+		if (serviceName != null) {
+			if (objectName.length() > 0) {
+				objectName.append(",");
+			}
+			objectName.append(ListenerTagNames.SERVICE_NAME_TAG).append("=").append(serviceName);
+		}
+						
+		listObjectName = new ObjectName("jboss.esb:" + objectName.toString());
+
+		return listObjectName;
+	}
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.actions.monitoring;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-/**
- * Interface for the MVEL Monitoring MBean.
- * 
- * @author tcunning
- * @since Version 4.4
- */
-public interface MVELMonitorMBean {
-	public ArrayList getMonitoredEvents();
-	public void reset();
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitorMBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions.monitoring;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+/**
+ * Interface for the MVEL Monitoring MBean.
+ * 
+ * @author tcunning
+ * @since Version 4.4
+ */
+public interface MVELMonitorMBean {
+	public ArrayList getMonitoredEvents();
+	public void reset();
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.actions.monitoring;
-
-import java.util.ArrayList;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.scripting.ScriptingAction;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.mapping.ObjectMapper;
-import org.jboss.soa.esb.message.mapping.ObjectMappingException;
-
-import bsh.EvalError;
-import bsh.Interpreter;
-
-/**
- * Action that monitors messages and has the ability to store information found at a particular MVEL pattern.
- * Uses beanshell evaluation to decide whether to store the message information.
- * 
- * @author tcunning
- * @since Version 4.4
- */
-public class MVELMonitoringAction extends AbstractActionPipelineProcessor {
-
-	public static final String MONITOR_VALUE = "monitor-value";
-	public static final String MVEL_PATTERN = "mvel-pattern";
-	public static final String PATTERN_NAME = "pattern-name";
-	public static final String PATTERN_CONDITIONAL = "pattern-conditional";
-	
-	private static final String BEANSHELL_VARIABLE = "beanshellVar";
-	
-    private ObjectMapper objectMapper;
-    private MVELMonitor mvelMonitor;
-	
-	ArrayList <MonitoringPatternBean> list = null;
-	
-	private static Logger logger = Logger.getLogger(ScriptingAction.class);
-	protected ConfigTree _config;
-	
-	/**
-	 * Constructor that forms 
-	 * @param config ConfigTree
-	 */
-	public MVELMonitoringAction(ConfigTree config) {
-		this._config = config;
-
-		ConfigTree[] configTree = _config.getChildren(MONITOR_VALUE);
-        if (null == configTree || configTree.length < 1)
-        {
-            logger.warn("Missing or empty destination list - This action class won't have any effect");
-            return;        
-        }
-
-        list = new ArrayList<MonitoringPatternBean>();
-        
-        for (ConfigTree curr : configTree)
-        {
-            try
-            {
-                String pattern = curr.getAttribute(MVEL_PATTERN, "");
-                String name = curr.getAttribute(PATTERN_NAME, "");
-                String conditional = curr.getAttribute(PATTERN_CONDITIONAL, "");
-                list.add(new MonitoringPatternBean(pattern, name, conditional));
-            }
-            catch (Exception e)
-            {
-            	e.printStackTrace();
-            }
-        }
-        
-        mvelMonitor = new MVELMonitor(config);        
-        try {
-        	mvelMonitor.registerMBean();
-        } catch (Exception e) {
-        	e.printStackTrace();
-        }
-	}
-	
-	public Message process(Message message) throws ActionProcessingException {
-		objectMapper = new ObjectMapper();
-		if (list != null) {
-			for (int i = 0; i<list.size(); i++) {
-				MonitoringPatternBean mpb = list.get(i);
-				String object = null;
-	            ObjectMapper mapper = new ObjectMapper();
-	            try {
-					object = (String) mapper.getObjectFromMessage(message, mpb.getPattern());
-					Interpreter inter = new Interpreter();
-					inter.eval(BEANSHELL_VARIABLE + " = " + object + mpb.getConditional());
-					Boolean b = (Boolean)inter.get(BEANSHELL_VARIABLE);
-					if (b.booleanValue()) {
-						mvelMonitor.addEvent(message, mpb);
-					}
-	            } catch (ObjectMappingException e1) {
-					throw new ActionProcessingException(e1);
-				} catch (EvalError e) {
-					throw new ActionProcessingException(e);
-				}
-			}
-		}			
-		return message;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions.monitoring;
+
+import java.util.ArrayList;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.actions.scripting.ScriptingAction;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.mapping.ObjectMapper;
+import org.jboss.soa.esb.message.mapping.ObjectMappingException;
+
+import bsh.EvalError;
+import bsh.Interpreter;
+
+/**
+ * Action that monitors messages and has the ability to store information found at a particular MVEL pattern.
+ * Uses beanshell evaluation to decide whether to store the message information.
+ * 
+ * @author tcunning
+ * @since Version 4.4
+ */
+public class MVELMonitoringAction extends AbstractActionPipelineProcessor {
+
+	public static final String MONITOR_VALUE = "monitor-value";
+	public static final String MVEL_PATTERN = "mvel-pattern";
+	public static final String PATTERN_NAME = "pattern-name";
+	public static final String PATTERN_CONDITIONAL = "pattern-conditional";
+	
+	private static final String BEANSHELL_VARIABLE = "beanshellVar";
+	
+    private ObjectMapper objectMapper;
+    private MVELMonitor mvelMonitor;
+	
+	ArrayList <MonitoringPatternBean> list = null;
+	
+	private static Logger logger = Logger.getLogger(ScriptingAction.class);
+	protected ConfigTree _config;
+	
+	/**
+	 * Constructor that forms 
+	 * @param config ConfigTree
+	 */
+	public MVELMonitoringAction(ConfigTree config) {
+		this._config = config;
+
+		ConfigTree[] configTree = _config.getChildren(MONITOR_VALUE);
+        if (null == configTree || configTree.length < 1)
+        {
+            logger.warn("Missing or empty destination list - This action class won't have any effect");
+            return;        
+        }
+
+        list = new ArrayList<MonitoringPatternBean>();
+        
+        for (ConfigTree curr : configTree)
+        {
+            try
+            {
+                String pattern = curr.getAttribute(MVEL_PATTERN, "");
+                String name = curr.getAttribute(PATTERN_NAME, "");
+                String conditional = curr.getAttribute(PATTERN_CONDITIONAL, "");
+                list.add(new MonitoringPatternBean(pattern, name, conditional));
+            }
+            catch (Exception e)
+            {
+            	e.printStackTrace();
+            }
+        }
+        
+        mvelMonitor = new MVELMonitor(config);        
+        try {
+        	mvelMonitor.registerMBean();
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
+	}
+	
+	public Message process(Message message) throws ActionProcessingException {
+		objectMapper = new ObjectMapper();
+		if (list != null) {
+			for (int i = 0; i<list.size(); i++) {
+				MonitoringPatternBean mpb = list.get(i);
+				String object = null;
+	            ObjectMapper mapper = new ObjectMapper();
+	            try {
+					object = (String) mapper.getObjectFromMessage(message, mpb.getPattern());
+					Interpreter inter = new Interpreter();
+					inter.eval(BEANSHELL_VARIABLE + " = " + object + mpb.getConditional());
+					Boolean b = (Boolean)inter.get(BEANSHELL_VARIABLE);
+					if (b.booleanValue()) {
+						mvelMonitor.addEvent(message, mpb);
+					}
+	            } catch (ObjectMappingException e1) {
+					throw new ActionProcessingException(e1);
+				} catch (EvalError e) {
+					throw new ActionProcessingException(e);
+				}
+			}
+		}			
+		return message;
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.actions.monitoring;
-
-import java.util.Date;
-
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Bean for storing event and message information.
- * 
- * @author tcunning
- * @since Version 4.4
- */
-public class MonitoringEventBean {
-	private String pattern;
-	private String name;
-	private String conditional;
-	private Message message;
-	
-	public MonitoringEventBean(Message message, MonitoringPatternBean mpb, String data) {
-		this.pattern = mpb.getPattern();
-		this.name = mpb.getName();
-		this.conditional = mpb.getConditional();
-		this.message = message;
-	}
-		
-	public String getName() {
-		return name;
-	}
-		
-	public String getPattern() {
-		return pattern;
-	}
-		
-	public String getConditional() {
-		return conditional;
-	}
-		
-	public String toString() {
-		return "Pattern [" + pattern + "] "
-			+ "Name [" + name + "] "
-			+ "Conditional [" + conditional + "] matched " + message.toString();
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringEventBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions.monitoring;
+
+import java.util.Date;
+
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Bean for storing event and message information.
+ * 
+ * @author tcunning
+ * @since Version 4.4
+ */
+public class MonitoringEventBean {
+	private String pattern;
+	private String name;
+	private String conditional;
+	private Message message;
+	
+	public MonitoringEventBean(Message message, MonitoringPatternBean mpb, String data) {
+		this.pattern = mpb.getPattern();
+		this.name = mpb.getName();
+		this.conditional = mpb.getConditional();
+		this.message = message;
+	}
+		
+	public String getName() {
+		return name;
+	}
+		
+	public String getPattern() {
+		return pattern;
+	}
+		
+	public String getConditional() {
+		return conditional;
+	}
+		
+	public String toString() {
+		return "Pattern [" + pattern + "] "
+			+ "Name [" + name + "] "
+			+ "Conditional [" + conditional + "] matched " + message.toString();
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.actions.monitoring;
-
-/**
- * Bean for storing pattern information.
- * 
- * @author tcunning
- * @since Version 4.4
- */
-public class MonitoringPatternBean {
-	private String pattern;
-	private String name;
-	private String conditional;
-	private String messageString;
-	
-	public MonitoringPatternBean(String name, String pattern, String conditional) {
-		this.pattern = pattern;
-		this.name = name;
-		this.conditional = conditional;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public String getPattern() {
-		return pattern;
-	}
-	
-	public String getConditional() {
-		return conditional;
-	}
-	
-	public String getMessageString() {
-		return messageString;
-	}
-	
-	public void setMessageString(String f_messageString) {
-		messageString = f_messageString;
-	}
-	
-	public String toString() {
-		return "Pattern [" + pattern + "] "
-			+ "Name [" + name + "] "
-			+ "Conditional [" + conditional + "]"
-			+ "Message [" + messageString + "]";
-	}
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MonitoringPatternBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.actions.monitoring;
+
+/**
+ * Bean for storing pattern information.
+ * 
+ * @author tcunning
+ * @since Version 4.4
+ */
+public class MonitoringPatternBean {
+	private String pattern;
+	private String name;
+	private String conditional;
+	private String messageString;
+	
+	public MonitoringPatternBean(String name, String pattern, String conditional) {
+		this.pattern = pattern;
+		this.name = name;
+		this.conditional = conditional;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public String getPattern() {
+		return pattern;
+	}
+	
+	public String getConditional() {
+		return conditional;
+	}
+	
+	public String getMessageString() {
+		return messageString;
+	}
+	
+	public void setMessageString(String f_messageString) {
+		messageString = f_messageString;
+	}
+	
+	public String toString() {
+		return "Pattern [" + pattern + "] "
+			+ "Name [" + name + "] "
+			+ "Conditional [" + conditional + "]"
+			+ "Message [" + messageString + "]";
+	}
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -53,6 +53,7 @@
 import org.jboss.soa.esb.helpers.NamingContextPool;
 import org.jboss.soa.esb.notification.jms.DefaultJMSPropertiesSetter;
 import org.jboss.soa.esb.notification.jms.JMSPropertiesSetter;
+import org.jboss.soa.esb.util.ClassUtil;
 import org.jboss.soa.esb.util.Util;
 
 /**
@@ -75,6 +76,7 @@
  *     &lt;property name="time-to-live" value="javax.jms.Message.DEFAULT_TIME_TO_LIVE"/&gt;
  *     &lt;property name="security-principal" value="username"/&gt;
  *     &lt;property name="security-credential" value="pasword"/&gt;
+ *     &lt;property name="property-strategy" value="&lt;property setter class name&gt;" /&gt;
  *     &lt;property name="message-prop-<i>&gt;prop-name&lt;</i>="<i>&gt; value="prop-value&lt;</i>" /&gt;
  * </pre>
  * Description of configuration attribues:
@@ -89,6 +91,7 @@
  * <li><i>time-to-live</i>: the JMS Time-To-Live to be used. Default is "javax.jms.Message.DEFAULT_TIME_TO_LIVE"
  * <li><i>security-principal</i>: security principal use when creating the JMS connection.
  * <li><i>security-credential</i>: the security credentials to use when creating the JMS connection. 
+ * <li><i>property-strategy</i>: the implementation of the JMSPropertiesSetter interface, if overriding the default. 
  * <li><i>message-prop</i>: properties to be set on the message are prefixed with "message-prop-".
  * </ul>
  *
@@ -121,6 +124,10 @@
      * Security credential used when creating the JMS connection 
 	 */
 	public static final String SECURITY_CREDITIAL = "security-credential";
+	/**
+	 * property strategy class.
+	 */
+	public static final String PROPERTY_STRATEGY = "property-strategy" ;
     /**
      * Routing properties.
      */
@@ -136,7 +143,7 @@
     /**
      * Strategy for setting JMSProperties
      */
-    private JMSPropertiesSetter jmsPropertiesStrategy = new DefaultJMSPropertiesSetter();
+    private final JMSPropertiesSetter jmsPropertiesStrategy ;
     /**
      * Whether messages sent by this router should be sent with delivery mode
      * DeliveryMode.PERSISTENT or DeliveryMode.NON_PERSISTENT
@@ -190,6 +197,17 @@
         jndiPkgPrefix = properties.getAttribute( JMSEpr.JNDI_PKG_PREFIX_TAG );
         connectionFactory = properties.getAttribute( JMSEpr.CONNECTION_FACTORY_TAG );
         
+        final String propertyStrategy = properties.getAttribute(PROPERTY_STRATEGY) ;
+        if (propertyStrategy == null) {
+            jmsPropertiesStrategy = new DefaultJMSPropertiesSetter() ;
+        } else {
+            try {
+                final Class propertyStrategyClass = ClassUtil.forName(propertyStrategy, getClass()) ;
+                jmsPropertiesStrategy = (JMSPropertiesSetter)propertyStrategyClass.newInstance() ;
+            } catch (final Throwable th) {
+                throw new ConfigurationException("Failed to instantiate property strategy class: " + propertyStrategy, th) ;
+            }
+        }
         
         final String securityPrincipal = properties.getAttribute(SECURITY_PRINCIPAL);
         final String securityCredential = properties.getAttribute(SECURITY_CREDITIAL);

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -529,6 +529,7 @@
                     }
                     if (courier.deliver(message)) {
                         if (synchronous) {
+                            courier.cleanup() ;
                             // JBESB-1016 replyToEPR has to be non-null or we'd have dropped out by this point!
 
                             // do we need to do this for synchronous calls? Vagueries of Couriers?

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -36,6 +36,8 @@
 import org.jboss.soa.esb.helpers.NamingContextException;
 import org.jboss.soa.esb.helpers.NamingContextPool;
 
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
 public class Configuration
 {
     private static Logger _logger = Logger.getLogger(Configuration.class);
@@ -448,4 +450,29 @@
 	            throw new ConfigurationException("Unexpected exception while accessing naming context pool", nce) ;
 	        }
         }
+	
+	/**
+	 * The SecurityService Implememtation Class 
+	 * 
+	 * @return String the fully qualified name of the ServiceService implementation class
+	 */
+	public static String getSecurityServiceImplementationClass()
+	{
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperty(Environment.SECURITY_SERVICE_IMPEMENTATION_CLASS);
+	}
+	
+	public static String getSecurityServiceConfigUrl()
+	{
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperty(Environment.SECURITY_SERVICE_CONFIG_URL);
+	}
+	
+	public static String getSecurityServiceCallbackHandlerImplClass()
+	{
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperty(Environment.SECURITY_SERVICE_CALLBACK_HANLDER_CLASS);
+	}
+	
+	public static Properties getSecurityServiceProperies()
+	{
+		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperties();
+	}
 }

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -55,6 +55,8 @@
 	public static final String JMS_CONNECTION_POOL_SIZE = "org.jboss.soa.esb.jms.connectionPool";
 	public static final String JMS_SESSION_SLEEP        = "org.jboss.soa.esb.jms.sessionSleep";
 	
+	public static final String WS_RETURN_STACK_TRACE = "org.jboss.soa.esb.ws.returnStackTrace";
+	public static final String WS_TIMEOUT = "org.jboss.soa.esb.ws.timeout" ;
 	/*
 	 * Core properties
 	 */
@@ -218,6 +220,14 @@
 	public static final String MESSAGE_TRACE = "org.jboss.soa.esb.messagetrace"; // on or off
 	public static final String PER_MESSAGE_TRACE = "org.jboss.soa.esb.permessagetrace"; // on or off
 	
+    /**
+     * The SecurityService Implementation class
+     */
+	public static final String SECURITY_SERVICE_IMPEMENTATION_CLASS 	= "org.jboss.soa.esb.services.security.implementationClass";
+	public static final String SECURITY_SERVICE_CALLBACK_HANLDER_CLASS 	= "org.jboss.soa.esb.services.security.callbackHandler";
+	public static final String SECURITY_SERVICE_CALLBACK 				= "org.jboss.soa.esb.services.security.callback_";
+	public static final String SECURITY_SERVICE_CONFIG_URL 				= "org.jboss.soa.esb.services.security.configUrl";
+	
 	// Configuration options for the Naming Context pooling.
 	/**
 	 * The maximum pool size.

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -101,6 +101,8 @@
 	public static final String DBSTORE_MODULE = "dbstore";
 	
 	public static final String FILTER_MODULE = "filters";
+	
+	public static final String SECURITY_MODULE = "security";
 
 	/**
 	 * Get the property manager responsible for the module component in the
@@ -143,12 +145,9 @@
 
 		try
 		{
-			PropertyManager propertyManager = PropertyManagerFactory
-					.getPropertyManager(
-							"org.jboss.soa.esb.propertymanager." + name, name);
+			PropertyManager propertyManager = PropertyManagerFactory.getPropertyManager("org.jboss.soa.esb.propertymanager." + name, name);
 	
-			String propertiesFilename = System.getProperty(
-					Environment.PROPERTIES_FILE, Environment.DEFAULT_PROPERTY_FILE);
+			String propertiesFilename = System.getProperty(Environment.PROPERTIES_FILE, Environment.DEFAULT_PROPERTY_FILE);
 	
 			/*
 			 * Does not cause reloading of the same file over and over. Once it is
@@ -157,8 +156,7 @@
 	
 			try
 			{
-				propertyManager.load(XMLFilePlugin.class.getName(),
-						propertiesFilename);
+				propertyManager.load(XMLFilePlugin.class.getName(), propertiesFilename);
 			}
 			catch (LoadPropertiesException ex)
 			{

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -64,7 +64,12 @@
 	public static final String DEPLOYMENT_NAME_TAG 			= "deployment";
 	
 	/** ActionProcessingPipeline */
-    public static final String MEP_ATTRIBUTE_TAG                    = "mep";
+    public static final String MEP_ATTRIBUTE_TAG            = "mep";
+    public static final String IN_XSD_ATTRIBUTE_TAG         = "inXsd";
+    public static final String OUT_XSD_ATTRIBUTE_TAG        = "outXsd";
+    public static final String FAULT_XSD_ATTRIBUTE_TAG      = "faultXsd";
+    public static final String VALIDATE_ATTRIBUTE_TAG       = "validate";
+    public static final String WEBSERVICE_ATTRIBUTE_TAG     = "webservice";
     public static final String ACTION_ELEMENT_TAG		    = "action";
     public static final String ACTION_CLASS_TAG			    = "class";
     public static final String PROCESS_METHOD_TAG		    = "process";
@@ -72,7 +77,17 @@
     public static final String NORMAL_COMPLETION_METHOD_TAG = "okMethod";
     public static final String EXCEPTION_METHOD_TAG		    = "exceptionMethod";
     public static final String HTTP_ROUTER_ROUTE_URL        = "routeUrl";
+    public static final String SECURITY_TAG                 = "security";
+    public static final String AUTHENTICATION_TAG           = "authentication";
+    public static final String LOGIN_CONFIG_TAG           	= "login-config";
+    public static final String CONFIG_POLICY_TAG           	= "policy-config";
+    public static final String CONFIG_POLICY_FILE_TAG      	= "file";
+    public static final String RUN_AS_TAG           		= "runAs";
+    public static final String USE_CALLERS_IDENTIDY_TAG 	= "useCallersIdentity";
+    public static final String MODULE_NAME_TAG 				= "moduleName";
+    public static final String CALLBACK_HANDLER_TAG			= "callbackHandler";
     
+    
     public static final String MEP_ONE_WAY                          = "OneWay" ;
     public static final String MEP_REQUEST_RESPONSE                 = "RequestResponse" ;
 

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/Configuration.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -31,6 +31,7 @@
 import javax.management.ObjectName;
 import javax.xml.transform.stream.StreamSource;
 
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.LifecycleUtil;
@@ -78,6 +79,11 @@
    
    public static ManagedLifecycleController create(String configXml, ObjectName serviceName)
    {
+       return create(configXml, serviceName, null) ;
+   }
+   
+   public static ManagedLifecycleController create(final String configXml, final ObjectName serviceName, final List<ContractReferencePublisher> publishers)
+   {
       InputStream validationInputStream = ClassUtil.getResourceAsStream(JBOSSESB_XSD, Configuration.class);
       //if this fails try using the
       if (validationInputStream == null)
@@ -118,7 +124,7 @@
 
              // In parallel, create a map of the contract publication info...
              ServicePublisher.addServicePublishers(controller, generator.getModel());
-
+             ServicePublisher.addContractReferencePublishers(controller, publishers) ;
             return controller;
          }
          else

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -30,9 +30,14 @@
 import org.jboss.soa.esb.listeners.config.xbeanmodel.FsListenerDocument.FsListener;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.FtpListenerDocument.FtpListener;
 import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsBusDocument.JmsBus;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsJcaProviderDocument.JmsJcaProvider;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsListenerDocument.JmsListener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.JmsMessageFilterDocument.JmsMessageFilter;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.SqlBusDocument.SqlBus;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.SqlListenerDocument.SqlListener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.SqlProviderDocument.SqlProvider;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.ScheduledListenerDocument.ScheduledListener;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.*;
 import org.jboss.soa.esb.listeners.config.mappers.*;
@@ -55,7 +60,6 @@
     /**
 	 * XMLBeans based configuration model instance.
 	 */
-	@SuppressWarnings("unused")
 	private XMLBeansModel model;
 	
 	/**
@@ -116,10 +120,63 @@
 
         listenerNode.setAttribute(ListenerTagNames.MAX_THREADS_TAG, YADOMUtil.getAttribute(properties, ListenerTagNames.MAX_THREADS_TAG, "1"));
 
+        listenerNode.setAttribute(ListenerTagNames.TRANSACTED_TAG, Boolean.toString(getInVMTransacted(service))) ;
         YADOMUtil.removeEmptyAttributes(eprNode);
 
         ActionMapper.map(listenerNode, service, model);
     }
+    
+    /**
+     * Try to find the InVM transacted value.  Check to see if the transacted attribute
+     * has been explicitly set on the service.  If it has not been explicitly set then we
+     * check to see if any of the listener/bus configurations are transacted and assume the
+     * InVM is implicitly transacted.
+     * 
+     * @param service The current service.
+     * @return true if transacted, false otherwise.
+     */
+    private boolean getInVMTransacted(final Service service)
+        throws ConfigurationException
+    {
+        if (service.isSetInvmScope()) {
+            return service.getInvmTransacted() ;
+        } else if (service.isSetListeners()) {
+            for (Listener listener: service.getListeners().getListenerList()) {
+                if (listener instanceof ScheduledListener) {
+                    if (((ScheduledListener)listener).getTransacted())
+                        return true ;
+                }
+                else if (listener instanceof JmsListener) {
+                    final Bus bus = model.getBus(listener.getBusidref()) ;
+                    if (!(bus instanceof JmsBus))
+                        continue ;
+                    
+                    final Provider provider = model.getProvider(bus) ;
+                    if (provider instanceof JmsJcaProvider) {
+                        // Jms JCA provider defaults to true
+                        final JmsJcaProvider jmsJcaProvider = (JmsJcaProvider)provider ;
+                        if (!jmsJcaProvider.isSetTransacted() || jmsJcaProvider.getTransacted())
+                            return true ;
+                    } else if (provider instanceof JmsProviderType) {
+                        JmsMessageFilter filter = ((JmsListener)listener).getJmsMessageFilter() ;
+                        if (filter == null)
+                            filter = ((JmsBus)bus).getJmsMessageFilter() ;
+                        if ((filter != null) && filter.getTransacted())
+                            return true ;
+                    }
+                } else if (listener instanceof SqlListener) {
+                    final Bus bus = model.getBus(listener.getBusidref()) ;
+                    if (!(bus instanceof SqlBus))
+                        continue ;
+                    
+                    final Provider provider = model.getProvider(bus) ;
+                    if ((provider instanceof SqlProvider) && ((SqlProvider)provider).getTransacted())
+                        return true ;
+                }
+            }
+        }
+        return false ;
+    }
 
     /**
 	 * Add a single ESB Aware Listener configuration node to configuration root. 

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -21,30 +21,38 @@
 */
 package org.jboss.soa.esb.listeners.config;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.SubDeployer;
 import org.jboss.deployment.SubDeployerSupport;
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
 import org.jboss.internal.soa.esb.util.XMLHelper;
+import org.jboss.internal.soa.esb.webservice.ESBContractGenerator;
+import org.jboss.internal.soa.esb.webservice.ESBServiceContractPublisher;
+import org.jboss.internal.soa.esb.webservice.ESBServiceEndpointInfo;
+import org.jboss.internal.soa.esb.webservice.JAXWSProviderClassGenerator;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.MetaData;
 import org.jboss.metadata.XmlFileLoader;
@@ -52,14 +60,20 @@
 import org.jboss.mx.util.MBeanProxyExt;
 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.soa.esb.util.XPathNamespaceContext;
 import org.jboss.system.ServiceControllerMBean;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
 import org.jboss.web.AbstractWebContainer;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
 
 /**
  * comment
@@ -74,10 +88,27 @@
 
    private ServiceControllerMBean serviceController;
    private Properties actionArtifactProperties;
+   private final File esbWarFiles ;
+   private final Set<String> esbNames = new HashSet<String>() ;
    
    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
@@ -87,8 +118,11 @@
    {
       setSuffixes(new String[]{".esb"});
       setRelativeOrder(1000); // before old EJB 2.1 deployer
+      final ServerConfig config = ServerConfigLocator.locate();
+      esbWarFiles = new File(config.getServerTempDeployDir(), "esbwarfiles") ;
+      esbWarFiles.mkdirs() ;
    }
-
+   
    public static boolean hasFile(DeploymentInfo di, String filePath)
    {
       String urlStr = di.url.getFile();
@@ -223,6 +257,57 @@
                in.close();
             }
          }
+         
+         final URL document = getDocumentUrl(di);
+         
+         if (document == null)
+         {
+            throw new DeploymentException("Unable to find document url of META-INF/jboss-esb.xml in: "
+                    + di.url);
+         }
+         final InputStream inputStream = document.openStream();
+         final String jbossEsbXml ;
+         try
+         {
+             final StringWriter sw = new StringWriter() ;
+             XMLHelper.replaceSystemProperties(XMLHelper.getXMLStreamReader(inputStream),
+                 XMLHelper.getXMLStreamWriter(sw)) ;
+             jbossEsbXml = sw.toString();
+         }
+         finally
+         {
+             inputStream.close();
+         }
+         
+         final Set<ObjectName> deps = new HashSet<ObjectName>();
+         final Jbossesb jbossEsb = getJbossEsb(jbossEsbXml) ;
+         addActionDependencies(di.shortName, jbossEsb, deps) ;
+         
+         JBoss4ESBDeployment deployment = new JBoss4ESBDeployment(jbossEsbXml, di.shortName);
+         
+         final String deploymentName = getDeploymentName(deployment) ;
+         di.context.put(JBoss4ESBDeploymentMetaData.class, new JBoss4ESBDeploymentMetaData(deployment, deploymentName, deps)) ;
+         // invoke super-class initialization
+         super.init(di);
+         // create webservice WAR
+         final ClassLoader origCL = Thread.currentThread().getContextClassLoader() ;
+         final List<ContractReferencePublisher> publishers = new ArrayList<ContractReferencePublisher>() ;
+         final File warFile ;
+         try
+         {
+             Thread.currentThread().setContextClassLoader(di.localCl) ;
+             warFile = createWebserviceWars(di.shortName, jbossEsb, deploymentName, publishers) ;
+         }
+         finally
+         {
+             Thread.currentThread().setContextClassLoader(origCL) ;
+         }
+         if (warFile != null)
+         {
+             deployment.setPublishers(publishers) ;
+             final URL warFileURL = warFile.toURL() ;
+             deployUrl(di, warFileURL, warFile.getName()) ;
+         }
       }
       catch (Exception e)
       {
@@ -232,24 +317,15 @@
          }
          throw new DeploymentException("failed to initialize", e);
       }
-
-      // invoke super-class initialization
-      super.init(di);
    }
 
    public synchronized void create(DeploymentInfo di) throws DeploymentException
    {
       log.info("create esb service, " + di.shortName);
-      URL document = getDocumentUrl(di);
-      
-      if (document == null)
-      {
-         throw new DeploymentException("Unable to find document url of META-INF/jboss-esb.xml in: "
-                 + di.url);
-      }
       try
       {
-         Set<ObjectName> deps = new HashSet<ObjectName>();
+         final JBoss4ESBDeploymentMetaData metaData = (JBoss4ESBDeploymentMetaData)di.context.get(JBoss4ESBDeploymentMetaData.class) ;
+         final Set<ObjectName> deps = metaData.getDependencies() ;
          InputStream in = di.localCl.getResourceAsStream("META-INF/deployment.xml");
          if (in != null)
          {
@@ -317,34 +393,16 @@
             }
          }
 
-         final InputStream inputStream = document.openStream();
-         final String jbossEsbXml ;
-         try
-         {
-             final StringWriter sw = new StringWriter() ;
-             XMLHelper.replaceSystemProperties(XMLHelper.getXMLStreamReader(inputStream),
-                 XMLHelper.getXMLStreamWriter(sw)) ;
-             jbossEsbXml = sw.toString();
-         }
-         finally
-         {
-             inputStream.close();
-         }
-         
-         addActionDependencies(di.shortName, jbossEsbXml, deps) ;
-         
-         JBoss4ESBDeployment deployment = new JBoss4ESBDeployment(jbossEsbXml, di.shortName);
-         deployment.setClassloader(di.ucl);
-         String name = PREFIX_CANONICAL_NAME + di.shortName;
+         String name = PREFIX_CANONICAL_NAME + metaData.getDeploymentName();
          ObjectName on = ObjectNameConverter.convert(name);
          // Check that the name is not registered
          if (server.isRegistered(on) == true)
          {
-            log.debug("The ESBModule name: " + name
-                      + "is already registered, adding uid=" + System.identityHashCode(deployment));
-            name = name + ",uid=" + System.identityHashCode(deployment);
-            on = ObjectNameConverter.convert(name);
+            throw new DeploymentException("Duplicate registration for " + name) ;
          }
+         
+         final JBoss4ESBDeployment deployment = metaData.getDeployment() ;
+         deployment.setClassloader(di.ucl);
          server.registerMBean(deployment, on);
          di.deployedObject = on;
          log.debug("Deploying: " + di.url);
@@ -359,44 +417,42 @@
       super.create(di);
    }
 
+   private Jbossesb getJbossEsb(final String configuration)
+       throws DeploymentException
+   {
+       try
+       {
+           final StringReader sr = new StringReader(configuration) ;
+           return JbossesbDocument.Factory.parse(sr).getJbossesb() ;
+       }
+       catch (final Exception ex)
+       {
+           throw new DeploymentException("Failed to parse jboss-esb.xml", ex) ;
+       }
+   }
+   
    private void addActionDependencies(final String deploymentName,
-      final String configuration, final Set<ObjectName> deps)
-      throws XPathExpressionException, DeploymentException, MalformedObjectNameException
+      final Jbossesb jbossEsb, final Set<ObjectName> deps)
+      throws MalformedObjectNameException
    {
-      final XmlFileLoader xfl = new XmlFileLoader() ;
-      final StringReader sr = new StringReader(configuration) ;
-      final InputSource is = new InputSource(sr) ;
-      final Element rootElement = xfl.getDocument(is, "META-INF/jboss-esb.xml").getDocumentElement() ;
-
       final Set<String> artifacts = new HashSet<String>() ;
       artifacts.add(ESB_ARTIFACT_NAME) ;
 
-      final String namespaceURI = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" ;
-      
-      final XPath xpathEvaluater = XPathFactory.newInstance().newXPath();
-      final XPathNamespaceContext namespaceContext = new XPathNamespaceContext() ;
-      namespaceContext.setMapping("jbesb", namespaceURI) ;
-      xpathEvaluater.setNamespaceContext(namespaceContext) ;
-
-      final NodeList actionList = (NodeList) xpathEvaluater.evaluate("/jbesb:jbossesb/jbesb:services/jbesb:service/jbesb:actions/jbesb:action",
-              rootElement, XPathConstants.NODESET) ; 
-      final int numActions = actionList.getLength() ;
-      if (numActions > 0)
+      final Services services = jbossEsb.getServices() ;
+      if (services != null)
       {
           final Set<String> actionClasses = new HashSet<String>() ;
-          for(int count = 0 ; count < numActions ; count++)
+          
+          for(final Service service : services.getServiceList())
           {
-              final Node actionNode = actionList.item(count) ;
-              if (!(actionNode instanceof Element))
+              final Actions actions = service.getActions() ;
+              if (actions != null)
               {
-                  log.warn("Action node is not an element: " + actionNode) ;
+                  for (final Action action: actions.getActionList())
+                  {
+                      actionClasses.add(action.getClass1()) ;
+                  }
               }
-              else
-              {
-                  final Element actionElement = (Element)actionNode ;
-                  final String actionClass = actionElement.getAttribute("class") ;
-                  actionClasses.add(actionClass) ;
-              }
           }
           
           final int numActionClasses = actionClasses.size() ;
@@ -423,7 +479,120 @@
           }
       }
    }
+   
+   private File createWebserviceWars(final String esbName, final Jbossesb jbossEsb, final String deploymentName,
+       final List<ContractReferencePublisher> publishers)
+       throws DeploymentException
+   {
+       final Services services = jbossEsb.getServices() ;
+       if (services != null)
+       {
+           final List<Service> endpointServices = new ArrayList<Service>() ;
+           for(final Service service : jbossEsb.getServices().getServiceList())
+           {
+               final Actions actions = service.getActions() ;
+               if (actions != null)
+               {
+                   if (!WebserviceType.DISABLED.equals(actions.getWebservice()))
+                   {
+                       final String inXsd = actions.getInXsd() ;
+                       if (inXsd != null)
+                       {
+                           endpointServices.add(service) ;
+                       }
+                   }
+               }
+           }
+           
+           if (endpointServices.size() > 0)
+           {
+               final StringWriter servletDefinition = new StringWriter() ;
+               final StringWriter servletMapping = new StringWriter() ;
+               
+               final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
+               final ZipOutputStream zos = new ZipOutputStream(baos) ;
+               zos.setComment("ESB war file for exposing webservices: " + esbName) ;
+               try
+               {
+                   final JAXWSProviderClassGenerator generator = new JAXWSProviderClassGenerator() ;
+                   
+                   for(Service service: endpointServices)
+                   {
+                       final ESBServiceEndpointInfo serviceInfo = new ESBServiceEndpointInfo(service) ;
+                       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) ;
+                       final String wsClassName = serviceInfo.getClassName().replace('.', '/') + ".class" ;
+                       addFile(zos, "WEB-INF/classes/" + wsClassName, wsClass) ;
+                       
+                       servletDefinition.append("<servlet><servlet-name>") ;
+                       servletDefinition.append(serviceInfo.getServletName())  ;
+                       servletDefinition.append("</servlet-name><servlet-class>") ;
+                       servletDefinition.append(serviceInfo.getClassName()) ;
+                       servletDefinition.append("</servlet-class></servlet>") ;
+                       
+                       servletMapping.append("<servlet-mapping><servlet-name>") ;
+                       servletMapping.append(serviceInfo.getServletName())  ;
+                       servletMapping.append("</servlet-name><url-pattern>") ;
+                       servletMapping.append(serviceInfo.getServletPath()) ;
+                       servletMapping.append("</url-pattern></servlet-mapping>") ;
+                       
+                       final org.jboss.soa.esb.Service esbService = new org.jboss.soa.esb.Service(service.getCategory(), service.getName()) ;
+                       final ContractReferencePublisher publisher = new ESBServiceContractPublisher(esbService, service.getDescription(), serviceInfo.getServletName()) ;
+                       publishers.add(publisher) ;
+                   }
+                   
+                   final StringWriter webXml = new StringWriter() ;
+                   webXml.append("<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"") ;
+                   webXml.append(" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd\" version=\"2.4\">") ;
+                   webXml.append(servletDefinition.getBuffer()) ;
+                   webXml.append(servletMapping.getBuffer()) ;
+                   webXml.append("</web-app>") ;
+                   
+                   addFile(zos, "WEB-INF/web.xml", webXml.toString()) ;
+                   zos.close() ;
+                   
+                   final File warFile = getESBWarFile(deploymentName, esbName, true) ;
+                   
+                   final FileOutputStream fos = new FileOutputStream(warFile) ;
+                   fos.write(baos.toByteArray()) ;
+                   fos.close() ;
+                   return warFile ;
+               }
+               catch (final Exception ex)
+               {
+                   throw new DeploymentException("Failed to create webservice artifact", ex) ;
+               }
+           }
+       }
+       return null ;
+   }
 
+   private void addFile(final ZipOutputStream zos, final String filename, final String contents)
+       throws IOException
+   {
+       addFile(zos, filename, contents.getBytes()) ;
+   }
+   
+   private void addFile(final ZipOutputStream zos, final String filename, final byte[] contents)
+       throws IOException
+   {
+       final ZipEntry entry = new ZipEntry(filename) ;
+       zos.putNextEntry(entry) ;
+       zos.write(contents) ;
+       zos.closeEntry() ;
+   }
+
    public synchronized void start(DeploymentInfo di)
            throws DeploymentException
    {
@@ -469,6 +638,18 @@
    public void destroy(DeploymentInfo di)
            throws DeploymentException
    {
+      final JBoss4ESBDeploymentMetaData metaData = (JBoss4ESBDeploymentMetaData)di.context.get(JBoss4ESBDeploymentMetaData.class) ;
+      if (metaData != null)
+      {
+          final String deploymentName = metaData.getDeploymentName() ;
+          final File warFile = getESBWarFile(deploymentName, di.shortName, false) ;
+          if (warFile != null)
+          {
+             warFile.delete();
+             warFile.getParentFile().delete() ;
+          }
+          removeDeploymentName(deploymentName) ;
+      }
       if (di.deployedObject != null)
       {
          try
@@ -484,4 +665,68 @@
       }
       super.destroy(di);
    }
+   
+    private File getESBWarFile(final String deploymentName, final String esbName, final boolean createDir)
+    {
+        final File esbDir = new File(esbWarFiles, deploymentName) ;
+        if (!esbDir.exists())
+        {
+            if (!createDir)
+            {
+                return null ;
+            }
+            esbDir.mkdir() ;
+        }
+        
+        final int lastSeparator = esbName.lastIndexOf('.') ;
+        final String warFileName = ((lastSeparator >= 0) ? esbName.substring(0, lastSeparator) : esbName) + ".war" ;
+        
+        return new File(esbDir, warFileName) ;
+    }
+    
+    private synchronized String getDeploymentName(final JBoss4ESBDeployment deployment)
+    {
+        final String deploymentName = deployment.getDeploymentName() ;
+        if (esbNames.add(deploymentName))
+        {
+            return deploymentName ;
+        }
+        return deploymentName + ",uid=" + System.identityHashCode(deployment) ;
+    }
+    
+    private synchronized void removeDeploymentName(final String deploymentName)
+    {
+        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/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -21,6 +21,9 @@
 */
 package org.jboss.soa.esb.listeners.config;
 
+import java.util.List;
+
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
 import org.jboss.soa.esb.lifecycle.LifecycleResourceManager;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
 import org.jboss.system.ServiceMBeanSupport;
@@ -35,10 +38,10 @@
 {
    private final String jbossEsbXml;
    private final String deploymentName ;
+   private List<ContractReferencePublisher> publishers ;
    private ManagedLifecycleController controller;
    private ClassLoader classloader;
 
-
    public JBoss4ESBDeployment(String jbossEsbXml, final String deploymentName)
    {
       this.jbossEsbXml = jbossEsbXml;
@@ -55,16 +58,30 @@
       return jbossEsbXml.replace("<", "&lt;").replace(">", "&gt;");
    }
 
-
    public void setClassloader(ClassLoader classloader)
    {
       this.classloader = classloader;
    }
 
+   public void setPublishers(final List<ContractReferencePublisher> publishers)
+   {
+       this.publishers = publishers ;
+   }
+
    public ManagedLifecycleController getController()
    {
       return controller;
    }
+   
+   public String getDeploymentName()
+   {
+       return deploymentName ;
+   }
+   
+   public List<ContractReferencePublisher> getPublishers()
+   {
+       return publishers ;
+   }
 
    @Override
    public void createService()
@@ -79,7 +96,7 @@
       {
          Thread.currentThread().setContextClassLoader(classloader);
          LifecycleResourceManager.getSingleton().associateDeployment(deploymentName) ;
-         controller = Configuration.create(jbossEsbXml, serviceName);
+         controller = Configuration.create(jbossEsbXml, serviceName, publishers);
          controller.start();
       }
       finally

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeploymentMetaData.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeploymentMetaData.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeploymentMetaData.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeploymentMetaData.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.soa.esb.listeners.config;
+
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+/**
+ * Meta Data used for ESB deployments
+ *
+ * @author <a href="kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class JBoss4ESBDeploymentMetaData
+{
+    private final JBoss4ESBDeployment deployment ;
+    private final String deploymentName ;
+    private final Set<ObjectName> dependencies ;
+
+   public JBoss4ESBDeploymentMetaData(final JBoss4ESBDeployment deployment, final String deploymentName,
+           final Set<ObjectName> dependencies)
+   {
+       this.deployment = deployment ;
+       this.deploymentName = deploymentName ;
+       this.dependencies = dependencies ;
+   }
+   
+   public JBoss4ESBDeployment getDeployment()
+   {
+       return deployment ;
+   }
+   
+   public String getDeploymentName()
+   {
+       return deploymentName ;
+   }
+   
+   public Set<ObjectName> getDependencies()
+   {
+       return dependencies ;
+   }
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -3,16 +3,19 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
 import org.jboss.internal.soa.esb.publish.ActionContractPublisher;
 import org.jboss.internal.soa.esb.publish.ContractPublisher;
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
 import org.jboss.internal.soa.esb.publish.Publish;
+import org.jboss.internal.soa.esb.publish.Publisher;
+import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.listeners.config.xbeanmodel.ActionDocument.Action;
 import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
 import org.jboss.soa.esb.util.ClassUtil;
 
@@ -26,23 +29,23 @@
     private String serviceName;
     private String category;
     private String description;
-    private ContractPublisher contractPublisher;
-    private static Map<ManagedLifecycleController, List<ServicePublisher>> servicePublishers = new LinkedHashMap<ManagedLifecycleController, List<ServicePublisher>>();
+    private Publisher publisher;
+    private static Map<ManagedLifecycleController, Map<Service, List<ServicePublisher>>> SERVICE_PUBLISHERS = new LinkedHashMap<ManagedLifecycleController, Map<Service, List<ServicePublisher>>>();
 
     /**
      * Public constructor.
      *
      * @param name     Service name.
      * @param category Service category.
-     * @param contractPublisher Contract publisher implementation.
+     * @param publisher publisher implementation.
      */
-    protected ServicePublisher(String name, String category, ContractPublisher contractPublisher) {
+    protected ServicePublisher(String name, String category, Publisher publisher) {
         AssertArgument.isNotNullAndNotEmpty(name, "name");
         AssertArgument.isNotNullAndNotEmpty(category, "category");
 
         this.serviceName = name;
         this.category = category;
-        this.contractPublisher = contractPublisher;
+        this.publisher = publisher;
     }
 
     /**
@@ -85,10 +88,19 @@
      * @return The contract publisher.
      */
     public ContractPublisher getContractPublisher() {
-        return contractPublisher;
+        return (publisher instanceof ContractPublisher ? (ContractPublisher)publisher : null);
     }
 
     /**
+     * Get the publisher for the Service associated with this publisher.
+     *
+     * @return The publisher.
+     */
+    public Publisher getPublisher() {
+        return publisher ;
+    }
+
+    /**
      * Add service publication from the suppplied configuration, keying them under the
      * controller that is managing these services.
      * <p/>
@@ -99,19 +111,60 @@
      * @param model The configuration model.
      */
     public static void addServicePublishers(ManagedLifecycleController controller, XMLBeansModel model) {
-        List<Service> serviceConfigs = model.getServices();
-        List<ServicePublisher> publishers = new ArrayList<ServicePublisher>();
+        List<org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service> serviceConfigs = model.getServices();
+        final Map<Service, List<ServicePublisher>> servicePublishers = new LinkedHashMap<Service, List<ServicePublisher>>() ;
 
-        publishers.clear();
-        for (Service service : serviceConfigs) {
-            ContractPublisher contractPublisher = getConractPublisher(service);
-            ServicePublisher servicePublisher = new ServicePublisher(service.getName(), service.getCategory(), contractPublisher);
+        for (org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service docService : serviceConfigs) {
+            ContractPublisher publisher = getConractPublisher(docService);
+            final Service service = new Service(docService.getCategory(), docService.getName()) ;
+            ServicePublisher servicePublisher = new ServicePublisher(service.getName(), service.getCategory(), publisher);
 
-            servicePublisher.setDescription(service.getDescription());
-            publishers.add(servicePublisher);
+            servicePublisher.setDescription(docService.getDescription());
+            addPublisher(servicePublishers, service, servicePublisher) ;
         }
+        
+        addServicePublishers(controller, servicePublishers) ;
+    }
+    
+    /**
+     * Add the publisher into map for the specified service.
+     * @param servicePublishers The service publishers
+     * @param service The service name
+     * @param publisher The publisher
+     */
+    private static void addPublisher(final Map<Service, List<ServicePublisher>> servicePublishers,
+            final Service service, final ServicePublisher publisher)
+    {
+        final List<ServicePublisher> publishers = servicePublishers.get(service) ;
+        if (publishers != null) {
+            publishers.add(publisher);
+        } else {
+            final List<ServicePublisher> newPublishers = new ArrayList<ServicePublisher>() ;
+            newPublishers.add(publisher) ;
+            servicePublishers.put(service, newPublishers) ;
+        }
+    }
 
-        servicePublishers.put(controller, publishers);
+    /**
+     * Add the service publishers to the controller map.
+     * @param controller The controller for the services
+     * @param servicePublishers The service publishers
+     */
+    private static synchronized void addServicePublishers(ManagedLifecycleController controller, Map<Service, List<ServicePublisher>> publishers) {
+        final Map<Service, List<ServicePublisher>> currentMap = SERVICE_PUBLISHERS.get(controller) ;
+        if (currentMap != null) {
+            for(Map.Entry<Service, List<ServicePublisher>> entry: publishers.entrySet()) {
+                final Service service = entry.getKey() ;
+                final List<ServicePublisher> currentList = currentMap.get(service) ;
+                if (currentList != null) {
+                    currentList.addAll(entry.getValue()) ;
+                } else {
+                    currentMap.put(service, entry.getValue()) ;
+                }
+            }
+        } else {
+            SERVICE_PUBLISHERS.put(controller, publishers) ;
+        }
     }
 
     /**
@@ -119,12 +172,14 @@
      * instances.
      * @return The full list of publishers.
      */
-    public static List<ServicePublisher> getServicePublishers() {
+    public static synchronized List<ServicePublisher> getServicePublishers() {
         List<ServicePublisher> publishers = new ArrayList<ServicePublisher>();
-        Collection<List<ServicePublisher>> allPublishers = servicePublishers.values();
+        Collection<Map<Service, List<ServicePublisher>>> allPublishers = SERVICE_PUBLISHERS.values();
 
-        for(List<ServicePublisher> curPublisherList : allPublishers) {
-            publishers.addAll(curPublisherList);
+        for(Map<Service, List<ServicePublisher>> servicePublishers: allPublishers) {
+            for(List<ServicePublisher> curPublisherList : servicePublishers.values()) {
+                publishers.addAll(curPublisherList);
+            }
         }
 
         return publishers;
@@ -134,12 +189,12 @@
      * Remove the service publications for the services under the control of the supplied controller.
      * @param controller Controller.
      */
-    public static void removeServicePublishers(ManagedLifecycleController controller) {
-        servicePublishers.remove(controller);
+    public static synchronized void removeServicePublishers(ManagedLifecycleController controller) {
+        SERVICE_PUBLISHERS.remove(controller);
     }
 
     @SuppressWarnings("unchecked")
-    private static ContractPublisher getConractPublisher(Service service) {
+    private static ContractPublisher getConractPublisher(org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service service) {
         if(service.getActions() == null || service.getActions().getActionList() == null) {
             return null;
         }
@@ -174,4 +229,55 @@
         // No publisher configured on any of the actions in the processing chain...
         return null;
     }
+
+    /**
+     * Add external contract reference publishers to the list of publishers
+     * @param controller The controller
+     * @param publishers
+     */
+    public static synchronized void addContractReferencePublishers(final ManagedLifecycleController controller, final List<? extends ContractReferencePublisher> publishers) {
+        if (publishers != null) {
+            final Map<Service, List<ServicePublisher>> servicePublishers = new LinkedHashMap<Service, List<ServicePublisher>>() ;
+            for(ContractReferencePublisher publisher: publishers) {
+                final Service service = publisher.getService() ;
+                final ServicePublisher servicePublisher = new ServicePublisher(service.getName(), service.getCategory(), publisher) ;
+                servicePublisher.setDescription(publisher.getDescription()) ;
+                addPublisher(servicePublishers, service, servicePublisher) ;
+            }
+            addServicePublishers(controller, servicePublishers) ;
+        }
+    }
+
+    /**
+     * Get the list of registered services
+     * @return The list of services.
+     */
+    public static synchronized List<Service> getServices() {
+        LinkedHashSet<Service> services = new LinkedHashSet<Service>();
+        Collection<Map<Service, List<ServicePublisher>>> allPublishers = SERVICE_PUBLISHERS.values();
+
+        for(Map<Service, List<ServicePublisher>> servicePublishers: allPublishers) {
+            services.addAll(servicePublishers.keySet()) ;
+        }
+
+        return new ArrayList<Service>(services);
+    }
+
+    /**
+     * Get the list of publishers registered against the specified {@link Service}
+     * @return The list of publishers.
+     */
+    public static synchronized List<ServicePublisher> getServicePublishers(final Service service) {
+        List<ServicePublisher> publishers = new ArrayList<ServicePublisher>();
+        Collection<Map<Service, List<ServicePublisher>>> allPublishers = SERVICE_PUBLISHERS.values();
+
+        for(Map<Service, List<ServicePublisher>> servicePublishers: allPublishers) {
+            final List<ServicePublisher> curPublisherList = servicePublishers.get(service) ;
+            if (curPublisherList != null) {
+                publishers.addAll(curPublisherList);
+            }
+        }
+
+        return publishers;
+    }
 }

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -29,6 +29,7 @@
 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;
@@ -61,6 +62,35 @@
 		        {
 		            listenerConfigTree.setAttribute(ListenerTagNames.MEP_ATTRIBUTE_TAG, mep.toString()) ;
 		        }
+		        final String inxsd = actions.getInXsd();
+		        if (inxsd != null) 
+		        {
+		            listenerConfigTree.setAttribute(ListenerTagNames.IN_XSD_ATTRIBUTE_TAG, inxsd);	
+		        }
+		        final String outxsd = actions.getOutXsd();
+		        if (outxsd != null) 
+		        {
+		            listenerConfigTree.setAttribute(ListenerTagNames.OUT_XSD_ATTRIBUTE_TAG, outxsd);	
+		        }
+		        
+		        final String faultxsd = actions.getFaultXsd();
+		        
+		        if (faultxsd != null)
+		        {
+		            listenerConfigTree.setAttribute(ListenerTagNames.FAULT_XSD_ATTRIBUTE_TAG, faultxsd);
+		        }    
+		        
+		        if (actions.isSetValidate())
+		        {
+		            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();
 			
 			try {

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapper.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapper.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapper.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapper.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package org.jboss.soa.esb.listeners.config.mappers;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.SecurityDocument.Security;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.w3c.dom.Element;
+
+/**
+ * Performs the mapping of XSD based configuration service actions onto a
+ * "ConfigTree" style listener configuration.
+ * 
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class SecurityMapper
+{
+	private SecurityMapper() {}
+	
+	/**
+	 * Perform the mapping.
+	 * 
+	 * @param toConfigTree
+	 *            The listener ConfigTree to which the actions are to be added.
+	 * @param service
+	 *            The Service to which the listener is bound. The Service defines the actions.
+	 * @throws ConfigurationException
+	 */
+	public static void map( final Element toConfigTree, final Service service ) throws ConfigurationException
+	{
+		final Security security = service.getSecurity();
+		if ( security != null)
+		{
+    		final Element securityElement = YADOMUtil.addElement( toConfigTree, ListenerTagNames.SECURITY_TAG );
+			MapperUtil.serialize( security, securityElement );
+		}
+	}
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -49,6 +49,10 @@
 import org.jboss.soa.esb.message.body.content.BytesBody;
 import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.services.registry.RegistryFactory;
+import org.jboss.soa.esb.services.security.SecurityService;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.services.security.auth.http.JbrHttpSecurityInfoExtractor;
+import org.jboss.soa.esb.services.security.auth.ws.WSSecurityInfoExtractor;
 import org.jboss.soa.esb.util.ClassUtil;
 
 import javax.management.MBeanServer;
@@ -497,7 +501,22 @@
 
             // Copy the request properties onto the message...
             Map properties = invocationRequest.getRequestPayload();
+            
+            
             if (properties != null) {
+                //	Extract any jbr http security information that may exist
+                AuthenticationRequest authRequest = new JbrHttpSecurityInfoExtractor().extractSecurityInfo(properties);
+                
+                // Extract any ws security information that may exist
+                if ( authRequest == null ) {
+                	authRequest = new WSSecurityInfoExtractor().extractSecurityInfo((String) invocationRequest.getParameter());
+                }
+                
+                if ( authRequest != null ) {
+                    message.getProperties().setProperty(SecurityService.AUTH_REQUEST, authRequest);
+                }
+                
+                
                 // Purposely not iterating over the Map.Entry Set because there's
                 // a bug in the Map impl used by JBossRemoting.  Not all the
                 // "values" are actually in the Map.Entry set.  Some of them are handled

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -22,7 +22,14 @@
 
 package org.jboss.soa.esb.listeners.message;
 
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.security.auth.Subject;
+
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.util.XMLHelper;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.ActionLifecycle;
 import org.jboss.soa.esb.actions.ActionPipelineProcessor;
@@ -45,10 +52,17 @@
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.Properties;
 import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.SecurityConfigUtil;
+import org.jboss.soa.esb.services.security.SecurityContext;
+import org.jboss.soa.esb.services.security.SecurityService;
+import org.jboss.soa.esb.services.security.SecurityServiceException;
+import org.jboss.soa.esb.services.security.SecurityServiceFactory;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
 import org.jboss.soa.esb.util.ClassUtil;
+import org.xml.sax.SAXException;
 
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
+import javax.xml.validation.Schema;
 
 /**
  * Action Processing Pipeline. <p/> Runs a list of action classes on a message
@@ -75,6 +89,15 @@
 	 * The active flag.
 	 */
 	private final AtomicBoolean active = new AtomicBoolean(false);
+	
+	/**
+	 * The request XSD.
+	 */
+	private final Schema requestSchema ;
+	/**
+	 * The response XSD.
+	 */
+	private final Schema responseSchema ;
 
 	/**
 	 * 
@@ -95,6 +118,8 @@
          * The flag indicating whether we are using implicit or explicit processing.
          */
 	private boolean defaultProcessing ;
+
+	private SecurityConfig securityConf;
 	
 	/**
 	 * public constructor
@@ -134,6 +159,33 @@
 		    throw new ConfigurationException("Unrecognised action MEP: " + mep) ;
 		}
 		
+		final boolean validate = config.getBooleanAttribute(ListenerTagNames.VALIDATE_ATTRIBUTE_TAG, false) ;
+		if (validate)
+		{
+			final String inXsd = config.getAttribute(ListenerTagNames.IN_XSD_ATTRIBUTE_TAG) ;
+			try
+			{
+				requestSchema = (inXsd == null ? null : XMLHelper.getSchema(inXsd)) ;
+			}
+			catch (final SAXException saxe)
+			{
+				throw new ConfigurationException("Failed to parse the request schema: " + inXsd, saxe) ;
+			}
+			final String outXsd = config.getAttribute(ListenerTagNames.OUT_XSD_ATTRIBUTE_TAG) ;
+			try
+			{
+				responseSchema = (outXsd == null ? null : XMLHelper.getSchema(outXsd)) ;
+			}
+			catch (final SAXException saxe)
+			{
+				throw new ConfigurationException("Failed to parse the response schema: " + outXsd, saxe) ;
+			}
+		}
+		else
+		{
+			requestSchema = null ;
+			responseSchema = null ;
+		}
 		if (LOGGER.isDebugEnabled())
 		{
 		    LOGGER.debug("Using mep: " + mep + ", oneWay: " + oneWay + ", defaultProcessing: " + defaultProcessing) ;
@@ -240,6 +292,16 @@
 		}
 		processors = processorList
 				.toArray(new ActionPipelineProcessor[processorList.size()]);
+		
+		ConfigTree[] securityConfigs = config.getChildren( ListenerTagNames.SECURITY_TAG );
+		if (securityConfigs.length > 0)
+		{
+			securityConf = SecurityConfigUtil.createSecurityConfig(securityConfigs[0]);
+			LOGGER.info(securityConf);
+			final SecurityService securitySerivce = SecurityServiceFactory.getSecurityService();
+			securitySerivce.configure();
+			securitySerivce.refreshSecurityConfig();
+		}
 	}
 
 	/**
@@ -267,6 +329,7 @@
 			}
 		}
 		active.set(true);
+		
 	}
 
 	/**
@@ -289,8 +352,6 @@
 	{
 		long start = System.nanoTime();
 		serviceMessageCounter.incrementTotalCount();
-		final Call callDetails = new Call() ;
-		callDetails.copy(message.getHeader().getCall()) ;
 
 		if (active.get())
 		{
@@ -299,105 +360,226 @@
 				LOGGER.debug("pipeline process for message: "+message.getHeader());
 			}
 
-			final int numProcessors = processors.length;
-			final Message[] messages = new Message[numProcessors];
+			if (securityConf != null)
+			{
+				return processPipelineSecured(message);
+			}
+			else
+			{
+    			return processPipeline(message);
+			}
+		}
+		else
+		{
+    		final Call callDetails = new Call() ;
+    		callDetails.copy(message.getHeader().getCall()) ;
+			LOGGER.debug("pipeline process disabled for message: "+message.getHeader());
 
-			Message currentMessage = message;
+			faultTo(callDetails, Factory.createErrorMessage(Factory.NOT_ENABLED, message, null));
+			long procTime = System.nanoTime() - start;
+        	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
+        			MessageStatusBean.MESSAGE_FAILED));
+        	
+			return false;
+		}
+	}
+	
+	private boolean processPipelineSecured(final Message message)
+	{
+		final Call callDetails = new Call() ;
+		callDetails.copy(message.getHeader().getCall()) ;
+		
+		/* 
+		 * 	If the gateway or another service passed a security context, use that context for authentication.
+		 *	A SecurityContext's subject will only contain Principal(given that they are serializable), but a Principal 
+		 *  might represent an id or a SSO Token that can be used for authentication.
+		 *  If a SubjectContext does not exist then create one to drive the authentication.
+		 */
+		SecurityContext securityContext = SecurityContext.getContext(message);
+		LOGGER.debug("Security Context before authentication : " + securityContext);
+		
+		if ( securityContext == null )
+		{
+			securityContext = new SecurityContext();
+		}
+		
+		try
+		{
+			// 	get the authentication request if one exists.
+    		AuthenticationRequest authRequest = (AuthenticationRequest) message.getProperties().getProperty( SecurityService.AUTH_REQUEST );
+		
+    		//	perform the authentication
+			SecurityServiceFactory.getSecurityService().authenticate(securityConf, securityContext, authRequest);
+			
+			//	add the security context to the message
+			message.getProperties().setProperty( SecurityService.CONTEXT, securityContext );
+			
+		} 
+		catch (final SecurityServiceException e)
+		{
+			LOGGER.error( "Authentication exception : ", e);
+			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
+			return false;
+		} 
+		catch (final ConfigurationException e)
+		{
+			LOGGER.error( "Authentication exception : ", e);
+			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
+			return false;
+		}
+		finally
+		{
+			//	always remove the authentication request as it contains sensitive information
+    		message.getProperties().remove( SecurityService.AUTH_REQUEST );
+		}
+		
+		PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() 
+		{
+			public Boolean run()
+			{
+				return processPipeline(message);
+			}
+		};
+		
+		Boolean processResult = (Boolean) Subject.doAsPrivileged(securityContext.getSubject(), action, null);
+		return processResult.booleanValue();
+	}
+	
+	private boolean processPipeline(final Message message)
+	{
+		long start = System.nanoTime();
+		final Call callDetails = new Call() ;
+		callDetails.copy(message.getHeader().getCall()) ;
 
-			for (int count = 0; count < numProcessors; count++)
+			if (LOGGER.isDebugEnabled())
 			{
-				final ActionPipelineProcessor processor = processors[count];
-				messages[count] = currentMessage;
+				LOGGER.debug("pipeline process for message: "+message.getHeader());
+			}
 
-				try
+			boolean result = false ;
+			String validationFailure = null ;
+			if (requestSchema != null)
+			{
+				final Object input = message.getBody().get() ;
+				if ((input == null) || !XMLHelper.validate(requestSchema, input.toString()))
 				{
-					LOGGER.debug("executing processor " + count+ " "+processor+" "+message.getHeader());
-					
-					currentMessage = processor.process(currentMessage);
+					validationFailure = "Request validation failure: " + input ;
+				}
+			}
+			if (validationFailure == null)
+			{
+				final int numProcessors = processors.length;
+				final Message[] messages = new Message[numProcessors];
 
-					if (currentMessage == null)
+				Message currentMessage = message;
+			
+				for (int count = 0; count < numProcessors; count++)
+				{
+					final ActionPipelineProcessor processor = processors[count];
+					messages[count] = currentMessage;
+
+					try
 					{
-						break;
+						LOGGER.debug("executing processor " + count+ " "+processor+" "+message.getHeader());
+						
+						currentMessage = processor.process(currentMessage);
+
+						if (currentMessage == null)
+						{
+							break;
+						}
 					}
-				}
-				catch (final Exception ex)
-				{
-					LOGGER
-							.warn(
-									"Unexpected exception caught while processing the action pipeline: "+message.getHeader(),
-									ex);
+					catch (final Exception ex)
+					{
+						if (LOGGER.isDebugEnabled())
+						{
+							LOGGER.debug("Unexpected exception caught while processing the action pipeline: "+message.getHeader(),ex);
+						}
 
-					notifyException(count, ex, messages);
+						notifyException(count, ex, messages);
 
-					/*
-					 * Is this an application specific error? If so, try to return
-					 * the error message to the identified recipient.
-					 */
+						/*
+						 * Is this an application specific error? If so, try to return
+						 * the error message to the identified recipient.
+						 */
+						
+						final boolean throwRuntime = transactional && (ex instanceof RuntimeException) ;
+						
+						if (ex instanceof ActionProcessingFaultException)
+						{
+							ActionProcessingFaultException fault = (ActionProcessingFaultException) ex;
+
+							if (fault.getFaultMessage() == null)
+							{
+								faultTo(callDetails, Factory.createErrorMessage(Factory.PROCESSING_ERROR, message, ex));
+							}
+							else
+								faultTo(callDetails, fault.getFaultMessage());
+						}
+						else if (!throwRuntime)
+						{
+							faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, ex));
+						}
+
+						long procTime = System.nanoTime() - start;
+						serviceMessageCounter.update(new ActionStatusBean(procTime, count, message,
+							ActionStatusBean.ACTION_FAILED));
+						DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
+							MessageStatusBean.MESSAGE_FAILED));
 					
-					final boolean throwRuntime = transactional && (ex instanceof RuntimeException) ;
-					
-					if (ex instanceof ActionProcessingFaultException)
+						if (throwRuntime)
+						{
+							throw (RuntimeException)ex ;
+						}
+						return false;
+					}
+					serviceMessageCounter.update(new ActionStatusBean((System.nanoTime() - start), count, message,
+						ActionStatusBean.ACTION_SENT));
+				}
+
+				// Reply...
+				if (!oneWay)
+				{
+					if (currentMessage != null)
 					{
-						ActionProcessingFaultException fault = (ActionProcessingFaultException) ex;
-
-						if (fault.getFaultMessage() == null)
+						if (responseSchema != null)
 						{
-							faultTo(callDetails, Factory.createErrorMessage(Factory.PROCESSING_ERROR, message, ex));
+							final Object output = message.getBody().get() ;
+							if ((output == null) || !XMLHelper.validate(responseSchema, output.toString()))
+							{
+								validationFailure = "Response validation failure: " + output ;
+							}
 						}
-						else
-							faultTo(callDetails, fault.getFaultMessage());
+						if (validationFailure == null)
+						{
+							replyTo(callDetails, currentMessage);
+						}
 					}
-					else if (!throwRuntime)
+					else if (!defaultProcessing)
 					{
-						faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, ex));
+						LOGGER.warn("No response message for RequestResponse mep! " + callDetails);
 					}
+				}
 
+				if (validationFailure == null)
+				{
+					notifySuccess(messages);
 					long procTime = System.nanoTime() - start;
-					serviceMessageCounter.update(new ActionStatusBean(procTime, count, message,
-							ActionStatusBean.ACTION_FAILED));
-		        	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
-		        			MessageStatusBean.MESSAGE_FAILED));
-					
-		        	        if (throwRuntime)
-		        	        {
-		        	            throw (RuntimeException)ex ;
-		        	        }
-					return false;
+					DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
+						MessageStatusBean.MESSAGE_SENT));
+					result = true;
 				}
-				serviceMessageCounter.update(new ActionStatusBean((System.nanoTime() - start), count, message,
-						ActionStatusBean.ACTION_SENT));
 			}
-
-			// Reply...
-			if (!oneWay)
+			
+			if (validationFailure != null)
 			{
-                            if (currentMessage != null)
-                            {
-                                replyTo(callDetails, currentMessage);
-                            }
-                            else if (!defaultProcessing)
-                            {
-                                LOGGER.warn("No response message for RequestResponse mep! " + callDetails);
-                            }
+				final MessageValidationException mve = new MessageValidationException(validationFailure) ;
+				faultTo(callDetails, Factory.createErrorMessage(Factory.VALIDATION_FAILURE, message, mve));
+				long procTime = System.nanoTime() - start;
+				DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
+					MessageStatusBean.MESSAGE_FAILED));
 			}
-
-			notifySuccess(messages);
-			long procTime = System.nanoTime() - start;
-        	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
-        			MessageStatusBean.MESSAGE_SENT));
-			return true;
-		}
-		else
-		{
-			LOGGER.debug("pipeline process disabled for message: "+message.getHeader());
-
-			faultTo(callDetails, Factory.createErrorMessage(Factory.NOT_ENABLED, message, null));
-			long procTime = System.nanoTime() - start;
-        	DeliveryObservableLogger.getInstance().logMessage(new MessageStatusBean(procTime, message, 
-        			MessageStatusBean.MESSAGE_FAILED));
-        	
-			return false;
-		}
+			return result ;
 	}
 	
 	/**

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageValidationException.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageValidationException.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageValidationException.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageValidationException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,55 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.soa.esb.listeners.message;
+
+import org.jboss.soa.esb.BaseException;
+
+/**
+ * Exception sent when pipeline message validation fails.
+ * 
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ */
+public class MessageValidationException extends BaseException
+{
+    /**
+     * The serial version UID for this exception.
+     */
+    private static final long serialVersionUID = 1145249669785492077L ;
+
+    public MessageValidationException()
+    {
+        super() ;
+    }
+
+    public MessageValidationException(final String message)
+    {
+        super(message) ;
+    }
+
+    public MessageValidationException(final Throwable cause)
+    {
+        super(cause) ;
+    }
+
+    public MessageValidationException(final String message, final Throwable cause)
+    {
+        super(message, cause);
+    }
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/errors/Factory.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/errors/Factory.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/listeners/message/errors/Factory.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -36,6 +36,7 @@
 	public static final String PROCESSING_ERROR = "urn:action/error/actionprocessingerror";
 	public static final String UNEXPECTED_ERROR = "urn:action/error/unexpectederror";
 	public static final String NOT_ENABLED = "urn:action/error/disabled";
+	public static final String VALIDATION_FAILURE = "urn:action/error/validationFailure" ;
 	
 	public static void createExceptionFromFault (Message msg) throws FaultMessageException
 	{

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/message/Fault.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/message/Fault.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/message/Fault.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -32,6 +32,10 @@
 public interface Fault
 {
 	public static final String THROWABLE_CONTENT = "org.jboss.soa.esb.message.fault.throwable";
+	public static final String DETAIL_CODE_CONTENT = "org.jboss.soa.esb.message.fault.detail.code";
+	public static final String DETAIL_DESCRIPTION_CONTENT = "org.jboss.soa.esb.message.fault.detail.description";
+	public static final String DETAIL_DETAIL_CONTENT = "org.jboss.soa.esb.message.fault.detail.detail";
+
 	
 	/**
 	 * @return the unique code representing this fault.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,107 +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.soa.esb.services.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * This class is indended to security related configuration properties.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- */
-public class SecurityConfig
-{
-	private String runAs;
-	private String useCallerIdentity;
-	private String moduleName;
-	private final String callbackHandler;
-	private Map<String,String> properties = new HashMap<String,String>();
-	
-	private SecurityConfig(
-			final String runAs, 
-			final String useCallerIdentity, 
-			final String moduleName,
-			final String callbackHandler,
-			final Map<String,String> properties)
-	{  
-		this.runAs = runAs;
-		this.useCallerIdentity = useCallerIdentity;
-		this.moduleName = moduleName;
-		this.callbackHandler= callbackHandler;
-		this.properties = properties;
-	}
-	
-	/**
-	 * 
-	 * @param runAs	- run as the specified role
-	 * @param useCallerIdentity - use the callers identity
-	 * @param moduleName - index into the jaas configuration policy file
-	 * @return <code>SecurityConfigInfo</code>
-	 */
-	public static SecurityConfig createSecurityInfo(
-			final String runAs, 
-			final String useCallerIdentity,
-			final String moduleName,
-			final String callbackHandler,
-			final Map<String,String> properties)
-	{
-		return new SecurityConfig(runAs, useCallerIdentity, moduleName, callbackHandler, properties);
-	}
-	
-	public String getCallbackHandler()
-	{
-		return callbackHandler;
-	}
-
-	public String getRunAs()
-	{
-		return runAs;
-	}
-	public String getUseCallerIdentity()
-	{
-		return useCallerIdentity;
-	}
-	
-	public String getModuleName()
-	{
-		return moduleName;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "[SecurityConfigInfo : runAs=" + runAs + ", useCallerIdentity=" + useCallerIdentity + ", moduleName=" + moduleName + ", callbackHandler=" + callbackHandler +", properties=" + properties +"]";
-	}
-	
-	public boolean hasRunAs()
-	{
-		return runAs != null;
-	}
-
-	public Map<String, String> getProperties()
-	{
-		return properties;
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfig.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,107 @@
+/*
+ * 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.soa.esb.services.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * This class is indended to security related configuration properties.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ */
+public class SecurityConfig
+{
+	private String runAs;
+	private String useCallerIdentity;
+	private String moduleName;
+	private final String callbackHandler;
+	private Map<String,String> properties = new HashMap<String,String>();
+	
+	private SecurityConfig(
+			final String runAs, 
+			final String useCallerIdentity, 
+			final String moduleName,
+			final String callbackHandler,
+			final Map<String,String> properties)
+	{  
+		this.runAs = runAs;
+		this.useCallerIdentity = useCallerIdentity;
+		this.moduleName = moduleName;
+		this.callbackHandler= callbackHandler;
+		this.properties = properties;
+	}
+	
+	/**
+	 * 
+	 * @param runAs	- run as the specified role
+	 * @param useCallerIdentity - use the callers identity
+	 * @param moduleName - index into the jaas configuration policy file
+	 * @return <code>SecurityConfigInfo</code>
+	 */
+	public static SecurityConfig createSecurityInfo(
+			final String runAs, 
+			final String useCallerIdentity,
+			final String moduleName,
+			final String callbackHandler,
+			final Map<String,String> properties)
+	{
+		return new SecurityConfig(runAs, useCallerIdentity, moduleName, callbackHandler, properties);
+	}
+	
+	public String getCallbackHandler()
+	{
+		return callbackHandler;
+	}
+
+	public String getRunAs()
+	{
+		return runAs;
+	}
+	public String getUseCallerIdentity()
+	{
+		return useCallerIdentity;
+	}
+	
+	public String getModuleName()
+	{
+		return moduleName;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "[SecurityConfigInfo : runAs=" + runAs + ", useCallerIdentity=" + useCallerIdentity + ", moduleName=" + moduleName + ", callbackHandler=" + callbackHandler +", properties=" + properties +"]";
+	}
+	
+	public boolean hasRunAs()
+	{
+		return runAs != null;
+	}
+
+	public Map<String, String> getProperties()
+	{
+		return properties;
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,58 +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.soa.esb.services.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-
-/**
- * This util class provides methods to extract information from a security
- * configuration. <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4.
- * 
- */
-public class SecurityConfigUtil
-{
-	private SecurityConfigUtil() { }
-
-	public static SecurityConfig createSecurityConfig(final ConfigTree securityFragment)
-	{
-		final String runAs = securityFragment.getAttribute(ListenerTagNames.RUN_AS_TAG);
-		final String useCallersIdentity = securityFragment.getAttribute(ListenerTagNames.USE_CALLERS_IDENTIDY_TAG);
-		final String moduleName = securityFragment.getAttribute(ListenerTagNames.MODULE_NAME_TAG);
-		final String callbackHandler = securityFragment.getAttribute(ListenerTagNames.CALLBACK_HANDLER_TAG);
-		final Map<String,String> properties = new HashMap<String, String>();
-		ConfigTree[] children = securityFragment.getChildren("property");
-		for (ConfigTree configTree : children)
-		{
-			String propertyName = configTree.getAttribute("name");
-			String propertyValue = configTree.getAttribute("value");
-			properties.put(propertyName, propertyValue);
-		}
-		
-		return SecurityConfig.createSecurityInfo(runAs, useCallersIdentity, moduleName, callbackHandler, properties);
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityConfigUtil.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,58 @@
+/*
+ * 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.soa.esb.services.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+
+/**
+ * This util class provides methods to extract information from a security
+ * configuration. <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4.
+ * 
+ */
+public class SecurityConfigUtil
+{
+	private SecurityConfigUtil() { }
+
+	public static SecurityConfig createSecurityConfig(final ConfigTree securityFragment)
+	{
+		final String runAs = securityFragment.getAttribute(ListenerTagNames.RUN_AS_TAG);
+		final String useCallersIdentity = securityFragment.getAttribute(ListenerTagNames.USE_CALLERS_IDENTIDY_TAG);
+		final String moduleName = securityFragment.getAttribute(ListenerTagNames.MODULE_NAME_TAG);
+		final String callbackHandler = securityFragment.getAttribute(ListenerTagNames.CALLBACK_HANDLER_TAG);
+		final Map<String,String> properties = new HashMap<String, String>();
+		ConfigTree[] children = securityFragment.getChildren("property");
+		for (ConfigTree configTree : children)
+		{
+			String propertyName = configTree.getAttribute("name");
+			String propertyValue = configTree.getAttribute("value");
+			properties.put(propertyName, propertyValue);
+		}
+		
+		return SecurityConfig.createSecurityInfo(runAs, useCallersIdentity, moduleName, callbackHandler, properties);
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,114 +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.soa.esb.services.security;
-
-import static org.jboss.soa.esb.services.security.principals.Group.ROLES_GROUP_NAME;
-import java.io.Serializable;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Enumeration;
-import java.util.Set;
-
-
-import javax.security.auth.Subject;
-
-import org.jboss.soa.esb.message.Message;
-
-/**
- * Security Context contains security related information that 
- * is not sensitive.
- * <p/>
- * Note that even though a Subject object instance is serialiable,
- * its private and public credentials are not(they are transient).
- * Also not that the Principal interface is not serializable but 
- * all implemenations should be.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- *
- */
-public final class SecurityContext implements Serializable
-{
-	private static final long serialVersionUID = 1L;
-	
-	private Subject subject;
-	
-	public SecurityContext()
-	{
-		subject = new Subject();
-	}
-	
-	public SecurityContext(Subject subject)
-	{
-		this.subject = subject;
-	}
-	
-	public Subject getSubject()
-	{
-		return subject;
-	}
-	
-	public String toString()
-	{
-		return "SecurityContext [" + subject + "]";
-	}
-	
-	public boolean isCallerInRole( final String roleName )
-	{
-        Set<Principal> principals = subject.getPrincipals();
-        for(Principal principal: principals)
-        {
-            if(principal instanceof Group)
-            {
-                Group group = (Group) principal;
-                if( group.getName().equalsIgnoreCase( ROLES_GROUP_NAME ) )
-                {
-                    Enumeration<? extends Principal> roles = group.members();
-                    while(roles.hasMoreElements())
-                    {
-                        Principal role = roles.nextElement();
-                        if(role.getName().equals(roleName))
-                        {
-                            return true;
-                        }
-                    } 
-                }
-            }
-        }
-        return false;
-	}
-	
-	public Set<? extends Principal> getPrincipals()
-	{
-		return subject.getPrincipals();
-	}
-	
-	/**
-	 * Will retrieve the SecurityContext from the passed in Message.
-	 * @param message - the message from which the SecurityContext should be retreieved
-	 * @return SecuirtyContext - the currently set SecurityContext or null if none has been set.
-	 */
-	public static SecurityContext getContext( final Message message )
-	{
-		return (SecurityContext) message.getProperties().getProperty( SecurityService.CONTEXT );
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,114 @@
+/*
+ * 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.soa.esb.services.security;
+
+import static org.jboss.soa.esb.services.security.principals.Group.ROLES_GROUP_NAME;
+import java.io.Serializable;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Enumeration;
+import java.util.Set;
+
+
+import javax.security.auth.Subject;
+
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * Security Context contains security related information that 
+ * is not sensitive.
+ * <p/>
+ * Note that even though a Subject object instance is serialiable,
+ * its private and public credentials are not(they are transient).
+ * Also not that the Principal interface is not serializable but 
+ * all implemenations should be.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ *
+ */
+public final class SecurityContext implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	
+	private Subject subject;
+	
+	public SecurityContext()
+	{
+		subject = new Subject();
+	}
+	
+	public SecurityContext(Subject subject)
+	{
+		this.subject = subject;
+	}
+	
+	public Subject getSubject()
+	{
+		return subject;
+	}
+	
+	public String toString()
+	{
+		return "SecurityContext [" + subject + "]";
+	}
+	
+	public boolean isCallerInRole( final String roleName )
+	{
+        Set<Principal> principals = subject.getPrincipals();
+        for(Principal principal: principals)
+        {
+            if(principal instanceof Group)
+            {
+                Group group = (Group) principal;
+                if( group.getName().equalsIgnoreCase( ROLES_GROUP_NAME ) )
+                {
+                    Enumeration<? extends Principal> roles = group.members();
+                    while(roles.hasMoreElements())
+                    {
+                        Principal role = roles.nextElement();
+                        if(role.getName().equals(roleName))
+                        {
+                            return true;
+                        }
+                    } 
+                }
+            }
+        }
+        return false;
+	}
+	
+	public Set<? extends Principal> getPrincipals()
+	{
+		return subject.getPrincipals();
+	}
+	
+	/**
+	 * Will retrieve the SecurityContext from the passed in Message.
+	 * @param message - the message from which the SecurityContext should be retreieved
+	 * @return SecuirtyContext - the currently set SecurityContext or null if none has been set.
+	 */
+	public static SecurityContext getContext( final Message message )
+	{
+		return (SecurityContext) message.getProperties().getProperty( SecurityService.CONTEXT );
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,85 +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.soa.esb.services.security;
-
-import java.security.Principal;
-
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-
-/**
- * This interface represents a Security service.
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- * 
- */
-public interface SecurityService
-{
-	/**
-	 * Constant intended for usage as a key in different types of maps.
-	 */
-	String CONTEXT = "org.jboss.soa.esb.services.security.context";
-	String AUTH_REQUEST = "org.jboss.soa.esb.services.security.authRequest";
-	
-	/**
-	 * Configure the security serivce for usage. This should take care of
-	 * reading any needed configurations required by the security system.
-	 * 
-	 * @throws ConfigurationException
-	 */
-	void configure() throws ConfigurationException;
-	
-	/**
-	 * Authenticates a subject.
-	 * 
-	 * @param securityContext - the security context to authenticate
-	 * @throws LoginException - if the authentication was not sucessful
-	 */
-	void authenticate(final SecurityConfig securityConfig, final SecurityContext securityContext, final AuthenticationRequest authRequest) throws SecurityServiceException;
-	
-	/**
-	 * Determines if the subject contains the passed in role in it's
-	 * set of Principals.
-	 * 
-	 * @param subject	- the Subject instance belonging to the caller.
-	 * @param context	- the principal instance representing the role to check for.
-	 * @return true		- if the caller has the role of 
-	 */
-	boolean isCallerInRole(final Subject subject, final Principal role);
-	
-	/**
-	 * Logout and clean up of any security state.
-	 * 
-	 * @param securityContext
-	 * @throws LoginException
-	 */
-	void logout(final SecurityConfig securityConfig);
-	
-	/**
-	 * Refresh the security configuration
-	 */
-	void refreshSecurityConfig();
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,85 @@
+/*
+ * 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.soa.esb.services.security;
+
+import java.security.Principal;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+
+/**
+ * This interface represents a Security service.
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ * 
+ */
+public interface SecurityService
+{
+	/**
+	 * Constant intended for usage as a key in different types of maps.
+	 */
+	String CONTEXT = "org.jboss.soa.esb.services.security.context";
+	String AUTH_REQUEST = "org.jboss.soa.esb.services.security.authRequest";
+	
+	/**
+	 * Configure the security serivce for usage. This should take care of
+	 * reading any needed configurations required by the security system.
+	 * 
+	 * @throws ConfigurationException
+	 */
+	void configure() throws ConfigurationException;
+	
+	/**
+	 * Authenticates a subject.
+	 * 
+	 * @param securityContext - the security context to authenticate
+	 * @throws LoginException - if the authentication was not sucessful
+	 */
+	void authenticate(final SecurityConfig securityConfig, final SecurityContext securityContext, final AuthenticationRequest authRequest) throws SecurityServiceException;
+	
+	/**
+	 * Determines if the subject contains the passed in role in it's
+	 * set of Principals.
+	 * 
+	 * @param subject	- the Subject instance belonging to the caller.
+	 * @param context	- the principal instance representing the role to check for.
+	 * @return true		- if the caller has the role of 
+	 */
+	boolean isCallerInRole(final Subject subject, final Principal role);
+	
+	/**
+	 * Logout and clean up of any security state.
+	 * 
+	 * @param securityContext
+	 * @throws LoginException
+	 */
+	void logout(final SecurityConfig securityConfig);
+	
+	/**
+	 * Refresh the security configuration
+	 */
+	void refreshSecurityConfig();
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,47 +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.soa.esb.services.security;
-
-/**
- * Exception for SecurityServices.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class SecurityServiceException extends Exception
-{
-    private static final long serialVersionUID = 1L;
-    
-    public SecurityServiceException()
-    {
-        super();
-    }
-    
-    public SecurityServiceException (String msg)
-    {
-        super(msg);
-    }
-    
-    public SecurityServiceException (String msg, Throwable cause)
-    {
-        super (msg, cause);
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceException.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,47 @@
+/*
+ * 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.soa.esb.services.security;
+
+/**
+ * Exception for SecurityServices.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class SecurityServiceException extends Exception
+{
+    private static final long serialVersionUID = 1L;
+    
+    public SecurityServiceException()
+    {
+        super();
+    }
+    
+    public SecurityServiceException (String msg)
+    {
+        super(msg);
+    }
+    
+    public SecurityServiceException (String msg, Throwable cause)
+    {
+        super (msg, cause);
+    }
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,68 +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.soa.esb.services.security;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.util.ClassUtil;
-
-public class SecurityServiceFactory
-{
-	private static Logger log = Logger.getLogger(SecurityServiceFactory.class);
-	
-	private static SecurityService instance;
-
-	private SecurityServiceFactory() { }
-
-	public static SecurityService getSecurityService() throws ConfigurationException
-	{
-		if (instance != null)
-		{
-			return instance;
-		}
-
-		String className = Configuration.getSecurityServiceImplementationClass();
-		if ( className == null )
-		{
-			throw new ConfigurationException("No SecurityService implementation has been set. Please check the configuration");
-		}
-
-		SecurityService service = null;
-		try
-		{
-			log.info("Using [" + className + "] as the SecurityService implementation.");
-			Class<?> securityClass = ClassUtil.forName(className, SecurityService.class);
-			service = (SecurityService) securityClass.newInstance();
-		} 
-		catch (ClassNotFoundException e)
-		{
-			throw new ConfigurationException("SecurityService Implementation=" + className + " not found", e);
-		} 
-		catch (Exception e)
-		{
-			throw new ConfigurationException("Invocation exception. " + e.getLocalizedMessage(), e);
-		}
-		instance = service;
-		return service;
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,68 @@
+/*
+ * 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.soa.esb.services.security;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.util.ClassUtil;
+
+public class SecurityServiceFactory
+{
+	private static Logger log = Logger.getLogger(SecurityServiceFactory.class);
+	
+	private static SecurityService instance;
+
+	private SecurityServiceFactory() { }
+
+	public static SecurityService getSecurityService() throws ConfigurationException
+	{
+		if (instance != null)
+		{
+			return instance;
+		}
+
+		String className = Configuration.getSecurityServiceImplementationClass();
+		if ( className == null )
+		{
+			throw new ConfigurationException("No SecurityService implementation has been set. Please check the configuration");
+		}
+
+		SecurityService service = null;
+		try
+		{
+			log.info("Using [" + className + "] as the SecurityService implementation.");
+			Class<?> securityClass = ClassUtil.forName(className, SecurityService.class);
+			service = (SecurityService) securityClass.newInstance();
+		} 
+		catch (ClassNotFoundException e)
+		{
+			throw new ConfigurationException("SecurityService Implementation=" + className + " not found", e);
+		} 
+		catch (Exception e)
+		{
+			throw new ConfigurationException("Invocation exception. " + e.getLocalizedMessage(), e);
+		}
+		instance = service;
+		return service;
+	}
+	
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/actions)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,90 +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.soa.esb.services.security.actions;
-
-import java.security.Principal;
-
-import javax.security.auth.Subject;
-
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.soa.esb.actions.BeanConfiguredAction;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.security.SecurityContext;
-import org.jboss.soa.esb.services.security.SecurityService;
-
-/**
- * JBossSecurityPropagator is an ESB action that can be used to 
- * propagate security information to JBoss Application Server(JBossAS).
- * </p>
- * This action can be placed before an action that calls out the a 
- * JBossAS instance, for example an EJB call.
- * 
- * Example config:
- * <pre>{@code
- * <action name="propagate" class="org.jboss.soa.esb.services.security.actions.JBossSecurityPropagator">
- *  <property name="runAs" value="adminRole"/>
- *   </action>
- * }</pre>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class JBossSecurityPropagator implements BeanConfiguredAction
-{
-	private String runAs;
-	
-	public Message process(final Message message)
-	{
-		final SecurityContext securityContext = (SecurityContext) message.getProperties().getProperty( SecurityService.CONTEXT );
-		if ( securityContext != null )
-		{
-			final Subject subject = securityContext.getSubject();
-			final Principal principal = getPrincipal(subject);
-			
-			//	associate the subject with jboss security
-			SecurityAssociation.pushSubjectContext(subject, principal, subject.getPublicCredentials());
-			
-			if ( runAs != null )
-			{
-    			//	associate the runAs role with jboss security
-	    		SecurityAssociation.pushRunAsIdentity(new RunAsIdentity(runAs, principal.getName()));
-			}
-			
-		}
-		return message;
-	}
-	
-	public void setRunAs(String runAs)
-	{
-		this.runAs = runAs;
-	}
-
-	private Principal getPrincipal( final Subject subject)
-	{
-		for (Principal principal : subject.getPrincipals())
-		{
-			return principal;
-		}
-		return null;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagator.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,90 @@
+/*
+ * 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.soa.esb.services.security.actions;
+
+import java.security.Principal;
+
+import javax.security.auth.Subject;
+
+import org.jboss.security.RunAsIdentity;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.soa.esb.actions.BeanConfiguredAction;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.security.SecurityContext;
+import org.jboss.soa.esb.services.security.SecurityService;
+
+/**
+ * JBossSecurityPropagator is an ESB action that can be used to 
+ * propagate security information to JBoss Application Server(JBossAS).
+ * </p>
+ * This action can be placed before an action that calls out the a 
+ * JBossAS instance, for example an EJB call.
+ * 
+ * Example config:
+ * <pre>{@code
+ * <action name="propagate" class="org.jboss.soa.esb.services.security.actions.JBossSecurityPropagator">
+ *  <property name="runAs" value="adminRole"/>
+ *   </action>
+ * }</pre>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class JBossSecurityPropagator implements BeanConfiguredAction
+{
+	private String runAs;
+	
+	public Message process(final Message message)
+	{
+		final SecurityContext securityContext = (SecurityContext) message.getProperties().getProperty( SecurityService.CONTEXT );
+		if ( securityContext != null )
+		{
+			final Subject subject = securityContext.getSubject();
+			final Principal principal = getPrincipal(subject);
+			
+			//	associate the subject with jboss security
+			SecurityAssociation.pushSubjectContext(subject, principal, subject.getPublicCredentials());
+			
+			if ( runAs != null )
+			{
+    			//	associate the runAs role with jboss security
+	    		SecurityAssociation.pushRunAsIdentity(new RunAsIdentity(runAs, principal.getName()));
+			}
+			
+		}
+		return message;
+	}
+	
+	public void setRunAs(String runAs)
+	{
+		this.runAs = runAs;
+	}
+
+	private Principal getPrincipal( final Subject subject)
+	{
+		for (Principal principal : subject.getPrincipals())
+		{
+			return principal;
+		}
+		return null;
+	}
+
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,45 +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.soa.esb.services.security.auth;
-
-import java.security.Principal;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * An AuthenticationRequest is intended to carry sensitive security
- * information between gateways and ESB services.
- * The information will be extracted from the specific transport that
- * the gateway uses.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- *
- */
-public interface AuthenticationRequest
-{
-	public abstract Set<?> getCredentials();
-
-	public abstract Map<String, ?> getProperties();
-
-	public abstract Principal getPrincipal();
-
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,45 @@
+/*
+ * 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.soa.esb.services.security.auth;
+
+import java.security.Principal;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * An AuthenticationRequest is intended to carry sensitive security
+ * information between gateways and ESB services.
+ * The information will be extracted from the specific transport that
+ * the gateway uses.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ *
+ */
+public interface AuthenticationRequest
+{
+	public abstract Set<?> getCredentials();
+
+	public abstract Map<String, ?> getProperties();
+
+	public abstract Principal getPrincipal();
+
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,103 +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.soa.esb.services.security.auth;
-
-import java.io.Serializable;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * AuthenticationRequestImpl is indended to transport security related information
- * needed to authenticate a caller.
- * </p>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class AuthenticationRequestImpl implements Serializable, AuthenticationRequest
-{
-	private static final long serialVersionUID = 1L;
-	
-	private Principal principal;
-	private Set<?> credentials;
-	private Map<String,?> properties;
-	
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getCredentials()
-	 */
-	public Set<?> getCredentials()
-	{
-		return credentials;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getProperties()
-	 */
-	public Map<String, ?> getProperties()
-	{
-		return properties;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getPrincipal()
-	 */
-	public Principal getPrincipal()
-	{
-		return principal;
-	}
-	
-	public static class Builder
-	{
-		// required
-    	private Principal principal;
-    	private Set<?> credentials;
-    	
-    	// optional
-    	private Map<String,Object> properties = new HashMap<String,Object>();
-    	
-    	public Builder(final Principal principal, final Set<?> credentials)
-    	{
-    		this.principal = principal;
-    		this.credentials = credentials;
-    	}
-    	
-    	public Builder property( final String name, final Object value)
-    	{
-    		properties.put(name, value);
-    		return this;
-    	}
-    	
-    	public AuthenticationRequest bulid()
-    	{
-    		return new AuthenticationRequestImpl(this);
-    	}
-	}
-    	
-	private AuthenticationRequestImpl(final Builder builder)
-	{
-		principal = builder.principal;
-		credentials = builder.credentials;
-		properties = builder.properties;
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,103 @@
+/*
+ * 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.soa.esb.services.security.auth;
+
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * AuthenticationRequestImpl is indended to transport security related information
+ * needed to authenticate a caller.
+ * </p>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class AuthenticationRequestImpl implements Serializable, AuthenticationRequest
+{
+	private static final long serialVersionUID = 1L;
+	
+	private Principal principal;
+	private Set<?> credentials;
+	private Map<String,?> properties;
+	
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getCredentials()
+	 */
+	public Set<?> getCredentials()
+	{
+		return credentials;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getProperties()
+	 */
+	public Map<String, ?> getProperties()
+	{
+		return properties;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getPrincipal()
+	 */
+	public Principal getPrincipal()
+	{
+		return principal;
+	}
+	
+	public static class Builder
+	{
+		// required
+    	private Principal principal;
+    	private Set<?> credentials;
+    	
+    	// optional
+    	private Map<String,Object> properties = new HashMap<String,Object>();
+    	
+    	public Builder(final Principal principal, final Set<?> credentials)
+    	{
+    		this.principal = principal;
+    		this.credentials = credentials;
+    	}
+    	
+    	public Builder property( final String name, final Object value)
+    	{
+    		properties.put(name, value);
+    		return this;
+    	}
+    	
+    	public AuthenticationRequest bulid()
+    	{
+    		return new AuthenticationRequestImpl(this);
+    	}
+	}
+    	
+	private AuthenticationRequestImpl(final Builder builder)
+	{
+		principal = builder.principal;
+		credentials = builder.credentials;
+		properties = builder.properties;
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,41 +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.soa.esb.services.security.auth;
-
-/**
- * SecurityInfoExtractor is indended for extracting security related
- * information for different of transports.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- * @param <T>
- */
-public interface SecurityInfoExtractor<T>
-{
-	/**
-	 * Extracts security related information from type T and
-	 * populates a {@link AuthenticationRequest}.
-	 * 
-	 * @param t - the type from which security information is to be extracted
-	 * @return - and instance of {@link AuthenticationRequest}
-	 */
-	AuthenticationRequest extractSecurityInfo( final T t );
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/SecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,41 @@
+/*
+ * 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.soa.esb.services.security.auth;
+
+/**
+ * SecurityInfoExtractor is indended for extracting security related
+ * information for different of transports.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ * @param <T>
+ */
+public interface SecurityInfoExtractor<T>
+{
+	/**
+	 * Extracts security related information from type T and
+	 * populates a {@link AuthenticationRequest}.
+	 * 
+	 * @param t - the type from which security information is to be extracted
+	 * @return - and instance of {@link AuthenticationRequest}
+	 */
+	AuthenticationRequest extractSecurityInfo( final T t );
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,72 +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.soa.esb.services.security.auth.http;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
-import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
-import org.jboss.soa.esb.services.security.principals.User;
-import org.jboss.util.Base64;
-
-/**
- * Extracts secuirty information from a HttpServletRequest
- * </p>
- * Supports BASIC authentication.
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class HttpSecurityInfoExtractor implements SecurityInfoExtractor<HttpServletRequest>
-{
-
-	public AuthenticationRequest extractSecurityInfo(HttpServletRequest httpRequest)
-	{
-		final String authType = httpRequest.getAuthType();
-		if ( authType == null )
-			return null;
-		
-		Set<Object> credentials = new HashSet<Object>();
-		if ( authType.equals("BASIC")) 
-		{
-            String auth = httpRequest.getHeader("Authorization");
-            auth = auth.substring(auth.indexOf(" "));
-            // decode the Base64 encoded username:password 
-    		String decoded = new String( Base64.decode(auth) );
-            final int separator = decoded.indexOf(":");
-            final String username = decoded.substring(0,separator);
-            String pwd = decoded.substring(separator+1,decoded.length());
-			credentials.add( pwd.toCharArray() );
-			pwd = null;
-			decoded = null;
-    		return new AuthenticationRequestImpl.Builder(new User(username), credentials ).bulid();
-		}
-		if ( authType.equals("DIGEST"))
-		{
-			// not supported yet.
-		}
-		
-		return null;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,72 @@
+/*
+ * 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.soa.esb.services.security.auth.http;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
+import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
+import org.jboss.soa.esb.services.security.principals.User;
+import org.jboss.util.Base64;
+
+/**
+ * Extracts secuirty information from a HttpServletRequest
+ * </p>
+ * Supports BASIC authentication.
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class HttpSecurityInfoExtractor implements SecurityInfoExtractor<HttpServletRequest>
+{
+
+	public AuthenticationRequest extractSecurityInfo(HttpServletRequest httpRequest)
+	{
+		final String authType = httpRequest.getAuthType();
+		if ( authType == null )
+			return null;
+		
+		Set<Object> credentials = new HashSet<Object>();
+		if ( authType.equals("BASIC")) 
+		{
+            String auth = httpRequest.getHeader("Authorization");
+            auth = auth.substring(auth.indexOf(" "));
+            // decode the Base64 encoded username:password 
+    		String decoded = new String( Base64.decode(auth) );
+            final int separator = decoded.indexOf(":");
+            final String username = decoded.substring(0,separator);
+            String pwd = decoded.substring(separator+1,decoded.length());
+			credentials.add( pwd.toCharArray() );
+			pwd = null;
+			decoded = null;
+    		return new AuthenticationRequestImpl.Builder(new User(username), credentials ).bulid();
+		}
+		if ( authType.equals("DIGEST"))
+		{
+			// not supported yet.
+		}
+		
+		return null;
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,70 +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.soa.esb.services.security.auth.http;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
-import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
-import org.jboss.soa.esb.services.security.principals.User;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class JbrHttpSecurityInfoExtractor implements SecurityInfoExtractor<Map<String,Object>>
-{
-	private Logger log = Logger.getLogger(JbrHttpSecurityInfoExtractor.class);
-	
-	public static final String USERNAME_KEY = "http.basic.username";
-	public static final String PASSWORD_KEY = "http.basic.password";
-	
-	public AuthenticationRequest extractSecurityInfo( final Map<String,Object> request )
-	{
-		AuthenticationRequest authRequest = null;
-		String username = (String) request.get(USERNAME_KEY);
-		if ( username != null )
-		{
-			User user = new User((String)username);
-			Set<char[]> credentials = new HashSet<char[]>();
-			
-			String passwd = (String) request.get(PASSWORD_KEY);
-			if ( passwd != null )
-			{
-    			credentials.add(passwd.toCharArray());
-    			Object remove = request.remove(PASSWORD_KEY);
-    			if ( remove == null )
-    			{ 
-    				log.warn("Could not remove the password from the request map");
-    			}
-			}
-			
-			authRequest = new AuthenticationRequestImpl.Builder( user, credentials ).bulid();
-		}
-		return authRequest;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,70 @@
+/*
+ * 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.soa.esb.services.security.auth.http;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
+import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
+import org.jboss.soa.esb.services.security.principals.User;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class JbrHttpSecurityInfoExtractor implements SecurityInfoExtractor<Map<String,Object>>
+{
+	private Logger log = Logger.getLogger(JbrHttpSecurityInfoExtractor.class);
+	
+	public static final String USERNAME_KEY = "http.basic.username";
+	public static final String PASSWORD_KEY = "http.basic.password";
+	
+	public AuthenticationRequest extractSecurityInfo( final Map<String,Object> request )
+	{
+		AuthenticationRequest authRequest = null;
+		String username = (String) request.get(USERNAME_KEY);
+		if ( username != null )
+		{
+			User user = new User((String)username);
+			Set<char[]> credentials = new HashSet<char[]>();
+			
+			String passwd = (String) request.get(PASSWORD_KEY);
+			if ( passwd != null )
+			{
+    			credentials.add(passwd.toCharArray());
+    			Object remove = request.remove(PASSWORD_KEY);
+    			if ( remove == null )
+    			{ 
+    				log.warn("Could not remove the password from the request map");
+    			}
+			}
+			
+			authRequest = new AuthenticationRequestImpl.Builder( user, credentials ).bulid();
+		}
+		return authRequest;
+	}
+
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,117 +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.soa.esb.services.security.auth.ws;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-import sun.misc.BASE64Decoder;
-
-/**
- * Represents a WS-Security BinarySecurityToken.
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class BinarySecurityToken
-{
-	private String encodingType;
-	private String valueType;
-	private Certificate cert;
-	private enum EncodingType { Base64Binary, HexBinary }
-	
-	public String getEncodingType()
-	{
-		return encodingType;
-	}
-	
-	public void setEncodingType(String encodingType)
-	{
-		this.encodingType = stripNSAlias(encodingType);
-	}
-	
-	public String getValueType()
-	{
-		return valueType;
-	}
-	
-	public void setValueType(String valueType)
-	{
-		this.valueType = stripNSAlias(valueType);
-	}
-	
-	public Certificate getKey()
-	{
-		return cert;
-	}
-	
-	public void setKey(final String key)
-	{
-		try
-		{
-			byte[] keyBytes = null;
-			if ( encodingType.equalsIgnoreCase( EncodingType.Base64Binary.toString() ) )
-			{
-    			BASE64Decoder decoder = new BASE64Decoder();
-    			keyBytes = decoder.decodeBuffer(key);
-			}
-			else
-			{
-				keyBytes = key.getBytes();
-			}
-				
-			CertificateFactory factory = CertificateFactory.getInstance( certificateMatch( valueType ) );
-			cert = factory.generateCertificate( new ByteArrayInputStream( keyBytes ));
-		} 
-		catch (CertificateException e)
-		{
-			throw new IllegalStateException("Could not create certificate: ", e);
-		} 
-		catch (IOException e)
-		{
-			throw new IllegalStateException("Could not create certificate: ", e);
-		} 
-	}
-	
-	private String certificateMatch(final String valueType)
-	{
-		if ( valueType.startsWith("X509") )
-			return "X.509";
-		
-		return valueType;
-	}
-
-	private String stripNSAlias(String value)
-	{
-		if ( value != null )
-		{
-			final int idx = value.indexOf(':');
-			if ( idx > 0 )
-				value = value.substring( idx + 1 );
-		}
-		return value;
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityToken.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,117 @@
+/*
+ * 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.soa.esb.services.security.auth.ws;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+
+import sun.misc.BASE64Decoder;
+
+/**
+ * Represents a WS-Security BinarySecurityToken.
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class BinarySecurityToken
+{
+	private String encodingType;
+	private String valueType;
+	private Certificate cert;
+	private enum EncodingType { Base64Binary, HexBinary }
+	
+	public String getEncodingType()
+	{
+		return encodingType;
+	}
+	
+	public void setEncodingType(String encodingType)
+	{
+		this.encodingType = stripNSAlias(encodingType);
+	}
+	
+	public String getValueType()
+	{
+		return valueType;
+	}
+	
+	public void setValueType(String valueType)
+	{
+		this.valueType = stripNSAlias(valueType);
+	}
+	
+	public Certificate getKey()
+	{
+		return cert;
+	}
+	
+	public void setKey(final String key)
+	{
+		try
+		{
+			byte[] keyBytes = null;
+			if ( encodingType.equalsIgnoreCase( EncodingType.Base64Binary.toString() ) )
+			{
+    			BASE64Decoder decoder = new BASE64Decoder();
+    			keyBytes = decoder.decodeBuffer(key);
+			}
+			else
+			{
+				keyBytes = key.getBytes();
+			}
+				
+			CertificateFactory factory = CertificateFactory.getInstance( certificateMatch( valueType ) );
+			cert = factory.generateCertificate( new ByteArrayInputStream( keyBytes ));
+		} 
+		catch (CertificateException e)
+		{
+			throw new IllegalStateException("Could not create certificate: ", e);
+		} 
+		catch (IOException e)
+		{
+			throw new IllegalStateException("Could not create certificate: ", e);
+		} 
+	}
+	
+	private String certificateMatch(final String valueType)
+	{
+		if ( valueType.startsWith("X509") )
+			return "X.509";
+		
+		return valueType;
+	}
+
+	private String stripNSAlias(String value)
+	{
+		if ( value != null )
+		{
+			final int idx = value.indexOf(':');
+			if ( idx > 0 )
+				value = value.substring( idx + 1 );
+		}
+		return value;
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,56 +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.soa.esb.services.security.auth.ws;
-
-/**
- * Placeholder for security information form a ws request.
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class UsernameToken
-{
-	private String userName;
-	private char[] password;
-	
-	public char[] getPassword()
-	{
-		return password;
-	}
-	
-	public void setPassword(String password)
-	{
-		this.password = password.toCharArray();
-	}
-	
-	public String getUserName()
-	{
-		return userName;
-	}
-	
-	public void setUserName(String userName)
-	{
-		this.userName = userName;
-	}
-	
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/UsernameToken.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,56 @@
+/*
+ * 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.soa.esb.services.security.auth.ws;
+
+/**
+ * Placeholder for security information form a ws request.
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class UsernameToken
+{
+	private String userName;
+	private char[] password;
+	
+	public char[] getPassword()
+	{
+		return password;
+	}
+	
+	public void setPassword(String password)
+	{
+		this.password = password.toCharArray();
+	}
+	
+	public String getUserName()
+	{
+		return userName;
+	}
+	
+	public void setUserName(String userName)
+	{
+		this.userName = userName;
+	}
+	
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,127 +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.soa.esb.services.security.auth.ws;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
-import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
-import org.jboss.soa.esb.services.security.principals.User;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.milyn.Smooks;
-import org.milyn.payload.JavaResult;
-import org.xml.sax.SAXException;
-
-/**
- * WSSecurityInfoExtractor extracts security related information from
- * a SOAP security header. 
- * </p>
- * If the security element contains a 'UsernameToken' element this will be
- * extraced into a principal with the username and a credential being the
- * password represented as a character array.
- * 
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class WSSecurityInfoExtractor implements SecurityInfoExtractor<String>
-{
-	/**
-	 * Smooks configuration file which specified the extraction
-	 */
-	private static final String SMOOK_CONFIG_FILE = "smooks-ws-security.xml";
-	/**
-	 * Smooks instance the will perform the extraction
-	 */
-	private Smooks smooks;
-	
-	/**
-	 * Creates an instance using the default Smooks config file.
-	 */
-	public WSSecurityInfoExtractor()
-	{
-		createSmooks( SMOOK_CONFIG_FILE );
-	}
-
-	/**
-	 * Creates an instance of Smooks using the passed in config file.  
-	 * 
-	 * @param configFile - the Smooks config file to use.
-	 */
-	public WSSecurityInfoExtractor(final String configFile)
-	{
-		createSmooks(configFile);
-	}
-	
-	/**
-	 * Extracts UsernameToken element is one exists and creates
-	 * a Principal with the username and sets a Credential using
-	 * the password. The type of the Credential is a character array.
-	 * If the SOAP message contains a BinarySecurityToken this will be
-	 * extracted and added as a Credential.
-	 * @param soap - the soap message represented as a String
-	 * @return {@link AuthenticationRequest}
-	 */
-	public AuthenticationRequest extractSecurityInfo(final String soap)
-	{
-		final JavaResult javaResult = new JavaResult();
-		smooks.filter(new StreamSource(new StringReader(soap)), javaResult);
-		
-		UsernameToken token = (UsernameToken) javaResult.getBean("userNameToken");
-		User user = null;
-		Set<Object> credentials = new HashSet<Object>();
-		if ( token != null )
-		{
-    		user = new User(token.getUserName());
-        	credentials.add(token.getPassword());
-		}
-		
-		BinarySecurityToken binaryToken = (BinarySecurityToken) javaResult.getBean("binarySecurityToken");
-		if ( binaryToken != null )
-		{
-    		credentials.add(binaryToken.getKey());
-		}
-		return new AuthenticationRequestImpl.Builder(user, credentials ).bulid();
-	}
-
-	private void createSmooks(final String configFile) 
-	{
-		try
-		{
-    		this.smooks = new Smooks( ClassUtil.getResourceAsStream(configFile, getClass()));
-		} 
-		catch (final SAXException e)
-		{
-			throw new IllegalStateException("Could not parse " + configFile, e);
-		} 
-		catch (final IOException e)
-		{
-			throw new IllegalStateException("Could not parse " + configFile, e);
-		}
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,127 @@
+/*
+ * 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.soa.esb.services.security.auth.ws;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.transform.stream.StreamSource;
+
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
+import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
+import org.jboss.soa.esb.services.security.principals.User;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.milyn.Smooks;
+import org.milyn.payload.JavaResult;
+import org.xml.sax.SAXException;
+
+/**
+ * WSSecurityInfoExtractor extracts security related information from
+ * a SOAP security header. 
+ * </p>
+ * If the security element contains a 'UsernameToken' element this will be
+ * extraced into a principal with the username and a credential being the
+ * password represented as a character array.
+ * 
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class WSSecurityInfoExtractor implements SecurityInfoExtractor<String>
+{
+	/**
+	 * Smooks configuration file which specified the extraction
+	 */
+	private static final String SMOOK_CONFIG_FILE = "smooks-ws-security.xml";
+	/**
+	 * Smooks instance the will perform the extraction
+	 */
+	private Smooks smooks;
+	
+	/**
+	 * Creates an instance using the default Smooks config file.
+	 */
+	public WSSecurityInfoExtractor()
+	{
+		createSmooks( SMOOK_CONFIG_FILE );
+	}
+
+	/**
+	 * Creates an instance of Smooks using the passed in config file.  
+	 * 
+	 * @param configFile - the Smooks config file to use.
+	 */
+	public WSSecurityInfoExtractor(final String configFile)
+	{
+		createSmooks(configFile);
+	}
+	
+	/**
+	 * Extracts UsernameToken element is one exists and creates
+	 * a Principal with the username and sets a Credential using
+	 * the password. The type of the Credential is a character array.
+	 * If the SOAP message contains a BinarySecurityToken this will be
+	 * extracted and added as a Credential.
+	 * @param soap - the soap message represented as a String
+	 * @return {@link AuthenticationRequest}
+	 */
+	public AuthenticationRequest extractSecurityInfo(final String soap)
+	{
+		final JavaResult javaResult = new JavaResult();
+		smooks.filter(new StreamSource(new StringReader(soap)), javaResult);
+		
+		UsernameToken token = (UsernameToken) javaResult.getBean("userNameToken");
+		User user = null;
+		Set<Object> credentials = new HashSet<Object>();
+		if ( token != null )
+		{
+    		user = new User(token.getUserName());
+        	credentials.add(token.getPassword());
+		}
+		
+		BinarySecurityToken binaryToken = (BinarySecurityToken) javaResult.getBean("binarySecurityToken");
+		if ( binaryToken != null )
+		{
+    		credentials.add(binaryToken.getKey());
+		}
+		return new AuthenticationRequestImpl.Builder(user, credentials ).bulid();
+	}
+
+	private void createSmooks(final String configFile) 
+	{
+		try
+		{
+    		this.smooks = new Smooks( ClassUtil.getResourceAsStream(configFile, getClass()));
+		} 
+		catch (final SAXException e)
+		{
+			throw new IllegalStateException("Could not parse " + configFile, e);
+		} 
+		catch (final IOException e)
+		{
+			throw new IllegalStateException("Could not parse " + configFile, e);
+		}
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-    <resource-config selector="Envelope/Header/Security/UsernameToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">userNameToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
-        <param name="bindings">
-            <binding property="userName" selector="Username" default="" />
-            <binding property="password" selector="Password" />
-        </param>
-    </resource-config>
-    
-    <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">binarySecurityToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
-        <param name="bindings">
-            <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
-            <binding property="valueType" selector="BinarySecurityToken @ValueType" />
-            <binding property="key" selector="BinarySecurityToken" />
-        </param>
-    </resource-config>
-
-</smooks-resource-list>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+    <resource-config selector="Envelope/Header/Security/UsernameToken">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">userNameToken</param>
+        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
+        <param name="bindings">
+            <binding property="userName" selector="Username" default="" />
+            <binding property="password" selector="Password" />
+        </param>
+    </resource-config>
+    
+    <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">binarySecurityToken</param>
+        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
+        <param name="bindings">
+            <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
+            <binding property="valueType" selector="BinarySecurityToken @ValueType" />
+            <binding property="key" selector="BinarySecurityToken" />
+        </param>
+    </resource-config>
+
+</smooks-resource-list>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,104 +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.soa.esb.services.security.principals;
-
-import java.io.Serializable;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A Role is a collection/group of Principals.
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class Group implements java.security.acl.Group, Serializable
-{
-	private static final long serialVersionUID = 1L;
-	public static final String ROLES_GROUP_NAME = "Roles";
-	
-	private final String groupName;
-	private final Set<Principal> members = new HashSet<Principal>(); 
-
-	public Group(final String groupName)
-	{
-		if ( groupName == null )
-			throw new NullPointerException("groupName argument must not be null");
-		
-		this.groupName = groupName;
-	}
-
-	public String getName()
-	{
-		return groupName;
-	}
-	
-	public String toString()
-	{
-		return "[groupName=" + groupName + ", members=" + members + "]";
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-			return true;
-		if(!(obj instanceof Group))
-			return false;
-		
-		Group other = (Group) obj; 
-		return other.groupName.equals(groupName) &&
-		other.members.equals(members);
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int hash = 17;
-		hash = 31 * hash + groupName == null ? 0 : groupName.hashCode();
-		return hash;
-	}
-
-	public boolean addMember(Principal user)
-	{
-		return members.add(user);
-	}
-
-	public boolean isMember(Principal user)
-	{
-		return members.contains(user);
-	}
-
-	public Enumeration<? extends Principal> members()
-	{
-		return Collections.enumeration(members);
-	}
-
-	public boolean removeMember(Principal user)
-	{
-		return members.remove(user);
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Group.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,104 @@
+/*
+ * 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.soa.esb.services.security.principals;
+
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A Role is a collection/group of Principals.
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class Group implements java.security.acl.Group, Serializable
+{
+	private static final long serialVersionUID = 1L;
+	public static final String ROLES_GROUP_NAME = "Roles";
+	
+	private final String groupName;
+	private final Set<Principal> members = new HashSet<Principal>(); 
+
+	public Group(final String groupName)
+	{
+		if ( groupName == null )
+			throw new NullPointerException("groupName argument must not be null");
+		
+		this.groupName = groupName;
+	}
+
+	public String getName()
+	{
+		return groupName;
+	}
+	
+	public String toString()
+	{
+		return "[groupName=" + groupName + ", members=" + members + "]";
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if(!(obj instanceof Group))
+			return false;
+		
+		Group other = (Group) obj; 
+		return other.groupName.equals(groupName) &&
+		other.members.equals(members);
+	}
+
+	@Override
+	public int hashCode()
+	{
+		int hash = 17;
+		hash = 31 * hash + groupName == null ? 0 : groupName.hashCode();
+		return hash;
+	}
+
+	public boolean addMember(Principal user)
+	{
+		return members.add(user);
+	}
+
+	public boolean isMember(Principal user)
+	{
+		return members.contains(user);
+	}
+
+	public Enumeration<? extends Principal> members()
+	{
+		return Collections.enumeration(members);
+	}
+
+	public boolean removeMember(Principal user)
+	{
+		return members.remove(user);
+	}
+	
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,76 +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.soa.esb.services.security.principals;
-
-import java.io.Serializable;
-import java.security.Principal;
-
-/**
- * A Role is a collection/group of Principals.
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class Role implements Principal, Serializable
-{
-	private static final long serialVersionUID = 1L;
-	private final String roleName;
-
-	public Role(final String roleName)
-	{
-		if ( roleName == null )
-			throw new NullPointerException("roleName argument must not be null");
-		
-		this.roleName = roleName;
-	}
-
-	public String getName()
-	{
-		return roleName;
-	}
-	
-	public String toString()
-	{
-		return "[roleName=" + roleName + "]";
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-			return true;
-		if(!(obj instanceof Role))
-			return false;
-		
-		Role other = (Role) obj; 
-		return this.roleName.equals(other.roleName);
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int hash = 17;
-		hash = 31 * hash + roleName == null ? 0 : roleName.hashCode();
-		return hash;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/Role.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,76 @@
+/*
+ * 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.soa.esb.services.security.principals;
+
+import java.io.Serializable;
+import java.security.Principal;
+
+/**
+ * A Role is a collection/group of Principals.
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class Role implements Principal, Serializable
+{
+	private static final long serialVersionUID = 1L;
+	private final String roleName;
+
+	public Role(final String roleName)
+	{
+		if ( roleName == null )
+			throw new NullPointerException("roleName argument must not be null");
+		
+		this.roleName = roleName;
+	}
+
+	public String getName()
+	{
+		return roleName;
+	}
+	
+	public String toString()
+	{
+		return "[roleName=" + roleName + "]";
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if(!(obj instanceof Role))
+			return false;
+		
+		Role other = (Role) obj; 
+		return this.roleName.equals(other.roleName);
+	}
+
+	@Override
+	public int hashCode()
+	{
+		int hash = 17;
+		hash = 31 * hash + roleName == null ? 0 : roleName.hashCode();
+		return hash;
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,76 +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.soa.esb.services.security.principals;
-
-import java.io.Serializable;
-import java.security.Principal;
-
-/**
- * Simple User
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class User implements Principal, Serializable
-{
-	private static final long serialVersionUID = 1L;
-	private final String name;
-
-	public User(final String name)
-	{
-		if ( name == null )
-			throw new NullPointerException("name argument must not be null");
-		
-		this.name = name;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-	
-	public String toString()
-	{
-		return "User [roleName=" + name + "]";
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-			return true;
-		if(!(obj instanceof User))
-			return false;
-		
-		User other = (User) obj; 
-		return this.name.equals(other.name);
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int hash = 17;
-		hash = 31 * hash + name == null ? 0 : name.hashCode();
-		return hash;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/services/security/principals/User.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,76 @@
+/*
+ * 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.soa.esb.services.security.principals;
+
+import java.io.Serializable;
+import java.security.Principal;
+
+/**
+ * Simple User
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class User implements Principal, Serializable
+{
+	private static final long serialVersionUID = 1L;
+	private final String name;
+
+	public User(final String name)
+	{
+		if ( name == null )
+			throw new NullPointerException("name argument must not be null");
+		
+		this.name = name;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+	
+	public String toString()
+	{
+		return "User [roleName=" + name + "]";
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if(!(obj instanceof User))
+			return false;
+		
+		User other = (User) obj; 
+		return this.name.equals(other.name);
+	}
+
+	@Override
+	public int hashCode()
+	{
+		int hash = 17;
+		hash = 31 * hash + name == null ? 0 : name.hashCode();
+		return hash;
+	}
+
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -184,6 +184,48 @@
         
         return ClassLoader.getSystemResourceAsStream(resource) ;
     }
+    
+    public static URL getResource(final String resourceName, final Class<?> caller)
+    {
+        final String resource ;
+        if (resourceName.startsWith("/"))
+        {
+            resource = resourceName.substring(1) ;
+        }
+        else
+        {
+            final Package callerPackage = caller.getPackage() ;
+            if (callerPackage != null)
+            {
+                    resource = callerPackage.getName().replace('.', '/') + '/' + resourceName ;
+            }
+            else
+            {
+                resource = resourceName ;
+            }
+        }
+        final ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader() ;
+        if (threadClassLoader != null)
+        {
+            final URL url = threadClassLoader.getResource(resource) ;
+            if (url != null)
+            {
+                return url ;
+            }
+        }
+        
+        final ClassLoader classLoader = caller.getClassLoader() ;
+        if (classLoader != null)
+        {
+            final URL url = classLoader.getResource(resource) ;
+            if (url != null)
+            {
+                return url ;
+            }
+        }
+        
+        return ClassLoader.getSystemResource(resource) ;
+    }
 
     /**
      * Get a package name and convert it to a path value, so it can be used

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/build.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -102,6 +102,9 @@
         <copy todir="${org.jboss.esb.test.persistdb.dir}">
             <fileset dir="resources/etc/" includes="persistUnitTestDB*"/>
         </copy>
+		<copy todir="${org.jboss.esb.tests.classes.dir}" >
+            <fileset dir="${org.jboss.esb.module.tests.src.dir}" includes="**/*.xml" />
+        </copy>
 		<copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
 
 

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,185 +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.services.security;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.net.URL;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.antlr.stringtemplate.test.FailedAssertionException;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.services.security.SecurityConfig;
-import org.jboss.soa.esb.services.security.SecurityContext;
-import org.jboss.soa.esb.services.security.SecurityService;
-import org.jboss.soa.esb.services.security.SecurityServiceException;
-import org.jboss.soa.esb.services.security.TestPrincipal;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
-import org.jboss.soa.esb.services.security.principals.Group;
-import org.jboss.soa.esb.services.security.principals.Role;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Unit test for {@link SecurityServiceImpl}
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- */
-public class JaasSecurityServiceUnitTest
-{
-	private SecurityService service = new JaasSecurityService();
-	private Subject subject = new Subject();
-	private String jbossEsbProperties;			
-	
-	@Test
-	public void authenticateUserpassword() throws ConfigurationException, SecurityServiceException
-	{
-		final String userName = "testUser";
-		final String password = "testPassword";
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "UserPassLogin", "org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler", null);
-		TestPrincipal principal = new TestPrincipal(userName);
-		Set<String> credentials = new HashSet<String>();
-		credentials.add(password);
-		
-		AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(principal, credentials).bulid();
-		SecurityContext context = new SecurityContext(subject);
-		service.configure();
-		service.authenticate(configInfo, context, authRequest);
-		
-		Set<TestPrincipal> principals = subject.getPrincipals( TestPrincipal.class );
-		assertEquals( 1, principals.size() );
-		assertEquals( userName, principals.iterator().next().getName() );
-	}
-	
-	@Test
-	public void authenticateWithRole() throws ConfigurationException, SecurityServiceException
-	{
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo("adminRole", null, "SuccessfulLogin", null, null);
-		SecurityContext context = new SecurityContext(subject);
-		service.authenticate(configInfo, context, null);
-		Set<Principal> principals = subject.getPrincipals( Principal.class );
-		assertEquals( 2, principals.size() );
-	}
-	
-	@Test
-	public void authenticateWithExistingRole() throws ConfigurationException, SecurityServiceException
-	{
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo("adminRole", null, "SuccessfulLogin", null, null);
-		Group group = new Group("Roles");
-		group.addMember(new Role("adminRole1"));
-		
-		subject.getPrincipals().add(group);
-		
-		SecurityContext context = new SecurityContext(subject);
-		service.authenticate(configInfo, context, null);
-		
-		Set<Principal> principals = subject.getPrincipals( Principal.class );
-		assertEquals( 2, principals.size() );
-	}
-	
-	@Test
-	public void isCallerInRole() throws SecurityServiceException 
-	{
-		final String roleName = "adminRole";
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(roleName, null, "SuccessfulLogin", null, null);
-		SecurityContext context = new SecurityContext(subject);
-		service.authenticate(configInfo, context, null);
-		assertTrue( service.isCallerInRole(subject, new Role(roleName)));
-	}
-	
-	@Test ( expected = SecurityServiceException.class )
-	public void loginFailure() throws ConfigurationException, SecurityServiceException
-	{
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "FailureLogin", null, null);
-		SecurityContext context = new SecurityContext(subject);
-		service.authenticate( configInfo, context, null );
-	}
-	
-	@Test
-	public void refresh() throws SecurityServiceException
-	{
-		Runnable runnable = new Runnable()
-		{
-			public void run()
-			{
-				threadLogin();
-			}
-		};
-		for (int i = 0; i < 1000; i++)
-		{
-    		Thread t1 = new Thread(runnable);
-    		Thread t2 = new Thread(runnable);
-    		t1.start();
-    		t2.start();
-		}
-	}
-	
-	private void threadLogin()
-	{
-		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "SuccessfulLogin", null, null);
-		SecurityContext context = new SecurityContext(new Subject());
-		service.refreshSecurityConfig();
-		try
-		{
-			service.authenticate( configInfo, context, null );
-		} 
-		catch (SecurityServiceException e)
-		{
-    		fail(e.getMessage());
-		}
-	}
-	
-	@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());
-		service.configure();
-	}
-	
-	@After
-	public void tearDown()
-	{
-		if ( jbossEsbProperties != null )
-            System.setProperty(Environment.PROPERTIES_FILE, jbossEsbProperties);
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter( JaasSecurityServiceUnitTest.class );
-	}
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,185 @@
+/*
+ * 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.services.security;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URL;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.antlr.stringtemplate.test.FailedAssertionException;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.services.security.SecurityConfig;
+import org.jboss.soa.esb.services.security.SecurityContext;
+import org.jboss.soa.esb.services.security.SecurityService;
+import org.jboss.soa.esb.services.security.SecurityServiceException;
+import org.jboss.soa.esb.services.security.TestPrincipal;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
+import org.jboss.soa.esb.services.security.principals.Group;
+import org.jboss.soa.esb.services.security.principals.Role;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link SecurityServiceImpl}
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ */
+public class JaasSecurityServiceUnitTest
+{
+	private SecurityService service = new JaasSecurityService();
+	private Subject subject = new Subject();
+	private String jbossEsbProperties;			
+	
+	@Test
+	public void authenticateUserpassword() throws ConfigurationException, SecurityServiceException
+	{
+		final String userName = "testUser";
+		final String password = "testPassword";
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "UserPassLogin", "org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler", null);
+		TestPrincipal principal = new TestPrincipal(userName);
+		Set<String> credentials = new HashSet<String>();
+		credentials.add(password);
+		
+		AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(principal, credentials).bulid();
+		SecurityContext context = new SecurityContext(subject);
+		service.configure();
+		service.authenticate(configInfo, context, authRequest);
+		
+		Set<TestPrincipal> principals = subject.getPrincipals( TestPrincipal.class );
+		assertEquals( 1, principals.size() );
+		assertEquals( userName, principals.iterator().next().getName() );
+	}
+	
+	@Test
+	public void authenticateWithRole() throws ConfigurationException, SecurityServiceException
+	{
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo("adminRole", null, "SuccessfulLogin", null, null);
+		SecurityContext context = new SecurityContext(subject);
+		service.authenticate(configInfo, context, null);
+		Set<Principal> principals = subject.getPrincipals( Principal.class );
+		assertEquals( 2, principals.size() );
+	}
+	
+	@Test
+	public void authenticateWithExistingRole() throws ConfigurationException, SecurityServiceException
+	{
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo("adminRole", null, "SuccessfulLogin", null, null);
+		Group group = new Group("Roles");
+		group.addMember(new Role("adminRole1"));
+		
+		subject.getPrincipals().add(group);
+		
+		SecurityContext context = new SecurityContext(subject);
+		service.authenticate(configInfo, context, null);
+		
+		Set<Principal> principals = subject.getPrincipals( Principal.class );
+		assertEquals( 2, principals.size() );
+	}
+	
+	@Test
+	public void isCallerInRole() throws SecurityServiceException 
+	{
+		final String roleName = "adminRole";
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(roleName, null, "SuccessfulLogin", null, null);
+		SecurityContext context = new SecurityContext(subject);
+		service.authenticate(configInfo, context, null);
+		assertTrue( service.isCallerInRole(subject, new Role(roleName)));
+	}
+	
+	@Test ( expected = SecurityServiceException.class )
+	public void loginFailure() throws ConfigurationException, SecurityServiceException
+	{
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "FailureLogin", null, null);
+		SecurityContext context = new SecurityContext(subject);
+		service.authenticate( configInfo, context, null );
+	}
+	
+	@Test
+	public void refresh() throws SecurityServiceException
+	{
+		Runnable runnable = new Runnable()
+		{
+			public void run()
+			{
+				threadLogin();
+			}
+		};
+		for (int i = 0; i < 1000; i++)
+		{
+    		Thread t1 = new Thread(runnable);
+    		Thread t2 = new Thread(runnable);
+    		t1.start();
+    		t2.start();
+		}
+	}
+	
+	private void threadLogin()
+	{
+		SecurityConfig configInfo = SecurityConfig.createSecurityInfo(null, null, "SuccessfulLogin", null, null);
+		SecurityContext context = new SecurityContext(new Subject());
+		service.refreshSecurityConfig();
+		try
+		{
+			service.authenticate( configInfo, context, null );
+		} 
+		catch (SecurityServiceException e)
+		{
+    		fail(e.getMessage());
+		}
+	}
+	
+	@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());
+		service.configure();
+	}
+	
+	@After
+	public void tearDown()
+	{
+		if ( jbossEsbProperties != null )
+            System.setProperty(Environment.PROPERTIES_FILE, jbossEsbProperties);
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter( JaasSecurityServiceUnitTest.class );
+	}
+	
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,429 +0,0 @@
-#
-# The contents of this file are subject to the terms
-# of the Common Development and Distribution License
-# (the License). You may not use this file except in
-# compliance with the License.
-#
-# You can obtain a copy of the License at
-# https://opensso.dev.java.net/public/CDDLv1.0.html or
-# opensso/legal/CDDLv1.0.txt
-# See the License for the specific language governing
-# permission and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL
-# Header Notice in each file and include the License file
-# at opensso/legal/CDDLv1.0.txt.
-# If applicable, add the following below the CDDL Header,
-# with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# $Id: AMClient.properties,v 1.12 2008/03/04 00:25:12 beomsuk Exp $
-#
-# Copyright 2006 Sun Microsystems Inc. All Rights Reserved
-#
-
-/* The following keys are used to configure the Debug service.
- * Possible values for the key 'level' are: off | error | warning | message. 
- * The key 'directory' specifies the output directory where the debug files 
- * will be created.
- * Trailing spaces are significant.
- * Windows: Use forward slashes "/" separate directories, not backslash "\".
- * Windows: Spaces in the file name are allowed for Windows.
- */
-com.iplanet.services.debug.level=message
-com.iplanet.services.debug.directory=/tmp
-
-/*
- * Server mode should be 'false'
- */
-com.iplanet.am.serverMode=false
-
-/*
- * Cache enable / disable properties
- */
-com.iplanet.am.sdk.caching.enabled=false
-com.sun.identity.idm.cache.enabled=false
-com.sun.identity.sm.cache.enabled=true
-
-/*
- * Configure remote plugin classes for configuration (SMS)
- */
-com.sun.identity.sm.sms_object_class_name=com.sun.identity.sm.jaxrpc.SMSJAXRPCObject
-
-/*
- * Naming URL
- */
-com.iplanet.am.naming.url=http://localhost:8080/opensso/namingservice
-
-/*
- * Notification URL
- */
-com.iplanet.am.notification.url=
-
-/*
- * Security Credentails to read the configuration data
- */
-com.sun.identity.agents.app.username=UrlAccessAgent
-com.iplanet.am.service.password=
-com.iplanet.am.service.secret=AQIC24u86rq9RRbx13mx0nb0uAGpxLdxGBY9
-
-/*
- * Encryption key that will be used to encrypt and decypt
- * data to communicate with the server.
- * This key is needed to decrypt passwords stored
- * in the SMS configuration.
- */
-am.encryption.pwd=SAMPLE_RAND
-
-/*
- * Encryption key that will be used to encrypt and decypt
- * data used locally within the client.
- */
-com.sun.identity.client.encryptionKey=SAMPLE_RAND
-
-/*
- * Encryption: The key "com.iplanet.security.encryptor" specifies
- * the encrypting class implementation.
- * Available classes are:
- *    com.iplanet.services.util.JCEEncryption
- *    com.iplanet.services.util.JSSEncryption
- */
-com.iplanet.security.encryptor=com.iplanet.services.util.JCEEncryption
-
-/*
- * Property to enable/disable the notifications for am.sdk and IdRepo Caches. 
- * If set to "true" notifications are enabled and disabled if set to "false".
- */
-com.sun.identity.idm.remote.notification.enabled=true
-
-/*
- * Cache update time (in minutes) for am.sdk & IdRepo Caches
- * if notification URL is not provided or if notifications are disabled.
- * Note: 
- * 1. This property is applicable only if 'com.iplanet.am.notification.url'
- *    is not provided or if 'com.sun.identity.idm.remote.notification.enabled'
- *    is set to 'false'.
- * 2. If the polling time is set as 0, then polling is disabled. 
- */
-com.iplanet.am.sdk.remote.pollingTime=1
-
-/*
- * Property to enable/disable the notifications for service management caches.
- * If set to "true" notifications are enabled and disabled if set to "false".
- */
-com.sun.identity.sm.notification.enabled=true
-
-/*
- * Cache update time (in minutes) for service configutation data,
- * if notification URL is not provided or if notifications are disabled.
- * Note: 
- * 1. This property is applicable only if 'com.iplanet.am.notification.url'
- *    is not provided or if 'com.sun.identity.sm.notification.enabled' is 
- *    set to 'false'.
- * 2. If the cache time is set as 0, then no cache updates will occur.
- */
-com.sun.identity.sm.cacheTime=1
-
-/*
- * Server protocol, host and port to be used by Client Services
- */
-com.iplanet.am.server.protocol=http
-com.iplanet.am.server.host=localhost
-com.iplanet.am.server.port=8080
-com.iplanet.am.services.deploymentDescriptor=opensso
-com.iplanet.am.console.protocol=@CONSOLE_PROTOCOL@
-com.iplanet.am.console.host=@CONSOLE_HOST@
-com.iplanet.am.console.port=@CONSOLE_PORT@
-com.iplanet.am.console.deploymentDescriptor=@CONSOLE_DEPLOY_URI@
-com.iplanet.am.console.remote=@CONSOLE_REMOTE@
-
-com.iplanet.am.cookie.name=iPlanetDirectoryPro
-
-/*
- * Session related properties.
- */
-com.iplanet.am.session.client.polling.enable=true
-com.iplanet.am.session.client.polling.period=180
-
-/*
- * Identify cert db directory path, prefix and password file
- * to initialize JSS Socket Factory when Web Container is configured SSL
- */
-com.iplanet.am.admin.cli.certdb.dir=
-com.iplanet.am.admin.cli.certdb.prefix=
-com.iplanet.am.admin.cli.certdb.passfile=//config/.wtpass
-
-/*
- * Identify property value for SSL ApprovalCallback / HostnameVerifier
- *    If com.iplanet.services.comm is configured as protocol handler
- *    and the checkSubjectAltName or resolveIPAddress feature is enabled, 
- *    cert8.db and key3.db with the prefix value of 
- *    com.iplanet.am.admin.cli.certdb.prefix will have to be created under 
- *    the directory of com.iplanet.am.admin.cli.certdb.dir before server is 
- *    restarted.
- */
-com.iplanet.am.jssproxy.trustAllServerCerts=false
-com.iplanet.am.jssproxy.checkSubjectAltName=false
-com.iplanet.am.jssproxy.resolveIPAddress=false
-com.iplanet.am.jssproxy.SSLTrustHostList=false
-
-/**************************************************************
- *              Policy Client parameters
- **************************************************************/
-/* Policy decision log parameters. Possible values for logging.level
- * are NONE, ALLOW, DENY, BOTH, and DECISION */
-com.sun.identity.agents.server.log.file.name=amRemotePolicyLog
-com.sun.identity.agents.logging.level=NONE
-
-/* Notification URL for updating cache */
-com.sun.identity.agents.notification.enabled=false
-com.sun.identity.agents.notification.url=
-
-/* Cache time in minutes */
-com.sun.identity.agents.polling.interval=3
-
-/* Information to cache. Possible value are "subtree" or "self" */
-com.sun.identity.policy.client.cacheMode=subtree
-
-/* Policy client clock skew value in seconds */
-com.sun.identity.policy.client.clockSkew=10 
-
-/*
-* Explicitly disable monitoring services in the client applications.
-*/
-com.sun.identity.monitoring=off
-
-/*
-* Specify if allow to use cached data for HttpURLConnection 
-*/
-com.sun.identity.urlconnection.useCache=false
-
-#
-# Specify implementation class for
-# com.sun.identity.plugin.configuration.ConfigurationInstance interface.
-com.sun.identity.plugin.configuration.class=com.sun.identity.plugin.configuration.impl.ConfigurationInstanceImpl
-
-#
-# Specify implementation class for 
-# com.sun.identity.plugin.datastore.DataStoreProvider interface.
-# This property defines the default datastore provider.
-com.sun.identity.plugin.datastore.class.default=com.sun.identity.plugin.datastore.impl.IdRepoDataStoreProvider
-
-#
-# Specify implementation class for
-# com.sun.identity.plugin.session.SessionProvider interface.
-com.sun.identity.plugin.session.class=com.sun.identity.plugin.session.impl.FMSessionProvider
-
-#
-# Specify XML signature provider class  
-com.sun.identity.saml.xmlsig.signatureprovider.class=com.sun.identity.saml.xmlsig.AMSignatureProvider
-
-#
-# Specify XML key provider implementation class 
-com.sun.identity.saml.xmlsig.keyprovider.class=com.sun.identity.saml.xmlsig.JKSKeyProvider
-
-#
-# Identify SAML XML signature keystore file, keystore password file
-# and key password file
-com.sun.identity.saml.xmlsig.keystore=@BASE_DIR@/keystore.jks
-com.sun.identity.saml.xmlsig.storepass=@BASE_DIR@/.storepass
-com.sun.identity.saml.xmlsig.keypass=@BASE_DIR@/.keypass
-com.sun.identity.saml.xmlsig.certalias=test
-
-#
-# Specify type of KeyStore used for saml xml signature. Default is JKS.
-# com.sun.identity.saml.xmlsig.storetype=JKS
-
-#
-# Flag for checking the Certificate which is embedded in the 
-# KeyInfo against the certificates in the keystore (specified
-# by the "com.sun.identity.saml.xmlsig.keystore" property). 
-# Possible values for the key are: on|off. If the flag is "on",
-# the certification must be presented in the keystore for 
-# XML signature validation. If the flag is "off", skip
-# the presence checking.
-com.sun.identity.saml.checkcert=on
-
-#
-# XML cannonicalization algorithm. Used for SAML XML signature generation
-# and verification. When not specified, or value is empty, default value
-# will be used. The following is the list of supported algorithms:
-# http://www.w3.org/2001/10/xml-exc-c14n#	(default)
-# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
-com.sun.identity.saml.xmlsig.c14nMethod=http://www.w3.org/2001/10/xml-exc-c14n#
-
-#
-# XML signature algorithm. Used for SAML XML Signature generation and
-# verification. When not specified, or value is empty, default value will be
-# used. The following is the list of supported algorithms:
-# http://www.w3.org/2000/09/xmldsig#rsa-sha1	(default)
-# http://www.w3.org/2000/09/xmldsig#hmac-sha1
-# http://www.w3.org/2000/09/xmldsig#dsa-sha1
-# http://www.w3.org/2001/04/xmldsig-more#rsa-md5
-# http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha256
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha384
-# http://www.w3.org/2001/04/xmldsig-more#rsa-sha512
-# http://www.w3.org/2001/04/xmldsig-more#hmac-md5
-# http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha256
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha384
-# http://www.w3.org/2001/04/xmldsig-more#hmac-sha512
-com.sun.identity.saml.xmlsig.xmlSigAlgorithm=
-
-#
-# XML transformation algorithm. Used for SAML XML signature generation
-# and verification. When not specified, or value is empty, default value
-# will be used. The following is the list of supported algorithms:
-# http://www.w3.org/2001/10/xml-exc-c14n#      (default)
-# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
-# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
-# http://www.w3.org/TR/1999/REC-xslt-19991116
-# http://www.w3.org/2000/09/xmldsig#base64
-# http://www.w3.org/TR/1999/REC-xpath-19991116
-# http://www.w3.org/2000/09/xmldsig#enveloped-signature
-# http://www.w3.org/TR/2001/WD-xptr-20010108
-# http://www.w3.org/2002/04/xmldsig-filter2
-# http://www.w3.org/2002/06/xmldsig-filter2
-# http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter
-com.sun.identity.saml.xmlsig.transformAlg=http://www.w3.org/2001/10/xml-exc-c14n#
- 
-
-#
-# SAML2 XML Encryption Provider Implementation class 
-com.sun.identity.saml2.xmlenc.EncryptionProvider=com.sun.identity.saml2.xmlenc.FMEncProvider
-
-
-#
-# SAML2 XML Signing Provider Implementation class. 
-com.sun.identity.saml2.xmlsig.SignatureProvider=com.sun.identity.saml2.xmlsig.FMSigProvider
-
-#
-# SAML2 XML Signing Certificate Validation. 
-com.sun.identity.saml2.crl.check=false
-
-#
-# SAML2 XML Signing Certificate Validation. 
-com.sun.identity.saml2.crl.check.ca=false
-
-#
-# Client ceritificate alias that will be used in SSL connection for Liberty
-# SOAP Binding
-com.sun.identity.liberty.ws.soap.certalias=
-
-#
-# If the message timestamp is before current timestamp by this amount
-# (millisec), it is considered a stale message.
-com.sun.identity.liberty.ws.soap.staleTimeLimit=300000
-
-#
-# All the messageID of a valid message will be stored in a cache with the it
-# is received to avoid duplicate messages. If the current time minus the
-# received time is greater than the above staleTimeLimit, it should be removed
-# from the cache. The is property specify the interval(millisec) that a 
-# cleanup thread should check the cache and remove those messageID.
-com.sun.identity.liberty.ws.soap.messageIDCacheCleanupInterval=60000
-
-#
-# Supported SOAP actors. Each actor must be seperated by '|'
-com.sun.identity.liberty.ws.soap.supportedActors=http://schemas.xmlsoap.org/soap/actor/next
-
-#
-# Namespace prefix mapping used when marshalling a JAXB content tree to a
-# DOM tree. The syntax is
-# <prefix>=<namespace>|<prefix>=<namespace>|..........
-com.sun.identity.liberty.ws.jaxb.namespacePrefixMappingList=S=http://schemas.xmlsoap.org/soap/envelope/|sb=urn:liberty:sb:2003-08|pp=urn:liberty:id-sis-pp:2003-08|ispp=http://www.sun.com/identity/liberty/pp|is=urn:liberty:is:2003-08
-
-#
-# JAXB package list used when constructing JAXBContext. Each package must be
-# seperated by ':'.
-com.sun.identity.liberty.ws.jaxb.packageList=
-
-#
-# Liberty ID-WSF security profile,
-# com.sun.identity.liberty.ws.wsc.certalias specifies default certificate
-#     alias for issuing web service security token for this web service client
-# com.sun.identity.liberty.ws.ta.certalias specifies certificate
-#     alias for trusted authority that will be used to sign SAML or SAML
-#     BEARER token of response message.
-# com.sun.identity.liberty.ws.trustedca.certaliases specifies certificate
-#     aliases for trusted CA. SAML or SAML BEARER token of incoming request
-#     message needs to be signed by a trusted CA in this list. The syntax is
-#     <cert alias 1>[:<issuer 1>]|<cert alias 2>[:<issuer 2>]|.....
-#     For example, 'myalias1:myissuer1|myalias2|myalias3:myissuer3
-#     'issuer' is used when the token doesn't have a KeyInfo inside the
-#     signature. The 'issuer' of the token needs to be in this list and the
-#     corresponding cert alias will be used to verify signature. If KeyInfo
-#     exists, the keystore needs to contain a cert alias that matches the
-#     KeyInfo and the cert alias needs to be in this list.
-# com.sun.identity.liberty.ws.security.TokenProviderImpl specifies
-#     implementation for security token provider
-com.sun.identity.liberty.ws.wsc.certalias=
-com.sun.identity.liberty.ws.ta.certalias=
-com.sun.identity.liberty.ws.trustedca.certaliases=
-com.sun.identity.liberty.ws.security.TokenProviderImpl=com.sun.identity.liberty.ws.security.LibSecurityTokenProvider
-
-
-#
-# URL for WSPRedirectHandlerServlet to handle Liberty WSF WSP-resource owner
-# interactions based on user agent redirects. This should be running in 
-# the same JVM where Liberty SP is running
-com.sun.identity.liberty.interaction.wspRedirectHandler=http://localhost:8080/opensso/WSPRedirectHandler
-
-
-#
-# indicates whether WSC would participate in interaction
-# valid values are interactIfNeeded | doNotInteract | doNotInteractForData
-# default value:interactIfNeeded
-# value used if an invalid value is specified:interactIfNeeded
-com.sun.identity.liberty.interaction.wscSpecifiedInteractionChoice=interactIfNeeded
-
-
-#
-# indicates whether WSC would include userInteractionHeader
-# valid values are yes|no (case ignored)
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillInlcudeUserInteractionHeader=yes
-
-
-#
-# indicates whether WSC would redirect user for interaction
-# valid values are yes|no
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillRedirect=yes
-
-
-#
-# WSC's preference on the acceptable duration for interaction(in seconds)
-# default value if the value is not specified or a non integer value is
-# specified : 60
-com.sun.identity.liberty.interaction.wscSpecifiedMaxInteractionTime=80
-
-
-#
-# indicates whether WSC would enforce that redirected to URL is https
-# valid values are yes|no (case ignored)
-# liberty specification require the value to be yes
-# default value:yes
-# value used if no value is specified:yes
-com.sun.identity.liberty.interaction.wscWillEnforceHttpsCheck=no
-
-
-#
-# This property is used to determine the Liberty identity web services framework
-# to be used when the framework can not determine from the in-bound message or
-# from the resource offering when AM is acting as the WSC.
-# The default version is 1.1, but the possible values are 1.0 or 1.1
-# com.sun.identity.liberty.wsf.version=1.1
-
-#
-# Login URL and Authentication web service URL for Liberty use cases
-com.sun.identity.loginurl=http://localhost:8080/opensso/UI/Login
-com.sun.identity.liberty.authnsvc.url=http://localhost:8080/opensso/Liberty/authnsvc
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas/AMConfig.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,429 @@
+#
+# The contents of this file are subject to the terms
+# of the Common Development and Distribution License
+# (the License). You may not use this file except in
+# compliance with the License.
+#
+# You can obtain a copy of the License at
+# https://opensso.dev.java.net/public/CDDLv1.0.html or
+# opensso/legal/CDDLv1.0.txt
+# See the License for the specific language governing
+# permission and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL
+# Header Notice in each file and include the License file
+# at opensso/legal/CDDLv1.0.txt.
+# If applicable, add the following below the CDDL Header,
+# with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# $Id: AMClient.properties,v 1.12 2008/03/04 00:25:12 beomsuk Exp $
+#
+# Copyright 2006 Sun Microsystems Inc. All Rights Reserved
+#
+
+/* The following keys are used to configure the Debug service.
+ * Possible values for the key 'level' are: off | error | warning | message. 
+ * The key 'directory' specifies the output directory where the debug files 
+ * will be created.
+ * Trailing spaces are significant.
+ * Windows: Use forward slashes "/" separate directories, not backslash "\".
+ * Windows: Spaces in the file name are allowed for Windows.
+ */
+com.iplanet.services.debug.level=message
+com.iplanet.services.debug.directory=/tmp
+
+/*
+ * Server mode should be 'false'
+ */
+com.iplanet.am.serverMode=false
+
+/*
+ * Cache enable / disable properties
+ */
+com.iplanet.am.sdk.caching.enabled=false
+com.sun.identity.idm.cache.enabled=false
+com.sun.identity.sm.cache.enabled=true
+
+/*
+ * Configure remote plugin classes for configuration (SMS)
+ */
+com.sun.identity.sm.sms_object_class_name=com.sun.identity.sm.jaxrpc.SMSJAXRPCObject
+
+/*
+ * Naming URL
+ */
+com.iplanet.am.naming.url=http://localhost:8080/opensso/namingservice
+
+/*
+ * Notification URL
+ */
+com.iplanet.am.notification.url=
+
+/*
+ * Security Credentails to read the configuration data
+ */
+com.sun.identity.agents.app.username=UrlAccessAgent
+com.iplanet.am.service.password=
+com.iplanet.am.service.secret=AQIC24u86rq9RRbx13mx0nb0uAGpxLdxGBY9
+
+/*
+ * Encryption key that will be used to encrypt and decypt
+ * data to communicate with the server.
+ * This key is needed to decrypt passwords stored
+ * in the SMS configuration.
+ */
+am.encryption.pwd=SAMPLE_RAND
+
+/*
+ * Encryption key that will be used to encrypt and decypt
+ * data used locally within the client.
+ */
+com.sun.identity.client.encryptionKey=SAMPLE_RAND
+
+/*
+ * Encryption: The key "com.iplanet.security.encryptor" specifies
+ * the encrypting class implementation.
+ * Available classes are:
+ *    com.iplanet.services.util.JCEEncryption
+ *    com.iplanet.services.util.JSSEncryption
+ */
+com.iplanet.security.encryptor=com.iplanet.services.util.JCEEncryption
+
+/*
+ * Property to enable/disable the notifications for am.sdk and IdRepo Caches. 
+ * If set to "true" notifications are enabled and disabled if set to "false".
+ */
+com.sun.identity.idm.remote.notification.enabled=true
+
+/*
+ * Cache update time (in minutes) for am.sdk & IdRepo Caches
+ * if notification URL is not provided or if notifications are disabled.
+ * Note: 
+ * 1. This property is applicable only if 'com.iplanet.am.notification.url'
+ *    is not provided or if 'com.sun.identity.idm.remote.notification.enabled'
+ *    is set to 'false'.
+ * 2. If the polling time is set as 0, then polling is disabled. 
+ */
+com.iplanet.am.sdk.remote.pollingTime=1
+
+/*
+ * Property to enable/disable the notifications for service management caches.
+ * If set to "true" notifications are enabled and disabled if set to "false".
+ */
+com.sun.identity.sm.notification.enabled=true
+
+/*
+ * Cache update time (in minutes) for service configutation data,
+ * if notification URL is not provided or if notifications are disabled.
+ * Note: 
+ * 1. This property is applicable only if 'com.iplanet.am.notification.url'
+ *    is not provided or if 'com.sun.identity.sm.notification.enabled' is 
+ *    set to 'false'.
+ * 2. If the cache time is set as 0, then no cache updates will occur.
+ */
+com.sun.identity.sm.cacheTime=1
+
+/*
+ * Server protocol, host and port to be used by Client Services
+ */
+com.iplanet.am.server.protocol=http
+com.iplanet.am.server.host=localhost
+com.iplanet.am.server.port=8080
+com.iplanet.am.services.deploymentDescriptor=opensso
+com.iplanet.am.console.protocol=@CONSOLE_PROTOCOL@
+com.iplanet.am.console.host=@CONSOLE_HOST@
+com.iplanet.am.console.port=@CONSOLE_PORT@
+com.iplanet.am.console.deploymentDescriptor=@CONSOLE_DEPLOY_URI@
+com.iplanet.am.console.remote=@CONSOLE_REMOTE@
+
+com.iplanet.am.cookie.name=iPlanetDirectoryPro
+
+/*
+ * Session related properties.
+ */
+com.iplanet.am.session.client.polling.enable=true
+com.iplanet.am.session.client.polling.period=180
+
+/*
+ * Identify cert db directory path, prefix and password file
+ * to initialize JSS Socket Factory when Web Container is configured SSL
+ */
+com.iplanet.am.admin.cli.certdb.dir=
+com.iplanet.am.admin.cli.certdb.prefix=
+com.iplanet.am.admin.cli.certdb.passfile=//config/.wtpass
+
+/*
+ * Identify property value for SSL ApprovalCallback / HostnameVerifier
+ *    If com.iplanet.services.comm is configured as protocol handler
+ *    and the checkSubjectAltName or resolveIPAddress feature is enabled, 
+ *    cert8.db and key3.db with the prefix value of 
+ *    com.iplanet.am.admin.cli.certdb.prefix will have to be created under 
+ *    the directory of com.iplanet.am.admin.cli.certdb.dir before server is 
+ *    restarted.
+ */
+com.iplanet.am.jssproxy.trustAllServerCerts=false
+com.iplanet.am.jssproxy.checkSubjectAltName=false
+com.iplanet.am.jssproxy.resolveIPAddress=false
+com.iplanet.am.jssproxy.SSLTrustHostList=false
+
+/**************************************************************
+ *              Policy Client parameters
+ **************************************************************/
+/* Policy decision log parameters. Possible values for logging.level
+ * are NONE, ALLOW, DENY, BOTH, and DECISION */
+com.sun.identity.agents.server.log.file.name=amRemotePolicyLog
+com.sun.identity.agents.logging.level=NONE
+
+/* Notification URL for updating cache */
+com.sun.identity.agents.notification.enabled=false
+com.sun.identity.agents.notification.url=
+
+/* Cache time in minutes */
+com.sun.identity.agents.polling.interval=3
+
+/* Information to cache. Possible value are "subtree" or "self" */
+com.sun.identity.policy.client.cacheMode=subtree
+
+/* Policy client clock skew value in seconds */
+com.sun.identity.policy.client.clockSkew=10 
+
+/*
+* Explicitly disable monitoring services in the client applications.
+*/
+com.sun.identity.monitoring=off
+
+/*
+* Specify if allow to use cached data for HttpURLConnection 
+*/
+com.sun.identity.urlconnection.useCache=false
+
+#
+# Specify implementation class for
+# com.sun.identity.plugin.configuration.ConfigurationInstance interface.
+com.sun.identity.plugin.configuration.class=com.sun.identity.plugin.configuration.impl.ConfigurationInstanceImpl
+
+#
+# Specify implementation class for 
+# com.sun.identity.plugin.datastore.DataStoreProvider interface.
+# This property defines the default datastore provider.
+com.sun.identity.plugin.datastore.class.default=com.sun.identity.plugin.datastore.impl.IdRepoDataStoreProvider
+
+#
+# Specify implementation class for
+# com.sun.identity.plugin.session.SessionProvider interface.
+com.sun.identity.plugin.session.class=com.sun.identity.plugin.session.impl.FMSessionProvider
+
+#
+# Specify XML signature provider class  
+com.sun.identity.saml.xmlsig.signatureprovider.class=com.sun.identity.saml.xmlsig.AMSignatureProvider
+
+#
+# Specify XML key provider implementation class 
+com.sun.identity.saml.xmlsig.keyprovider.class=com.sun.identity.saml.xmlsig.JKSKeyProvider
+
+#
+# Identify SAML XML signature keystore file, keystore password file
+# and key password file
+com.sun.identity.saml.xmlsig.keystore=@BASE_DIR@/keystore.jks
+com.sun.identity.saml.xmlsig.storepass=@BASE_DIR@/.storepass
+com.sun.identity.saml.xmlsig.keypass=@BASE_DIR@/.keypass
+com.sun.identity.saml.xmlsig.certalias=test
+
+#
+# Specify type of KeyStore used for saml xml signature. Default is JKS.
+# com.sun.identity.saml.xmlsig.storetype=JKS
+
+#
+# Flag for checking the Certificate which is embedded in the 
+# KeyInfo against the certificates in the keystore (specified
+# by the "com.sun.identity.saml.xmlsig.keystore" property). 
+# Possible values for the key are: on|off. If the flag is "on",
+# the certification must be presented in the keystore for 
+# XML signature validation. If the flag is "off", skip
+# the presence checking.
+com.sun.identity.saml.checkcert=on
+
+#
+# XML cannonicalization algorithm. Used for SAML XML signature generation
+# and verification. When not specified, or value is empty, default value
+# will be used. The following is the list of supported algorithms:
+# http://www.w3.org/2001/10/xml-exc-c14n#	(default)
+# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
+com.sun.identity.saml.xmlsig.c14nMethod=http://www.w3.org/2001/10/xml-exc-c14n#
+
+#
+# XML signature algorithm. Used for SAML XML Signature generation and
+# verification. When not specified, or value is empty, default value will be
+# used. The following is the list of supported algorithms:
+# http://www.w3.org/2000/09/xmldsig#rsa-sha1	(default)
+# http://www.w3.org/2000/09/xmldsig#hmac-sha1
+# http://www.w3.org/2000/09/xmldsig#dsa-sha1
+# http://www.w3.org/2001/04/xmldsig-more#rsa-md5
+# http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha256
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha384
+# http://www.w3.org/2001/04/xmldsig-more#rsa-sha512
+# http://www.w3.org/2001/04/xmldsig-more#hmac-md5
+# http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha256
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha384
+# http://www.w3.org/2001/04/xmldsig-more#hmac-sha512
+com.sun.identity.saml.xmlsig.xmlSigAlgorithm=
+
+#
+# XML transformation algorithm. Used for SAML XML signature generation
+# and verification. When not specified, or value is empty, default value
+# will be used. The following is the list of supported algorithms:
+# http://www.w3.org/2001/10/xml-exc-c14n#      (default)
+# http://www.w3.org/2001/10/xml-exc-c14n#WithComments
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315
+# http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments
+# http://www.w3.org/TR/1999/REC-xslt-19991116
+# http://www.w3.org/2000/09/xmldsig#base64
+# http://www.w3.org/TR/1999/REC-xpath-19991116
+# http://www.w3.org/2000/09/xmldsig#enveloped-signature
+# http://www.w3.org/TR/2001/WD-xptr-20010108
+# http://www.w3.org/2002/04/xmldsig-filter2
+# http://www.w3.org/2002/06/xmldsig-filter2
+# http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter
+com.sun.identity.saml.xmlsig.transformAlg=http://www.w3.org/2001/10/xml-exc-c14n#
+ 
+
+#
+# SAML2 XML Encryption Provider Implementation class 
+com.sun.identity.saml2.xmlenc.EncryptionProvider=com.sun.identity.saml2.xmlenc.FMEncProvider
+
+
+#
+# SAML2 XML Signing Provider Implementation class. 
+com.sun.identity.saml2.xmlsig.SignatureProvider=com.sun.identity.saml2.xmlsig.FMSigProvider
+
+#
+# SAML2 XML Signing Certificate Validation. 
+com.sun.identity.saml2.crl.check=false
+
+#
+# SAML2 XML Signing Certificate Validation. 
+com.sun.identity.saml2.crl.check.ca=false
+
+#
+# Client ceritificate alias that will be used in SSL connection for Liberty
+# SOAP Binding
+com.sun.identity.liberty.ws.soap.certalias=
+
+#
+# If the message timestamp is before current timestamp by this amount
+# (millisec), it is considered a stale message.
+com.sun.identity.liberty.ws.soap.staleTimeLimit=300000
+
+#
+# All the messageID of a valid message will be stored in a cache with the it
+# is received to avoid duplicate messages. If the current time minus the
+# received time is greater than the above staleTimeLimit, it should be removed
+# from the cache. The is property specify the interval(millisec) that a 
+# cleanup thread should check the cache and remove those messageID.
+com.sun.identity.liberty.ws.soap.messageIDCacheCleanupInterval=60000
+
+#
+# Supported SOAP actors. Each actor must be seperated by '|'
+com.sun.identity.liberty.ws.soap.supportedActors=http://schemas.xmlsoap.org/soap/actor/next
+
+#
+# Namespace prefix mapping used when marshalling a JAXB content tree to a
+# DOM tree. The syntax is
+# <prefix>=<namespace>|<prefix>=<namespace>|..........
+com.sun.identity.liberty.ws.jaxb.namespacePrefixMappingList=S=http://schemas.xmlsoap.org/soap/envelope/|sb=urn:liberty:sb:2003-08|pp=urn:liberty:id-sis-pp:2003-08|ispp=http://www.sun.com/identity/liberty/pp|is=urn:liberty:is:2003-08
+
+#
+# JAXB package list used when constructing JAXBContext. Each package must be
+# seperated by ':'.
+com.sun.identity.liberty.ws.jaxb.packageList=
+
+#
+# Liberty ID-WSF security profile,
+# com.sun.identity.liberty.ws.wsc.certalias specifies default certificate
+#     alias for issuing web service security token for this web service client
+# com.sun.identity.liberty.ws.ta.certalias specifies certificate
+#     alias for trusted authority that will be used to sign SAML or SAML
+#     BEARER token of response message.
+# com.sun.identity.liberty.ws.trustedca.certaliases specifies certificate
+#     aliases for trusted CA. SAML or SAML BEARER token of incoming request
+#     message needs to be signed by a trusted CA in this list. The syntax is
+#     <cert alias 1>[:<issuer 1>]|<cert alias 2>[:<issuer 2>]|.....
+#     For example, 'myalias1:myissuer1|myalias2|myalias3:myissuer3
+#     'issuer' is used when the token doesn't have a KeyInfo inside the
+#     signature. The 'issuer' of the token needs to be in this list and the
+#     corresponding cert alias will be used to verify signature. If KeyInfo
+#     exists, the keystore needs to contain a cert alias that matches the
+#     KeyInfo and the cert alias needs to be in this list.
+# com.sun.identity.liberty.ws.security.TokenProviderImpl specifies
+#     implementation for security token provider
+com.sun.identity.liberty.ws.wsc.certalias=
+com.sun.identity.liberty.ws.ta.certalias=
+com.sun.identity.liberty.ws.trustedca.certaliases=
+com.sun.identity.liberty.ws.security.TokenProviderImpl=com.sun.identity.liberty.ws.security.LibSecurityTokenProvider
+
+
+#
+# URL for WSPRedirectHandlerServlet to handle Liberty WSF WSP-resource owner
+# interactions based on user agent redirects. This should be running in 
+# the same JVM where Liberty SP is running
+com.sun.identity.liberty.interaction.wspRedirectHandler=http://localhost:8080/opensso/WSPRedirectHandler
+
+
+#
+# indicates whether WSC would participate in interaction
+# valid values are interactIfNeeded | doNotInteract | doNotInteractForData
+# default value:interactIfNeeded
+# value used if an invalid value is specified:interactIfNeeded
+com.sun.identity.liberty.interaction.wscSpecifiedInteractionChoice=interactIfNeeded
+
+
+#
+# indicates whether WSC would include userInteractionHeader
+# valid values are yes|no (case ignored)
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillInlcudeUserInteractionHeader=yes
+
+
+#
+# indicates whether WSC would redirect user for interaction
+# valid values are yes|no
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillRedirect=yes
+
+
+#
+# WSC's preference on the acceptable duration for interaction(in seconds)
+# default value if the value is not specified or a non integer value is
+# specified : 60
+com.sun.identity.liberty.interaction.wscSpecifiedMaxInteractionTime=80
+
+
+#
+# indicates whether WSC would enforce that redirected to URL is https
+# valid values are yes|no (case ignored)
+# liberty specification require the value to be yes
+# default value:yes
+# value used if no value is specified:yes
+com.sun.identity.liberty.interaction.wscWillEnforceHttpsCheck=no
+
+
+#
+# This property is used to determine the Liberty identity web services framework
+# to be used when the framework can not determine from the in-bound message or
+# from the resource offering when AM is acting as the WSC.
+# The default version is 1.1, but the possible values are 1.0 or 1.1
+# com.sun.identity.liberty.wsf.version=1.1
+
+#
+# Login URL and Authentication web service URL for Liberty use cases
+com.sun.identity.loginurl=http://localhost:8080/opensso/UI/Login
+com.sun.identity.liberty.authnsvc.url=http://localhost:8080/opensso/Liberty/authnsvc
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,9 +0,0 @@
-SuccessfulLogin {
-  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
-};
-FailureLogin {
-  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
-};
-UserPassLogin {
-  org.jboss.soa.esb.services.security.UserPassLoginModule required;
-};
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,9 @@
+SuccessfulLogin {
+  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
+};
+FailureLogin {
+  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
+};
+UserPassLogin {
+  org.jboss.soa.esb.services.security.UserPassLoginModule required;
+};
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,99 +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"/>
-    </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>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/security-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,99 @@
+<?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"/>
+    </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>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,57 +0,0 @@
-/*
- * 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, JBoss Inc.
- */
-package org.jboss.internal.soa.esb.webservice;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-
-import junit.framework.TestCase;
-
-import org.jboss.soa.esb.listeners.config.Generator;
-import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
-import org.jboss.soa.esb.util.FileUtil;
-import org.xml.sax.InputSource;
-
-public class ESBContractGeneratorUnitTest extends TestCase {
-	public void testGenerateWSDL() throws Exception {
-		URL url = getClass().getResource("./jbossesb_config_06.xml");
-		byte[] configBytes = FileUtil.readFile(new File(url.getFile()));
-        ByteArrayOutputStream listenerXml = new ByteArrayOutputStream();
-        ByteArrayOutputStream gatewayXml = new ByteArrayOutputStream();
-        Generator generator = new Generator(new ByteArrayInputStream(configBytes), listenerXml, gatewayXml);
-        generator.generate();
-        List<Service> services = generator.getModel().getServices();
-        final Service service = services.get(0) ;
-        final ESBServiceEndpointInfo endpointInfo = new ESBServiceEndpointInfo(service) ;
-        String wsdl = ESBContractGenerator.generateWSDL(service, endpointInfo);
-        java.io.StringReader strReader = new java.io.StringReader(wsdl);
-        InputSource inputSource = new InputSource(strReader);
-        Definition def = WSDLFactory.newInstance().newWSDLReader().readWSDL("file://tmp.wsdl", inputSource);
-        assertNotNull("Failed to generate wsdl file" , def);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,57 @@
+/*
+ * 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, JBoss Inc.
+ */
+package org.jboss.internal.soa.esb.webservice;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+
+import junit.framework.TestCase;
+
+import org.jboss.soa.esb.listeners.config.Generator;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.jboss.soa.esb.util.FileUtil;
+import org.xml.sax.InputSource;
+
+public class ESBContractGeneratorUnitTest extends TestCase {
+	public void testGenerateWSDL() throws Exception {
+		URL url = getClass().getResource("./jbossesb_config_06.xml");
+		byte[] configBytes = FileUtil.readFile(new File(url.getFile()));
+        ByteArrayOutputStream listenerXml = new ByteArrayOutputStream();
+        ByteArrayOutputStream gatewayXml = new ByteArrayOutputStream();
+        Generator generator = new Generator(new ByteArrayInputStream(configBytes), listenerXml, gatewayXml);
+        generator.generate();
+        List<Service> services = generator.getModel().getServices();
+        final Service service = services.get(0) ;
+        final ESBServiceEndpointInfo endpointInfo = new ESBServiceEndpointInfo(service) ;
+        String wsdl = ESBContractGenerator.generateWSDL(service, endpointInfo);
+        java.io.StringReader strReader = new java.io.StringReader(wsdl);
+        InputSource inputSource = new InputSource(strReader);
+        Definition def = WSDLFactory.newInstance().newWSDLReader().readWSDL("file://tmp.wsdl", inputSource);
+        assertNotNull("Failed to generate wsdl file" , def);
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,17 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayFault" type="x1:fault"/>
-  <xs:complexType name="fault">
-    <xs:sequence>
-      <xs:element name="code" type="xs:string"/>
-      <xs:element name="faultString" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-    <xs:element name="sayFault2" type="x1:fault2"/>
-  <xs:complexType name="fault2">
-    <xs:sequence>
-      <xs:element name="code" type="xs:int"/>
-      <xs:element name="descrption" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-</xs:schema>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/fault.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,17 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayFault" type="x1:fault"/>
+  <xs:complexType name="fault">
+    <xs:sequence>
+      <xs:element name="code" type="xs:string"/>
+      <xs:element name="faultString" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+    <xs:element name="sayFault2" type="x1:fault2"/>
+  <xs:complexType name="fault2">
+    <xs:sequence>
+      <xs:element name="code" type="xs:int"/>
+      <xs:element name="descrption" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+  
+</xs:schema>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,18 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb
-	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
-	<services>
-		<service category="FirstServiceESB" name="SimpleListener"
-			description="Hello World" invmScope="GLOBAL">>
-			<actions 
-				inXsd="/org/jboss/internal/soa/esb/webservice/request.xsd"
-				outXsd="/org/jboss/internal/soa/esb/webservice/response.xsd"
-				faultXsd="/org/jboss/internal/soa/esb/webservice/fault.xsd">
-				<action name="action2"
-					class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="printfull" value="true" />
-				</action>
-			</actions>
-		</service>
-	</services>
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/jbossesb_config_06.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,18 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb
+	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+	<services>
+		<service category="FirstServiceESB" name="SimpleListener"
+			description="Hello World" invmScope="GLOBAL">>
+			<actions 
+				inXsd="/org/jboss/internal/soa/esb/webservice/request.xsd"
+				outXsd="/org/jboss/internal/soa/esb/webservice/response.xsd"
+				faultXsd="/org/jboss/internal/soa/esb/webservice/fault.xsd">
+				<action name="action2"
+					class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="printfull" value="true" />
+				</action>
+			</actions>
+		</service>
+	</services>
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,8 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayHi" type="x1:sayHi"/>
-  <xs:complexType name="sayHi">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHi" type="x1:sayHi"/>
+  <xs:complexType name="sayHi">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,8 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayHiReponse" type="x1:sayHiReponse"/>
-  <xs:complexType name="sayHiReponse">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/response.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHiReponse" type="x1:sayHiReponse"/>
+  <xs:complexType name="sayHiReponse">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -51,6 +51,7 @@
 import org.jboss.soa.esb.listeners.gateway.DefaultESBPropertiesSetter;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.notification.jms.JMSPropertiesSetter;
 import org.jboss.soa.esb.testutils.SerializableMockQueue;
 import org.junit.Before;
 import org.junit.Test;
@@ -75,6 +76,7 @@
 	private final String bodyContent = "hello";
 	private Message msg;
 	private ConfigTree tree;
+	private static final String PROPERTY_SETTER_TEST_NAME = "MockJMSPropertiesSetter" ;
 
 
 	@Test
@@ -250,6 +252,16 @@
 		assertEquals( jndiPkgPrefix, router.getJndiPkgPrefix() );
 		assertEquals( connectionFactory, router.getConnectionFactory() );
 	}
+
+	@Test
+	public void usePropertyStrategy() throws ConfigurationException, NamingException, JMSException, ActionProcessingException
+	{
+		final ConfigTree tree = createConfigTree() ;
+		tree.setAttribute(JMSRouter.PROPERTY_STRATEGY, MockJMSPropertiesSetter.class.getName()) ;
+		final MockJMSRouter router = new MockJMSRouter(tree) ;
+		router.route(msg) ;
+		assertEquals("Property setter value", PROPERTY_SETTER_TEST_NAME, router.getJmsMessage().getStringProperty(PROPERTY_SETTER_TEST_NAME)) ;
+	}
 	
 	@Before
 	public void setup() throws URISyntaxException
@@ -351,6 +363,15 @@
 			return securityCredential;
 		}
 	}
+	
+	static class MockJMSPropertiesSetter implements JMSPropertiesSetter
+	{
+		public void setJMSProperties(final Message esbMsg, final javax.jms.Message jmsMessage)
+			throws JMSException
+		{
+			jmsMessage.setStringProperty(PROPERTY_SETTER_TEST_NAME, PROPERTY_SETTER_TEST_NAME) ;
+		}
+	}
 
 	/*
 	 * Just here to help Ant to find annotated test.

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/ServicePublisherUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,11 +1,15 @@
 package org.jboss.soa.esb.listeners.config;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
+import org.jboss.internal.soa.esb.webservice.ESBServiceContractPublisher;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
 
 /**
@@ -18,6 +22,8 @@
         ManagedLifecycleController controller1 = new ManagedLifecycleController(null); // TODO: Introduce an interface and Mock for ManagedLifecycleController
         ManagedLifecycleController controller2 = new ManagedLifecycleController(null); // TODO: Introduce an interface and Mock for ManagedLifecycleController
 
+        assertEquals("Service count", 0, ServicePublisher.getServices().size());
+        
         generator = new Generator(getClass().getResourceAsStream("jbossesb_config_04.xml"));
         ServicePublisher.addServicePublishers(controller1, generator.getModel());
         List<ServicePublisher> publishers = ServicePublisher.getServicePublishers();
@@ -27,6 +33,8 @@
         assertEquals("B2", publishers.get(1).getCategory() + publishers.get(1).getServiceName());
         assertEquals(null, publishers.get(1).getContractPublisher());
 
+        assertEquals("Service count", 2, ServicePublisher.getServices().size());
+        
         generator = new Generator(getClass().getResourceAsStream("jbossesb_config_05.xml"));
         ServicePublisher.addServicePublishers(controller2, generator.getModel());
         publishers = ServicePublisher.getServicePublishers();
@@ -39,13 +47,35 @@
         assertEquals(null, publishers.get(2).getContractPublisher());
         assertEquals("D4", publishers.get(3).getCategory() + publishers.get(3).getServiceName());
         assertTrue(publishers.get(3).getContractPublisher() instanceof MockContractPublisher);
+        
+        assertEquals("A1", 1, ServicePublisher.getServicePublishers(new Service("A", "1")).size()) ;
+        assertEquals("B2", 1, ServicePublisher.getServicePublishers(new Service("B", "2")).size()) ;
+        assertEquals("C3", 1, ServicePublisher.getServicePublishers(new Service("C", "3")).size()) ;
+        assertEquals("D4", 1, ServicePublisher.getServicePublishers(new Service("D", "4")).size()) ;
+        
+        assertEquals("Service count", 4, ServicePublisher.getServices().size());
 
+        final ESBServiceContractPublisher publisher = new ESBServiceContractPublisher(new Service("C", "3"), "test", "endpoint") ;
+        ServicePublisher.addContractReferencePublishers(controller2, Arrays.asList(publisher)) ;
+        assertEquals("C3", 2, ServicePublisher.getServicePublishers(new Service("C", "3")).size()) ;
+        
+        assertEquals("Service count", 4, ServicePublisher.getServices().size());
+        
         ServicePublisher.removeServicePublishers(controller1);
         publishers = ServicePublisher.getServicePublishers();
-        assertEquals(2, publishers.size());
+        assertEquals(3, publishers.size());
         assertEquals("C3", publishers.get(0).getCategory() + publishers.get(0).getServiceName());
         assertEquals(null, publishers.get(0).getContractPublisher());
-        assertEquals("D4", publishers.get(1).getCategory() + publishers.get(1).getServiceName());
-        assertTrue(publishers.get(1).getContractPublisher() instanceof MockContractPublisher);
+        assertEquals("C3", publishers.get(1).getCategory() + publishers.get(1).getServiceName());
+        assertTrue("ContractReferencePublisher", publishers.get(1).getPublisher() instanceof ContractReferencePublisher);
+        assertEquals("D4", publishers.get(2).getCategory() + publishers.get(2).getServiceName());
+        assertTrue(publishers.get(2).getContractPublisher() instanceof MockContractPublisher);
+        
+        assertEquals("Service count", 2, ServicePublisher.getServices().size());
+        
+        assertEquals("A1", 0, ServicePublisher.getServicePublishers(new Service("A", "1")).size()) ;
+        assertEquals("B2", 0, ServicePublisher.getServicePublishers(new Service("B", "2")).size()) ;
+        assertEquals("C3", 2, ServicePublisher.getServicePublishers(new Service("C", "3")).size()) ;
+        assertEquals("D4", 1, ServicePublisher.getServicePublishers(new Service("D", "4")).size()) ;
     }
 }

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_06.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_06.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_06.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_06.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,16 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb
+	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+	<services>
+		<service category="FirstServiceESB" name="SimpleListener"
+			description="Hello World" invmScope="GLOBAL">>
+			<actions mep="OneWay"
+				inXsd="/org/jboss/soa/esb/listeners/config/request.xsd">
+				<action name="action2"
+					class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="printfull" value="true" />
+				</action>
+			</actions>
+		</service>
+	</services>
+</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapperUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapperUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapperUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/SecurityMapperUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, 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.soa.esb.listeners.config.mappers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.config.Generator;
+import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
+import org.jboss.soa.esb.listeners.config.xbeanmodel.ServiceDocument.Service;
+import org.junit.Before;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Unit test for {@link SecurityMapper}
+ * <p/>
+ * 
+ * @author Daniel Bevenius
+ *
+ */
+public class SecurityMapperUnitTest
+{
+	private static final String ESB_CONFIG = "jbossesb_config_security.xml";
+	
+	private Element root;
+	private XMLBeansModel model;
+
+	private Service service;
+
+	private Node securityNode;
+	
+	@Test
+	public void mapRunAs() throws ConfigurationException
+	{
+		Node runAsNode = securityNode.getAttributes().getNamedItem( ListenerTagNames.RUN_AS_TAG );
+		assertNotNull( runAsNode.getNodeName() );
+		assertEquals( "MrPoon", runAsNode.getNodeValue() );
+	}
+	
+	@Test
+	public void mapModuleName() throws ConfigurationException
+	{
+		Node moduleNameNode = securityNode.getAttributes().getNamedItem( ListenerTagNames.MODULE_NAME_TAG );
+		assertNotNull( moduleNameNode.getNodeName() );
+		assertEquals( "mod1", moduleNameNode.getNodeValue());
+	}
+	
+	@Test
+	public void mapUseCallersIdentity() throws ConfigurationException
+	{
+		Node userIdentityNode = securityNode.getAttributes().getNamedItem( ListenerTagNames.USE_CALLERS_IDENTIDY_TAG );
+		assertNotNull( userIdentityNode.getNodeName() );
+		assertEquals( "user1", userIdentityNode.getNodeValue());
+	}
+	
+	//	setup methods
+	
+	@Before
+	public void setup() throws ConfigurationException, IOException
+	{
+		root = createRootElement();
+		model = getXmlBeanModel( ESB_CONFIG );
+		service = model.getServices().get( 0 );
+		
+		SecurityMapper.map( root, service );
+		securityNode = root.getFirstChild();
+	}
+	
+	private XMLBeansModel getXmlBeanModel( String fileName ) throws ConfigurationException, IOException
+	{
+		InputStream inputStream = getClass().getResourceAsStream( ESB_CONFIG );
+		GeneratorMock mock = new GeneratorMock( inputStream );
+		XMLBeansModel model = mock.getModel();
+		return model;
+	}
+	
+	private Element createRootElement() throws ConfigurationException
+	{
+		Document doc = YADOMUtil.createDocument();
+		Element root = YADOMUtil.addElement(doc, "jbossesb-gateways");
+		root.setAttribute("parameterReloadSecs", "1000" );
+		return root;
+	}
+	
+	/**
+	 * Just here to get proved access to the XMLBeansModel
+	 *
+	 */
+	private class GeneratorMock extends Generator
+	{
+
+		public GeneratorMock(InputStream config) throws ConfigurationException, IOException
+		{
+			super( config );
+		}
+
+		@Override
+		public XMLBeansModel getModel()
+		{
+			return super.getModel();
+		}
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter( SecurityMapperUnitTest.class );
+	}
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_config_security.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_config_security.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_config_security.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/mappers/jbossesb_config_security.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,34 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+
+	<providers>
+	
+    	<jms-provider
+            name="JBossMessaging"
+            connection-factory="XAConnectionFactory"
+            jndi-URL="jnp://127.0.0.1:1099"
+            jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+            jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
+
+            <jms-bus busid="quickstartEsbChannel">
+                <jms-message-filter
+                    dest-type="QUEUE"
+                    dest-name="queue/quickstart_jms_transacted_Request_esb"
+                    selector="CorrelationID = '13'"/>
+            </jms-bus>
+        </jms-provider>
+	
+    </providers>
+	<services>    
+		<service category="Test2" name="JMSJCATest" description="JMS JCA Test">
+            <security runAs="MrPoon" moduleName="mod1" useCallersIdentity="user1"/>
+			<listeners>    	    
+				<jms-listener name="JMSListener" busidref="quickstartEsbChannel" maxThreads="1"/>
+			</listeners>
+			<actions>    	    
+				<action name="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
+			</actions>
+		</service>
+	</services>
+	
+</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/request.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/request.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/request.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/request.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHi" type="x1:sayHi"/>
+  <xs:complexType name="sayHi">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/response.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/response.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/response.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/response.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHiReponse" type="x1:sayHiReponse"/>
+  <xs:complexType name="sayHiReponse">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,130 +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.soa.esb.services.security;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-import org.junit.Test;
-
-/**
- * Unit test for {@link SecurityConfigUtil}
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * 
- */
-public class SecurityConfigUtilUnitTest
-{
-	private String runAs = "kalle";
-	
-	@Test
-	public void createSecurityConfigInfoWithAuth()
-	{
-		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
-		
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		assertEquals(runAs, securityInfo.getRunAs());
-		assertNull(securityInfo.getUseCallerIdentity());
-	}
-	
-	@Test
-	public void createSecurityConfigInfoWithoutAuth()
-	{
-		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		assertEquals(runAs, securityInfo.getRunAs());
-		assertNull(securityInfo.getUseCallerIdentity());
-	}
-	
-	@Test
-	public void createSecurityConfigInfoWithUseCallersIdentity()
-	{
-		final String callersIdentity = "DrCox";
-		final ConfigTree securityFragment = createSecurityFragment(runAs, callersIdentity, null);
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		assertEquals(callersIdentity, securityInfo.getUseCallerIdentity());
-	}
-	
-	@Test
-	public void createSecurityConfigInfoWithModuleName()
-	{
-		final String moduleName = "testModule";
-		final ConfigTree securityFragment = createSecurityFragment(runAs, null, moduleName);
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		assertEquals(moduleName, securityInfo.getModuleName());
-	}
-	
-	@Test
-	public void hasRunAs()
-	{
-		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		assertTrue(securityInfo.hasRunAs());
-	}
-	
-	@Test
-	public void properties()
-	{
-		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null, "kalle");
-		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
-		Map<String, String> properties = securityInfo.getProperties();
-		assertNotNull( properties );
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(SecurityConfigUtilUnitTest.class);
-	}
-	
-	private ConfigTree createSecurityFragment(
-			final String runAs, 
-			final String callerIdentity, 
-			final String moduleName)
-	{
-		final ConfigTree securityElement = new ConfigTree(ListenerTagNames.SECURITY_TAG);
-		securityElement.setAttribute(ListenerTagNames.RUN_AS_TAG, runAs);
-		securityElement.setAttribute(ListenerTagNames.USE_CALLERS_IDENTIDY_TAG, callerIdentity);
-		securityElement.setAttribute(ListenerTagNames.MODULE_NAME_TAG, moduleName);
-		return securityElement;
-	}
-	
-	private ConfigTree createSecurityFragment(
-			final String runAs, 
-			final String callerIdentity, 
-			final String moduleName,
-			final String alias)
-	{
-		final ConfigTree securityElement = createSecurityFragment(runAs, callerIdentity, moduleName);
-		ConfigTree property = new ConfigTree("property", securityElement);
-		property.setAttribute("name", "alias");
-		property.setAttribute("value", alias);
-		return securityElement;
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityConfigUtilUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,130 @@
+/*
+ * 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.soa.esb.services.security;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link SecurityConfigUtil}
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * 
+ */
+public class SecurityConfigUtilUnitTest
+{
+	private String runAs = "kalle";
+	
+	@Test
+	public void createSecurityConfigInfoWithAuth()
+	{
+		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
+		
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		assertEquals(runAs, securityInfo.getRunAs());
+		assertNull(securityInfo.getUseCallerIdentity());
+	}
+	
+	@Test
+	public void createSecurityConfigInfoWithoutAuth()
+	{
+		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		assertEquals(runAs, securityInfo.getRunAs());
+		assertNull(securityInfo.getUseCallerIdentity());
+	}
+	
+	@Test
+	public void createSecurityConfigInfoWithUseCallersIdentity()
+	{
+		final String callersIdentity = "DrCox";
+		final ConfigTree securityFragment = createSecurityFragment(runAs, callersIdentity, null);
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		assertEquals(callersIdentity, securityInfo.getUseCallerIdentity());
+	}
+	
+	@Test
+	public void createSecurityConfigInfoWithModuleName()
+	{
+		final String moduleName = "testModule";
+		final ConfigTree securityFragment = createSecurityFragment(runAs, null, moduleName);
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		assertEquals(moduleName, securityInfo.getModuleName());
+	}
+	
+	@Test
+	public void hasRunAs()
+	{
+		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null);
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		assertTrue(securityInfo.hasRunAs());
+	}
+	
+	@Test
+	public void properties()
+	{
+		final ConfigTree securityFragment = createSecurityFragment(runAs, null, null, "kalle");
+		SecurityConfig securityInfo = SecurityConfigUtil.createSecurityConfig(securityFragment);
+		Map<String, String> properties = securityInfo.getProperties();
+		assertNotNull( properties );
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(SecurityConfigUtilUnitTest.class);
+	}
+	
+	private ConfigTree createSecurityFragment(
+			final String runAs, 
+			final String callerIdentity, 
+			final String moduleName)
+	{
+		final ConfigTree securityElement = new ConfigTree(ListenerTagNames.SECURITY_TAG);
+		securityElement.setAttribute(ListenerTagNames.RUN_AS_TAG, runAs);
+		securityElement.setAttribute(ListenerTagNames.USE_CALLERS_IDENTIDY_TAG, callerIdentity);
+		securityElement.setAttribute(ListenerTagNames.MODULE_NAME_TAG, moduleName);
+		return securityElement;
+	}
+	
+	private ConfigTree createSecurityFragment(
+			final String runAs, 
+			final String callerIdentity, 
+			final String moduleName,
+			final String alias)
+	{
+		final ConfigTree securityElement = createSecurityFragment(runAs, callerIdentity, moduleName);
+		ConfigTree property = new ConfigTree("property", securityElement);
+		property.setAttribute("name", "alias");
+		property.setAttribute("value", alias);
+		return securityElement;
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,59 +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.soa.esb.services.security;
-
-import static org.junit.Assert.*;
-
-import javax.security.auth.Subject;
-
-import org.jboss.soa.esb.services.security.principals.Group;
-import org.jboss.soa.esb.services.security.principals.Role;
-import org.jboss.soa.esb.services.security.principals.User;
-import org.junit.Test;
-
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class SecurityContextUnitTest
-{
-	@Test
-	public void isCallerInRole()
-	{
-		Subject subject = new Subject();
-		subject.getPrincipals().add( new User("AustinPowerwich") );
-		Group roles = new Group("Roles");
-		roles.addMember( new Role("Admin"));
-		subject.getPrincipals().add(roles);
-		
-		SecurityContext securityContext = new SecurityContext(subject);
-		boolean callerInRole = securityContext.isCallerInRole("Admin");
-		assertTrue( callerInRole );
-	}
-
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(SecurityContextUnitTest.class);
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityContextUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,59 @@
+/*
+ * 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.soa.esb.services.security;
+
+import static org.junit.Assert.*;
+
+import javax.security.auth.Subject;
+
+import org.jboss.soa.esb.services.security.principals.Group;
+import org.jboss.soa.esb.services.security.principals.Role;
+import org.jboss.soa.esb.services.security.principals.User;
+import org.junit.Test;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class SecurityContextUnitTest
+{
+	@Test
+	public void isCallerInRole()
+	{
+		Subject subject = new Subject();
+		subject.getPrincipals().add( new User("AustinPowerwich") );
+		Group roles = new Group("Roles");
+		roles.addMember( new Role("Admin"));
+		subject.getPrincipals().add(roles);
+		
+		SecurityContext securityContext = new SecurityContext(subject);
+		boolean callerInRole = securityContext.isCallerInRole("Admin");
+		assertTrue( callerInRole );
+	}
+
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(SecurityContextUnitTest.class);
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,72 +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.soa.esb.services.security;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URL;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.common.Environment;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class SecurityServiceFactoryUnitTest
-{
-	private String jbossEsbProperties;
-
-
-	@Test 
-	public void getSecurityService() throws Exception
-	{
-		SecurityService securityService = SecurityServiceFactory.getSecurityService();
-		assertNotNull( securityService );
-	}
-	
-	@Before
-	public void setup()
-	{
-        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(SecurityServiceFactoryUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/SecurityServiceFactoryUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,72 @@
+/*
+ * 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.soa.esb.services.security;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URL;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class SecurityServiceFactoryUnitTest
+{
+	private String jbossEsbProperties;
+
+
+	@Test 
+	public void getSecurityService() throws Exception
+	{
+		SecurityService securityService = SecurityServiceFactory.getSecurityService();
+		assertNotNull( securityService );
+	}
+	
+	@Before
+	public void setup()
+	{
+        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(SecurityServiceFactoryUnitTest.class);
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,126 +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.soa.esb.services.security;
-
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-
-/**
- * LoginModule intended for testing perposes. <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- */
-public class TestLoginModule implements LoginModule
-{
-	private Subject subject;
-
-	// the authentication status
-	private boolean succeeded = false;
-
-	private boolean commitSucceeded = false;
-
-	private String username = "test";
-
-	private TestPrincipal principal;
-
-	private static boolean forceLogin;
-
-	private CallbackHandler callbackHandler;
-	
-	public void initialize( final Subject subject, final CallbackHandler callbackHandler, final Map<String,?> sharedState, final Map<String,?> options )
-	{
-		this.subject = subject;
-		this.callbackHandler = callbackHandler;
-		forceLogin = "true".equalsIgnoreCase( (String) options.get( "forceLogin" ) );
-	}
-
-	public boolean login() throws LoginException
-	{
-		if ( forceLogin )
-		{
-    		succeeded = true;
-    		return true;
-		}
-		else
-		{
-    		succeeded = false;
-			throw new FailedLoginException( "Login failed" );
-		}
-	}
-
-	public boolean commit() throws LoginException
-	{
-		if (succeeded == false)
-		{
-			return false;
-		} 
-		else
-		{
-			principal = new TestPrincipal( username );
-			if ( !subject.getPrincipals().contains( principal ) )
-			{
-				subject.getPrincipals().add( principal );
-			}
-
-			// in any case, clean out state
-			username = null;
-
-			commitSucceeded = true;
-			return true;
-		}
-	}
-
-	public boolean abort() throws LoginException
-	{
-		if (succeeded == false)
-		{
-			return false;
-		} 
-		else if ( succeeded == true && commitSucceeded == false)
-		{
-			// login succeeded but overall authentication failed
-			succeeded = false;
-			username = null;
-			principal = null;
-		} 
-		else
-		{
-			logout();
-		}
-		return true;
-	}
-
-	public boolean logout() throws LoginException
-	{
-
-		subject.getPrincipals().remove( principal );
-		succeeded = false;
-		succeeded = commitSucceeded;
-		username = null;
-		principal = null;
-		return true;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestLoginModule.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,126 @@
+/*
+ * 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.soa.esb.services.security;
+
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+/**
+ * LoginModule intended for testing perposes. <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ */
+public class TestLoginModule implements LoginModule
+{
+	private Subject subject;
+
+	// the authentication status
+	private boolean succeeded = false;
+
+	private boolean commitSucceeded = false;
+
+	private String username = "test";
+
+	private TestPrincipal principal;
+
+	private static boolean forceLogin;
+
+	private CallbackHandler callbackHandler;
+	
+	public void initialize( final Subject subject, final CallbackHandler callbackHandler, final Map<String,?> sharedState, final Map<String,?> options )
+	{
+		this.subject = subject;
+		this.callbackHandler = callbackHandler;
+		forceLogin = "true".equalsIgnoreCase( (String) options.get( "forceLogin" ) );
+	}
+
+	public boolean login() throws LoginException
+	{
+		if ( forceLogin )
+		{
+    		succeeded = true;
+    		return true;
+		}
+		else
+		{
+    		succeeded = false;
+			throw new FailedLoginException( "Login failed" );
+		}
+	}
+
+	public boolean commit() throws LoginException
+	{
+		if (succeeded == false)
+		{
+			return false;
+		} 
+		else
+		{
+			principal = new TestPrincipal( username );
+			if ( !subject.getPrincipals().contains( principal ) )
+			{
+				subject.getPrincipals().add( principal );
+			}
+
+			// in any case, clean out state
+			username = null;
+
+			commitSucceeded = true;
+			return true;
+		}
+	}
+
+	public boolean abort() throws LoginException
+	{
+		if (succeeded == false)
+		{
+			return false;
+		} 
+		else if ( succeeded == true && commitSucceeded == false)
+		{
+			// login succeeded but overall authentication failed
+			succeeded = false;
+			username = null;
+			principal = null;
+		} 
+		else
+		{
+			logout();
+		}
+		return true;
+	}
+
+	public boolean logout() throws LoginException
+	{
+
+		subject.getPrincipals().remove( principal );
+		succeeded = false;
+		succeeded = commitSucceeded;
+		username = null;
+		principal = null;
+		return true;
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,58 +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.soa.esb.services.security;
-
-import java.security.Principal;
-
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-
-/**
- * Principal intented for use in test. </p>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- */
-public class TestPrincipal implements Principal, java.io.Serializable
-{
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * @serial
-	 */
-	private String name;
-
-	public TestPrincipal(String name)
-	{
-		AssertArgument.isNotNull( name, "name" );
-		this.name = name;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-	
-	@Override
-	public String toString()
-	{
-		return "TestPrincipal [ name=" + name + "]";
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/TestPrincipal.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,58 @@
+/*
+ * 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.soa.esb.services.security;
+
+import java.security.Principal;
+
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+
+/**
+ * Principal intented for use in test. </p>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ */
+public class TestPrincipal implements Principal, java.io.Serializable
+{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * @serial
+	 */
+	private String name;
+
+	public TestPrincipal(String name)
+	{
+		AssertArgument.isNotNull( name, "name" );
+		this.name = name;
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "TestPrincipal [ name=" + name + "]";
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,111 +0,0 @@
-package org.jboss.soa.esb.services.security;
-
-import java.io.IOException;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-
-public class UserPassLoginModule implements LoginModule
-{
-	private Subject subject;
-	private CallbackHandler callbackHandler;
-	private TestPrincipal principal;
-
-	private String userName = null;
-	private boolean succeeded = false;
-	private boolean commitSucceeded = false;
-
-	public void initialize(
-			final Subject subject, 
-			final CallbackHandler callbackHandler , 
-			final Map<String,?> sharedMap, 
-			final Map<String,?> options)
-	{
-		this.subject = subject;
-		this.callbackHandler = callbackHandler;
-	}
-
-	public boolean login() throws LoginException
-	{
-		NameCallback nameCallback = new NameCallback("user:");
-		PasswordCallback passwordCallback = new PasswordCallback("password:", true);
-		try
-		{
-			callbackHandler.handle(new Callback[] { nameCallback, passwordCallback });
-		} 
-		catch (IOException e)
-		{
-			throw new LoginException(e.getMessage());
-		} 
-		catch (UnsupportedCallbackException e)
-		{
-			throw new LoginException(e.getMessage());
-		}
-		
-		// dummy login
-		final String name = nameCallback.getName();
-		final String passwd = new String(passwordCallback.getPassword());
-		if (name.equals("testUser") && passwd.equals("testPassword"))
-		{
-			userName = name;
-			succeeded = true;
-			return true;
-		} else
-		{
-			succeeded = false;
-			return false;
-		}
-	}
-
-	public boolean commit() throws LoginException
-	{
-		if (!succeeded)
-		{
-			userName = null;
-			return false;
-		}
-
-		principal = new TestPrincipal(userName);
-		if (!subject.getPrincipals().contains(principal))
-		{
-			subject.getPrincipals().add(principal);
-		}
-
-		userName = null;
-		commitSucceeded = true;
-		return true;
-	}
-
-	public boolean abort() throws LoginException
-	{
-		if (succeeded == false)
-		{
-			return false;
-		}
-		else if (succeeded == true && commitSucceeded == true)
-		{
-			logout();
-		} 
-		else
-		{
-			succeeded = false;
-		}
-		return true;
-	}
-
-	public boolean logout() throws LoginException
-	{
-		subject.getPrincipals().remove(principal);
-		principal = null;
-		userName = null;
-		succeeded = commitSucceeded = false;
-		return true;
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/UserPassLoginModule.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,111 @@
+package org.jboss.soa.esb.services.security;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+public class UserPassLoginModule implements LoginModule
+{
+	private Subject subject;
+	private CallbackHandler callbackHandler;
+	private TestPrincipal principal;
+
+	private String userName = null;
+	private boolean succeeded = false;
+	private boolean commitSucceeded = false;
+
+	public void initialize(
+			final Subject subject, 
+			final CallbackHandler callbackHandler , 
+			final Map<String,?> sharedMap, 
+			final Map<String,?> options)
+	{
+		this.subject = subject;
+		this.callbackHandler = callbackHandler;
+	}
+
+	public boolean login() throws LoginException
+	{
+		NameCallback nameCallback = new NameCallback("user:");
+		PasswordCallback passwordCallback = new PasswordCallback("password:", true);
+		try
+		{
+			callbackHandler.handle(new Callback[] { nameCallback, passwordCallback });
+		} 
+		catch (IOException e)
+		{
+			throw new LoginException(e.getMessage());
+		} 
+		catch (UnsupportedCallbackException e)
+		{
+			throw new LoginException(e.getMessage());
+		}
+		
+		// dummy login
+		final String name = nameCallback.getName();
+		final String passwd = new String(passwordCallback.getPassword());
+		if (name.equals("testUser") && passwd.equals("testPassword"))
+		{
+			userName = name;
+			succeeded = true;
+			return true;
+		} else
+		{
+			succeeded = false;
+			return false;
+		}
+	}
+
+	public boolean commit() throws LoginException
+	{
+		if (!succeeded)
+		{
+			userName = null;
+			return false;
+		}
+
+		principal = new TestPrincipal(userName);
+		if (!subject.getPrincipals().contains(principal))
+		{
+			subject.getPrincipals().add(principal);
+		}
+
+		userName = null;
+		commitSucceeded = true;
+		return true;
+	}
+
+	public boolean abort() throws LoginException
+	{
+		if (succeeded == false)
+		{
+			return false;
+		}
+		else if (succeeded == true && commitSucceeded == true)
+		{
+			logout();
+		} 
+		else
+		{
+			succeeded = false;
+		}
+		return true;
+	}
+
+	public boolean logout() throws LoginException
+	{
+		subject.getPrincipals().remove(principal);
+		principal = null;
+		userName = null;
+		succeeded = commitSucceeded = false;
+		return true;
+	}
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,70 +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.soa.esb.services.security.actions;
-
-import static org.junit.Assert.*;
-
-import javax.security.auth.Subject;
-
-import org.jboss.security.SecurityAssociation;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.services.security.SecurityContext;
-import org.jboss.soa.esb.services.security.SecurityService;
-import org.jboss.soa.esb.services.security.principals.User;
-import org.junit.Test;
-
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * Unittest for {@link JBossSecurityPropagator}
- * </p>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class JBossSecurityPropagatorUnitTest
-{
-	@Test
-	public void process()
-	{
-		JBossSecurityPropagator propagator = new JBossSecurityPropagator();
-		propagator.setRunAs("adminRole");
-		Message message = MessageFactory.getInstance().getMessage();
-		Subject subject = new Subject();
-		subject.getPrincipals().add(new User("testUser"));
-		
-		SecurityContext securityContext = new SecurityContext(subject);
-		message.getProperties().setProperty( SecurityService.CONTEXT, securityContext );
-		
-		propagator.process(message);
-		
-		Subject jbossSubject = SecurityAssociation.getSubject();
-		System.out.println(jbossSubject);
-		assertEquals( subject, jbossSubject);
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(JBossSecurityPropagatorUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/actions/JBossSecurityPropagatorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,70 @@
+/*
+ * 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.soa.esb.services.security.actions;
+
+import static org.junit.Assert.*;
+
+import javax.security.auth.Subject;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.services.security.SecurityContext;
+import org.jboss.soa.esb.services.security.SecurityService;
+import org.jboss.soa.esb.services.security.principals.User;
+import org.junit.Test;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * Unittest for {@link JBossSecurityPropagator}
+ * </p>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class JBossSecurityPropagatorUnitTest
+{
+	@Test
+	public void process()
+	{
+		JBossSecurityPropagator propagator = new JBossSecurityPropagator();
+		propagator.setRunAs("adminRole");
+		Message message = MessageFactory.getInstance().getMessage();
+		Subject subject = new Subject();
+		subject.getPrincipals().add(new User("testUser"));
+		
+		SecurityContext securityContext = new SecurityContext(subject);
+		message.getProperties().setProperty( SecurityService.CONTEXT, securityContext );
+		
+		propagator.process(message);
+		
+		Subject jbossSubject = SecurityAssociation.getSubject();
+		System.out.println(jbossSubject);
+		assertEquals( subject, jbossSubject);
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(JBossSecurityPropagatorUnitTest.class);
+	}
+
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,52 +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.soa.esb.services.security.auth;
-
-import static org.junit.Assert.*;
-
-import java.security.Principal;
-
-import org.jboss.soa.esb.services.security.TestPrincipal;
-import org.junit.Test;
-
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class AuthenticationRequestUnitTest
-{
-	@Test
-	public void contruct()
-	{
-		final Principal principal = new TestPrincipal("testUser");
-		AuthenticationRequest request = new AuthenticationRequestImpl.Builder(principal, null ).bulid();
-		assertEquals( principal, request.getPrincipal());
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(AuthenticationRequestUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,52 @@
+/*
+ * 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.soa.esb.services.security.auth;
+
+import static org.junit.Assert.*;
+
+import java.security.Principal;
+
+import org.jboss.soa.esb.services.security.TestPrincipal;
+import org.junit.Test;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class AuthenticationRequestUnitTest
+{
+	@Test
+	public void contruct()
+	{
+		final Principal principal = new TestPrincipal("testUser");
+		AuthenticationRequest request = new AuthenticationRequestImpl.Builder(principal, null ).bulid();
+		assertEquals( principal, request.getPrincipal());
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(AuthenticationRequestUnitTest.class);
+	}
+
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,373 +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.soa.esb.services.security.auth.http;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.util.Base64;
-import org.junit.Test;
-
-/**
- * Unit test for {@link HttpSecurityInfoExtractor} 
- * <p>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- */
-public class HttpSecurityInfoExtractorUnitTest
-{
-	private String username = "Bob";
-	private String password = "Kelso";
-	
-	@Test
-	public void extractSecurityInfo() throws IOException
-	{
-		HttpSecurityInfoExtractor extractor = new HttpSecurityInfoExtractor();
-		MockHttpServletRequest httpRequest = new MockHttpServletRequest();
-		httpRequest.setAuthType("BASIC");
-		String userNamePassword= username + ":" + password;
-		String base64Userpass = Base64.encodeBytes(userNamePassword.getBytes());
-		final String authString = "Basic " + base64Userpass;
-		
-		httpRequest.addHeader("Authorization", authString);
-		AuthenticationRequest authRequest = extractor.extractSecurityInfo(httpRequest);
-		
-		assertNotNull(authRequest); 
-		char[] passwd = (char[]) authRequest.getCredentials().iterator().next();
-		assertEquals(password, new String(passwd));
-		assertEquals(username, authRequest.getPrincipal().getName());
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(HttpSecurityInfoExtractorUnitTest.class);
-	}
-	
-	private static class MockHttpServletRequest implements HttpServletRequest
-	{
-		private String authType;
-		private Map<String,String> headers = new HashMap<String,String>();
-		
-		public void setAuthType(String authType)
-		{
-			this.authType = authType;
-		}
-
-		public String getAuthType()
-		{
-			return authType;
-		}
-
-		public String getContextPath()
-		{
-			return null;
-		}
-
-		public Cookie[] getCookies()
-		{
-			return null;
-		}
-
-		public long getDateHeader(String arg0)
-		{
-			return 0;
-		}
-
-		public String getHeader(String header)
-		{
-			return headers.get(header);
-		}
-		public void addHeader(final String headerName, final String object)
-		{
-			headers.put(headerName, object);
-		}
-
-		public Enumeration getHeaderNames()
-		{
-			return null;
-		}
-
-		public Enumeration getHeaders(String arg0)
-		{
-			return null;
-		}
-
-		public int getIntHeader(String arg0)
-		{
-			return 0;
-		}
-
-		public String getMethod()
-		{
-			return null;
-		}
-
-		public String getPathInfo()
-		{
-			return null;
-		}
-
-		public String getPathTranslated()
-		{
-			return null;
-		}
-
-		public String getQueryString()
-		{
-			return null;
-		}
-
-		public String getRemoteUser()
-		{
-			return null;
-		}
-
-		public String getRequestURI()
-		{
-			return null;
-		}
-
-		public StringBuffer getRequestURL()
-		{
-			return null;
-		}
-
-		public String getRequestedSessionId()
-		{
-			return null;
-		}
-
-		public String getServletPath()
-		{
-			return null;
-		}
-
-		public HttpSession getSession()
-		{
-			return null;
-		}
-
-		public HttpSession getSession(boolean arg0)
-		{
-			return null;
-		}
-		
-		private Principal userPrincipal;
-
-		public void setUserPrincipal(Principal userPrincipal)
-		{
-			this.userPrincipal = userPrincipal;
-		}
-
-		public Principal getUserPrincipal()
-		{
-			return this.userPrincipal;
-		}
-
-		public boolean isRequestedSessionIdFromCookie()
-		{
-			return false;
-		}
-
-		public boolean isRequestedSessionIdFromURL()
-		{
-			return false;
-		}
-
-		public boolean isRequestedSessionIdFromUrl()
-		{
-			return false;
-		}
-
-		public boolean isRequestedSessionIdValid()
-		{
-			return false;
-		}
-
-		public boolean isUserInRole(String arg0)
-		{
-			return false;
-		}
-
-		public Object getAttribute(String arg0)
-		{
-			return null;
-		}
-
-		public Enumeration getAttributeNames()
-		{
-			return null;
-		}
-
-		public String getCharacterEncoding()
-		{
-			return null;
-		}
-
-		public int getContentLength()
-		{
-			return 0;
-		}
-
-		public String getContentType()
-		{
-			return null;
-		}
-
-		public ServletInputStream getInputStream() throws IOException
-		{
-			return null;
-		}
-
-		public String getLocalAddr()
-		{
-			return null;
-		}
-
-		public String getLocalName()
-		{
-			return null;
-		}
-
-		public int getLocalPort()
-		{
-			return 0;
-		}
-
-		public Locale getLocale()
-		{
-			return null;
-		}
-
-		public Enumeration getLocales()
-		{
-			return null;
-		}
-
-		public String getParameter(String arg0)
-		{
-			return null;
-		}
-
-		public Map getParameterMap()
-		{
-			return null;
-		}
-
-		public Enumeration getParameterNames()
-		{
-			return null;
-		}
-
-		public String[] getParameterValues(String arg0)
-		{
-			return null;
-		}
-
-		public String getProtocol()
-		{
-			return null;
-		}
-
-		public BufferedReader getReader() throws IOException
-		{
-			return null;
-		}
-
-		public String getRealPath(String arg0)
-		{
-			return null;
-		}
-
-		public String getRemoteAddr()
-		{
-			return null;
-		}
-
-		public String getRemoteHost()
-		{
-			return null;
-		}
-
-		public int getRemotePort()
-		{
-			return 0;
-		}
-
-		public RequestDispatcher getRequestDispatcher(String arg0)
-		{
-			return null;
-		}
-
-		public String getScheme()
-		{
-			return null;
-		}
-
-		public String getServerName()
-		{
-			return null;
-		}
-
-		public int getServerPort()
-		{
-			return 0;
-		}
-
-		public boolean isSecure()
-		{
-			return false;
-		}
-
-		public void removeAttribute(String arg0)
-		{
-		}
-
-		public void setAttribute(String arg0, Object arg1)
-		{
-		}
-
-		public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
-		{
-		}
-		
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,373 @@
+/*
+ * 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.soa.esb.services.security.auth.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.util.Base64;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link HttpSecurityInfoExtractor} 
+ * <p>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ */
+public class HttpSecurityInfoExtractorUnitTest
+{
+	private String username = "Bob";
+	private String password = "Kelso";
+	
+	@Test
+	public void extractSecurityInfo() throws IOException
+	{
+		HttpSecurityInfoExtractor extractor = new HttpSecurityInfoExtractor();
+		MockHttpServletRequest httpRequest = new MockHttpServletRequest();
+		httpRequest.setAuthType("BASIC");
+		String userNamePassword= username + ":" + password;
+		String base64Userpass = Base64.encodeBytes(userNamePassword.getBytes());
+		final String authString = "Basic " + base64Userpass;
+		
+		httpRequest.addHeader("Authorization", authString);
+		AuthenticationRequest authRequest = extractor.extractSecurityInfo(httpRequest);
+		
+		assertNotNull(authRequest); 
+		char[] passwd = (char[]) authRequest.getCredentials().iterator().next();
+		assertEquals(password, new String(passwd));
+		assertEquals(username, authRequest.getPrincipal().getName());
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(HttpSecurityInfoExtractorUnitTest.class);
+	}
+	
+	private static class MockHttpServletRequest implements HttpServletRequest
+	{
+		private String authType;
+		private Map<String,String> headers = new HashMap<String,String>();
+		
+		public void setAuthType(String authType)
+		{
+			this.authType = authType;
+		}
+
+		public String getAuthType()
+		{
+			return authType;
+		}
+
+		public String getContextPath()
+		{
+			return null;
+		}
+
+		public Cookie[] getCookies()
+		{
+			return null;
+		}
+
+		public long getDateHeader(String arg0)
+		{
+			return 0;
+		}
+
+		public String getHeader(String header)
+		{
+			return headers.get(header);
+		}
+		public void addHeader(final String headerName, final String object)
+		{
+			headers.put(headerName, object);
+		}
+
+		public Enumeration getHeaderNames()
+		{
+			return null;
+		}
+
+		public Enumeration getHeaders(String arg0)
+		{
+			return null;
+		}
+
+		public int getIntHeader(String arg0)
+		{
+			return 0;
+		}
+
+		public String getMethod()
+		{
+			return null;
+		}
+
+		public String getPathInfo()
+		{
+			return null;
+		}
+
+		public String getPathTranslated()
+		{
+			return null;
+		}
+
+		public String getQueryString()
+		{
+			return null;
+		}
+
+		public String getRemoteUser()
+		{
+			return null;
+		}
+
+		public String getRequestURI()
+		{
+			return null;
+		}
+
+		public StringBuffer getRequestURL()
+		{
+			return null;
+		}
+
+		public String getRequestedSessionId()
+		{
+			return null;
+		}
+
+		public String getServletPath()
+		{
+			return null;
+		}
+
+		public HttpSession getSession()
+		{
+			return null;
+		}
+
+		public HttpSession getSession(boolean arg0)
+		{
+			return null;
+		}
+		
+		private Principal userPrincipal;
+
+		public void setUserPrincipal(Principal userPrincipal)
+		{
+			this.userPrincipal = userPrincipal;
+		}
+
+		public Principal getUserPrincipal()
+		{
+			return this.userPrincipal;
+		}
+
+		public boolean isRequestedSessionIdFromCookie()
+		{
+			return false;
+		}
+
+		public boolean isRequestedSessionIdFromURL()
+		{
+			return false;
+		}
+
+		public boolean isRequestedSessionIdFromUrl()
+		{
+			return false;
+		}
+
+		public boolean isRequestedSessionIdValid()
+		{
+			return false;
+		}
+
+		public boolean isUserInRole(String arg0)
+		{
+			return false;
+		}
+
+		public Object getAttribute(String arg0)
+		{
+			return null;
+		}
+
+		public Enumeration getAttributeNames()
+		{
+			return null;
+		}
+
+		public String getCharacterEncoding()
+		{
+			return null;
+		}
+
+		public int getContentLength()
+		{
+			return 0;
+		}
+
+		public String getContentType()
+		{
+			return null;
+		}
+
+		public ServletInputStream getInputStream() throws IOException
+		{
+			return null;
+		}
+
+		public String getLocalAddr()
+		{
+			return null;
+		}
+
+		public String getLocalName()
+		{
+			return null;
+		}
+
+		public int getLocalPort()
+		{
+			return 0;
+		}
+
+		public Locale getLocale()
+		{
+			return null;
+		}
+
+		public Enumeration getLocales()
+		{
+			return null;
+		}
+
+		public String getParameter(String arg0)
+		{
+			return null;
+		}
+
+		public Map getParameterMap()
+		{
+			return null;
+		}
+
+		public Enumeration getParameterNames()
+		{
+			return null;
+		}
+
+		public String[] getParameterValues(String arg0)
+		{
+			return null;
+		}
+
+		public String getProtocol()
+		{
+			return null;
+		}
+
+		public BufferedReader getReader() throws IOException
+		{
+			return null;
+		}
+
+		public String getRealPath(String arg0)
+		{
+			return null;
+		}
+
+		public String getRemoteAddr()
+		{
+			return null;
+		}
+
+		public String getRemoteHost()
+		{
+			return null;
+		}
+
+		public int getRemotePort()
+		{
+			return 0;
+		}
+
+		public RequestDispatcher getRequestDispatcher(String arg0)
+		{
+			return null;
+		}
+
+		public String getScheme()
+		{
+			return null;
+		}
+
+		public String getServerName()
+		{
+			return null;
+		}
+
+		public int getServerPort()
+		{
+			return 0;
+		}
+
+		public boolean isSecure()
+		{
+			return false;
+		}
+
+		public void removeAttribute(String arg0)
+		{
+		}
+
+		public void setAttribute(String arg0, Object arg1)
+		{
+		}
+
+		public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
+		{
+		}
+		
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,73 +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.soa.esb.services.security.auth.http;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.junit.Test;
-
-/**
- * Unit test for {@link JbrHttpSecurityInfoExtractor} 
- * <p>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @since 4.4
- */
-public class JbrHttpSecurityInfoExtractorUnitTest
-{
-	private String username = "Alf";
-	private String password = "Melmac";
-	
-	@Test
-	public void extractSecurityInfo()
-	{
-		Map<String,Object> metadata = createRequestMap(username, password);
-		
-		JbrHttpSecurityInfoExtractor extractor = new JbrHttpSecurityInfoExtractor();
-		AuthenticationRequest authRequest = extractor.extractSecurityInfo(metadata);
-		
-		assertNotNull(authRequest); 
-		assertEquals(username, authRequest.getPrincipal().getName());
-		char[] passwd = (char[]) authRequest.getCredentials().iterator().next();
-		assertEquals(password, new String(passwd));
-	}
-	
-	private Map<String,Object> createRequestMap(final String username, final String password)
-	{
-		Map<String,Object> metadata = new HashMap<String,Object>();
-        metadata.put("http.basic.username", username);
-        metadata.put("http.basic.password", password);
-        return metadata;
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(JbrHttpSecurityInfoExtractorUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,73 @@
+/*
+ * 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.soa.esb.services.security.auth.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link JbrHttpSecurityInfoExtractor} 
+ * <p>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @since 4.4
+ */
+public class JbrHttpSecurityInfoExtractorUnitTest
+{
+	private String username = "Alf";
+	private String password = "Melmac";
+	
+	@Test
+	public void extractSecurityInfo()
+	{
+		Map<String,Object> metadata = createRequestMap(username, password);
+		
+		JbrHttpSecurityInfoExtractor extractor = new JbrHttpSecurityInfoExtractor();
+		AuthenticationRequest authRequest = extractor.extractSecurityInfo(metadata);
+		
+		assertNotNull(authRequest); 
+		assertEquals(username, authRequest.getPrincipal().getName());
+		char[] passwd = (char[]) authRequest.getCredentials().iterator().next();
+		assertEquals(password, new String(passwd));
+	}
+	
+	private Map<String,Object> createRequestMap(final String username, final String password)
+	{
+		Map<String,Object> metadata = new HashMap<String,Object>();
+        metadata.put("http.basic.username", username);
+        metadata.put("http.basic.password", password);
+        return metadata;
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(JbrHttpSecurityInfoExtractorUnitTest.class);
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/keystore
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/keystore (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/keystore)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,104 +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.soa.esb.services.security.auth.ws;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * Unittest for {@link BinarySecurityToken}
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class BinarySecurityTokenTest
-{
-	private String expectedEncoding = "Base64Binary";
-	private String expectedValueType = "X509v3";
-	private BinarySecurityToken token = new BinarySecurityToken();
-	
-	@Test
-	public void setEncodingTypeWithNSPrefix()
-	{
-		token.setEncodingType("wsse:" + expectedEncoding);
-		assertEquals( expectedEncoding, token.getEncodingType() );
-	}
-	
-	@Test
-	public void setEncodingTypeWithNSPrefix2()
-	{
-		token.setEncodingType("d:" + expectedEncoding);
-		assertEquals( expectedEncoding, token.getEncodingType() );
-	}
-	
-	@Test
-	public void setEncodingTypeWithoutNSPrefix()
-	{
-		token.setEncodingType(expectedEncoding);
-		assertEquals( expectedEncoding, token.getEncodingType() );
-	}
-	
-	@Test
-	public void setEncodingType()
-	{
-		token.setEncodingType(expectedEncoding);
-		assertEquals( expectedEncoding, token.getEncodingType() );
-	}
-	
-	@Test
-	public void setEncodingTypeNull()
-	{
-		token.setEncodingType(null);
-		assertNull(token.getEncodingType());
-	}
-	
-	@Test
-	public void setKey() throws ConfigurationException, SAXException, IOException, ParserConfigurationException
-	{
-		token.setEncodingType(expectedEncoding);
-		token.setValueType(expectedValueType);
-		token.setKey(getExampleCert());
-	}
-	
-	private String getExampleCert() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		InputStream inputStream = ClassUtil.getResourceAsStream("cert-example.xml", getClass() );
-		return new String(StreamUtils.readStream(inputStream));
-	}
-
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(BinarySecurityTokenTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/BinarySecurityTokenTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,104 @@
+/*
+ * 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.soa.esb.services.security.auth.ws;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * Unittest for {@link BinarySecurityToken}
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class BinarySecurityTokenTest
+{
+	private String expectedEncoding = "Base64Binary";
+	private String expectedValueType = "X509v3";
+	private BinarySecurityToken token = new BinarySecurityToken();
+	
+	@Test
+	public void setEncodingTypeWithNSPrefix()
+	{
+		token.setEncodingType("wsse:" + expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
+	public void setEncodingTypeWithNSPrefix2()
+	{
+		token.setEncodingType("d:" + expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
+	public void setEncodingTypeWithoutNSPrefix()
+	{
+		token.setEncodingType(expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
+	public void setEncodingType()
+	{
+		token.setEncodingType(expectedEncoding);
+		assertEquals( expectedEncoding, token.getEncodingType() );
+	}
+	
+	@Test
+	public void setEncodingTypeNull()
+	{
+		token.setEncodingType(null);
+		assertNull(token.getEncodingType());
+	}
+	
+	@Test
+	public void setKey() throws ConfigurationException, SAXException, IOException, ParserConfigurationException
+	{
+		token.setEncodingType(expectedEncoding);
+		token.setValueType(expectedValueType);
+		token.setKey(getExampleCert());
+	}
+	
+	private String getExampleCert() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		InputStream inputStream = ClassUtil.getResourceAsStream("cert-example.xml", getClass() );
+		return new String(StreamUtils.readStream(inputStream));
+	}
+
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(BinarySecurityTokenTest.class);
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,90 +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.soa.esb.services.security.auth.ws;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
-import java.io.InputStream;
-import javax.xml.parsers.ParserConfigurationException;
-import junit.framework.JUnit4TestAdapter;
-import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-
-/**
- * Unit test for {@link WSSecurityInfoExtractor}
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class WSSecurityInfoExtractorUnitTest
-{
-	@Test
-	public void extractUserPassSecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		WSSecurityInfoExtractor extractor = new WSSecurityInfoExtractor("smooks-config.xml");
-		String soap = createUserPassSoapString();
-		AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
-		assertNotNull(authRequest);
-		assertEquals( "Clark", authRequest.getPrincipal().getName());
-	}
-	
-	@Test
-	public void extractKeySecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		WSSecurityInfoExtractor extractor = new WSSecurityInfoExtractor("smooks-config.xml");
-		String soap = createKeySoapString();
-		AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
-		assertNotNull(authRequest);
-		assertTrue( authRequest.getCredentials().size() > 0 );
-		Object cert = authRequest.getCredentials().iterator().next();
-		assertTrue( cert instanceof java.security.cert.X509Certificate);
-	}
-	
-	private String createUserPassSoapString() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		return getStringFromFile("soap-userpass-example.xml");
-	}
-	
-	private String createKeySoapString() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		return getStringFromFile("soap-keys-example.xml");
-	}
-	
-	private String getStringFromFile(final String fileName ) throws SAXException, IOException, ParserConfigurationException, ConfigurationException
-	{
-		InputStream inputStream = ClassUtil.getResourceAsStream(fileName, getClass() );
-		return new String(StreamUtils.readStream(inputStream));
-	}
-
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(WSSecurityInfoExtractorUnitTest.class);
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,90 @@
+/*
+ * 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.soa.esb.services.security.auth.ws;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.io.InputStream;
+import javax.xml.parsers.ParserConfigurationException;
+import junit.framework.JUnit4TestAdapter;
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.services.security.auth.AuthenticationRequest;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Unit test for {@link WSSecurityInfoExtractor}
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class WSSecurityInfoExtractorUnitTest
+{
+	@Test
+	public void extractUserPassSecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		WSSecurityInfoExtractor extractor = new WSSecurityInfoExtractor("smooks-config.xml");
+		String soap = createUserPassSoapString();
+		AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
+		assertNotNull(authRequest);
+		assertEquals( "Clark", authRequest.getPrincipal().getName());
+	}
+	
+	@Test
+	public void extractKeySecurityInfo() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		WSSecurityInfoExtractor extractor = new WSSecurityInfoExtractor("smooks-config.xml");
+		String soap = createKeySoapString();
+		AuthenticationRequest authRequest = extractor.extractSecurityInfo(soap);
+		assertNotNull(authRequest);
+		assertTrue( authRequest.getCredentials().size() > 0 );
+		Object cert = authRequest.getCredentials().iterator().next();
+		assertTrue( cert instanceof java.security.cert.X509Certificate);
+	}
+	
+	private String createUserPassSoapString() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		return getStringFromFile("soap-userpass-example.xml");
+	}
+	
+	private String createKeySoapString() throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		return getStringFromFile("soap-keys-example.xml");
+	}
+	
+	private String getStringFromFile(final String fileName ) throws SAXException, IOException, ParserConfigurationException, ConfigurationException
+	{
+		InputStream inputStream = ClassUtil.getResourceAsStream(fileName, getClass() );
+		return new String(StreamUtils.readStream(inputStream));
+	}
+
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(WSSecurityInfoExtractorUnitTest.class);
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,11 +0,0 @@
-MIICQjCCAasCBEif0tUwDQYJKoZIhvcNAQEEBQAwaDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0
-b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVK
-Qm9zczEPMA0GA1UEAxMGRGFuaWVsMB4XDTA4MDgxMTA1NDkwOVoXDTA4MTEwOTA1NDkwOVowaDEL
-MAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYD
-VQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVKQm9zczEPMA0GA1UEAxMGRGFuaWVsMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCdSh96Xyt4LeZbXz9pk4eaHrj2sGFmI9lkLQiW/DbF9ETXFvWYCS4N
-lsONmPx63KSbzJZQZRlJSAW2y6hQO18G9NMFQpn2W/jtPSw61kH3dXDQ+kZ2UMk9K93nt4XLvGm6
-dMQAGZAjzpz4lzhcYrDJI4NMw5LpeljDawkradtuiwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAHi2
-S1zC8jIqncSeMRwOvPOEQIcsZJELYFUCiTwPrAg5hNkp/oewm6uCkgqmry09+3+ZXg2KLQ+RgeuV
-8yfeBvk7TFjtOWeHWnBOaxKiAyLibxGchVfMPl847MZ2w4d6vu776cqb1NKghAE53dn9AzUHIWwx
-OizXyDaDiBMj5xgs

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/cert-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,11 @@
+MIICQjCCAasCBEif0tUwDQYJKoZIhvcNAQEEBQAwaDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0
+b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVK
+Qm9zczEPMA0GA1UEAxMGRGFuaWVsMB4XDTA4MDgxMTA1NDkwOVoXDTA4MTEwOTA1NDkwOVowaDEL
+MAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRAwDgYD
+VQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVKQm9zczEPMA0GA1UEAxMGRGFuaWVsMIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQCdSh96Xyt4LeZbXz9pk4eaHrj2sGFmI9lkLQiW/DbF9ETXFvWYCS4N
+lsONmPx63KSbzJZQZRlJSAW2y6hQO18G9NMFQpn2W/jtPSw61kH3dXDQ+kZ2UMk9K93nt4XLvGm6
+dMQAGZAjzpz4lzhcYrDJI4NMw5LpeljDawkradtuiwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAHi2
+S1zC8jIqncSeMRwOvPOEQIcsZJELYFUCiTwPrAg5hNkp/oewm6uCkgqmry09+3+ZXg2KLQ+RgeuV
+8yfeBvk7TFjtOWeHWnBOaxKiAyLibxGchVfMPl847MZ2w4d6vu776cqb1NKghAE53dn9AzUHIWwx
+OizXyDaDiBMj5xgs

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-    <resource-config selector="Envelope/Header/Security/UsernameToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">userNameToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
-        <param name="bindings">
-            <binding property="userName" selector="Username" default="" />
-            <binding property="password" selector="Password" />
-        </param>
-    </resource-config>
-    
-    <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">binarySecurityToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
-        <param name="bindings">
-            <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
-            <binding property="valueType" selector="BinarySecurityToken @ValueType" />
-            <binding property="key" selector="BinarySecurityToken" />
-        </param>
-    </resource-config>
-
-</smooks-resource-list>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+    <resource-config selector="Envelope/Header/Security/UsernameToken">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">userNameToken</param>
+        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
+        <param name="bindings">
+            <binding property="userName" selector="Username" default="" />
+            <binding property="password" selector="Password" />
+        </param>
+    </resource-config>
+    
+    <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
+        <resource>org.milyn.javabean.BeanPopulator</resource>
+        <param name="beanId">binarySecurityToken</param>
+        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
+        <param name="bindings">
+            <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
+            <binding property="valueType" selector="BinarySecurityToken @ValueType" />
+            <binding property="key" selector="BinarySecurityToken" />
+        </param>
+    </resource-config>
+
+</smooks-resource-list>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,22 +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://schemas.xmlsoap.org/ws/2002/04/secext">
-            <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>
-    </soap:Body>
-</soap:Envelope> 
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-keys-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,22 @@
+<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://schemas.xmlsoap.org/ws/2002/04/secext">
+            <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>
+    </soap:Body>
+</soap:Envelope> 
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,18 +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://schemas.xmlsoap.org/ws/2002/04/secext">
-      <wsse:UsernameToken>
-        <wsse:Username>Clark</wsse:Username>
-        <wsse:Password>griswald</wsse:Password>
-      </wsse:UsernameToken>
-    </wsse:Security>
-  </soap:Header>
-
-  <soap:Body>
-  </soap:Body>
-
-</soap:Envelope> 
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/soap-userpass-example.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,18 @@
+<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://schemas.xmlsoap.org/ws/2002/04/secext">
+      <wsse:UsernameToken>
+        <wsse:Username>Clark</wsse:Username>
+        <wsse:Password>griswald</wsse:Password>
+      </wsse:UsernameToken>
+    </wsse:Security>
+  </soap:Header>
+
+  <soap:Body>
+  </soap:Body>
+
+</soap:Envelope> 
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,9 +0,0 @@
-SuccessfulLogin {
-  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
-};
-FailureLogin {
-  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
-};
-UserPassLogin {
-  org.jboss.soa.esb.services.security.SimpleLoginModule required ;
-};
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,9 @@
+SuccessfulLogin {
+  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
+};
+FailureLogin {
+  org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
+};
+UserPassLogin {
+  org.jboss.soa.esb.services.security.SimpleLoginModule required ;
+};
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,69 +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.soa.esb.services.security.principals;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * Unit test for {@link Role}
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class GroupUnitTest
-{
-	private Group groupOne = new Group("groupOne");
-	private Group group1 = new Group("groupOne");
-	private Group groupTwo = new Group("groupTwo");
-	private Group group2 = new Group("groupTwo");
-	
-	@Test (expected = NullPointerException.class)
-	public void constuctWithNullGroupName()
-	{
-		new Group(null);
-	}
-
-	@Test
-	public void equals()
-	{
-		groupOne.addMember(new Role("role1"));
-		assertFalse(group1.equals(groupOne));
-		assertFalse(groupOne.equals(group1));
-		assertFalse(groupOne.equals(group2));
-		group1.addMember(new Role("role1"));
-		assertEquals(groupOne, group1);
-	}
-	
-	@Test
-	public void hashcode()
-	{
-		assertEquals(groupOne.hashCode(), group1.hashCode());
-		assertFalse(groupOne.hashCode() == groupTwo.hashCode());
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(GroupUnitTest.class);
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/GroupUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,69 @@
+/*
+ * 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.soa.esb.services.security.principals;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * Unit test for {@link Role}
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class GroupUnitTest
+{
+	private Group groupOne = new Group("groupOne");
+	private Group group1 = new Group("groupOne");
+	private Group groupTwo = new Group("groupTwo");
+	private Group group2 = new Group("groupTwo");
+	
+	@Test (expected = NullPointerException.class)
+	public void constuctWithNullGroupName()
+	{
+		new Group(null);
+	}
+
+	@Test
+	public void equals()
+	{
+		groupOne.addMember(new Role("role1"));
+		assertFalse(group1.equals(groupOne));
+		assertFalse(groupOne.equals(group1));
+		assertFalse(groupOne.equals(group2));
+		group1.addMember(new Role("role1"));
+		assertEquals(groupOne, group1);
+	}
+	
+	@Test
+	public void hashcode()
+	{
+		assertEquals(groupOne.hashCode(), group1.hashCode());
+		assertFalse(groupOne.hashCode() == groupTwo.hashCode());
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(GroupUnitTest.class);
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,65 +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.soa.esb.services.security.principals;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import junit.framework.JUnit4TestAdapter;
-
-/**
- * Unit test for {@link Role}
- * <p/>
- * 
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- *
- */
-public class RoleUnitTest
-{
-	private Role roleOne = new Role("roleOne");
-	private Role role1 = new Role("roleOne");
-	private Role roleTwo = new Role("roleTwo");
-	private Role role2 = new Role("roleTwo");
-	
-	@Test (expected = NullPointerException.class)
-	public void constuctWithNullRoleName()
-	{
-		new Role(null);
-	}
-
-	@Test
-	public void equals()
-	{
-		assertEquals(roleOne, role1);
-		assertFalse(roleOne.equals(role2));
-	}
-	
-	@Test
-	public void hashcode()
-	{
-		assertEquals(roleOne.hashCode(), role1.hashCode());
-		assertFalse(roleOne.hashCode() == roleTwo.hashCode());
-	}
-	
-	public static junit.framework.Test suite()
-	{
-		return new JUnit4TestAdapter(RoleUnitTest.class);
-	}
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/principals/RoleUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,65 @@
+/*
+ * 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.soa.esb.services.security.principals;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import junit.framework.JUnit4TestAdapter;
+
+/**
+ * Unit test for {@link Role}
+ * <p/>
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
+public class RoleUnitTest
+{
+	private Role roleOne = new Role("roleOne");
+	private Role role1 = new Role("roleOne");
+	private Role roleTwo = new Role("roleTwo");
+	private Role role2 = new Role("roleTwo");
+	
+	@Test (expected = NullPointerException.class)
+	public void constuctWithNullRoleName()
+	{
+		new Role(null);
+	}
+
+	@Test
+	public void equals()
+	{
+		assertEquals(roleOne, role1);
+		assertFalse(roleOne.equals(role2));
+	}
+	
+	@Test
+	public void hashcode()
+	{
+		assertEquals(roleOne.hashCode(), role1.hashCode());
+		assertFalse(roleOne.hashCode() == roleTwo.hashCode());
+	}
+	
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter(RoleUnitTest.class);
+	}
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,90 +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.type" value="jboss"/>
-		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
-		<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.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/>
-    	<property name="org.jboss.soa.esb.services.security.configUrl" value="jaas.login"/>
-    </properties>
-    <properties name="registry">      
-    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
-    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
-    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
-    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
-    </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"/>
-    </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">
-		<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"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/services/security/security-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,90 @@
+<?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.type" value="jboss"/>
+		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+		<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.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/>
+    	<property name="org.jboss.soa.esb.services.security.configUrl" value="jaas.login"/>
+    </properties>
+    <properties name="registry">      
+    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
+    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
+    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
+    </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"/>
+    </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">
+		<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"/>
+		<!-- # of milliseconds to timeout waiting for a connection from pool -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+</esb>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -158,6 +158,7 @@
 			<pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/>
 			<pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>
 			<pathelement location="${org.jboss.esb.server.server}/lib/jbossts-common.jar"/>
+			<pathelement location="${org.jboss.esb.server.server}/lib/quartz.jar"/>
 		</path>
 	</target>
 
@@ -291,7 +292,7 @@
 			<path refid="quickstart-dependencies-classpath" />
 			<path refid="quickstart-lib-classpath" />
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
-			<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar quartz-all.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
 			<path refid="deployment-classpath" />
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
 		</path>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/build.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,29 +0,0 @@
-<project name="Quickstart_monitoring_action" default="run" basedir=".">
-	
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-	
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	
-	<target name="runtest" depends="compile" 
-		description="sends a JMS message to queue/quickstart_monitoringaction_Request_gw">
-		<echo>Runs Test JMS Sender</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
-			<arg value="3"/>
-			<classpath refid="exec-classpath"/>
-		</java>
-                <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
-                        <arg value="14"/>
-                        <classpath refid="exec-classpath"/>
-                </java>
-                <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
-                        <arg value="23"/>
-                        <classpath refid="exec-classpath"/>
-                </java>
-	</target>  
-	
-	
-</project>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,29 @@
+<project name="Quickstart_monitoring_action" default="run" basedir=".">
+	
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+	
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml"/>
+	
+	<target name="runtest" depends="compile" 
+		description="sends a JMS message to queue/quickstart_monitoringaction_Request_gw">
+		<echo>Runs Test JMS Sender</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
+			<arg value="3"/>
+			<classpath refid="exec-classpath"/>
+		</java>
+                <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
+                        <arg value="14"/>
+                        <classpath refid="exec-classpath"/>
+                </java>
+                <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.monitoringaction.test.SendJMSMessage" failonerror="true">
+                        <arg value="23"/>
+                        <classpath refid="exec-classpath"/>
+                </java>
+	</target>  
+	
+	
+</project>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/deployment.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,4 +0,0 @@
-<jbossesb-deployment>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw</depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw</depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_monitoringaction_Request_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jboss-esb.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,47 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-              <jms-bus busid="quickstartGwChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_monitoringaction_Request_gw"
-                   />
-              </jms-bus>
-              <jms-bus busid="quickstartEsbChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_monitoringaction_Request_esb"
-                  />
-              </jms-bus>
-
-          </jms-provider>
-      </providers>
-      
-      <services>
-        <service 
-        	category="FirstServiceESB" 
-        	name="SimpleListener" 
-        	description="Hello World">
-            <listeners>
-                <jms-listener name="JMS-Gateway"
-                    busidref="quickstartGwChannel"
-                    is-gateway="true"
-                />
-                <jms-listener name="helloWorld"
-                              busidref="quickstartEsbChannel"
-                />
-            </listeners>
-            <actions mep="OneWay">
-                   <action name="mvelmonitor" 
-                   	class="org.jboss.soa.esb.actions.monitoring.MVELMonitoringAction">
-			<property name="expressions">
-				<monitor-value mvel-pattern="message.body.org.jboss.soa.esb.message.defaultEntry" pattern-name="body.BODY_CONTENT" pattern-conditional=">5"/>
-			</property>
-		   </action> 
-            </actions>
-        </service>
-      </services>
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,47 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+              <jms-bus busid="quickstartGwChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_monitoringaction_Request_gw"
+                   />
+              </jms-bus>
+              <jms-bus busid="quickstartEsbChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_monitoringaction_Request_esb"
+                  />
+              </jms-bus>
+
+          </jms-provider>
+      </providers>
+      
+      <services>
+        <service 
+        	category="FirstServiceESB" 
+        	name="SimpleListener" 
+        	description="Hello World">
+            <listeners>
+                <jms-listener name="JMS-Gateway"
+                    busidref="quickstartGwChannel"
+                    is-gateway="true"
+                />
+                <jms-listener name="helloWorld"
+                              busidref="quickstartEsbChannel"
+                />
+            </listeners>
+            <actions mep="OneWay">
+                   <action name="mvelmonitor" 
+                   	class="org.jboss.soa.esb.actions.monitoring.MVELMonitoringAction">
+			<property name="expressions">
+				<monitor-value mvel-pattern="message.body.org.jboss.soa.esb.message.defaultEntry" pattern-name="body.BODY_CONTENT" pattern-conditional=">5"/>
+			</property>
+		   </action> 
+            </actions>
+        </service>
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,86 +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.type" value="jboss"/>
-		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
-		<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="registry">      
-    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
-    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
-    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
-    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
-    </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"/>
-    </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">
-		<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"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,86 @@
+<?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.type" value="jboss"/>
+		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+		<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="registry">      
+    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
+    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
+    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
+    </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"/>
+    </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">
+		<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"/>
+		<!-- # of milliseconds to timeout waiting for a connection from pool -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+</esb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jndi.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/juddi.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any 
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct 
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
- 
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-  

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/juddi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any 
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct 
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+ 
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+  

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/lib (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/lib)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/listener.log
===================================================================

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/listener.log (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/listener.log)
===================================================================

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/log4j.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A size based file rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="./listener.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="DEBUG"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="./listener.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="DEBUG"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/readme.txt	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,38 +0,0 @@
-Overview:
-=========
-  The purpose of the monitoring_action quickstart sample is to show
-  the use of the MVELMonitoringAction.     This action will allow you to use
-  MVEL patterns and expressions parsed through beanshell in order to store
-  information from your messages. 
-
-Running this quickstart:
-========================
-  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
-  and a more detailed descripton of the different ways to run the quickstarts.
-
-  NOTE:
-  After running the quickstart, (ant runtest), go to jmx-console.    You 
-  should be able to find the object :
- 
-  jboss.esb:category=MVELMonitor,deployment=Quickstart_monitoring_action.esb,service-name=SimpleListener
- 
-  Two of the messages should meet the expression and will be stored in the bean.
-
-To Run standalone mode:
-=======================
-  1. In a command terminal window in the quickstart folder type
-     'ant deploy-jms-dests'.
-  2. In a command terminal window in this folder ("Window1"), type 'ant run'.
-  3. Open another command terminal window in this folder ("Window2"), type
-     'ant runtest'.
-  4. Switch back to "Window1" to see the output from the ESB
-  5. When finished, interrupt the ESB using Ctrl-C and, in this folder
-     ("Window1"), type 'ant undeploy-jms-dests'.
-
-To Run '.esb' archive mode:
-===========================
-  1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-  2. Open another command terminal window in this folder ("Window2"), type
-     'ant runtest'.
-  3. Switch back to Application Server console to see the output from the ESB
-  4. In this folder ("Window1"), type 'ant undeploy'.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,38 @@
+Overview:
+=========
+  The purpose of the monitoring_action quickstart sample is to show
+  the use of the MVELMonitoringAction.     This action will allow you to use
+  MVEL patterns and expressions parsed through beanshell in order to store
+  information from your messages. 
+
+Running this quickstart:
+========================
+  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
+  and a more detailed descripton of the different ways to run the quickstarts.
+
+  NOTE:
+  After running the quickstart, (ant runtest), go to jmx-console.    You 
+  should be able to find the object :
+ 
+  jboss.esb:category=MVELMonitor,deployment=Quickstart_monitoring_action.esb,service-name=SimpleListener
+ 
+  Two of the messages should meet the expression and will be stored in the bean.
+
+To Run standalone mode:
+=======================
+  1. In a command terminal window in the quickstart folder type
+     'ant deploy-jms-dests'.
+  2. In a command terminal window in this folder ("Window1"), type 'ant run'.
+  3. Open another command terminal window in this folder ("Window2"), type
+     'ant runtest'.
+  4. Switch back to "Window1" to see the output from the ESB
+  5. When finished, interrupt the ESB using Ctrl-C and, in this folder
+     ("Window1"), type 'ant undeploy-jms-dests'.
+
+To Run '.esb' archive mode:
+===========================
+  1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+  2. Open another command terminal window in this folder ("Window2"), type
+     'ant runtest'.
+  3. Switch back to Application Server console to see the output from the ESB
+  4. In this folder ("Window1"), type 'ant undeploy'.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.monitoringaction;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-public class MyJMSListenerAction extends AbstractActionLifecycle
-{
-    
-  protected ConfigTree	_config;
-	  
-  public MyJMSListenerAction(ConfigTree config) { _config = config; } 
-
-  
-  public Message displayMessage(Message message) throws Exception{
-		
-		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");		  		  
-		  System.out.println("Body: " + message.getBody().get()) ;
-		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-		  return message; 
-        		
-	}
-    
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/MyJMSListenerAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.monitoringaction;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class MyJMSListenerAction extends AbstractActionLifecycle
+{
+    
+  protected ConfigTree	_config;
+	  
+  public MyJMSListenerAction(ConfigTree config) { _config = config; } 
+
+  
+  public Message displayMessage(Message message) throws Exception{
+		
+		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");		  		  
+		  System.out.println("Body: " + message.getBody().get()) ;
+		  System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+		  return message; 
+        		
+	}
+    
+	
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.samples.quickstart.monitoringaction.test;
-
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.client.ServiceInvoker;
-
-/**
- * Standalone class with to send ESB messages to a 'known' [category,name].
- * <p/> arg0 - service category
- * <br/>arg1 - service name
- * <br/>arg2 - Text of message to send
- * 
- * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
- * @since Version 4.0
- *
- */
-public class SendEsbMessage 
-{
-    public static void main(String args[]) throws Exception
-    {
-//      Setting the ConnectionFactory such that it will use scout
-        System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-        
-    	if (args.length < 3)
-    	{
-    		System.out.println("Usage SendEsbMessage <category> <name> <text to send>");
-    	}
-    	
-    	Message esbMessage = MessageFactory.getInstance().getMessage();
-
-    	esbMessage.getBody().add(args[2]);
-    	
-        new ServiceInvoker(args[0], args[1]).deliverAsync(esbMessage);
-    	
-    }
-    
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendEsbMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.samples.quickstart.monitoringaction.test;
+
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.client.ServiceInvoker;
+
+/**
+ * Standalone class with to send ESB messages to a 'known' [category,name].
+ * <p/> arg0 - service category
+ * <br/>arg1 - service name
+ * <br/>arg2 - Text of message to send
+ * 
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+ * @since Version 4.0
+ *
+ */
+public class SendEsbMessage 
+{
+    public static void main(String args[]) throws Exception
+    {
+//      Setting the ConnectionFactory such that it will use scout
+        System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+        
+    	if (args.length < 3)
+    	{
+    		System.out.println("Usage SendEsbMessage <category> <name> <text to send>");
+    	}
+    	
+    	Message esbMessage = MessageFactory.getInstance().getMessage();
+
+    	esbMessage.getBody().add(args[2]);
+    	
+        new ServiceInvoker(args[0], args[1]).deliverAsync(esbMessage);
+    	
+    }
+    
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,87 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.monitoringaction.test;
-
-import java.util.Properties;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class SendJMSMessage {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-    
-    
-    public void setupConnection() throws JMSException, NamingException
-    {
-        Properties properties1 = new Properties();
-		properties1.put(Context.INITIAL_CONTEXT_FACTORY,
-				"org.jnp.interfaces.NamingContextFactory");
-		properties1.put(Context.URL_PKG_PREFIXES,
-				"org.jboss.naming:org.jnp.interfaces");
-		properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
-		InitialContext iniCtx = new InitialContext(properties1);
-
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_monitoringaction_Request_gw");
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    	System.out.println("Connection Started");
-    }
-    
-    public void stop() throws JMSException 
-    { 
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-    
-    public void sendAMessage(String msg) throws JMSException {
-    	
-        QueueSender send = session.createSender(que);        
-        ObjectMessage tm = session.createObjectMessage(msg);
-        
-        send.send(tm);        
-        send.close();
-    }
-       
-    
-    public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessage sm = new SendJMSMessage();
-    	sm.setupConnection();
-    	sm.sendAMessage(args[0]); 
-    	sm.stop();
-    	
-    }
-    
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/monitoring_action/src/org/jboss/soa/esb/samples/quickstart/monitoringaction/test/SendJMSMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.monitoringaction.test;
+
+import java.util.Properties;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class SendJMSMessage {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+    
+    
+    public void setupConnection() throws JMSException, NamingException
+    {
+        Properties properties1 = new Properties();
+		properties1.put(Context.INITIAL_CONTEXT_FACTORY,
+				"org.jnp.interfaces.NamingContextFactory");
+		properties1.put(Context.URL_PKG_PREFIXES,
+				"org.jboss.naming:org.jnp.interfaces");
+		properties1.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
+		InitialContext iniCtx = new InitialContext(properties1);
+
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();
+    	que = (Queue) iniCtx.lookup("queue/quickstart_monitoringaction_Request_gw");
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    	System.out.println("Connection Started");
+    }
+    
+    public void stop() throws JMSException 
+    { 
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+    
+    public void sendAMessage(String msg) throws JMSException {
+    	
+        QueueSender send = session.createSender(que);        
+        ObjectMessage tm = session.createObjectMessage(msg);
+        
+        send.send(tm);        
+        send.close();
+    }
+       
+    
+    public static void main(String args[]) throws Exception
+    {        	    	
+    	SendJMSMessage sm = new SendJMSMessage();
+    	sm.setupConnection();
+    	sm.sendAMessage(args[0]); 
+    	sm.stop();
+    	
+    }
+    
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/build.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,45 +0,0 @@
-<project name="Quickstart_publish_as_webservice" default="run" basedir=".">
-	
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-	
-	<!-- additional deploys -->
-	<property name="additional.deploys" value="*.xsd"/>
-
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	<target name="runtest" depends="compile"  description="sends soap message to published web service">
-		<echo>Send soap message to published web service and receive reponse</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SOAPTest" failonerror="true">
-		      <arg value="HelloWorld"/>	
-                      <classpath refid="exec-classpath"/>
-		</java>
-                <echo/>
-                <echo/>
-		<echo>Send soap message to published web service and receive soap fault message</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SOAPTest" failonerror="true">
-		      <arg value="Error"/>	
-                      <classpath refid="exec-classpath"/>
-		</java>
-	</target> 
-	
-	<target name="sendesb" depends="compile" description="send esb Message to esb service">
-		<echo>Send esb message to esb service and get response</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SendEsbMessage" failonerror="true">
-			<arg value="ESBServiceSample"/> <!--  service category -->
-			<arg value="HelloWorldPubService"/>  <!--  service name -->
-			<arg value="HelloWorld"/> <!--  Message text -->
-			<classpath refid="exec-classpath"/>
-		</java>
-		<echo>Send esb message to esb service and get error</echo>
-		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SendEsbMessage" failonerror="true">
-			<arg value="ESBServiceSample"/> <!--  service category -->
-			<arg value="HelloWorldPubService"/>  <!--  service name -->
-			<arg value="Error"/> <!--  Message text -->
-			<classpath refid="exec-classpath"/>
-		</java>
-
-	</target>
-</project>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,45 @@
+<project name="Quickstart_publish_as_webservice" default="run" basedir=".">
+	
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+	
+	<!-- additional deploys -->
+	<property name="additional.deploys" value="*.xsd"/>
+
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml"/>
+	<target name="runtest" depends="compile"  description="sends soap message to published web service">
+		<echo>Send soap message to published web service and receive reponse</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SOAPTest" failonerror="true">
+		      <arg value="HelloWorld"/>	
+                      <classpath refid="exec-classpath"/>
+		</java>
+                <echo/>
+                <echo/>
+		<echo>Send soap message to published web service and receive soap fault message</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SOAPTest" failonerror="true">
+		      <arg value="Error"/>	
+                      <classpath refid="exec-classpath"/>
+		</java>
+	</target> 
+	
+	<target name="sendesb" depends="compile" description="send esb Message to esb service">
+		<echo>Send esb message to esb service and get response</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SendEsbMessage" failonerror="true">
+			<arg value="ESBServiceSample"/> <!--  service category -->
+			<arg value="HelloWorldPubService"/>  <!--  service name -->
+			<arg value="HelloWorld"/> <!--  Message text -->
+			<classpath refid="exec-classpath"/>
+		</java>
+		<echo>Send esb message to esb service and get error</echo>
+		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test.SendEsbMessage" failonerror="true">
+			<arg value="ESBServiceSample"/> <!--  service category -->
+			<arg value="HelloWorldPubService"/>  <!--  service name -->
+			<arg value="Error"/> <!--  Message text -->
+			<classpath refid="exec-classpath"/>
+		</java>
+
+	</target>
+</project>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/deployment.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,5 +0,0 @@
-<jbossesb-deployment>
-  <depends>jboss.esb:deployment=soap.esb</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply</depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=soap.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply</depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/fault.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayFault" type="x1:fault"/>
-  <xs:complexType name="fault">
-    <xs:sequence>
-      <xs:element name="code" type="xs:string"/>
-      <xs:element name="faultString" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/fault.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/fault.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayFault" type="x1:fault"/>
+  <xs:complexType name="fault">
+    <xs:sequence>
+      <xs:element name="code" type="xs:string"/>
+      <xs:element name="faultString" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_publish_as_webservice_Request_esb_reply">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,37 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-
-    <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-              <jms-bus busid="quickstartEsbChannel">
-                  <jms-message-filter
-                      dest-type="QUEUE"
-                      dest-name="queue/quickstart_publish_as_webservice_Request_esb"
-                      selector="serviceName='HelloWorldPubService'"
-                  />
-              </jms-bus>
-
-          </jms-provider>
-      </providers>
-      
-      <services>
-        <service 
-        	category="ESBServiceSample" 
-        	name="HelloWorldPubService" 
-        	description="Hello world ESB Service">
-            <listeners>
-                <jms-listener name="helloWorld"
-                              busidref="quickstartEsbChannel"
-                              maxThreads="1"
-                />
-            </listeners>
-            <actions  inXsd="/request.xsd" outXsd="/response.xsd" faultXsd="/fault.xsd">
-                   <action name="action" 
-                   	class="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.MyJMSListenerAction" 
-                   	process="displayMessage" 
-                   	/>  
-            </actions>
-        </service>
-      </services>
-     
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,37 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+
+    <providers>
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+              <jms-bus busid="quickstartEsbChannel">
+                  <jms-message-filter
+                      dest-type="QUEUE"
+                      dest-name="queue/quickstart_publish_as_webservice_Request_esb"
+                      selector="serviceName='HelloWorldPubService'"
+                  />
+              </jms-bus>
+
+          </jms-provider>
+      </providers>
+      
+      <services>
+        <service 
+        	category="ESBServiceSample" 
+        	name="HelloWorldPubService" 
+        	description="Hello world ESB Service">
+            <listeners>
+                <jms-listener name="helloWorld"
+                              busidref="quickstartEsbChannel"
+                              maxThreads="1"
+                />
+            </listeners>
+            <actions  inXsd="/request.xsd" outXsd="/response.xsd" faultXsd="/fault.xsd">
+                   <action name="action" 
+                   	class="org.jboss.soa.esb.samples.quickstart.publishAsWebservice.MyJMSListenerAction" 
+                   	process="displayMessage" 
+                   	/>  
+            </actions>
+        </service>
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,86 +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.type" value="jboss"/>
-		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
-		<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="registry">      
-    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
-    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
-    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
-    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
-    </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"/>
-    </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">
-		<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"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,86 @@
+<?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.type" value="jboss"/>
+		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+		<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="registry">      
+    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
+    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
+    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#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.RMITransport"/>
+    </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"/>
+    </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">
+		<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"/>
+		<!-- # of milliseconds to timeout waiting for a connection from pool -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+                <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+</esb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jndi.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/juddi.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any 
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct 
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
- 
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-  

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/juddi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any 
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct 
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+ 
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+  

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/lib (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/lib)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/log4j.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A size based file rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="./listener.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="DEBUG"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="./listener.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="DEBUG"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/readme.txt	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,18 +0,0 @@
-Overview:
-=========
-  The purpose of the publish_as_webservice quickstart sample is to demonstrate how to 
-  publish a esb service as a web service. 
-
-Running this quickstart:
-========================
-  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
-  and a more detailed descripton of the different ways to run the quickstarts.
-
-To Run '.esb' archive mode:
-===========================
-  1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-  2. Open another command terminal window in this folder ("Window2"), type
-     'ant runtest'.
-  3. Open another command terminal window in this folder ("Window2"), type
-     'ant sendesb'.
-  4. In this folder ("Window1"), type 'ant undeploy'.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,18 @@
+Overview:
+=========
+  The purpose of the publish_as_webservice quickstart sample is to demonstrate how to 
+  publish a esb service as a web service. 
+
+Running this quickstart:
+========================
+  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
+  and a more detailed descripton of the different ways to run the quickstarts.
+
+To Run '.esb' archive mode:
+===========================
+  1. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
+  2. Open another command terminal window in this folder ("Window2"), type
+     'ant runtest'.
+  3. Open another command terminal window in this folder ("Window2"), type
+     'ant sendesb'.
+  4. In this folder ("Window1"), type 'ant undeploy'.

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/request.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,8 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayHi" type="x1:sayHi"/>
-  <xs:complexType name="sayHi">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/request.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/request.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHi" type="x1:sayHi"/>
+  <xs:complexType name="sayHi">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/response.xsd	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,8 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="sayHiResponse" type="x1:sayHiResponse"/>
-  <xs:complexType name="sayHiResponse">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/response.xsd)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/response.xsd	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="sayHiResponse" type="x1:sayHiResponse"/>
+  <xs:complexType name="sayHiResponse">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/.classpath	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/.classpath)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.classpath	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/.project	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>pubservice-sample</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/.project)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/.project	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pubservice-sample</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.publishAsWebservice;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.actions.ActionProcessingDetailFaultException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-public class MyJMSListenerAction extends AbstractActionLifecycle
-{
-    protected ConfigTree _config;
-    
-    public MyJMSListenerAction(ConfigTree config)
-    {
-        _config = config;
-    }
-    
-    public Message displayMessage(Message message) throws Exception
-    {
-        final String request = (String)message.getBody().get() ;
-        if (request.contains("Error")) {
-            final String detail = "<say:sayFault xmlns:say=\"http://www.jboss.org/sayHi\"><say:code>" +
-                "myErrorCode" + "</say:code><say:faultString>" + "myDescription" +
-                "</say:faultString></say:sayFault>" ;
-            throw new ActionProcessingDetailFaultException(new QName("http://www.jboss.org/sayHi", "myErrorCode"), "myDescription", detail) ;
-        }
-        
-        System.out.println("Received request: " + request) ;
-        final String responseMsg = "<say:sayHiResponse xmlns:say=\"http://www.jboss.org/sayHi\"><say:arg0>" +
-            "Response from ESB Service" + "</say:arg0></say:sayHiResponse>" ;
-        message.getBody().add(responseMsg);
-        return message;
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/MyJMSListenerAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.publishAsWebservice;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.actions.ActionProcessingDetailFaultException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class MyJMSListenerAction extends AbstractActionLifecycle
+{
+    protected ConfigTree _config;
+    
+    public MyJMSListenerAction(ConfigTree config)
+    {
+        _config = config;
+    }
+    
+    public Message displayMessage(Message message) throws Exception
+    {
+        final String request = (String)message.getBody().get() ;
+        if (request.contains("Error")) {
+            final String detail = "<say:sayFault xmlns:say=\"http://www.jboss.org/sayHi\"><say:code>" +
+                "myErrorCode" + "</say:code><say:faultString>" + "myDescription" +
+                "</say:faultString></say:sayFault>" ;
+            throw new ActionProcessingDetailFaultException(new QName("http://www.jboss.org/sayHi", "myErrorCode"), "myDescription", detail) ;
+        }
+        
+        System.out.println("Received request: " + request) ;
+        final String responseMsg = "<say:sayHiResponse xmlns:say=\"http://www.jboss.org/sayHi\"><say:arg0>" +
+            "Response from ESB Service" + "</say:arg0></say:sayHiResponse>" ;
+        message.getBody().add(responseMsg);
+        return message;
+    }
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test;
-import java.io.IOException;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-
-public class SOAPTest  {
-	public static void main(String args[]) {
- 
-		String request = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:say=\"http://www.jboss.org/sayHi\">"
-                                + "<soapenv:Header/> <soapenv:Body> <say:sayHi> <say:arg0>" + args[0] + "</say:arg0></say:sayHi>"
-                                + "</soapenv:Body> </soapenv:Envelope>";
-		HttpClient client = new HttpClient();
-		PostMethod postMethod = new PostMethod(
-				"http://127.0.0.1:8080/Quickstart_publish_as_webservice/ESBServiceSample/HelloWorldPubService?wsdl");
-
-		StringRequestEntity requestEntity = new StringRequestEntity(request);
-		postMethod.setRequestEntity(requestEntity);
-		try {
-			client.executeMethod(postMethod);
-			System.out.println("Response from web service");
-			System.out.println(postMethod.getResponseBodyAsString());
-		} catch (HttpException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		System.exit(0);
-
-	}
-
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.publishAsWebservice.test;
+import java.io.IOException;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+
+public class SOAPTest  {
+	public static void main(String args[]) {
+ 
+		String request = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:say=\"http://www.jboss.org/sayHi\">"
+                                + "<soapenv:Header/> <soapenv:Body> <say:sayHi> <say:arg0>" + args[0] + "</say:arg0></say:sayHi>"
+                                + "</soapenv:Body> </soapenv:Envelope>";
+		HttpClient client = new HttpClient();
+		PostMethod postMethod = new PostMethod(
+				"http://127.0.0.1:8080/Quickstart_publish_as_webservice/ESBServiceSample/HelloWorldPubService?wsdl");
+
+		StringRequestEntity requestEntity = new StringRequestEntity(request);
+		postMethod.setRequestEntity(requestEntity);
+		try {
+			client.executeMethod(postMethod);
+			System.out.println("Response from web service");
+			System.out.println(postMethod.getResponseBodyAsString());
+		} catch (HttpException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		System.exit(0);
+
+	}
+
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.soa.esb.samples.quickstart.publishAsWebservice.test;
-
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.couriers.FaultMessageException;
-
-/**
- * Standalone class with to send ESB messages to a 'known' [category,name].
- * <p/> arg0 - service category
- * <br/>arg1 - service name
- * <br/>arg2 - Text of message to send
- * 
- * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
- * @since Version 4.0
- *
- */
-public class SendEsbMessage 
-{
-    public static void main(String args[]) throws Exception
-    {
-//      Setting the ConnectionFactory such that it will use scout
-        System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-        
-        if (args.length < 3)
-        {
-            System.out.println("Usage SendEsbMessage <category> <name> <text to send>");
-        }
-        
-        Message esbMessage = MessageFactory.getInstance().getMessage();
-        final String message = "<say:sayHi xmlns:say=\"http://www.jboss.org/sayHi\"><say:arg0>" + args[2] + "</say:arg0></say:sayHi>" ;
-        esbMessage.getBody().add(message);
-        
-        ServiceInvoker invoker = new ServiceInvoker(args[0], args[1]);
-        
-        Message response = null;
-        try {
-            response= invoker.deliverSync(esbMessage, 3000);
-            System.out.println(response.getBody().get());
-        } catch (final FaultMessageException fme) {
-            final Message returnedMessage = fme.getReturnedMessage() ;
-            System.out.println("Received a fault message exception") ;
-            System.out.println("\tMessage: " + fme.getMessage()) ;
-            System.out.println("\tCode: " + fme.getCode()) ;
-            System.out.println("\tCause: " + fme.getCause()) ;
-            System.out.println("\tReturned message: " + returnedMessage) ;
-        }catch(Exception ex) {
-           ex.printStackTrace();
-        } 
-        System.exit(0);
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.samples.quickstart.publishAsWebservice.test;
+
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.couriers.FaultMessageException;
+
+/**
+ * Standalone class with to send ESB messages to a 'known' [category,name].
+ * <p/> arg0 - service category
+ * <br/>arg1 - service name
+ * <br/>arg2 - Text of message to send
+ * 
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+ * @since Version 4.0
+ *
+ */
+public class SendEsbMessage 
+{
+    public static void main(String args[]) throws Exception
+    {
+//      Setting the ConnectionFactory such that it will use scout
+        System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+        
+        if (args.length < 3)
+        {
+            System.out.println("Usage SendEsbMessage <category> <name> <text to send>");
+        }
+        
+        Message esbMessage = MessageFactory.getInstance().getMessage();
+        final String message = "<say:sayHi xmlns:say=\"http://www.jboss.org/sayHi\"><say:arg0>" + args[2] + "</say:arg0></say:sayHi>" ;
+        esbMessage.getBody().add(message);
+        
+        ServiceInvoker invoker = new ServiceInvoker(args[0], args[1]);
+        
+        Message response = null;
+        try {
+            response= invoker.deliverSync(esbMessage, 3000);
+            System.out.println(response.getBody().get());
+        } catch (final FaultMessageException fme) {
+            final Message returnedMessage = fme.getReturnedMessage() ;
+            System.out.println("Received a fault message exception") ;
+            System.out.println("\tMessage: " + fme.getMessage()) ;
+            System.out.println("\tCode: " + fme.getCode()) ;
+            System.out.println("\tCause: " + fme.getCause()) ;
+            System.out.println("\tReturned message: " + returnedMessage) ;
+        }catch(Exception ex) {
+           ex.printStackTrace();
+        } 
+        System.exit(0);
+    }
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/readme.txt
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/readme.txt	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -83,4 +83,7 @@
   JBoss ESB.  It uses the Transformation engine as well as the static-routing
   feature.  It also demonstrations the use of multiple JVMs running different
   services.
-  This is a fairly advanced demonstration.
+  This is a fairly advanced demonstration.
+
+* publish_as_webservice - demonstrations how to use SOAPIn and SOAPOut action to publish 
+  a esb service as a web service

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/build.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,78 +0,0 @@
-<project name="Quickstart_webservice_producer_secured" default="deploy" basedir=".">
-	
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-			
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-
-    <target name="quickstart-specific-checks" depends="assert-ws-available"/>
-
-    <target name="quickstart-specific-dependencies">
-        <path id="quickstart-dependencies-classpath">
-            <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
-        </path>
-    </target>
-	
-    <target name="quickstart-specific-assemblies">
-        <!-- Overriden from the target of the same name in base-build.xml. -->
-        <!-- Called by the "deploy" target.  Don't call directly!! -->
-
-        <!-- Build the webservice... -->
-        <war warfile="build/${ant.project.name}.war"
-             webxml="${basedir}/war/resources/WEB-INF/web.xml">
-            <fileset dir="${basedir}/war/view">
-                <include name="**/*"/>
-            </fileset>
-        </war>
-    </target>
-
-    <target name="runtest" depends="compile" description="run tests over jms, http, and socket">
-        <!--antcall target="saygoodbye_over_jms" /-->
-        <antcall target="saygoodbye_over_http" />
-        <!--antcall target="saygoodbye_over_socket" /-->
-    </target>
-
-    <target name="saygoodbye_over_jms" depends="compile">
-        <echo>Invoking a JBossWS Endpoint over JMS (via JBoss ESB).</echo>
-        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
-            <arg value="jms" />
-            <classpath refid="exec-classpath" />
-        </java>
-    </target>
-
-    <target name="saygoodbye_over_http" depends="compile">
-        <echo>Invoking a JBossWS Endpoint over HTTP (via JBoss ESB).</echo>
-        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
-            <arg value="http" />
-            <arg value="8765" />
-            <classpath refid="exec-classpath" />
-        </java>
-    </target>
-
-    <target name="saygoodbye_over_socket" depends="compile">
-        <echo>Invoking a JBossWS Endpoint over a raw socket connection (via JBoss ESB).</echo>
-        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
-            <arg value="socket" />
-            <arg value="8888" />
-            <classpath refid="exec-classpath" />
-        </java>
-    </target>
-
-	<target name="quickstart-specific-deploys">
-        <echo message="Copy jbossesb-properties.xml and jaas.login to jbossesb.sar" />
-        <copy todir="${quickstart.org.jboss.esb.server.home}/server/${quickstart.org.jboss.esb.server.config}/deploy/jbossesb.sar" filtering="true" overwrite="true">
-			<filterset>
-                    <filter token="KEYSTORE_PATH" value="${basedir}/keystore"/>
-			</filterset>
-            <fileset dir="${basedir}">
-                <include name="jbossesb-properties.xml"/>
-                <include name="jaas.login"/>
-            </fileset>
-        </copy>
-    </target>
-
-
-</project>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/build.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,78 @@
+<project name="Quickstart_webservice_producer_secured" default="deploy" basedir=".">
+	
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+			
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml"/>
+
+    <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+
+    <target name="quickstart-specific-dependencies">
+        <path id="quickstart-dependencies-classpath">
+            <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
+        </path>
+    </target>
+	
+    <target name="quickstart-specific-assemblies">
+        <!-- Overriden from the target of the same name in base-build.xml. -->
+        <!-- Called by the "deploy" target.  Don't call directly!! -->
+
+        <!-- Build the webservice... -->
+        <war warfile="build/${ant.project.name}.war"
+             webxml="${basedir}/war/resources/WEB-INF/web.xml">
+            <fileset dir="${basedir}/war/view">
+                <include name="**/*"/>
+            </fileset>
+        </war>
+    </target>
+
+    <target name="runtest" depends="compile" description="run tests over jms, http, and socket">
+        <!--antcall target="saygoodbye_over_jms" /-->
+        <antcall target="saygoodbye_over_http" />
+        <!--antcall target="saygoodbye_over_socket" /-->
+    </target>
+
+    <target name="saygoodbye_over_jms" depends="compile">
+        <echo>Invoking a JBossWS Endpoint over JMS (via JBoss ESB).</echo>
+        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
+            <arg value="jms" />
+            <classpath refid="exec-classpath" />
+        </java>
+    </target>
+
+    <target name="saygoodbye_over_http" depends="compile">
+        <echo>Invoking a JBossWS Endpoint over HTTP (via JBoss ESB).</echo>
+        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
+            <arg value="http" />
+            <arg value="8765" />
+            <classpath refid="exec-classpath" />
+        </java>
+    </target>
+
+    <target name="saygoodbye_over_socket" depends="compile">
+        <echo>Invoking a JBossWS Endpoint over a raw socket connection (via JBoss ESB).</echo>
+        <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test.SendMessage" failonerror="true">
+            <arg value="socket" />
+            <arg value="8888" />
+            <classpath refid="exec-classpath" />
+        </java>
+    </target>
+
+	<target name="quickstart-specific-deploys">
+        <echo message="Copy jbossesb-properties.xml and jaas.login to jbossesb.sar" />
+        <copy todir="${quickstart.org.jboss.esb.server.home}/server/${quickstart.org.jboss.esb.server.config}/deploy/jbossesb.sar" filtering="true" overwrite="true">
+			<filterset>
+                    <filter token="KEYSTORE_PATH" value="${basedir}/keystore"/>
+			</filterset>
+            <fileset dir="${basedir}">
+                <include name="jbossesb-properties.xml"/>
+                <include name="jaas.login"/>
+            </fileset>
+        </copy>
+    </target>
+
+
+</project>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/deployment.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,7 +0,0 @@
-<jbossesb-deployment>
-    <depends>jboss.esb:deployment=soap.esb</depends>
-    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw</depends>
-    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb</depends>
-    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply
-    </depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/deployment.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,7 @@
+<jbossesb-deployment>
+    <depends>jboss.esb:deployment=soap.esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply
+    </depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jaas.login	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,3 +0,0 @@
-CertLogin {
-  com.sun.security.auth.module.KeyStoreLoginModule required keyStoreURL="file://@KEYSTORE_PATH@" debug=false;
-};

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jaas.login)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jaas.login	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,3 @@
+CertLogin {
+  com.sun.security.auth.module.KeyStoreLoginModule required keyStoreURL="file://@KEYSTORE_PATH@" debug=false;
+};

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-    <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply"
-           xmbean-dd="xmdesc/Queue-xmbean.xml">
-        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-        <depends>jboss.messaging:service=PostOffice</depends>
-    </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbm-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply"
+           xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbmq-queue-service.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_gw">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_producer_secured_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,54 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb
-        xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
-        parameterReloadSecs="5">
-
-    <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-            <jms-bus busid="quickstartGwChannel">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_producer_secured_gw"/>
-            </jms-bus>
-            <jms-bus busid="quickstartEsbChannel">
-                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_producer_secured_esb"/>
-            </jms-bus>
-        </jms-provider>
-
-        <jbr-provider name="JBR-Http" protocol="http" host="localhost">
-            <jbr-bus busid="Http-1" port="8765" />
-        </jbr-provider>
-
-        <jbr-provider name="JBR-Socket" protocol="socket" host="localhost">
-            <jbr-bus busid="Socket-1" port="8888" />
-        </jbr-provider>
-
-    </providers>
-
-    <services>
-
-        <service category="MyServiceCategory" name="MyWSProducerService" description="WS Frontend speaks natively to the ESB">
-			<security moduleName="CertLogin" runAs="adminRole" callbackHandler="org.jboss.internal.soa.esb.services.security.CertCallbackHandler">
-				<property name="alias" value="jbossesb"/>
-				<property name="keyPassword" value="jbossesb"/>
-			</security>
-
-            <listeners>
-                <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" is-gateway="true"/>
-                <jbr-listener name="Http-Gateway" busidref="Http-1" is-gateway="true"/>
-                <jbr-listener name="Socket-Gateway" busidref="Socket-1" is-gateway="true"/>
-
-                <jms-listener name="JMS-ESBListener" busidref="quickstartEsbChannel"/>
-            </listeners>
-            <actions>
-
-                <action name="print-before" class="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.PrintSubjectAction"/>
-
-                <action name="JBossWSAdapter" class="org.jboss.soa.esb.actions.soap.SOAPProcessor">
-                    <property name="jbossws-endpoint" value="GoodbyeWorldWS"/>
-                </action>
-		<action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>	
-            </actions>
-        </service>
-
-    </services>
-
-</jbossesb>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jboss-esb.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,54 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb
+        xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
+        parameterReloadSecs="5">
+
+    <providers>
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
+            <jms-bus busid="quickstartGwChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_producer_secured_gw"/>
+            </jms-bus>
+            <jms-bus busid="quickstartEsbChannel">
+                <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_producer_secured_esb"/>
+            </jms-bus>
+        </jms-provider>
+
+        <jbr-provider name="JBR-Http" protocol="http" host="localhost">
+            <jbr-bus busid="Http-1" port="8765" />
+        </jbr-provider>
+
+        <jbr-provider name="JBR-Socket" protocol="socket" host="localhost">
+            <jbr-bus busid="Socket-1" port="8888" />
+        </jbr-provider>
+
+    </providers>
+
+    <services>
+
+        <service category="MyServiceCategory" name="MyWSProducerService" description="WS Frontend speaks natively to the ESB">
+			<security moduleName="CertLogin" runAs="adminRole" callbackHandler="org.jboss.internal.soa.esb.services.security.CertCallbackHandler">
+				<property name="alias" value="jbossesb"/>
+				<property name="keyPassword" value="jbossesb"/>
+			</security>
+
+            <listeners>
+                <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" is-gateway="true"/>
+                <jbr-listener name="Http-Gateway" busidref="Http-1" is-gateway="true"/>
+                <jbr-listener name="Socket-Gateway" busidref="Socket-1" is-gateway="true"/>
+
+                <jms-listener name="JMS-ESBListener" busidref="quickstartEsbChannel"/>
+            </listeners>
+            <actions>
+
+                <action name="print-before" class="org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.PrintSubjectAction"/>
+
+                <action name="JBossWSAdapter" class="org.jboss.soa.esb.actions.soap.SOAPProcessor">
+                    <property name="jbossws-endpoint" value="GoodbyeWorldWS"/>
+                </action>
+		<action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>	
+            </actions>
+        </service>
+
+    </services>
+
+</jbossesb>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,98 +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.configUrl" value="/jaas.login"/>
-    </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>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jbossesb-properties.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,98 @@
+<?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.configUrl" value="/jaas.login"/>
+    </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/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jndi.properties	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/jndi.properties	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/keystore
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/keystore (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/keystore)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/lib (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/lib)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/log4j.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A size based file rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="./listener.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="quickstart">
-      <priority value="INFO"/>
-   </category>
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/log4j.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="./listener.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="quickstart">
+      <priority value="INFO"/>
+   </category>
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/readme.txt	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,23 +0,0 @@
-Overview:
-=========
-  This sample demonstrates how to deploy a JSR181 Webservice endpoint on
-  JBossESB using the SOAPProcessor action and configuring security in JBossESB.  
-  This quickstart sends a SOAP message, with a security header using a BinarySecurityToken  
-  which is a public certifcate.  
-
-Running this quickstart:
-========================
-  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
-  and a more detailed descripton of the different ways to run the quickstarts.
-
-  Note, this quickstart requires an ESB and JBossWS installation into
-  JBoss AS 4.2.0.GA.  Installation instructions for both can be found in the
-  install/readme.txt.
-
-To Run:
-=======
-  1. Type 'ant deploy'.
-  2. Restart you esb server
-  2. Type 'ant runtest'.
-  3. Switch back to Application Server console to see the output from the ESB
-  4. In this folder ("Window1"), type 'ant undeploy'.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/readme.txt)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/readme.txt	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,23 @@
+Overview:
+=========
+  This sample demonstrates how to deploy a JSR181 Webservice endpoint on
+  JBossESB using the SOAPProcessor action and configuring security in JBossESB.  
+  This quickstart sends a SOAP message, with a security header using a BinarySecurityToken  
+  which is a public certifcate.  
+
+Running this quickstart:
+========================
+  Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts
+  and a more detailed descripton of the different ways to run the quickstarts.
+
+  Note, this quickstart requires an ESB and JBossWS installation into
+  JBoss AS 4.2.0.GA.  Installation instructions for both can be found in the
+  install/readme.txt.
+
+To Run:
+=======
+  1. Type 'ant deploy'.
+  2. Restart you esb server
+  2. Type 'ant runtest'.
+  3. Switch back to Application Server console to see the output from the ESB
+  4. In this folder ("Window1"), type 'ant undeploy'.

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured;
-
-
-import java.net.URL;
-import java.io.File;
-import java.io.FilePermission;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permissions;
-import java.security.PermissionCollection;
-import java.security.Policy;
-
-import javax.security.auth.Subject;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-public class PrintSubjectAction extends AbstractActionLifecycle
-{
-    
-  protected ConfigTree	config;
-	  
-  public PrintSubjectAction(ConfigTree config) throws ConfigurationException
-  { 
-	  this.config = config; 
-  } 
-  
-  public Message process(Message message) throws Exception
-  {
-	  System.out.println("Subject : " + Subject.getSubject(AccessController.getContext()));
-	  return message; 
-  }
-	
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/PrintSubjectAction.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured;
+
+
+import java.net.URL;
+import java.io.File;
+import java.io.FilePermission;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Permissions;
+import java.security.PermissionCollection;
+import java.security.Policy;
+
+import javax.security.auth.Subject;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+public class PrintSubjectAction extends AbstractActionLifecycle
+{
+    
+  protected ConfigTree	config;
+	  
+  public PrintSubjectAction(ConfigTree config) throws ConfigurationException
+  { 
+	  this.config = config; 
+  } 
+  
+  public Message process(Message message) throws Exception
+  {
+	  System.out.println("Subject : " + Subject.getSubject(AccessController.getContext()));
+	  return message; 
+  }
+	
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,120 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test;
-
-import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.Client;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.net.InetAddress;
-
-import org.jboss.soa.esb.actions.StoreMessageToFile;
-
-public class SendMessage {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-
-    public void sendMessageOverJMS(String message) throws JMSException, NamingException {
-        QueueSender sender = null;
-
-    	setupJMSConnection();
-        try {
-            ObjectMessage tm = null;
-
-            sender = session.createSender(que);
-            tm = session.createObjectMessage(message);
-	    tm.setStringProperty(StoreMessageToFile.PROPERTY_JBESB_FILENAME, "WebServiceProducerTest.log");
-            sender.send(tm);
-        } finally {
-            if(sender != null) {
-                sender.close();
-            }
-            cleanupJMSConnection();
-        }
-    }
-
-    private void sendMessageToJBRListener(String protocol, int port, String message) throws Throwable {
-        String locatorURI = protocol + "://localhost:" + port;
-        InvokerLocator locator = new InvokerLocator(locatorURI);
-        System.out.println("Calling JBoss Remoting Listener using locator URI: " + locatorURI);
-
-        Client remotingClient = null;
-        try {
-            remotingClient = new Client(locator);
-            remotingClient.connect();
-
-            // Deliver the message to the listener...
-            Object response = remotingClient.invoke(message);
-            System.out.println("JBR Class: " + response.getClass().getName());
-            System.out.println("Response from JBoss Remoting Listener '" + locatorURI + "' was '" + response + "'.");
-        } finally {
-            if(remotingClient != null) {
-                remotingClient.disconnect();
-            }
-        }
-    }
-
-    public void setupJMSConnection() throws JMSException, NamingException
-    {
-    	InitialContext iniCtx = new InitialContext();
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_webservice_producer_gw");
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    }
-
-    public void cleanupJMSConnection() throws JMSException
-    {
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-
-    private static String getMessage(String messageNum) {
-        String msg = new String(StreamUtils.readStream(SendMessage.class.getResourceAsStream("soap_message_" + messageNum + ".xml")));
-        return msg;
-    }
-
-    public static void main(String args[]) throws Throwable
-    {        	    	
-    	SendMessage sm = new SendMessage();
-        String msg = getMessage("01");
-
-        String protocol = args[0];
-        if(protocol.equals("jms")) {
-            sm.sendMessageOverJMS(msg);
-        } else {
-            sm.sendMessageToJBRListener(protocol, Integer.parseInt(args[1]), msg);
-        }
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/SendMessage.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.test;
+
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.Client;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.net.InetAddress;
+
+import org.jboss.soa.esb.actions.StoreMessageToFile;
+
+public class SendMessage {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+
+    public void sendMessageOverJMS(String message) throws JMSException, NamingException {
+        QueueSender sender = null;
+
+    	setupJMSConnection();
+        try {
+            ObjectMessage tm = null;
+
+            sender = session.createSender(que);
+            tm = session.createObjectMessage(message);
+	    tm.setStringProperty(StoreMessageToFile.PROPERTY_JBESB_FILENAME, "WebServiceProducerTest.log");
+            sender.send(tm);
+        } finally {
+            if(sender != null) {
+                sender.close();
+            }
+            cleanupJMSConnection();
+        }
+    }
+
+    private void sendMessageToJBRListener(String protocol, int port, String message) throws Throwable {
+        String locatorURI = protocol + "://localhost:" + port;
+        InvokerLocator locator = new InvokerLocator(locatorURI);
+        System.out.println("Calling JBoss Remoting Listener using locator URI: " + locatorURI);
+
+        Client remotingClient = null;
+        try {
+            remotingClient = new Client(locator);
+            remotingClient.connect();
+
+            // Deliver the message to the listener...
+            Object response = remotingClient.invoke(message);
+            System.out.println("JBR Class: " + response.getClass().getName());
+            System.out.println("Response from JBoss Remoting Listener '" + locatorURI + "' was '" + response + "'.");
+        } finally {
+            if(remotingClient != null) {
+                remotingClient.disconnect();
+            }
+        }
+    }
+
+    public void setupJMSConnection() throws JMSException, NamingException
+    {
+    	InitialContext iniCtx = new InitialContext();
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();
+    	que = (Queue) iniCtx.lookup("queue/quickstart_webservice_producer_gw");
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    }
+
+    public void cleanupJMSConnection() throws JMSException
+    {
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+
+    private static String getMessage(String messageNum) {
+        String msg = new String(StreamUtils.readStream(SendMessage.class.getResourceAsStream("soap_message_" + messageNum + ".xml")));
+        return msg;
+    }
+
+    public static void main(String args[]) throws Throwable
+    {        	    	
+    	SendMessage sm = new SendMessage();
+        String msg = getMessage("01");
+
+        String protocol = args[0];
+        if(protocol.equals("jms")) {
+            sm.sendMessageOverJMS(msg);
+        } else {
+            sm.sendMessageToJBRListener(protocol, Integer.parseInt(args[1]), msg);
+        }
+    }
+}

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,22 +0,0 @@
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:good="http://webservice_producer/goodbyeworld">
-   <soapenv:Header>
-<wsse:Security xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext">
-            <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>
-   </soapenv:Header>
-   <soapenv:Body>
-      <good:sayGoodbye>
-         <message>Goodbye!!</message>
-      </good:sayGoodbye>
-   </soapenv:Body>
-</soapenv:Envelope>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_01.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,22 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:good="http://webservice_producer/goodbyeworld">
+   <soapenv:Header>
+<wsse:Security xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext">
+            <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>
+   </soapenv:Header>
+   <soapenv:Body>
+      <good:sayGoodbye>
+         <message>Goodbye!!</message>
+      </good:sayGoodbye>
+   </soapenv:Body>
+</soapenv:Envelope>

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,8 +0,0 @@
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:good="http://webservice_producer/goodbyeworld">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <good:sayGoodbyeWithoutResponse>
-         <message>Goodbye!!</message>
-      </good:sayGoodbyeWithoutResponse>
-   </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/test/soap_message_02.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,8 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:good="http://webservice_producer/goodbyeworld">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <good:sayGoodbyeWithoutResponse>
+         <message>Goodbye!!</message>
+      </good:sayGoodbyeWithoutResponse>
+   </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,55 +0,0 @@
-package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.webservice;
-
-import javax.jws.WebService;
-import javax.jws.WebMethod;
-import javax.jws.Oneway;
-import javax.jws.WebParam;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.Body;
-import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.actions.soap.SOAPProcessor;
-
-/**
- * @author
- */
- at WebService(name = "GoodbyeWorldWS", targetNamespace="http://webservice_producer/goodbyeworld")
-// @SOAPBinding(style = SOAPBinding.Style.RPC)
-public class GoodbyeWorldWS {
-
-    @WebMethod
-    public String sayGoodbye(@WebParam(name="message") String message) {
-
-        Message esbMessage = SOAPProcessor.getMessage();
-        if(esbMessage != null) {
-            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
-            // System.out.println("\n" + esbMessage.toString() + "\n");
-        }
-        System.out.println("Web Service Parameter - message=" + message);
-        return "... Ah Goodbye then!!!! - " + message;
-    }
-
-    @WebMethod
-    public String sayAdios(String message) {
-        Message esbMessage = SOAPProcessor.getMessage();
-        if(esbMessage != null) {
-            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
-            // System.out.println("\n" + esbMessage.toString() + "\n");
-        }
-        System.out.println("Web Service Parameter - message=" + message);
-        return "... Adios Amigo!!!! - " + message;
-    }
-    
-    @WebMethod
-    @Oneway
-    public void sayGoodbyeWithoutResponse(@WebParam(name="message") String message) {
-
-        Message esbMessage = SOAPProcessor.getMessage();
-        if(esbMessage != null) {
-            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
-        }
-        System.out.println("Web Service Parameter - message=" + message);
-    }
-    
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/src/org/jboss/soa/esb/samples/quickstart/webserviceproducersecured/webservice/GoodbyeWorldWS.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,55 @@
+package org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.webservice;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+import javax.jws.Oneway;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.actions.ActionUtils;
+import org.jboss.soa.esb.actions.soap.SOAPProcessor;
+
+/**
+ * @author
+ */
+ at WebService(name = "GoodbyeWorldWS", targetNamespace="http://webservice_producer/goodbyeworld")
+// @SOAPBinding(style = SOAPBinding.Style.RPC)
+public class GoodbyeWorldWS {
+
+    @WebMethod
+    public String sayGoodbye(@WebParam(name="message") String message) {
+
+        Message esbMessage = SOAPProcessor.getMessage();
+        if(esbMessage != null) {
+            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
+            // System.out.println("\n" + esbMessage.toString() + "\n");
+        }
+        System.out.println("Web Service Parameter - message=" + message);
+        return "... Ah Goodbye then!!!! - " + message;
+    }
+
+    @WebMethod
+    public String sayAdios(String message) {
+        Message esbMessage = SOAPProcessor.getMessage();
+        if(esbMessage != null) {
+            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
+            // System.out.println("\n" + esbMessage.toString() + "\n");
+        }
+        System.out.println("Web Service Parameter - message=" + message);
+        return "... Adios Amigo!!!! - " + message;
+    }
+    
+    @WebMethod
+    @Oneway
+    public void sayGoodbyeWithoutResponse(@WebParam(name="message") String message) {
+
+        Message esbMessage = SOAPProcessor.getMessage();
+        if(esbMessage != null) {
+            System.out.println("**** SOAPRequest perhaps mediated by ESB:\n" + esbMessage.getBody().get());
+        }
+        System.out.println("Web Service Parameter - message=" + message);
+    }
+    
+}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/resources)

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<web-app 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"
-         version="2.4">
-
-    <servlet>
-        <servlet-name>GoodbyeWorldWS</servlet-name>
-        <servlet-class>org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.webservice.GoodbyeWorldWS</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>GoodbyeWorldWS</servlet-name>
-        <url-pattern>/GoodbyeWorldWS</url-pattern>
-    </servlet-mapping>
-
-</web-app>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/resources/WEB-INF/web.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<web-app 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"
+         version="2.4">
+
+    <servlet>
+        <servlet-name>GoodbyeWorldWS</servlet-name>
+        <servlet-class>org.jboss.soa.esb.samples.quickstart.webserviceproducersecured.webservice.GoodbyeWorldWS</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>GoodbyeWorldWS</servlet-name>
+        <url-pattern>/GoodbyeWorldWS</url-pattern>
+    </servlet-mapping>
+
+</web-app>

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/view)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,9 +0,0 @@
-<html>
-	<body>
-		This is just a place holder.<br>
-		Verify the that the WS has been deployed by hitting 
-			<a href="http://localhost:8080/jbossws">
-				http://localhost:8080/jbossws
-			</a>
-  </body>
-</html>	
\ No newline at end of file

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer_secured/war/view/index.jsp	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,9 @@
+<html>
+	<body>
+		This is just a place holder.<br>
+		Verify the that the WS has been deployed by hitting 
+			<a href="http://localhost:8080/jbossws">
+				http://localhost:8080/jbossws
+			</a>
+  </body>
+</html>	
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Mapping.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Mapping.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Mapping.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -65,7 +65,10 @@
         mapping.setEsb(mappingElement.attributeValue(Constants.ESB_VARNAME_TAG));
         mapping.setBpm(mappingElement.attributeValue(Constants.BPM_VARNAME_TAG));
         mapping.setDefaultValue(mappingElement.attributeValue(Constants.DEFAULT_VALUE_TAG));
-        mapping.setIsProcessScope(Boolean.parseBoolean(mappingElement.attributeValue(Constants.PROCESS_SCOPE_ATTR)));
+        final String isProcessScope = mappingElement.attributeValue(Constants.PROCESS_SCOPE_ATTR) ;
+        if (isProcessScope != null) {
+            mapping.setIsProcessScope(Boolean.valueOf(isProcessScope));
+        }
         if (log.isDebugEnabled()) log.debug(mappingElement.asXML() + ":" + mapping);
         return mapping;
     }
@@ -81,7 +84,10 @@
         mapping.setEsb(mappingElement.getAttribute(Constants.ESB_VARNAME_TAG));
         mapping.setBpm(mappingElement.getAttribute(Constants.BPM_VARNAME_TAG));
         mapping.setDefaultValue(mappingElement.getAttribute(Constants.DEFAULT_VALUE_TAG));
-        mapping.setIsProcessScope(Boolean.parseBoolean(mappingElement.getAttribute(Constants.PROCESS_SCOPE_ATTR)));
+        final String isProcessScope = mappingElement.getAttribute(Constants.PROCESS_SCOPE_ATTR) ;
+        if (isProcessScope != null) {
+            mapping.setIsProcessScope(Boolean.valueOf(isProcessScope));
+        }
         if (log.isDebugEnabled()) log.debug(mappingElement.toXml() + ":" + mapping);
         return mapping;
     }

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -93,11 +93,23 @@
             body.add(Constants.VARIABLE_VALUES, variableMap);
         if (_replyToOriginator) {
             final Call call = message.getHeader().getCall() ;
-            body.add(Constants.REPLY_TO, getEPR(call.getReplyTo())) ;
-            body.add(Constants.FAULT_TO, getEPR(call.getFaultTo())) ;
+            setEPR(body, Constants.REPLY_TO, getEPR(call.getReplyTo())) ;
+            setEPR(body, Constants.FAULT_TO, getEPR(call.getFaultTo())) ;
         }
 	}
 	
+    private void setEPR(final Body body, final String name, final String value)
+    {
+        if (value == null)
+        {
+            body.remove(name) ;
+        }
+        else
+        {
+            body.add(name, value) ;
+        }
+    }
+    
 	private String getEPR(final EPR epr)
 	{
 		if (epr == null) {

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelper.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -23,10 +23,8 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.WeakHashMap;
 import java.util.Map.Entry;
 
 import javax.xml.xpath.XPath;
@@ -36,6 +34,7 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.internal.soa.esb.services.rules.util.RulesContext;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.message.Message;
@@ -59,20 +58,34 @@
 {
 	private static Logger log = Logger.getLogger(DslHelper.class);
 	
+	/**
+	 * The name of the boolean map context.
+	 */
+	private static final String BOOLEAN_MAP = "DslHelper.BooleanMap" ;
+	
+	/**
+	 * The name of the number map.
+	 */
+	private static final String NUMBER_MAP = "DslHelper.NumberMap" ;
+	
+	/**
+	 * The name of the string map.
+	 */
+	private static final String STRING_MAP = "DslHelper.StringMap" ;
+	
+	/**
+	 * The name of the node map.
+	 */
+	private static final String NODE_MAP = "DslHelper.NodeMap" ;
+	
+	/**
+	 * The name of the node list map.
+	 */
+	private static final String NODE_LIST_MAP = "DslHelper.NodeListMap" ;
+	
 	/** XPath instance */
 	private static XPathFactory xpf = XPathFactory.newInstance();
     private static MessagePayloadProxy payloadProxy;
-    
-    /* 
-     * Maps that contain cached XPath results.
-     * K = XPath expression String
-     * V = {@link XPathCacheObject}
-     */
-	private static Map<String,XPathCacheObject<Boolean>> xpathBooleanResults = Collections.synchronizedMap( new WeakHashMap<String,XPathCacheObject<Boolean>>() );
-	private static Map<String,XPathCacheObject<Number>> xpathNumberResults = Collections.synchronizedMap( new WeakHashMap<String,XPathCacheObject<Number>>() );
-	private static Map<String,XPathCacheObject<String>> xpathStringResults = Collections.synchronizedMap( new WeakHashMap<String,XPathCacheObject<String>>() );
-	private static Map<String,XPathCacheObject<Node>> xpathNodeResults = Collections.synchronizedMap( new WeakHashMap<String,XPathCacheObject<Node>>() );
-	private static Map<String,XPathCacheObject<NodeList>> xpathNodeListResults = Collections.synchronizedMap( new WeakHashMap<String,XPathCacheObject<NodeList>>() );
 
     static {
         payloadProxy = new MessagePayloadProxy(new ConfigTree("config"), new String[] {BytesBody.BYTES_LOCATION}, new String[] {BytesBody.BYTES_LOCATION});
@@ -112,16 +125,27 @@
 	 */
     public static Boolean selectAsBoolean(final Message message, final String xpathExp, final Map<String,String> namespaces ) throws XPathExpressionException
 	{
-		XPathCacheObject<Boolean> cachedObject = xpathBooleanResults.get( xpathExp );
-		if ( cacheHit( cachedObject, message ) )
-			return cachedObject.getResult();
+		Map<String, Boolean> booleanMap = (Map<String, Boolean>)RulesContext.getContext(BOOLEAN_MAP) ;
+		if (booleanMap != null)
+		{
+			final Boolean result = booleanMap.get(xpathExp) ;
+			if (result != null)
+			{
+				return result ;
+			}
+		}
+		else
+		{
+			booleanMap = new HashMap<String, Boolean>() ;
+			RulesContext.setContext(BOOLEAN_MAP, booleanMap) ;
+		}
 		
 		XPath xpath = getXPath( namespaces );
 		Boolean value = (Boolean) xpath.evaluate( xpathExp, getInputSource(message), XPathConstants.BOOLEAN);
-		xpathBooleanResults.put( xpathExp, new XPathCacheObject<Boolean>( message.hashCode(), value ) );
+		booleanMap.put(xpathExp, value) ;
 		return value;
 	}
-    
+
     /**
 	 * Uses XPath to select the Number matched by the XPath expression. 
 	 * <p/>
@@ -157,13 +181,24 @@
      */
     public static Number selectAsNumber(final Message message, final String xpathExp, final Map<String,String> namespaces ) throws XPathExpressionException
 	{
-		final XPathCacheObject<Number> cachedObject = xpathNumberResults.get( xpathExp );
-		if ( cacheHit( cachedObject, message ) )
-			return cachedObject.getResult();
+		Map<String, Number> numberMap = (Map<String, Number>)RulesContext.getContext(NUMBER_MAP) ;
+		if (numberMap != null)
+		{
+			final Number result = numberMap.get(xpathExp) ;
+			if (result != null)
+			{
+				return result ;
+			}
+		}
+		else
+		{
+			numberMap = new HashMap<String, Number>() ;
+			RulesContext.setContext(NUMBER_MAP, numberMap) ;
+		}
 		
 		final XPath xpath = getXPath( namespaces );
 		final Number number = (Number) xpath.evaluate( xpathExp, getInputSource(message), XPathConstants.NUMBER);
-		xpathNumberResults.put( xpathExp, new XPathCacheObject<Number>( message.hashCode(), number ) );
+		numberMap.put(xpathExp, number) ;
 		return number;
 	}
     
@@ -202,13 +237,23 @@
      */
     public static String selectAsString(final Message message, final String xpathExp, final Map<String,String> namespaces ) throws XPathExpressionException
     {
-		final XPathCacheObject<String> cachedObject = xpathStringResults.get( xpathExp );
-		if ( cacheHit( cachedObject, message ) )
-			return cachedObject.getResult();
-		
+		Map<String, String> stringMap = (Map<String, String>)RulesContext.getContext(STRING_MAP) ;
+		if (stringMap != null)
+		{
+			final String result = stringMap.get(xpathExp) ;
+			if (result != null)
+			{
+				return result ;
+			}
+		}
+		else
+		{
+			stringMap = new HashMap<String, String>() ;
+			RulesContext.setContext(STRING_MAP, stringMap) ;
+		}
 		final XPath xpath = getXPath( namespaces );
 		final String string = (String) xpath.evaluate( xpathExp, getInputSource(message), XPathConstants.STRING);
-		xpathStringResults.put( xpathExp, new XPathCacheObject<String>( message.hashCode(), string ) );
+		stringMap.put(xpathExp, string) ;
 		return string;
 	}
     
@@ -249,13 +294,23 @@
      */
     public static Node selectAsNode(final Message message, final String xpathExp, final Map<String,String> namespaces ) throws XPathExpressionException
 	{
-		final XPathCacheObject<Node> cachedObject = xpathNodeResults.get( xpathExp );
-		if ( cacheHit( cachedObject, message ) )
-			return cachedObject.getResult();
-		
+		Map<String, Node> nodeMap = (Map<String, Node>)RulesContext.getContext(NODE_MAP) ;
+		if (nodeMap != null)
+		{
+			final Node result = nodeMap.get(xpathExp) ;
+			if (result != null)
+			{
+				return result ;
+			}
+		}
+		else
+		{
+			nodeMap = new HashMap<String, Node>() ;
+			RulesContext.setContext(NODE_MAP, nodeMap) ;
+		}
 		final XPath xpath = getXPath( namespaces );
 		final Node node = (Node) xpath.evaluate( xpathExp, getInputSource(message), XPathConstants.NODE);
-		xpathNodeResults.put( xpathExp, new XPathCacheObject<Node>( message.hashCode(), node ) );
+		nodeMap.put(xpathExp, node) ;
 		return node;
 	}
     
@@ -295,14 +350,24 @@
      */
     public static NodeList selectAsNodeList( final Message message, final String xpathExp, Map<String,String> namespaces ) throws XPathExpressionException
 	{
-		final XPathCacheObject<NodeList> cachedObject = xpathNodeListResults.get( xpathExp );
-		if ( cacheHit( cachedObject, message ) )
-			return cachedObject.getResult();
-		
+		Map<String, NodeList> nodeListMap = (Map<String, NodeList>)RulesContext.getContext(NODE_LIST_MAP) ;
+		if (nodeListMap != null)
+		{
+			final NodeList result = nodeListMap.get(xpathExp) ;
+			if (result != null)
+			{
+				return result ;
+			}
+		}
+		else
+		{
+			nodeListMap = new HashMap<String, NodeList>() ;
+			RulesContext.setContext(NODE_LIST_MAP, nodeListMap) ;
+		}
 		final XPath xpath = getXPath( namespaces );
 		final NodeList nodeList = (NodeList) xpath.evaluate(xpathExp, getInputSource(message), XPathConstants.NODESET);
 		log.info("XPath [" + xpathExp + "], nr of matches : " + nodeList.getLength());
-		xpathNodeListResults.put( xpathExp, new XPathCacheObject<NodeList>( message.hashCode(), nodeList ) );
+		nodeListMap.put(xpathExp, nodeList) ;
 		return nodeList;
 	}
     
@@ -551,15 +616,6 @@
 		}
 		return namespacesMap;
 	}
-    
-	/*
-	 * Checks if the cachedObject was non-null, and if so, checks the message hashCode against
-	 * the cachedObjects messageHashCode.
-	 */
-    private static <T> boolean cacheHit ( final XPathCacheObject<T> cachedObject, final Message message )
-    {
-		return cachedObject != null && cachedObject.getMessageHashCode() == message.hashCode();
-    }
 	
 	private static double parseDouble( final String string ) throws XPathExpressionException
 	{
@@ -619,54 +675,4 @@
 		setNamespaces( xpath, namespaces );
 		return xpath;
     }
-    
-	/**
-	 * XPathCacheObject holds results from XPath evaluations and message object instance hashcodes.
-	 * </p> 
-	 * The intent of this class is for it to be used as the value in a Map:
-	 * <pre>
-	 * {@code  
-	 * Map<String,XPathCacheObject> xpathResults = new WeakHashMap<String,XPathCacheObject>() );
-	 * }</pre><br><br>
-	 * The key would be a String representing the XPath expression which was used to evaluate the result from 
-	 * the Message Object instance represented by the messageHashCode.
-	 * 
-	 */
-	private static class XPathCacheObject<T>
-	{
-		/*
-		 * The hashCode of the Message object used in the XPath evaluation
-		 */
-		private final int messageHashCode;
-		/*
-		 * The result from the XPath evalutaion
-		 */
-		private final T result;
-		
-		/**
-		 * Sole constructor.
-		 * 
-		 * @param messageHashCode -
-		 * 				The hashCode of the Message object used in the XPath evaluation
-		 * @param result -
-		 * 				The result from the XPath evalutaion
-		 */
-		public XPathCacheObject( final int messageHashCode, final T result )
-		{
-			this.messageHashCode = messageHashCode;
-			this.result = result;
-		}
-		
-		public int getMessageHashCode() 
-		{ 
-			return messageHashCode; 
-		}
-		
-		public T getResult() 
-		{ 
-			return result; 
-		}
-	}
-	
 }
-	

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -37,6 +37,7 @@
 import org.drools.compiler.DroolsParserException;
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
 import org.jboss.internal.soa.esb.services.routing.cbr.JBRulesCounter;
+import org.jboss.internal.soa.esb.services.rules.util.RulesContext;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.lifecycle.LifecyclePriorities;
 import org.jboss.soa.esb.lifecycle.LifecycleResource;
@@ -460,30 +461,32 @@
 			boolean isRulesChanged = false;
 
 			final Map<String, String> ruleSets = lifecycleRuleSets.getLifecycleResource();
-			if ( ruleReload ) 
-			{
-				String currentRuleSet = ruleSets.get( ruleSet );
-				newRuleSet = rbHelper.getRulesAsString( ruleSet, dsl );
-				if ( currentRuleSet == null || !currentRuleSet.equals(newRuleSet) ) 
-				{
-					isRulesChanged = true;
-				}
-			}
-			final Map<String, RuleBase> ruleBases = lifecycleRuleBases.getLifecycleResource();
-			RuleBase ruleBase = ruleBases.get( ruleSet );
-			if ( ruleBase == null || isRulesChanged ) 
-			{
-				ruleBase = rbHelper.createRuleBaseFromRuleFiles(ruleSet, dsl);
-				if (ruleBase != null)
-					ruleBases.put(ruleSet, ruleBase);
-				if (newRuleSet == null) 
-					newRuleSet = rbHelper.getRulesAsString(ruleSet, dsl);
-				if (ruleSet != null)
-					ruleSets.put(ruleSet, newRuleSet);
-			}
 
-			return ruleBase;
+            synchronized (ruleSets) {
+                if ( ruleReload )
+                {
+                    String currentRuleSet = ruleSets.get( ruleSet );
+                    newRuleSet = rbHelper.getRulesAsString( ruleSet, dsl );
+                    if ( currentRuleSet == null || !currentRuleSet.equals(newRuleSet) )
+                    {
+                        isRulesChanged = true;
+                    }
+                }
+                final Map<String, RuleBase> ruleBases = lifecycleRuleBases.getLifecycleResource();
+                RuleBase ruleBase = ruleBases.get( ruleSet );
+                if ( ruleBase == null || isRulesChanged )
+                {
+                    ruleBase = rbHelper.createRuleBaseFromRuleFiles(ruleSet, dsl);
+                    if (ruleBase != null)
+                        ruleBases.put(ruleSet, ruleBase);
+                    if (newRuleSet == null)
+                        newRuleSet = rbHelper.getRulesAsString(ruleSet, dsl);
+                    if (ruleSet != null)
+                        ruleSets.put(ruleSet, newRuleSet);
+                }
 
+                return ruleBase;
+            }            
 		} 
 		catch (final LifecycleResourceException e) 
 		{
@@ -525,14 +528,18 @@
 		final long startTime = System.nanoTime();
 		try 
 		{
-			RuleBase ruleBase = getCachedRuleBases().get( decisionTable );
-			if ( ruleReload || ruleBase == null ) 
-			{
-				ruleBase = DroolsRuleBaseHelper.getInstance().createRuleBaseFromDecisionTable(decisionTable);
-				getCachedRuleBases().put( decisionTable, ruleBase );
-			} 
-			return ruleBase;
-		} 
+            Map<String, RuleBase> ruleBases = getCachedRuleBases();
+
+            synchronized (ruleBases) {
+                RuleBase ruleBase = ruleBases.get( decisionTable );
+                if ( ruleReload || ruleBase == null ) 
+                {
+                    ruleBase = DroolsRuleBaseHelper.getInstance().createRuleBaseFromDecisionTable(decisionTable);
+                    ruleBases.put( decisionTable, ruleBase );
+                }
+                return ruleBase;
+            }
+        }
 		catch (final IOException e) 
 		{
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
@@ -579,16 +586,24 @@
 	{
 		
 		final StatelessSession statelessSession = ruleBase.newStatelessSession();
-		final List<Object> facts = getFacts( message, objectList );
-		addGlobalsVariables( statelessSession, globals );
-		statelessSession.execute(facts);
+		RulesContext.clearContext() ;
+		try
+		{
+			final List<Object> facts = getFacts( message, objectList );
+			addGlobalsVariables( statelessSession, globals );
+			statelessSession.execute(facts);
+		}
+		finally
+		{
+			RulesContext.clearContext() ;
+		}
 		return message;
 	}
 	
 	/**
 	 * Execute rules using using the Stateful API
 	 * 
-	 * @param rulebase -
+	 * @param   rulebase -
      * 			the rulebase to use
 	 * @param dispose -
 	 * 			if true the working memory will be dereferenced.	
@@ -610,26 +625,27 @@
 			final Map<String,Object> globals,
 			final List<Object> objectList) 
 	{
-		final StatefulSession statefulSession = getStatefulSession( ruleBase );
-		try
-		{
-    		addGlobalsVariables( statefulSession, globals );
-			final List<Object> facts = getFacts( message, objectList );
-    		insertObjectsIntoWorkingMemory( facts, statefulSession );
-    		statefulSession.fireAllRules();
-		}
-		finally 
-		{
-    		if ( dispose ) 
-    		{
-    			for ( StatefulSession session : ruleBase.getStatefulSessions())
-				{
-    				session.dispose();
-				}
-    		}
-		}
+        synchronized (ruleBase) {
+            RulesContext.clearContext() ;
+            final StatefulSession statefulSession = getStatefulSession( ruleBase );
+            try
+            {
+                addGlobalsVariables( statefulSession, globals );
+                final List<Object> facts = getFacts( message, objectList );
+                insertObjectsIntoWorkingMemory( facts, statefulSession );
+                statefulSession.fireAllRules();
+            }
+            finally
+            {
+                RulesContext.clearContext() ;
+                if ( dispose )
+                {
+                    statefulSession.dispose();
+                }
+            }
+        }
 		
-		return message;
+        return message;
 	}
 	
 	private List<Object> getFacts(final Message message, final List<Object> objectList )
@@ -647,10 +663,12 @@
 	 */
 	private StatefulSession getStatefulSession( final RuleBase ruleBase )
 	{
-		final StatefulSession[] statefulSessions = ruleBase.getStatefulSessions();
-		boolean existingSession = statefulSessions != null && statefulSessions.length > 0;
-		return existingSession ? statefulSessions[0] : ruleBase.newStatefulSession();
-	}
+        synchronized (ruleBase) {
+            final StatefulSession[] statefulSessions = ruleBase.getStatefulSessions();
+            boolean existingSession = statefulSessions != null && statefulSessions.length > 0;
+            return existingSession ? statefulSessions[0] : ruleBase.newStatefulSession();
+        }
+    }
 	
 	/*
 	 * Will set the passed-in elements in the globals Map as global
@@ -661,9 +679,10 @@
 		if ( globals != null )
 		{
 			Set<Entry<String, Object>> entrySet = globals.entrySet();
-			for ( Entry<String, Object> entry : entrySet )
+			for ( Entry<String, Object> entry : entrySet ) {
 				statelessSession.setGlobal( entry.getKey(), entry.getValue() );
-		}
+            }
+        }
 	}
 	
 	/*

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/RuleServiceCallHelper.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/RuleServiceCallHelper.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/RuleServiceCallHelper.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -33,6 +33,7 @@
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.rules.RuleService;
+import org.apache.log4j.Logger;
 
 /**
  * RuleServiceCallHelper is a util class for calling
@@ -44,7 +45,10 @@
  */
 public class RuleServiceCallHelper
 {
-	private RuleServiceCallHelper() 
+
+    private static Logger logger = Logger.getLogger(RuleServiceCallHelper.class);
+
+    private RuleServiceCallHelper()
 	{
 		throw new AssertionError();
 	}
@@ -95,8 +99,15 @@
 		
 		final String decisionTable = configTree.getAttribute( DECISION_TABLE.getTagName() );
 		final String ruleAgent = configTree.getAttribute( RULE_AGENT_PROPERTIES.getTagName() );
-		
-		final Boolean continueStateful = (Boolean) message.getProperties().getProperty( CONTINUE.getTagName(), Boolean.FALSE );
+
+        if(logger.isDebugEnabled()) {
+            final boolean isRuleReloadSpecified = (configTree.getAttribute(ListenerTagNames.RULE_RELOAD_TAG) != null);
+            if (ruleAgent != null && isRuleReloadSpecified) {
+                logger.debug("'" + ListenerTagNames.RULE_RELOAD_TAG + "' is specified on the same configuration as a Rule Agent configuration is specified.  Ignoring the '" + ListenerTagNames.RULE_RELOAD_TAG + "' configuration.");
+            }
+        }
+
+        final Boolean continueStateful = (Boolean) message.getProperties().getProperty( CONTINUE.getTagName(), Boolean.FALSE );
 		if ( continueStateful )
 		{
 			//	ruleSet can be a rule file, decisiontable or a ruleAgent properties file for continueStatefulRules

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java	2008-08-18 22:01:16 UTC (rev 21609)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.internal.soa.esb.services.rules.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Class providing access to a rules context for an execution.
- */
-public class RulesContext 
-{
-    /**
-     * The rules context passed via 
-     */
-    private static final ThreadLocal<Map<String, Object>> CONTEXT = new ThreadLocal<Map<String,Object>>() ;
-    
-    /**
-     * Clear the context associated with the current thread.
-     */
-    public static void clearContext()
-    {
-        CONTEXT.set(null) ;
-    }
-    
-    /**
-     * Get the rules context value with the specified name. 
-     * @param name The name of the context value.
-     * @return The context value or null if not set.
-     */
-    public static Object getContext(final String name)
-    {
-        final Map<String, Object> context = CONTEXT.get() ;
-        return (context != null) ? context.get(name) : null ;
-    }
-    
-    /**
-     * Set the context value.
-     * @param name The name of the context value.
-     * @param value The associated value or null to remove.
-     */
-    public static void setContext(final String name, final Object value)
-    {
-        final Map<String, Object> context = CONTEXT.get() ;
-        if (context != null)
-        {
-            initialiseContext(context, name, value) ;
-        }
-        else
-        {
-            final Map<String, Object> newContext = new HashMap<String, Object>() ;
-            CONTEXT.set(newContext) ;
-            initialiseContext(newContext, name, value) ;
-        }
-    }
-    
-    /**
-     * Initialise the context value.
-     * @param context The current context.
-     * @param name The name of the context value.
-     * @param value The value of the context or null if it is to be removed.
-     */
-    private static void initialiseContext(final Map<String, Object> context, final String name, final Object value)
-    {
-        if (value == null)
-        {
-            context.remove(name) ;
-        }
-        else
-        {
-            context.put(name, value) ;
-        }
-    }
-}

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/util/RulesContext.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.internal.soa.esb.services.rules.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Class providing access to a rules context for an execution.
+ */
+public class RulesContext 
+{
+    /**
+     * The rules context passed via 
+     */
+    private static final ThreadLocal<Map<String, Object>> CONTEXT = new ThreadLocal<Map<String,Object>>() ;
+    
+    /**
+     * Clear the context associated with the current thread.
+     */
+    public static void clearContext()
+    {
+        CONTEXT.set(null) ;
+    }
+    
+    /**
+     * Get the rules context value with the specified name. 
+     * @param name The name of the context value.
+     * @return The context value or null if not set.
+     */
+    public static Object getContext(final String name)
+    {
+        final Map<String, Object> context = CONTEXT.get() ;
+        return (context != null) ? context.get(name) : null ;
+    }
+    
+    /**
+     * Set the context value.
+     * @param name The name of the context value.
+     * @param value The associated value or null to remove.
+     */
+    public static void setContext(final String name, final Object value)
+    {
+        final Map<String, Object> context = CONTEXT.get() ;
+        if (context != null)
+        {
+            initialiseContext(context, name, value) ;
+        }
+        else
+        {
+            final Map<String, Object> newContext = new HashMap<String, Object>() ;
+            CONTEXT.set(newContext) ;
+            initialiseContext(newContext, name, value) ;
+        }
+    }
+    
+    /**
+     * Initialise the context value.
+     * @param context The current context.
+     * @param name The name of the context value.
+     * @param value The value of the context or null if it is to be removed.
+     */
+    private static void initialiseContext(final Map<String, Object> context, final String name, final Object value)
+    {
+        if (value == null)
+        {
+            context.remove(name) ;
+        }
+        else
+        {
+            context.put(name, value) ;
+        }
+    }
+}

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelperUnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelperUnitTest.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/routing/cbr/DslHelperUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -37,10 +37,13 @@
 import junit.framework.JUnit4TestAdapter;
 
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.services.rules.util.RulesContext;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -218,7 +221,7 @@
 		}
 		long endTime = TimeUnit.NANOSECONDS.toMillis( System.nanoTime() - startTime );
 		log.info( "Timed " + nrOfCalls + " runs : " + endTime + "ms" );
-		assertTrue( nrOfCalls + " of calls should have taken less then 150ms", endTime < 150 );
+		assertTrue( nrOfCalls + " of calls should have taken less then 150ms, took " + endTime, endTime < 150 );
 	}
 	
 	@Test 
@@ -237,6 +240,13 @@
 		DslHelper.parseNamespaces( null );
 	}
 	
+	@Before
+	@After
+	public void clearContext()
+	{
+		RulesContext.clearContext() ;
+	}
+	
 	@BeforeClass
 	public static void createMessage() throws UnsupportedEncodingException
 	{

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/lib/ext/build-time/jboss-saaj.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -35,6 +35,7 @@
 public class MBeanSoapUIInvoker implements SoapUIInvoker {
 
     private static final String[] buildRequestSig = new String[] {String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
+    private static final String[] buildFaultSig = new String[] {String.class.getName(), String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
     private static final String[] getEndpointSig = new String[] {String.class.getName(), Properties.class.getName()};
     private MBeanServer mbeanServer;
     private ObjectName serviceName;
@@ -82,6 +83,53 @@
     }
 
     /**
+     * Build a SOAP response for the specified operation on the specified WSDL.
+     *
+     * @param wsdl            WSDL URL.
+     * @param operation       Operation name.
+     * @param params          Message parameter map.
+     * @param httpClientProps {@link org.apache.commons.httpclient.HttpClient} creation properties.
+     * @param smooksResource  {@link org.milyn.Smooks} transformation configuration resource file.
+     *                        Null if no transformations are to be performed on the SOAP message before serializing it
+     *                        for return.
+     *  @param soapNs         the SOAP namespace. If null one of the defaults will be used:
+     *                        http://schemas.xmlsoap.org/soap/envelope/
+     *                        http://www.w3.org/2003/05/soap-envelope 
+     * @return The SOAP Message.
+     * @throws java.io.IOException                   Failed to load WSDL.
+     * @throws UnsupportedOperationException Operation not supported on specified WSDL.
+     * @throws org.xml.sax.SAXException                  Failed to parse the SOAP UI generated request message.
+     */
+    public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+        try {
+            return (String) mbeanServer.invoke(serviceName, "buildResponse", new Object[] {wsdl, operation, params, httpClientProps, smooksResource, soapNs}, buildRequestSig);
+        } catch (InstanceNotFoundException e) {
+            throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'.  This service must be deployed before this action can be used.", e);
+        } catch (MBeanException e) {
+            rethrowException(e);
+        } catch (ReflectionException e) {
+            rethrowException(e);
+        }
+
+        throw new RuntimeException("Unexpected code exit point reached!");
+    }
+
+
+
+    public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+        try {
+            return (String) mbeanServer.invoke(serviceName, "buildFault", new Object[] {wsdl, operation, faultName, params, httpClientProps, smooksResource, soapNs}, buildFaultSig);
+        } catch (InstanceNotFoundException e) {
+            throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'.  This service must be deployed before this action can be used.", e);
+        } catch (MBeanException e) {
+            rethrowException(e);
+        } catch (ReflectionException e) {
+            rethrowException(e);
+        } 
+        throw new RuntimeException("Unexpected code exit point reached!");
+    }
+
+    /**
      * Get the 1st endpoint from the specified WSDL.
      *
      * @param wsdl WSDL URL.

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -11,6 +11,10 @@
  */
 public interface SoapUIInvoker {
     String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+    
+    String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+    
+    String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
 
     String getEndpoint(String wsdl, Properties httpClientProps) throws IOException;
 }

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -22,6 +22,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.publish.ActionContractPublisher;
 import org.jboss.internal.soa.esb.publish.ContractInfo;
+import org.jboss.internal.soa.esb.publish.ServletContractPublisher;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.EPR;
@@ -50,7 +51,7 @@
  * Contract publisher for a Webservice endpoint.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class WebserviceContractPublisher implements ActionContractPublisher {
+public class WebserviceContractPublisher implements ActionContractPublisher, ServletContractPublisher {
 
     private static Logger logger = Logger.getLogger(WebserviceContractPublisher.class);    
     private String endpointName;

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -50,6 +50,15 @@
                 public String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
                     return service.buildRequest(wsdl, operation, params, httpClientProps, smooksResource, soapNs);
                 }
+
+                public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+                    return service.buildResponse(wsdl, operation, params, httpClientProps, smooksResource, soapNs) ;
+                }
+
+                public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+                    return service.buildFault(wsdl, operation, faultName, params, httpClientProps, smooksResource, soapNs) ;
+                }
+
                 public String getEndpoint(String wsdl, Properties httpClientProps) throws IOException {
                     return service.getEndpoint(wsdl, httpClientProps);
                 }

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/lib/soap-xmlbeans-1.2.jar (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/services/soapui-client/src/lib/soap-xmlbeans-1.2.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -27,40 +27,59 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.net.URL;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
+import javax.wsdl.Part;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.commons.httpclient.HttpClient;
 import org.apache.log4j.Logger;
-import org.apache.commons.httpclient.HttpClient;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
 import org.jboss.internal.soa.esb.soap.OGNLUtils;
+import org.jboss.internal.soa.esb.util.ESBProperties;
 import org.jboss.internal.soa.esb.util.LRUCache;
-import org.jboss.internal.soa.esb.util.ESBProperties;
+import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.internal.soa.esb.util.XMLHelper;
 import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.http.HttpClientFactory;
-import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.system.server.ServerConfig;
 import org.jboss.system.server.ServerConfigLocator;
-import org.milyn.xml.XmlUtil;
 import org.milyn.Smooks;
 import org.milyn.resource.URIResourceLocator;
-import org.w3c.dom.*;
+import org.milyn.xml.XmlUtil;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
 
 import com.eviware.soapui.SoapUI;
 import com.eviware.soapui.impl.wsdl.WsdlInterface;
+import com.eviware.soapui.impl.wsdl.WsdlOperation;
 import com.eviware.soapui.impl.wsdl.WsdlProject;
+import com.eviware.soapui.impl.wsdl.support.soap.SoapMessageBuilder;
 import com.eviware.soapui.impl.wsdl.support.wsdl.WsdlLoader;
+import com.eviware.soapui.impl.wsdl.support.xsd.SampleXmlUtil;
+import com.eviware.soapui.model.iface.MessagePart;
 import com.eviware.soapui.model.iface.Operation;
+import com.eviware.soapui.settings.WsdlSettings;
 
+
 /**
  * Soap UI Soap Client Service MBean.
  *
@@ -288,8 +307,67 @@
         Operation operationInst = getOperation(wsdl, operation, httpClientProps);
         String requestTemplate = operationInst.getRequestAt(0).getRequestContent();
 
-        return buildRequest(requestTemplate, params, smooksResource, soapNs);
+        return buildSOAPMessage(requestTemplate, params, smooksResource, soapNs);
     }
+    
+    /**
+     * Use soapUI to build a SOAP response for the specified operation on the specified WSDL.
+     *
+     * @param wsdl            WSDL URL 
+     * @param operation       Operation name.
+     * @param params          Message parameter map.
+     * @param httpClientProps {@link org.apache.commons.httpclient.HttpClient} creation properties.
+     * @param smooksResource  {@link org.milyn.Smooks} transformation configuration resource file.
+     *                        Null if no transformations are to be performed on the SOAP message before serializing it
+     *                        for return.
+     * @param soapNs 		  optional SOAP namespace
+     * @return The SOAP Message.
+     * @throws IOException                   Failed to load WSDL.
+     * @throws UnsupportedOperationException Operation not supported on specified WSDL.
+     * @throws SAXException                  Failed to parse the SOAP UI generated request message.
+     */
+    public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+    	Operation operationInst = getOperation(wsdl, operation, httpClientProps);
+        WsdlOperation wsdlOperation = (WsdlOperation)operationInst;
+        String responseTemplate = wsdlOperation.createResponse(true);
+        return buildSOAPMessage(responseTemplate, params, smooksResource, soapNs);   	
+    }
+    
+    
+    public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+    	String faultDetail = null;
+    	Operation operationInst = getOperation(wsdl, operation, httpClientProps);
+        WsdlOperation wsdlOperation = (WsdlOperation)operationInst;
+        MessagePart[] faultParts = wsdlOperation.getFaultParts();
+        params.put("Fault.faultcode","soapenv:server");
+	    SoapMessageBuilder soapMessageBuilder = wsdlOperation.getInterface().getMessageBuilder();
+	    String faultTemplate = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+	                            + "<soapenv:Body><soapenv:Fault><faultcode>?</faultcode><faultstring>?</faultstring><detail>";
+		XmlObject detail = XmlObject.Factory.newInstance();
+        for (int i = 0 ; i < faultParts.length; i++) {
+        	MessagePart.FaultPart faultPart = (MessagePart.FaultPart)faultParts[i];
+        	if (faultPart.getName().equalsIgnoreCase(faultName)) {
+        		SampleXmlUtil generator = new SampleXmlUtil( false );
+        		generator.setExampleContent( false );
+        		generator.setTypeComment( false );
+        		XmlCursor cursor = detail.newCursor();   			
+    			cursor.toFirstContentToken();
+    			generator.setTypeComment( true );
+    			generator.setIgnoreOptional(wsdlOperation.getInterface().getSettings().getBoolean( WsdlSettings.XML_GENERATION_ALWAYS_INCLUDE_OPTIONAL_ELEMENTS ) );
+    			for( Part part : faultPart.getWsdlParts() ) {
+    				try {
+						soapMessageBuilder.createElementForPart(part, cursor, generator);
+					} catch (Exception e) {
+						logger.error("Unable to create soap fualt template", e);
+					}
+        		}
+        	}
+        }
+        faultTemplate = faultTemplate + detail.xmlText( new XmlOptions().setSaveAggressiveNamespaces().setSavePrettyPrint())
+                        + "</detail></soapenv:Fault></soapenv:Body></soapenv:Envelope>";
+        faultDetail = buildSOAPMessage(faultTemplate, params, smooksResource, soapNs);        
+        return faultDetail;         	
+    }
 
     /**
      * Get the 1st endpoint from the specified WSDL.
@@ -353,7 +431,7 @@
         return new EsbWsdlLoader(wsdl, httpClient);
     }
 
-    private String buildRequest(String soapMessageTemplate, Map params, String smooksResource, String soapNs) throws IOException, SAXException {
+    private String buildSOAPMessage(String soapMessageTemplate, Map params, String smooksResource, String soapNs) throws IOException, SAXException {
         Document messageDoc = getDocBuilder().parse(new InputSource(new StringReader(soapMessageTemplate)));
 
         Element docRoot = messageDoc.getDocumentElement();

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -55,6 +55,26 @@
     public abstract String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
 
     /**
+     * Use soapUI mockService to Build a SOAP response for the specified operation on the specified WSDL.
+     *
+     * @param wsdl            WSDL URL.
+     * @param operation       Operation name.
+     * @param params          Message parameter map..
+     * @param smooksResource  {@link org.milyn.Smooks} transformation configuration resource file.
+     *                        Null if no transformations are to be performed on the SOAP message before serializing it
+     *                        for return.
+     * @param soapNs 		  optional SOAP namespace
+     * @return The SOAP Message.
+     * @throws IOException                   Failed to load WSDL.
+     * @throws UnsupportedOperationException Operation not supported on specified WSDL.
+     * @throws SAXException                  Failed to parse the SOAP UI generated request message.
+     */
+    public abstract String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+
+    
+    public abstract String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+    
+    /**
      * Get the 1st endpoint from the specified WSDL.
      *
      * @param wsdl WSDL URL.

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2008-08-18 22:35:07 UTC (rev 21613)
@@ -312,6 +312,26 @@
         assertEquals("http://localhost:18080/active-bpel/services/RetailerCallback", mbean.getEndpoint(wsdlFile.toURI().toString(), properties));
     }
 
+    public void test_BuildResponse() throws Exception {    
+    	File wsdlFile = new File(WSDL_LOCATAION + "/helloworld.wsdl");
+    	properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
+    	SoapUIClientService mbean = new SoapUIClientService();
+    	Map<Object, Object> paras = new HashMap<Object, Object>();
+    	paras.put("sayHiReponse.arg0", "response");
+    	String str = mbean.buildResponse(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", paras, properties, null, null);
+    	assertTrue("Failed to generate correct soap response", str.indexOf("<say:arg0>response</say:arg0>") > -1);
+    }
+    
+    public void test_BuildFault() throws Exception {    
+    	File wsdlFile = new File(WSDL_LOCATAION + "/helloworld.wsdl");
+    	properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
+    	SoapUIClientService mbean = new SoapUIClientService();
+    	Map<Object, Object> paras = new HashMap<Object, Object>();
+    	paras.put("Fault.detail.sayFault.code", "test");
+    	String str = mbean.buildFault(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", "HelloWorldPubServiceFault1", paras, properties, null, null);
+    	assertTrue("Failed to generate correct soap fault message", str.indexOf("<say:code>test</say:code>") > -1);
+    }
+    
     private void addOrderItems(List<OrderItem> items) {
         items.add(new OrderItem(1, "item1", 1, new BigDecimal(1.00), 1));
         items.add(new OrderItem(2, "item2", 2, new BigDecimal(2.00), 2));
@@ -389,5 +409,5 @@
         final InputStream outputIS = SoapUIClientServiceMBeanUnitTest.class.getResourceAsStream("output.xml") ;
         
         System.out.println("compare returns: " + compareCharStreams(expectedIS, outputIS));
-    }
+    }    
 }

Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/helloworld.wsdl (from rev 21609, labs/jbossesb/tags/JBESB_4_4_GA_CP1_IR1/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/helloworld.wsdl)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/helloworld.wsdl	                        (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/helloworld.wsdl	2008-08-18 22:35:07 UTC (rev 21613)
@@ -0,0 +1,71 @@
+<wsdl:definitions targetNamespace='http://soa.jboss.org/ESBServiceSample' xmlns:ns1='http://www.jboss.org/sayHi' xmlns:ns2='http://www.jboss.org/sayHi' xmlns:ns3='http://www.jboss.org/sayHi' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://soa.jboss.org/ESBServiceSample' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'>
+ <wsdl:types>
+  <xs:schema elementFormDefault='qualified' targetNamespace='http://www.jboss.org/sayHi' version='1.0' xmlns:x1='http://www.jboss.org/sayHi' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+   <xs:element name='sayHi' type='x1:sayHi'/>
+   <xs:complexType name='sayHi'>
+    <xs:sequence>
+     <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+    </xs:sequence>
+   </xs:complexType>
+
+  </xs:schema>
+  <xs:schema elementFormDefault='qualified' targetNamespace='http://www.jboss.org/sayHi' version='1.0' xmlns:x1='http://www.jboss.org/sayHi' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+   <xs:element name='sayHiReponse' type='x1:sayHiReponse'/>
+   <xs:complexType name='sayHiReponse'>
+    <xs:sequence>
+     <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+    </xs:sequence>
+   </xs:complexType>
+  </xs:schema>
+
+  <xs:schema elementFormDefault='qualified' targetNamespace='http://www.jboss.org/sayHi' version='1.0' xmlns:x1='http://www.jboss.org/sayHi' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+   <xs:element name='sayFault' type='x1:fault'/>
+   <xs:complexType name='fault'>
+    <xs:sequence>
+     <xs:element name='code' type='xs:string'/>
+     <xs:element name='faultString' type='xs:string'/>
+    </xs:sequence>
+   </xs:complexType>
+  </xs:schema>
+
+ </wsdl:types>
+ <wsdl:message name='HelloWorldPubServiceReq'>
+  <wsdl:part element='ns1:sayHi' name='in'></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name='HelloWorldPubServiceRes'>
+  <wsdl:part element='ns1:sayHiReponse' name='out'></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name='HelloWorldPubServiceFault1'>
+  <wsdl:part element='ns1:sayFault' name='fault1'></wsdl:part>
+
+ </wsdl:message>
+ <wsdl:portType name='HelloWorldPubServicePortType'>
+  <wsdl:operation name='HelloWorldPubServiceOp'>
+   <wsdl:input message='tns:HelloWorldPubServiceReq' name='HelloWorldPubServiceReq'></wsdl:input>
+   <wsdl:output message='tns:HelloWorldPubServiceRes' name='HelloWorldPubServiceRes'></wsdl:output>
+   <wsdl:fault message='tns:HelloWorldPubServiceFault1' name='HelloWorldPubServiceFault1'></wsdl:fault>
+  </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name='HelloWorldPubServiceBinding' type='tns:HelloWorldPubServicePortType'>
+
+  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+  <wsdl:operation name='HelloWorldPubServiceOp'>
+   <wsdl:input>
+    <soap:body use='literal'/>
+   </wsdl:input>
+   <wsdl:output>
+    <soap:body use='literal'/>
+   </wsdl:output>
+   <wsdl:fault name='HelloWorldPubServiceFault1'>
+
+    <soap:fault name='HelloWorldPubServiceFault1' use='literal'/>
+   </wsdl:fault>
+  </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name='HelloWorldPubServiceService'>
+  <wsdl:port binding='tns:HelloWorldPubServiceBinding' name='HelloWorldPubServicePortType'>
+   <soap:address location='http://127.0.0.1:8080/Quickstart_helloworld_pub_service/ESBServiceSample/HelloWorldPubService'/>
+  </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
\ No newline at end of file

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/contract.jsp
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/contract.jsp	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/contract.jsp	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,86 +1,92 @@
-<%@ page import="java.util.List" %>
-<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
-<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
-<%@ page import="org.jboss.soa.esb.services.registry.ServiceNotFoundException" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
-<%@ page import="java.net.URI" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractInfo" %>
-<%@ page import="org.jboss.soa.esb.actions.soap.WebserviceContractPublisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
-<%
-    List publishers = ServicePublisher.getServicePublishers();
-    Registry registry = RegistryFactory.getRegistry();
-    String targetServiceCat = request.getParameter("serviceCat");
-    String targetServiceName = request.getParameter("serviceName");
-    String targetProtocol = request.getParameter("protocol");
-    ContractInfo contractInfo = null;
-    String contractData = null;
-    List eprs;
-
-    try {
-        List allEprs = (List) registry.findEPRs(targetServiceCat, targetServiceName);
-        eprs = new ArrayList(allEprs.size());
-        
-        for (int i = 0; i < allEprs.size(); i++) {
-        	EPR epr = (EPR) allEprs.get(i);
-            URI eprURI = URI.create(epr.getAddr().getAddress());
-            String protocol = eprURI.getScheme();
-
-        	if (protocol.equalsIgnoreCase(targetProtocol)) {
-        		eprs.add(epr);
-        	}
-        	
-        }
+<%@ page import="java.util.List" %>
+<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
+<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
+<%@ page import="org.jboss.soa.esb.services.registry.ServiceNotFoundException" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractInfo" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ServletContractPublisher" %>
+<%@ page import="org.jboss.soa.esb.Service" %>
+<%
+    Registry registry = RegistryFactory.getRegistry();
+    String targetServiceCat = request.getParameter("serviceCat");
+    String targetServiceName = request.getParameter("serviceName");
+    String targetProtocol = request.getParameter("protocol");
+    final Service service = new Service(targetServiceCat, targetServiceName) ;
+    
+    final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
+    ContractInfo contractInfo = null;
+    String contractData = "";
+
+    List eprs;
+    try {
+        eprs = (List) registry.findEPRs(targetServiceCat, targetServiceName);
     } catch (ServiceNotFoundException e) {
         // ignore for now - just return an empty list
         eprs = new ArrayList();
-    } catch (RegistryException e) {
-        // ignore for now - just return an empty list
-        eprs = new ArrayList();
-    }
-
-    // JBESB-1547 - Contract console should generate HTTP 404 when asking for non-deployed service WSDL 
-    if (eprs == null || eprs.isEmpty()) {
+    } catch (RegistryException e) {
+        // ignore for now - just return an empty list
+        eprs = new ArrayList();
+    }
+
+    EPR contractPublisherEPR = null ;
+    for (int ii = 0; ii < eprs.size(); ii++) {
+        EPR epr = (EPR) eprs.get(ii);
+        URI eprURI = URI.create(epr.getAddr().getAddress());
+        String protocol = eprURI.getScheme();
+
+        if (protocol.equalsIgnoreCase(targetProtocol)) {
+            contractPublisherEPR = epr ;
+            break;
+        }
+    }
+    
+    for (ServicePublisher servicePublisher: servicePublishers) {
+
+        if (contractPublisherEPR != null) {
+	        final ContractPublisher contractPublisher = servicePublisher.getContractPublisher() ;
+	        if (contractPublisher == null) {
+	            continue;
+	        }
+
+	        if(contractPublisher instanceof ServletContractPublisher) {
+	            contractInfo = ((ServletContractPublisher)contractPublisher).getContractInfo(contractPublisherEPR, request);
+	        } else {
+	            contractInfo = contractPublisher.getContractInfo(contractPublisherEPR);
+	        }
+	
+	        if (contractInfo != null) {
+	            contractData = contractInfo.getData();
+	            if (contractData != null) {
+		            response.setContentType(contractInfo.getMimeType());
+	            }
+	        }
+	        if (contractData == null) {
+	            contractData = "<Unavailable/>";
+	            response.setContentType("text/xml");
+	        }
+	        break ;
+        } else {
+            final Publisher publisher = servicePublisher.getPublisher() ;
+            if (publisher instanceof ContractReferencePublisher) {
+                final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
+                final URI serviceURI = contractReferencePublisher.getServiceURI() ;
+                if (serviceURI.getScheme().equalsIgnoreCase(targetProtocol)) {
+	                response.sendRedirect(contractReferencePublisher.getServiceContractURI().toString()) ;
+	                return ;
+                }
+            }
+        }
+    }
+    // JBESB-1547 - Contract console should generate HTTP 404 when asking for non-deployed service WSDL 
+    if (contractPublisherEPR == null) {
         response.sendError(HttpServletResponse.SC_NOT_FOUND);
-		return;    	
+        return;
     }
-    
-    for (int i = 0; i < publishers.size() && contractInfo == null; i++) {
-        ServicePublisher publisher = (ServicePublisher) publishers.get(i);
-        String serviceCategory = publisher.getCategory();
-        String serviceName = publisher.getServiceName();
-
-        if (publisher.getContractPublisher() == null) {
-            continue;
-        } else if (!serviceCategory.equalsIgnoreCase(targetServiceCat) ||
-                !serviceName.equalsIgnoreCase(targetServiceName)) {
-            continue;
-        }
-
-        for (int ii = 0; ii < eprs.size(); ii++) {
-            EPR epr = (EPR) eprs.get(ii);
-
-            ContractPublisher contractPublisher = publisher.getContractPublisher();
-
-            if(contractPublisher instanceof WebserviceContractPublisher) {
-                contractInfo = ((WebserviceContractPublisher)contractPublisher).getContractInfo(epr, request);
-            } else {
-                contractInfo = contractPublisher.getContractInfo(epr);
-            }
-            break;
-        }
-
-        if (contractInfo != null && contractInfo.getData() != null) {
-            contractData = contractInfo.getData();
-            response.setContentType(contractInfo.getMimeType());
-        } 
-    }
-    
-    if (contractData == null) {
-        contractData = "<Unavailable/>";
-        response.setContentType("text/xml");
-    }
-%><%= contractData %>
\ No newline at end of file
+%><%=contractData%>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/index.jsp
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/index.jsp	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/contract-web/src/main/webapp/index.jsp	2008-08-18 22:35:07 UTC (rev 21613)
@@ -5,7 +5,11 @@
 <%@ page import="org.jboss.soa.esb.addressing.EPR" %>
 <%@ page import="java.net.URI" %>
 <%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
-<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
+<%@ page import="org.jboss.soa.esb.Service" %>
 <html>
 <head>
     <title>JBoss ESB - Service List</title>
@@ -19,57 +23,79 @@
 
 <div class="pageSection">
     <%
-        List publishers = ServicePublisher.getServicePublishers();
+        List<Service> services = ServicePublisher.getServices();
         Registry registry = RegistryFactory.getRegistry();
 
-        for (int i = 0; i < publishers.size(); i++) {
-            ServicePublisher publisher = (ServicePublisher) publishers.get(i);
-            String serviceCategory = publisher.getCategory();
-            String serviceName = publisher.getServiceName();
-            List eprs;
+        for (Service service: services) {
+            String serviceCategory = service.getCategory();
+            String serviceName = service.getName();
+            
+            final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
+            if ((servicePublishers != null) && (servicePublishers.size() > 0)) {
+    %>
+    <fieldset>
+        <legend><b><%=service%></b></legend>
+                <%=servicePublishers.get(0).getDescription()%>
+    <%
+                for(ServicePublisher servicePublisher: servicePublishers) {
+                    final Publisher publisher = servicePublisher.getPublisher() ;
+                    if (!(publisher instanceof ContractReferencePublisher)) {
+                        List eprs;
 
-            try {
-                eprs = (List) registry.findEPRs(serviceCategory, serviceName);
-            } catch (Exception e) {
-                // ignore for now - just return an empty list
-                eprs = new ArrayList();
-            }
+                        try {
+                            eprs = (List) registry.findEPRs(serviceCategory, serviceName);
+                        } catch (Exception e) {
+                            // ignore for now - just return an empty list
+                            eprs = new ArrayList();
+                        }
+                        for (int ii = 0; ii < eprs.size(); ii++) {
+                            EPR epr = (EPR) eprs.get(ii);
+                            URI eprURI = URI.create(epr.getAddr().getAddress());
+                            String protocol = eprURI.getScheme();
+                            String relContractURI = "contract.jsp?serviceCat=" + serviceCategory + "&serviceName=" + serviceName + "&protocol=" + protocol;
     %>
-    <fieldset>
-        <legend><b><%=serviceCategory%>:<%=serviceName%></b></legend>
-        <%=publisher.getDescription()%>
-        <%
-            for (int ii = 0; ii < eprs.size(); ii++) {
-                EPR epr = (EPR) eprs.get(ii);
-                URI eprURI = URI.create(epr.getAddr().getAddress());
-                String protocol = eprURI.getScheme();
-                String relContractURI = "contract.jsp?serviceCat=" + serviceCategory + "&serviceName=" + serviceName + "&protocol=" + protocol;
-                URI thisPage = URI.create(request.getRequestURL().toString());
-                URI contractURI = thisPage.resolve(relContractURI);
-        %>
         <fieldset>
             <legend><b><%=protocol.toUpperCase()%></b></legend>
 
             <ul>
                 <li><b>Endpoint</b>: <%=eprURI%></li>
-                <%
-                    if(publisher.getContractPublisher() != null) {
-                %>
+    <%
+                            if(publisher != null) {
+                                URI thisPage = URI.create(request.getRequestURL().toString());
+                                URI contractURI = thisPage.resolve(relContractURI);
+    %>
                 <li><b>Contract</b>: <a href="<%=relContractURI%>"><%=contractURI%></a></li>
-                <%
-                    } else {
-                %>
+    <%
+                            } else {
+    %>
                 <li><b>Contract</b>: Unavailable</li>
-                <%
-                    }
-                %>
+    <%
+                            }
+    %>
             </ul>
-        </fieldset>
+        </fieldset>
+    <%
+                        }
+                    } else {
+                        final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
+                        final URI serviceURI = contractReferencePublisher.getServiceURI() ;
+                        final URI serviceContractURI = contractReferencePublisher.getServiceContractURI() ;
+    %>
+         <fieldset>
+            <legend><b>serviceURI.getScheme()</b></legend>
+
+            <ul>
+                <li><b>Endpoint</b>: <%=serviceURI%></li>
+                <li><b>Contract</b>: <a href="<%=serviceContractURI%>"><%=serviceContractURI%></a></li>
+            </ul>
+        </fieldset>
         <%
-            }
-        %>
+                    }
+                }
+    %>
     </fieldset>
     <%
+            }
         }
     %>
 </div>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -1,23 +1,26 @@
 <?xml version="1.0"?>
 <project name="jboss-esb-console" default="jar" basedir=".">
-	<property name="esb.root.dir" location="../../.."/>
-	<property name="console.dir" value="${esb.root.dir}/tools/console"/>
-	<property file="${esb.root.dir}/tools/console/management-esb/db.properties"/>
-	<property name="mgmt.dir" location="."/>
-	<property name="mgmt.build.dir" location="${mgmt.dir}/build"/>
-	<property name="src.java.dir" location="${mgmt.dir}/src/main/java"/>
+    <property name="esb.root.dir" location="../../.."/>
+    <property name="console.dir" value="${esb.root.dir}/tools/console"/>
+    <property file="${esb.root.dir}/tools/console/management-esb/db.properties"/>
+    <property name="mgmt.dir" location="."/>
+    <property name="mgmt.build.dir" location="${mgmt.dir}/build"/>
+    <property name="src.java.dir" location="${mgmt.dir}/src/main/java"/>
 
-	<target name="clean">
-		<delete dir="${mgmt.build.dir}"/>
-	</target>
+    <target name="clean">
+        <delete dir="${mgmt.build.dir}"/>
+    </target>
 
     <!-- Are we embedded in a source hierarchy? -->
     <condition property="hierarchy.source">
-      <available file="${esb.root.dir}/build-distr.xml"/>
+        <available file="${esb.root.dir}/build-distr.xml"/>
     </condition>
     <!-- Are we embedded in a jbossesb distribution hierarchy? -->
     <condition property="hierarchy.jbossesb">
-      <available file="${esb.root.dir}/JBossORG-EULA.txt"/>
+        <or>
+            <available file="${esb.root.dir}/JBossORG-EULA.txt"/>
+            <available file="${esb.root.dir}/JEMS-EULA.txt"/>
+        </or>
     </condition>
 
     <target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
@@ -29,124 +32,114 @@
         <fail unless="dist.exists"
               message="JBossESB must be built. Please run 'ant dist' in ${esb.root.dir}"/>
 
-        <property name="lib.dir" location="${mgmt.dir}/../../../build/lib"/>        
+        <property name="lib.dir" location="${mgmt.dir}/../../../build/lib"/>
     </target>
 
-        <target name="define-lib">
-		<condition property="esb.lib.dir"
-			value="${esb.root.dir}/lib/ext">
-			<available type="dir" file="${esb.root.dir}/lib/ext"/>
-		</condition>
-		<condition property="esb.lib.dir"
-			value="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib">
-			<available type="dir" file="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib"/>
-		</condition>
-                <condition property="esb.lib.dir"
-                         value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
-                         <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>
-                </condition>
-		<condition property="esb.lib.dir"
-                         value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
-                         <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>
-                </condition>
-		<condition property="server.lib.dir"
-			value="../../../server/default/lib">
-                        <available type="dir" file="../../../server/default/lib"
-/>
-                </condition>
-                <property name="server.lib.dir" value="${esb.lib.dir}"/>
-		<path id="build.classpath">
-			<fileset dir="${esb.root.dir}/tools/console/management-web/lib">
-				<include name="*.jar"/>
-			</fileset>
-                        <fileset dir="${server.lib.dir}">
-                                <include name="*.jar"/>
-                        </fileset>
-			<fileset dir="${esb.lib.dir}">
-			<include name="*.jar"/>
-			</fileset>
-			<fileset dir="${mgmt.dir}/lib">
-				<include name="*.jar"/>
-			</fileset>
-			<fileset refid="lib"/>
-		</path>
+    <target name="define-lib">
+        <condition property="esb.lib.dir"
+                   value="${esb.root.dir}/lib/ext">
+            <available type="dir" file="${esb.root.dir}/lib/ext"/>
+        </condition>
+        <condition property="esb.lib.dir"
+                   value="${esb.root.dir}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib">
+            <available type="dir" file="${esb.root.dir}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib"/>
+        </condition>
+        <condition property="server.lib.dir" value="../../../server/${org.jboss.esb.server.config}/lib">
+            <available type="dir" file="../../../server/${org.jboss.esb.server.config}/lib" />
+        </condition>
+        <property name="server.lib.dir" value="${esb.lib.dir}"/>
+        <path id="build.classpath">
+            <fileset dir="${esb.root.dir}/tools/console/management-web/lib">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset dir="${server.lib.dir}">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset dir="${esb.lib.dir}">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset dir="${mgmt.dir}/lib">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset refid="lib"/>
+        </path>
 
-                <condition property="lib.dir.path"
-			value="${mgmt.dir}/../../../lib">
-                        <available type="dir" file="${mgmt.dir}/../../../lib"/>
-                </condition>
+        <condition property="lib.dir.path"
+                   value="${mgmt.dir}/../../../lib">
+            <available type="dir" file="${mgmt.dir}/../../../lib"/>
+        </condition>
 
-                <condition property="lib.dir.path" value="${mgmt.dir}/./lib">
-                        <available type="dir" file="${mgmt.dir}/./lib"/>
-                </condition>
+        <condition property="lib.dir.path" value="${mgmt.dir}/./lib">
+            <available type="dir" file="${mgmt.dir}/./lib"/>
+        </condition>
 
-		<fileset id="lib" dir="${lib.dir}">
-                	<include name="*.jar" />
-		</fileset>
+        <fileset id="lib" dir="${lib.dir}">
+            <include name="*.jar"/>
+        </fileset>
 
-		<condition property="rosetta.src" value="${esb.root.dir}/rosetta/src">
-			<available type="dir" file="${esb.root.dir}/rosetta/src"/>
-		</condition>
-		<condition property="rosetta.src" value="${src.java.dir}">
-			<available type="dir" file="${src.java.dir}"/>
-		</condition>
-                <property name="lib.dir" location="lib.dir.path"/>
-        </target>
+        <condition property="rosetta.src" value="${esb.root.dir}/rosetta/src">
+            <available type="dir" file="${esb.root.dir}/rosetta/src"/>
+        </condition>
+        <condition property="rosetta.src" value="${src.java.dir}">
+            <available type="dir" file="${src.java.dir}"/>
+        </condition>
+        <property name="lib.dir" location="lib.dir.path"/>
+    </target>
 
-	<target name="init" depends="dependencies, define-lib">
-		<mkdir dir="${mgmt.build.dir}"/>
-		<mkdir dir="${mgmt.build.dir}/classes"/>
-	</target>
+    <target name="init" depends="dependencies, define-lib">
+        <mkdir dir="${mgmt.build.dir}"/>
+        <mkdir dir="${mgmt.build.dir}/classes"/>
+    </target>
 
-	<target name="compile" depends="init"
-			description="Build the management war">
-		<echo>${esb.root.dir}</echo>
-		<mkdir dir="${mgmt.build.dir}/classes"/>
-		<javac classpathref="build.classpath"
-			        destdir="${mgmt.build.dir}/classes"
-			        debug="on"
-				includes="org/jboss/soa/esb/monitoring/**"
-				source="1.5"
-				target="1.5"
-			    	deprecation="${javac.deprecation}"
-			        nowarn="on">
-			<src path="${rosetta.src}"/>
-			<src path="${src.java.dir}"/>
-		</javac>
-		<copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"
-			todir="build/classes/org/jboss/soa/esb/monitoring">
-		</copy>
-	</target>
+    <target name="compile" depends="init"
+            description="Build the management war">
+        <echo>${esb.root.dir}</echo>
+        <mkdir dir="${mgmt.build.dir}/classes"/>
+        <javac classpathref="build.classpath"
+               destdir="${mgmt.build.dir}/classes"
+               debug="on"
+               includes="org/jboss/soa/esb/monitoring/**"
+               source="1.5"
+               target="1.5"
+               deprecation="${javac.deprecation}"
+               nowarn="on">
+            <src path="${rosetta.src}"/>
+            <src path="${src.java.dir}"/>
+        </javac>
+        <copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"
+              todir="build/classes/org/jboss/soa/esb/monitoring">
+        </copy>
+    </target>
 
-	<target name="jar" depends="compile"
-			description="Build the distribution .jar file">
-		<mkdir dir="${mgmt.dir}/build"/>
-		<property file="${db}.properties"/>
-		<echo>${db}</echo>
-		<echo>${console.dir}</echo>
-		<copy file="monitoring.cfg.xml" todir="${mgmt.build.dir}" overwrite="true">
-			<filterset>
-				<filter token="connection.datasource" value="${connection.datasource}"/>
-				<filter token="db.dialect" value="${db.dialect}"/>
-			</filterset>
-		</copy>
-		<jar jarfile="${mgmt.build.dir}/management-client.jar">
-			<fileset dir="${mgmt.build.dir}/classes">
-				<include name="org/jboss/soa/esb/monitoring/*.class"/>
-				<include name="org/jboss/soa/esb/monitoring/pojo/*.class"/>
-				<include name="org/jboss/soa/esb/monitoring/client/*.class"/>
-			</fileset>
-		</jar>
-	        <jar jarfile="${mgmt.build.dir}/management-server.jar">
-                        <fileset dir="${mgmt.build.dir}/classes">
-				<include name="org/jboss/soa/esb/monitoring/*.class"/>
-                                <include name="org/jboss/soa/esb/monitoring/pojo/*.class"/>
-				<include name="org/jboss/soa/esb/monitoring/server/*.class"/>
-                                <include name="**/*.xml"/>
-                        </fileset>
-                        <fileset dir="${mgmt.build.dir}">
-                                <include name="monitoring.cfg.xml"/>
-                        </fileset>
-                </jar>
-	</target>
+    <target name="jar" depends="compile"
+            description="Build the distribution .jar file">
+        <mkdir dir="${mgmt.dir}/build"/>
+        <property file="${db}.properties"/>
+        <echo>${db}</echo>
+        <echo>${console.dir}</echo>
+        <copy file="monitoring.cfg.xml" todir="${mgmt.build.dir}" overwrite="true">
+            <filterset>
+                <filter token="connection.datasource" value="${connection.datasource}"/>
+                <filter token="db.dialect" value="${db.dialect}"/>
+            </filterset>
+        </copy>
+        <jar jarfile="${mgmt.build.dir}/management-client.jar">
+            <fileset dir="${mgmt.build.dir}/classes">
+                <include name="org/jboss/soa/esb/monitoring/*.class"/>
+                <include name="org/jboss/soa/esb/monitoring/pojo/*.class"/>
+                <include name="org/jboss/soa/esb/monitoring/client/*.class"/>
+            </fileset>
+        </jar>
+        <jar jarfile="${mgmt.build.dir}/management-server.jar">
+            <fileset dir="${mgmt.build.dir}/classes">
+                <include name="org/jboss/soa/esb/monitoring/*.class"/>
+                <include name="org/jboss/soa/esb/monitoring/pojo/*.class"/>
+                <include name="org/jboss/soa/esb/monitoring/server/*.class"/>
+                <include name="**/*.xml"/>
+            </fileset>
+            <fileset dir="${mgmt.build.dir}">
+                <include name="monitoring.cfg.xml"/>
+            </fileset>
+        </jar>
+    </target>
 </project>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-esb/build.xml	2008-08-18 22:18:58 UTC (rev 21612)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-esb/build.xml	2008-08-18 22:35:07 UTC (rev 21613)
@@ -14,7 +14,6 @@
 
 	<!-- Default deploy property settings for the jbossesb-server -->
 	<property name="org.jboss.esb.server.home" value="${product.dir}"/>
-	<property name="org.jboss.esb.server.config" value="default"/>
 
 	<target name="clean">
 		<delete dir="${mgmt.esb.dir}/build"/>
@@ -22,9 +21,36 @@
 		<ant dir="${console.dir}/management" target="clean"/>
 	</target>
 
-	<target name="messaging-config">
-        	<property name="org.jboss.esb.server.deploy.dir"
-            		value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+	<target name="initialise-config" unless="org.jboss.esb.server.config">
+		<condition property="jbossesb-server-production">
+			<available file="${org.jboss.esb.server.home}/server/production/deploy/jbossesb.sar"/>
+		</condition>
+		<condition property="jbossesb-server-default">
+			<available file="${org.jboss.esb.server.home}/server/default/deploy/jbossesb.sar"/>
+		</condition>
+
+		<condition property="jbossesb-server-recognised">
+			<or>
+				<isset property="jbossesb-server-production"/>
+				<isset property="jbossesb-server-default"/>
+			</or>
+		</condition>
+
+		<fail unless="jbossesb-server-recognised" message="Could not detect default ESB server instance"/>
+
+		<condition property="org.jboss.esb.server.config"
+			value="production">
+			<isset property="jbossesb-server-production"/>
+		</condition>
+		<condition property="org.jboss.esb.server.config"
+			value="default">
+			<isset property="jbossesb-server-default"/>
+		</condition>
+	</target>
+
+	<target name="initialise-messaging" depends="initialise-config">
+		<property name="org.jboss.esb.server.deploy.dir"
+			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 			
 		<condition property="messaging.present">
 			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
@@ -69,7 +95,7 @@
 		</copy>
 	</target>
 
-	<target name="esb" depends="messaging-config,messaging-dependencies,jbossmq-dependencies,build-war,copy-metainf"
+	<target name="esb" depends="initialise-messaging,messaging-dependencies,jbossmq-dependencies,build-war,copy-metainf"
 		description="Build the management ESB">
 		<mkdir dir="${mgmt.esb.dir}/build"/>	
 		<mkdir dir="${mgmt.esb.dir}/build/META-INF"/>
@@ -107,7 +133,7 @@
 		</jar>
 	</target>
 
-	<target name="copy-datasource" if="management.ds.available">
+	<target name="copy-datasource" if="management.ds.available" depends="initialise-config">
 		<filter token="db.username" value="${db.username}"/>
 		<filter token="db.password" value="${db.password}"/>
 		<copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" filtering="true" overwrite="true"/>




More information about the jboss-svn-commits mailing list