Author: keith Date: Tue Aug 5 02:58:36 2008 New Revision: 20395 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20395
Log: Patching WSAS to address Mashup-1060 Modified: trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt trunk/mashup/java/modules/patches/wsas/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Modified: trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt?rev=20395&r1=20394&r2=20395&view=diff ============================================================================== --- trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt (original) +++ trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt Tue Aug 5 02:58:36 2008 @@ -2,4 +2,5 @@ https://wso2.org/jira/browse/WSAS-798 https://wso2.org/jira/browse/MASHUP-940 -https://wso2.org/jira/browse/MASHUP-941 \ No newline at end of file +https://wso2.org/jira/browse/MASHUP-941 +https://wso2.org/jira/browse/WSAS-801 \ No newline at end of file Modified: trunk/mashup/java/modules/patches/wsas/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/patches/wsas/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java?rev=20395&r1=20394&r2=20395&view=diff ============================================================================== --- trunk/mashup/java/modules/patches/wsas/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java (original) +++ trunk/mashup/java/modules/patches/wsas/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Tue Aug 5 02:58:36 2008 @@ -151,7 +151,7 @@ } axisService = getAxisConfig().getService(serviceName); // axisService.getPolicySubject().attachPolicy(policy); - + // When there is a transport binding sec policy assertion, // the service should be exposed only via HTTPS Iterator alternatives = policy.getAlternatives(); @@ -223,7 +223,7 @@ ServiceIdentifierDO.EMPTY_SERVICE_VERSION, baos.toString()); serviceAdmin.setSoap12BindingPolicy(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION, baos.toString()); - + } catch (Exception e) { throw new AxisFault("Could not load security policy", e); } @@ -267,9 +267,11 @@ ServiceAdmin serviceAdmin = new ServiceAdmin(); removeAllSecurityScenarioPolicies(serviceAdmin, serviceName); ServiceDO serviceDO = pm.getService(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION); + if (serviceDO.getIsUTAuthEnabled()) { + serviceDO.setIsExposedOnAllTransports(true); + getAxisConfig().getService(serviceName).setEnableAllTransports(true); + } serviceDO.setIsUTAuthEnabled(false); - serviceDO.setIsExposedOnAllTransports(true); - getAxisConfig().getService(serviceName).setEnableAllTransports(true); SecurityScenarioDO securityScenario = serviceDO.getSecurityScenario(); if (securityScenario != null) { securityScenario.removeService(serviceDO); @@ -341,9 +343,9 @@ // idAtt.getAttributeValue())) { // break; // } - - - + + + } catch (Exception e) { throw AxisFault.makeFault(e); } @@ -514,8 +516,10 @@ serviceDO = pm.getService(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION); serviceDO.setIsUTAuthEnabled(false); - serviceDO.setIsExposedOnAllTransports(true); - getAxisConfig().getService(serviceName).setEnableAllTransports(true); + +// AxisService service = getAxisConfig().getService(serviceName); +// serviceDO.setIsExposedOnAllTransports(true); +// service.setEnableAllTransports(true); for (int i = 0; i < trustedCertStores.length; i++) { String ks = trustedCertStores[i]; KeyStoreDO keyStore = pm.getKeyStore(ks); _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
