[wsas-java-dev] svn commit r4620 - in
trunk/wsas/java/modules/www/extensions/core: js xslt
svn at wso2.org
svn at wso2.org
Sun Jul 1 23:42:23 PDT 2007
Author: ruwan
Date: Sun Jul 1 23:42:02 2007
New Revision: 4620
Modified:
trunk/wsas/java/modules/www/extensions/core/js/data_service.js
trunk/wsas/java/modules/www/extensions/core/xslt/data_service.xsl
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_config_param.xsl
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_operation.xsl
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_output_mapping.xsl
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Log:
Fixing WSAS-288
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 Sun Jul 1 23:42:02 2007
@@ -110,14 +110,14 @@
if (typeof (this.req) == "undefined") {
wso2.wsf.Util.callbackhelper(dataServiceObj,
"data_service.xsl", document.getElementById("divDataServiceDetails"));
- showNewDataServiceHeader(document.getElementById('dataServiceHeader'));
+ showNewDataServiceHeader(document.getElementById('dataServiceHeader'), dataServiceObj.getAttribute("ds_step"));
} else {
serviceSpecificName
= this.req.responseXML.getElementsByTagName("data")[0].getAttribute("name");
wso2.wsf.Util.callbackhelper(this.req.responseXML,
xslToReload, document.getElementById("divDataServiceDetails"));
if(serviceSpecificName == null || serviceSpecificName == "") {
- showNewDataServiceHeader(document.getElementById('dataServiceHeader'));
+ showNewDataServiceHeader(document.getElementById('dataServiceHeader'), dataServiceObj.getAttribute("ds_step"));
} else {
showDataServiceHeader(document.getElementById('dataServiceHeader'));
}
@@ -130,6 +130,9 @@
} else if (dataServiceObj.getAttribute("ds_step") == "2") {
displayAddDataServiceOperation();
}
+
+ document.getElementById("dsPreviewDiv").appendChild(document.createTextNode(
+ prettyPrintDOMNode(dataServiceObj.getElementsByTagName("data").item(0), "", " ", true)));
}
function addEditDataServiceQueryDone(){
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service.xsl Sun Jul 1 23:42:02 2007
@@ -8,7 +8,7 @@
</h4><br/>
<fieldset style="border:none;">
-
+ <div id="formDiv" style="float: left;">
<div id="formset">
<xsl:for-each select="//return/data">
@@ -29,6 +29,7 @@
<div id="formset_button">
<div style="align: right;">
+ <input type="button" onClick="javascript:startServices(this,1); return false;" value="Cancel"/>
<xsl:if test="//return/@ds_step!=0">
<input type="button" onclick="javascript:ds_back(); return false;;"
value=" < Back "></input>
@@ -39,20 +40,34 @@
value=" Next > "></input>
</xsl:if>
- <input type="button" value="Generate">
- <xsl:attribute name="onclick">javascript:showGeneratedConfigFile();return false;
- </xsl:attribute>
- </input>
+ <xsl:if test="//return/@ds_step=2">
+ <input type="button" value="Finish">
+ <xsl:attribute name="onclick">javascript:showGeneratedConfigFile();return false;
+ </xsl:attribute>
+ </input>
+ </xsl:if>
</div>
</div>
+ </div>
+ <div id="previewDiv" style="margin-left: 680px;">
+ <div id="formset">
+ <form>
+ <fieldset>
+ <legend>Preview of the Data Service configuration</legend>
+ <textarea rows="30" cols="60" id="dsPreviewDiv" disabled="true" style="color: blue; border: none; margin-left: 20px; padding: 5px;"></textarea>
+
+ </fieldset>
+ </form>
+ </div>
+ </div>
</fieldset>
</xsl:template>
<xsl:template name="ds_config">
<form>
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Configuration</legend>
<div>
<label style="width: 150px;">Data Service Name
@@ -132,7 +147,7 @@
<xsl:template name="ds_query">
<form>
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Queries</legend>
<xsl:if test="count(query)=0">
<label style="width: 500px; color: brown; align: left;">Currently there are no queries present for the service <xsl:value-of
@@ -191,7 +206,7 @@
<xsl:template name="ds_operation">
<form>
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Operations</legend>
<xsl:if test="count(operation)=0">
<label style="width: 500px; color: brown; align: left;">Currently there are no operations present for the service <xsl:value-of
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_config_param.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_config_param.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_config_param.xsl Sun Jul 1 23:42:02 2007
@@ -8,7 +8,7 @@
<div id="formset">
<!--<xsl:for-each select="property">-->
<form>
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Data Service Management - Add Configuration Parameter</legend>
<div>
<label style="width: 150px;">Parameter Name</label>
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_operation.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_operation.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_operation.xsl Sun Jul 1 23:42:02 2007
@@ -8,7 +8,7 @@
<div id="formset">
<xsl:for-each select="data">
<form>
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Add/Edit Operation</legend>
<div>
<label style="width: 150px;">Operation Name</label>
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_output_mapping.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_output_mapping.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_output_mapping.xsl Sun Jul 1 23:42:02 2007
@@ -2,7 +2,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="">
<xsl:template name="add_output_mapping">
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>Data Service Management - Add Output Mapping</legend>
<div>
<label>Select Type</label>
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 Sun Jul 1 23:42:02 2007
@@ -7,7 +7,7 @@
<div id="formset">
<form name="dataServiceAddQueryForm">
- <fieldset>
+ <fieldset style="width: 650px;">
<legend>SQL Query/Stored Procedure Configuration</legend>
<div>
<label>Query Id</label>
More information about the Wsas-java-dev
mailing list