Author: keith Date: Fri Jul 18 03:08:23 2008 New Revision: 19502 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19502
Log: Fixing Mashup-979 Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupArchiveManupulator.java trunk/mashup/java/modules/www/js/mashup-utils.js trunk/mashup/java/modules/www/js/services.js Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupArchiveManupulator.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupArchiveManupulator.java?rev=19502&r1=19501&r2=19502&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupArchiveManupulator.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupArchiveManupulator.java Fri Jul 18 03:08:23 2008 @@ -282,7 +282,7 @@ public void uploadMashupService(String destinationServerAddress, DataHandler dataHandler, ConfigurationContext configCtx, String serviceJsFileName, String mashupServiceName, String infoCardToken, - String overwriteExisting, String mode, + String overwriteExisting, String localUserName, String mode, String basicAuthUsername, String basicAuthPassword) throws AxisFault { @@ -317,6 +317,14 @@ options.setAction("urn:shareMashupIC"); options.setProperty(HTTPConstants.CHUNKED, "false"); options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE); + + // Creating a custom protocol based on the user's keystores and trusted certs within + if (localUserName != null) { + ProtocolSocketFactory psf = new CustomProtocolSocketFactory(localUserName); + Protocol protocol = new Protocol("custom-https", psf, 443); + options.setProperty(HTTPConstants.CUSTOM_PROTOCOL_HANDLER, protocol); + } + QName opAddEntry = new QName("http://service.share.mashup.wso2.org/xsd";, "shareMashupIC"); // parameters to the service ServiceName string, service file name, Modified: trunk/mashup/java/modules/www/js/mashup-utils.js URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/mashup-utils.js?rev=19502&r1=19501&r2=19502&view=diff ============================================================================== --- trunk/mashup/java/modules/www/js/mashup-utils.js (original) +++ trunk/mashup/java/modules/www/js/mashup-utils.js Fri Jul 18 03:08:23 2008 @@ -336,7 +336,7 @@ if (mode == "infocard") { infoCardToken = InformationCard.GetToken(); - wso2.mashup.services.shareServiceIC(serviceName, destAddress, infoCardToken, overwriteExisting, migrateTags, submitServiceCallback, labelElement, submitServiceError, basicAuth, basicAuthUsername, basicAuthPassword); + wso2.mashup.services.shareServiceIC(serviceName, destAddress, infoCardToken, overwriteExisting, migrateTags, localUserName, submitServiceCallback, labelElement, submitServiceError, basicAuth, basicAuthUsername, basicAuthPassword); } else { wso2.mashup.services.shareService(serviceName, destAddress, destUsername, destPassword, overwriteExisting, migrateTags, localUserName, submitServiceCallback, labelElement, submitServiceError, basicAuth, basicAuthUsername, basicAuthPassword); } Modified: trunk/mashup/java/modules/www/js/services.js URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/services.js?rev=19502&r1=19501&r2=19502&view=diff ============================================================================== --- trunk/mashup/java/modules/www/js/services.js (original) +++ trunk/mashup/java/modules/www/js/services.js Fri Jul 18 03:08:23 2008 @@ -340,7 +340,7 @@ * @param {callback} params Parameters to be set in the callback */ wso2.mashup.services.shareServiceIC = -function (serviceName, destinationAddress, infocardtoken, overwriteExisting, migrateTags, callback, +function (serviceName, destinationAddress, infocardtoken, overwriteExisting, migrateTags, localUserName, callback, params, errorCallback, mode, basicAuthUsername, basicAuthPassword) { @@ -358,6 +358,8 @@ '</req:overwriteExisting>\n' + ' <req:migrateTags>' + migrateTags + '</req:migrateTags>\n' + + ' <req:localUser>' + localUserName + + '</req:localUser>\n' + ' <req:mode>' + mode + '</req:mode>\n'; _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
