Author: channa
Date: Tue Aug  5 04:21:18 2008
New Revision: 20406
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20406

Log:
Displaying session restoration dialog when session expired during the running 
of data service creation and edit wiazrds. MASHUP-1024.


Modified:
   trunk/mashup/java/modules/distribution/create-distro-build.xml
   trunk/mashup/java/modules/www/create_ds.jsp
   trunk/mashup/java/modules/www/edit_ds.jsp

Modified: trunk/mashup/java/modules/distribution/create-distro-build.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/create-distro-build.xml?rev=20406&r1=20405&r2=20406&view=diff
==============================================================================
--- trunk/mashup/java/modules/distribution/create-distro-build.xml      
(original)
+++ trunk/mashup/java/modules/distribution/create-distro-build.xml      Tue Aug 
 5 04:21:18 2008
@@ -209,6 +209,8 @@
         </move>
         <delete 
dir="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/images"/>
         <replace 
file="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/js/data_service.js" 
token="DataServiceAdmin" value="MashupDataServiceAdmin"/>
+        <replace 
file="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/js/data_service.js" 
token="deployDataServiceCallback);" value="deployDataServiceCallback, '', 
wso2.mashup.services.defaultErrHandler);"/>
+        <replace 
file="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/js/data_service.js" 
token="getDataServiceContentsCallback);" value="getDataServiceContentsCallback, 
'', wso2.mashup.services.defaultErrHandler);"/>
 
         <echo message="### Extract and Copy the WSRequest Native ###"/>
         <unzip src="target/zips/wsrequest-${wsrequest.version}.zip" 
dest="target/temp/wsrequest"/>

Modified: trunk/mashup/java/modules/www/create_ds.jsp
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/create_ds.jsp?rev=20406&r1=20405&r2=20406&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/create_ds.jsp (original)
+++ trunk/mashup/java/modules/www/create_ds.jsp Tue Aug  5 04:21:18 2008
@@ -54,6 +54,10 @@
     <script language="javascript" src="js/wso2/WSRequest.js"></script>
     <script language="javascript" src="extensions/yui/js/yui.js"></script>
     <script language="javascript" 
src="extensions/core/js/data_service.js"></script>
+    <script type="text/javascript" src="js/mashup-utils.js"></script>
+    <script type="text/javascript" src="js/InformationCards.js"></script>
+    <script type="text/javascript" src="js/mashup-main.js"></script>
+    <script language="javascript" src="js/services.js" 
type="text/javascript"></script>
 
     <script language="JavaScript" type="text/javascript">
         function init() {

Modified: trunk/mashup/java/modules/www/edit_ds.jsp
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/edit_ds.jsp?rev=20406&r1=20405&r2=20406&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/edit_ds.jsp   (original)
+++ trunk/mashup/java/modules/www/edit_ds.jsp   Tue Aug  5 04:21:18 2008
@@ -57,6 +57,10 @@
     <script language="javascript" src="js/wso2/WSRequest.js"></script>
     <script language="javascript" src="extensions/yui/js/yui.js"></script>
     <script language="javascript" 
src="extensions/core/js/data_service.js"></script>
+    <script type="text/javascript" src="js/mashup-utils.js"></script>
+    <script type="text/javascript" src="js/InformationCards.js"></script>
+    <script type="text/javascript" src="js/mashup-main.js"></script>
+    <script language="javascript" src="js/services.js" 
type="text/javascript"></script>
 
     <script language="JavaScript" type="text/javascript">
         function init() {

_______________________________________________
Mashup-dev mailing list
[email protected]
http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to