[mashup-dev] svn commit r14619 - in trunk/mashup/java/modules: coreservices/servicesharinghelper/src/org/wso2/mashup/coreservices/servicesharinghelper coreservices/sharingservice/src/org/wso2/mashup/share/service www/js

[svn at wso2.org]

Author: tyrell
Date: Sun Mar  9 22:28:25 2008
New Revision: 14619

Log:

Fixing MASHUP-711

Modified:
   trunk/mashup/java/modules/coreservices/servicesharinghelper/src/org/wso2/mashup/coreservices/servicesharinghelper/ServiceSharingHelper.java
   trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
   trunk/mashup/java/modules/www/js/services.js

Modified: trunk/mashup/java/modules/coreservices/servicesharinghelper/src/org/wso2/mashup/coreservices/servicesharinghelper/ServiceSharingHelper.java
==============================================================================
--- trunk/mashup/java/modules/coreservices/servicesharinghelper/src/org/wso2/mashup/coreservices/servicesharinghelper/ServiceSharingHelper.java	(original)
+++ trunk/mashup/java/modules/coreservices/servicesharinghelper/src/org/wso2/mashup/coreservices/servicesharinghelper/ServiceSharingHelper.java	Sun Mar  9 22:28:25 2008
@@ -91,7 +91,7 @@
         return Boolean.valueOf(success);
     }
 
-    public Boolean shareService(String serviceName, String infoCardToken,
+    public Boolean shareServiceIC(String serviceName, String infoCardToken,
                                 String destinationServerAddress, String overwriteExisting)
             throws IOException {
         boolean success;

Modified: trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
==============================================================================
--- trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java	(original)
+++ trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java	Sun Mar  9 22:28:25 2008
@@ -101,10 +101,10 @@
     }
 
     public void shareMashupIC(String serviceName, String infoCardToken, String fileName,
-                            DataHandler dataHandler, String overwriteExisting)
+                              DataHandler dataHandler, String overwriteExisting)
             throws IOException {
 
-        String username = null;
+        String username = null;        
 
         if (dataHandler == null) {
             throw new MashupFault("Cannot read the uploaded Mashup Service.");
@@ -114,16 +114,16 @@
         ServerConfiguration serverConfig = ServerConfiguration.getInstance();
 
         String keyStore = serverConfig.getFirstProperty(MashupConstants.SECURITY_CONFIG + "." +
-                MashupConstants.SECURITY_CONFIG_KEYSTORE + MashupConstants
+                MashupConstants.SECURITY_CONFIG_KEYSTORE + "." + MashupConstants
                 .SECURITY_CONFIG_KEYSTORE_LOCATION);
         String keyStorePass = serverConfig.getFirstProperty(MashupConstants.SECURITY_CONFIG + "." +
-                MashupConstants.SECURITY_CONFIG_KEYSTORE + MashupConstants
+                MashupConstants.SECURITY_CONFIG_KEYSTORE + "." + MashupConstants
                 .SECURITY_CONFIG_KEYSTORE_PASSWORD);
         String keyAlias = serverConfig.getFirstProperty(MashupConstants.SECURITY_CONFIG + "." +
-                MashupConstants.SECURITY_CONFIG_KEYSTORE + MashupConstants
+                MashupConstants.SECURITY_CONFIG_KEYSTORE + "." + MashupConstants
                 .SECURITY_CONFIG_KEYSTORE_KEYALIAS);
         String keyPass = serverConfig.getFirstProperty(MashupConstants.SECURITY_CONFIG + "." +
-                MashupConstants.SECURITY_CONFIG_KEYSTORE + MashupConstants
+                MashupConstants.SECURITY_CONFIG_KEYSTORE + "." + MashupConstants
                 .SECURITY_CONFIG_KEYSTORE_KEYPASSWORD);
 
         try {

Modified: trunk/mashup/java/modules/www/js/services.js
==============================================================================
--- trunk/mashup/java/modules/www/js/services.js	(original)
+++ trunk/mashup/java/modules/www/js/services.js	Sun Mar  9 22:28:25 2008
@@ -322,6 +322,9 @@
 
     var callURL = serverURL + "/" + "ServiceSharingHelper" + "/" ;
 
+    //Making the infocard token transport friendly
+    infocardtoken = "<![CDATA[" + infocardtoken + "]]>";
+
     var body_xml = '<req:shareServiceICRequest xmlns:req="http://servicesharinghelper.coreservices.mashup.wso2.org/xsd">\n' +
                    ' <req:serviceName>' + serviceName + '</req:serviceName>\n' +
                    ' <req:infoCardToken>' + infocardtoken + '</req:infoCardToken>\n' +