Author: jim.ma Date: 2013-12-09 06:35:52 -0500 (Mon, 09 Dec 2013) New Revision: 18155 Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jaspi/WEB-INF/jboss-webservices.xml Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: Configure jaspi security domain in jboss-webservices.xml Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-12-09 11:04:23 UTC (rev 18154) +++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-12-09 11:35:52 UTC (rev 18155) @@ -138,7 +138,7 @@ epConfigFile = wsmd.getConfigFile(); } - JaspiServerAuthenticator jaspiAuthenticator = getJaspiAuthenticator(dep); + JaspiServerAuthenticator jaspiAuthenticator = getJaspiAuthenticator(dep, wsmd); Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile); @@ -152,9 +152,14 @@ } } - private JaspiServerAuthenticator getJaspiAuthenticator(Deployment dep) { - //TODO: get security-domain from jboss-webservices.xml and get hostname - String securityDomain = "jaspi"; + private JaspiServerAuthenticator getJaspiAuthenticator(Deployment dep, JBossWebservicesMetaData wsmd) { + String securityDomain = null; + if (wsmd != null) { + securityDomain = wsmd.getProperty(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN); + } + if (securityDomain == null) { + return null; + } ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain); if (appPolicy == null) { Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain); Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java =================================================================== --- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2013-12-09 11:04:23 UTC (rev 18154) +++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2013-12-09 11:35:52 UTC (rev 18155) @@ -49,6 +49,7 @@ */ public class JaspiServerAuthenticator { + public static final String JASPI_SECURITY_DOMAIN = "jaspi.security.domain"; private ServerAuthConfig serverConfig; private String securityDomain; private JASPIAuthenticationInfo jpi; Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-09 11:04:23 UTC (rev 18154) +++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-09 11:35:52 UTC (rev 18155) @@ -298,7 +298,7 @@ </classes> <webinf dir="${tests.output.dir}/test-resources//jaxws/cxf/jaspi/WEB-INF"> - <include name="jboss-web.xml"/> + <include name="jboss-*.xml"/> </webinf> </war> Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jaspi/WEB-INF/jboss-webservices.xml =================================================================== --- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jaspi/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jaspi/WEB-INF/jboss-webservices.xml 2013-12-09 11:35:52 UTC (rev 18155) @@ -0,0 +1,13 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.2" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee"> + + <property> + <name>jaspi.security.domain</name> + <value>jaspi</value> + </property> + +</webservices> \ No newline at end of file Property changes on: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jaspi/WEB-INF/jboss-webservices.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native