Author: keith Date: Sun Jul 13 21:10:06 2008 New Revision: 19209 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19209
Log: Fixing Mashup-940 via a patch applied to WSAS 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=19209&r1=19208&r2=19209&view=diff ============================================================================== --- trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt (original) +++ trunk/mashup/java/modules/patches/wsas/resources/wsas-patches.txt Sun Jul 13 21:10:06 2008 @@ -1,3 +1,4 @@ JIRA issues that this patch address https://wso2.org/jira/browse/WSAS-798 +https://wso2.org/jira/browse/MASHUP-940 \ 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=19209&r1=19208&r2=19209&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 Sun Jul 13 21:10:06 2008 @@ -289,8 +289,19 @@ policyFile.getAbsolutePath() + " is null"); } - if (serviceAdmin.removeSoap11BindingPolicy(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION, idAtt.getAttributeValue()) && serviceAdmin.removeSoap12BindingPolicy(serviceName, ServiceIdentifierDO.EMPTY_SERVICE_VERSION, idAtt.getAttributeValue())) { - break; + String policyID = idAtt.getAttributeValue(); + if ("UTOverTransport".equals(policyID)) { + serviceAdmin.removeHttpBindingPolicy(serviceName, + ServiceIdentifierDO.EMPTY_SERVICE_VERSION, + policyID); + } + if (serviceAdmin.removeSoap11BindingPolicy(serviceName, + ServiceIdentifierDO.EMPTY_SERVICE_VERSION, + policyID) && + serviceAdmin.removeSoap12BindingPolicy(serviceName, + ServiceIdentifierDO.EMPTY_SERVICE_VERSION, + policyID)) { + break; } // if (serviceAdmin.removePolicy(serviceName, // ServiceIdentifierDO.EMPTY_SERVICE_VERSION, _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
