[wsas-java-dev] svn commit r2601 - in trunk/wsas/java/modules/www/extensions/core: js xslt

[svn at wso2.org]

Author: chamil
Date: Mon May 14 07:27:23 2007
New Revision: 2601

Modified:
   trunk/wsas/java/modules/www/extensions/core/js/data_service.js
   trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Log:
This is the last bit of functional code for the front end for the data service.

Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/data_service.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/data_service.js	Mon May 14 07:27:23 2007
@@ -203,8 +203,8 @@
 function deployDataService(){
 	var dataServiceContents = document.getElementById("txtDataServiceReviewBox").value;
 	    var body_xml = '<req:saveDataServiceContents xmlns:req="http://org.apache.axis2/xsd">\n' +
-				   		' <arg0>' + serviceName + '</arg0>\n' +
-				   		' <arg0>' + dataServiceContents + '</arg0>\n' +
+				   		' <arg0>' + curDataServiceName + '</arg0>\n' +
+				   		' <arg1>' + dataServiceContents + '</arg1>\n' +
                    ' </req:saveDataServiceContents>\n';
 
     var callURL = serverURL + "/" + "DataServiceAdmin" + "/saveDataServiceContents" ;
@@ -220,7 +220,8 @@
     if (!onError()) {
         return;
     }
-	listServiceData(curDataServiceName);
+	//listServiceData(curDataServiceName);
+	showServiceInitializer();
 }
 
 
@@ -284,16 +285,16 @@
 }
 
 function showGeneratedConfigFile(){
-	var finalScreenHTML = '<h4><div id="divGeneratedConfigHeader"></div></h4><p>&nbsp;</p>' +
+	var finalScreenHTML = '<h4><div id="divGeneratedConfigHeader"></div></h4>' +
+			'<h2>Review and Save Dataservice</h2>' +
      	'<div id="formset">' +
             '<form>' +
-                '<fieldset>' +
-                    '<legend>Data Service Management - Review and Save</legend>' +
+                '<fieldset style="border:none;">' +
                     '<div>' +
-                       	'<textarea rows="30" cols="100" id="txtDataServiceReviewBox"/>' +
-                    '</div>' +
-                	'<div class="buttonrow">' +
-                			'<label></label><input type="button" value="Deploy" onclick="javascript:deployDataService();return false;"/>' +
+                       	'<textarea rows="30" cols="80" id="txtDataServiceReviewBox"></textarea>' +
+                    '</div><p>&nbsp;</p>' +
+                	'<div>' +
+                		'<input type="button" value="Deploy" onclick="javascript:deployDataService();return false;"/>' +
                 	'</div>' +
                   '</fieldset>' +
               '</form>' +

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl	Mon May 14 07:27:23 2007
@@ -64,15 +64,27 @@
 					<table class="styled" width="50%">
 						<thead>
 							<tr>
+								<th>Mapping type</th>
 								<th>Output Field Name</th>
 								<th>Column Name</th>
 							</tr>
 						</thead>
-					<xsl:for-each select="result/element">
-						<tr>
-							<td><xsl:value-of select="@name"/> </td>
-							<td><xsl:value-of select="@column"/></td>
-						</tr>
+					<xsl:for-each select="result/*">
+						<xsl:choose>
+							<xsl:when test="@href != ''">
+								<tr>
+									<td>Query</td>
+									<td colspan="2"><xsl:value-of select="@href"/><xsl:value-of select="@href"/> </td>
+								</tr>
+							</xsl:when>
+							<xsl:otherwise>
+								<tr>
+									<td>Element</td>
+									<td><xsl:value-of select="@name"/><xsl:value-of select="@href"/> </td>
+									<td><xsl:value-of select="@column"/></td>
+								</tr>
+							</xsl:otherwise>
+						</xsl:choose>
                 	</xsl:for-each>
                 	</table>
                 	<div>