Author: sumedha Date: Mon Jun 2 04:47:44 2008 New Revision: 17787 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17787
Log: copying wsas2.2 changes to trunk Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl?rev=17787&r1=17786&r2=17787&view=diff ============================================================================== --- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl (original) +++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl Mon Jun 2 04:47:44 2008 @@ -108,7 +108,7 @@ </select> </div> <div> - <label>IN/OUT Type</label> + <label>IN/OUT Type<font color='blue'>*</font></label> <select> <xsl:attribute name="id">inputMappingInOutTypeId</xsl:attribute> <option> @@ -142,7 +142,7 @@ </select> </div> <div> - <label>Ordinal</label> + <label>Ordinal<font color='blue'>*</font></label> <input type="text"> <xsl:attribute name="size">5</xsl:attribute> <xsl:attribute name="id">inputMappingOrdinalId</xsl:attribute> @@ -153,6 +153,9 @@ </xsl:if> </input> </div> + <div> + <label><font color='blue'>*Required only for stored procedures.</font></label> + </div> </fieldset> </form> Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl?rev=17787&r1=17786&r2=17787&view=diff ============================================================================== --- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl (original) +++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl Mon Jun 2 04:47:44 2008 @@ -43,13 +43,14 @@ <xsl:otherwise> <xsl:for-each select="param"> <xsl:variable name="paramType" select="@type"/> - <xsl:if test="$paramType='IN'"> + <xsl:if test="$paramType='' or $paramType='IN' or $paramType='INOUT'"> <label> <xsl:value-of select="@name"/> </label> <input type="text"> <xsl:attribute name="size">30</xsl:attribute> <xsl:attribute name="id"><xsl:value-of select="generate-id()"/>_genId</xsl:attribute> + <xsl:attribute name="value"><xsl:value-of select="@name"/></xsl:attribute> </input> </xsl:if> </xsl:for-each> @@ -72,6 +73,8 @@ </xsl:when> <xsl:otherwise> <xsl:for-each select="$query/param"> + <xsl:variable name="paramType" select="@type"/> + <xsl:if test="$paramType='' or $paramType='IN' or $paramType='INOUT'"> <label> <xsl:value-of select="@name"/> </label> @@ -79,6 +82,7 @@ <xsl:attribute name="size">30</xsl:attribute> <xsl:attribute name="id"><xsl:value-of select="generate-id()"/>_genId</xsl:attribute> </input> + </xsl:if> </xsl:for-each> </xsl:otherwise> </xsl:choose> @@ -122,7 +126,10 @@ <xsl:choose> <xsl:when test="param"> <xsl:for-each select="param"> + <xsl:variable name="paramType" select="@type"/> + <xsl:if test="$paramType='' or $paramType='IN' or $paramType='INOUT'"> holderObject["<xsl:value-of select="@name"/>"] = document.getElementById('<xsl:value-of select="generate-id()"/>_genId').value; + </xsl:if> </xsl:for-each> addNewOperationForDataServiceOK(holderObject,"TRUE",'<xsl:value-of select="$tmpOperationName"/>'); </xsl:when> @@ -137,7 +144,10 @@ <xsl:choose> <xsl:when test="$query/param"> <xsl:for-each select="$query/param"> - holderObject["<xsl:value-of select="@name"/>"] = document.getElementById('<xsl:value-of select="generate-id()"/>_genId').value; + <xsl:variable name="paramType" select="@type"/> + <xsl:if test="$paramType='' or $paramType='IN' or $paramType='INOUT'"> + holderObject["<xsl:value-of select="@name"/>"] = document.getElementById('<xsl:value-of select="generate-id()"/>_genId').value; + </xsl:if> </xsl:for-each> addNewOperationForDataServiceOK(holderObject,"TRUE",'<xsl:value-of select="$tmpOperationName"/>'); </xsl:when> Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl?rev=17787&r1=17786&r2=17787&view=diff ============================================================================== --- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl (original) +++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_result_mapping.xsl Mon Jun 2 04:47:44 2008 @@ -3,6 +3,7 @@ <xsl:param name="queryId"/> <xsl:param name="eleName"/> + <xsl:param name="atName"/> <xsl:param name="colName"/> <xsl:param name="queryHref"/> @@ -21,6 +22,9 @@ <xsl:when test="[EMAIL PROTECTED]/result/[EMAIL PROTECTED]"> <xsl:text>Element</xsl:text> </xsl:when> + <xsl:when test="[EMAIL PROTECTED]/result/[EMAIL PROTECTED]"> + <xsl:text>Attribute</xsl:text> + </xsl:when> <xsl:when test="[EMAIL PROTECTED]/result/[EMAIL PROTECTED]"> <xsl:text>Query</xsl:text> </xsl:when> @@ -57,7 +61,7 @@ <select> <xsl:attribute name="id">cmbDataServiceOMType</xsl:attribute> <xsl:attribute name="onchange">changeToNextMapping('<xsl:value-of select="$queryId"/>', this);return false;</xsl:attribute> - <xsl:if test="$eleName or $colName or $queryHref"> + <xsl:if test="$eleName or $atName or $colName or $queryHref"> <xsl:attribute name="disabled">true</xsl:attribute> </xsl:if> <option> @@ -67,6 +71,13 @@ </xsl:if> Element </option> + <option> + <xsl:attribute name="value">Attribute</xsl:attribute> + <xsl:if test="$mappingType='Attribute'"> + <xsl:attribute name="selected">true</xsl:attribute> + </xsl:if> + Attribute + </option> <xsl:if test="$dataSourceType!='CSV' and count($queries)>1"> <option> <xsl:attribute name="value">Query</xsl:attribute> @@ -82,7 +93,7 @@ <xsl:if test="$mappingType='Query'"> <xsl:attribute name="style">display: inline;</xsl:attribute> </xsl:if> - <xsl:if test="$mappingType='Element'"> + <xsl:if test="$mappingType='Element' or $mappingType='Attribute'"> <xsl:attribute name="style">display: none;</xsl:attribute> </xsl:if> <div> @@ -127,7 +138,7 @@ <xsl:if test="$mappingType='Query'"> <xsl:attribute name="style">display: none;</xsl:attribute> </xsl:if> - <xsl:if test="$mappingType='Element'"> + <xsl:if test="$mappingType='Element' or $mappingType='Attribute'"> <xsl:attribute name="style">display: inline;</xsl:attribute> </xsl:if> <div> @@ -135,8 +146,17 @@ <input type="text"> <xsl:attribute name="size">30</xsl:attribute> <xsl:attribute name="id">txtDataServiceOMElementName</xsl:attribute> - <xsl:attribute name="value"><xsl:value-of select="$eleName"/></xsl:attribute> - <xsl:if test="$eleName"> + <xsl:attribute name="value"> + <xsl:choose> + <xsl:when test="$eleName"> + <xsl:value-of select="$eleName"/> + </xsl:when> + <xsl:when test="$atName"> + <xsl:value-of select="$atName"/> + </xsl:when> + </xsl:choose> + </xsl:attribute> + <xsl:if test="$eleName or $atName"> <xsl:attribute name="style">background-color:#E4E8F5;</xsl:attribute> </xsl:if> </input> @@ -186,7 +206,17 @@ </xsl:otherwise> </xsl:choose> </xsl:for-each> - addEditSpecificOutputMapping('<xsl:value-of select="$queryId"/>', document.getElementById('cmbDataServiceOMType'),'<xsl:value-of select="$eleName"/>', cqmObj);return false; + <xsl:variable name="oldOutputFieldName"> + <xsl:choose> + <xsl:when test="$eleName"> + <xsl:value-of select="$eleName"/> + </xsl:when> + <xsl:when test="$atName"> + <xsl:value-of select="$atName"/> + </xsl:when> + </xsl:choose> + </xsl:variable> + addEditSpecificOutputMapping('<xsl:value-of select="$queryId"/>', document.getElementById('cmbDataServiceOMType'),'<xsl:value-of select="$oldOutputFieldName"/>', cqmObj);return false; </xsl:attribute> </input> <input type="button" onclick="closeContainer('divADDEditOutputMapping'); refreshParentQueryContainer('{$queryId}', 'data_service_add_query.xsl', 'divDSAddQuery', 'Add New Query'); return false;" value="Cancel"/> Modified: trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl?rev=17787&r1=17786&r2=17787&view=diff ============================================================================== --- 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 Jun 2 04:47:44 2008 @@ -170,7 +170,7 @@ </xsl:when> <xsl:otherwise> <xsl:choose> - <xsl:when test="[EMAIL PROTECTED]/result/element or [EMAIL PROTECTED]/result/call-query"> + <xsl:when test="[EMAIL PROTECTED]/result/element or [EMAIL PROTECTED]/result/attribute or [EMAIL PROTECTED]/result/call-query"> <div>Output Mappings</div> <div> <table class="styled" width="460px;" style="margin-left:20px;"> @@ -253,6 +253,7 @@ <xsl:template match="result"> <xsl:apply-templates select="call-query"/> <xsl:apply-templates select="element"/> + <xsl:apply-templates select="attribute"/> </xsl:template> <xsl:template match="call-query"> @@ -308,6 +309,34 @@ </tr> </xsl:template> + <xsl:template match="attribute"> + <tr> + <td>Attribute</td> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@column"/> + </td> + <td style="width:50px;"> + <a alt="Delete"> + <xsl:attribute name="title">Delete</xsl:attribute> + <xsl:attribute name="onclick">javascript:removeQueryOutputMapping('<xsl:value-of select="$queryId"/>','Attribute','<xsl:value-of select="@name"/>');return false;</xsl:attribute> + <xsl:attribute name="id">cancel_link</xsl:attribute> + <xsl:attribute name="href">#</xsl:attribute> + <xsl:text>      </xsl:text> + </a> + <a alt="Edit"> + <xsl:attribute name="title">Edit</xsl:attribute> + <xsl:attribute name="onclick">javascript:editQueryOutputMappingAttribute('<xsl:value-of select="$queryId"/>','<xsl:value-of select="@name"/>', '<xsl:value-of select="@column"/>');return false;</xsl:attribute> + <xsl:attribute name="id">edit_link</xsl:attribute> + <xsl:attribute name="href">#</xsl:attribute> + <xsl:text>      </xsl:text> + </a> + </td> + </tr> + </xsl:template> + <xsl:template match="param"> <tr> <td> _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
