Author: lresende
Date: Thu Jul 19 11:18:54 2007
New Revision: 557718
URL: http://svn.apache.org/viewvc?view=rev&rev=557718
Log:
TUSCANY-1458 - Applying Amita's patch
Modified:
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
Modified:
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl?view=diff&rev=557718&r1=557717&r2=557718
==============================================================================
---
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
(original)
+++
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
Thu Jul 19 11:18:54 2007
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<xsl:output method="html" version="1.0" encoding="Unicode"
indent="yes"/>
<xsl:template match="/root/das:DataGraphRoot">
@@ -25,21 +25,20 @@
</body>
</html>
</xsl:template>
- <xsl:template match="COMPANY">
- <table border="1">
- <tr bgcolor="#9acd32">
- <th align="left">COMPANYID</th>
- <th
align="left">COMPANYNAME</th>
- </tr>
-
- <tr>
- <td>
- <xsl:value-of
select="@ID"/>
- </td>
- <td>
- <xsl:value-of
select="@NAME"/>
- </td>
- </tr>
- </table>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ <xsl:template match="COMPANY">
+ <table border="1">
+ <tr bgcolor="#9acd32">
+ <th align="left">COMPANYID</th>
+ <th align="left">COMPANYNAME</th>
+ </tr>
+ <tr>
+ <td>
+ <xsl:value-of select="ID"/>
+ </td>
+ <td>
+ <xsl:value-of select="NAME"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+</xsl:stylesheet>
Modified:
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl?view=diff&rev=557718&r1=557717&r2=557718
==============================================================================
---
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
(original)
+++
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
Thu Jul 19 11:18:54 2007
@@ -17,7 +17,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<xsl:output method="html" version="1.0" encoding="Unicode"
indent="yes"/>
- <xsl:key name="companyidkey" match="/root/das:DataGraphRoot/DEPARTMENT"
use="@COMPANYID"/>
+ <xsl:key name="companyidkey" match="/root/das:DataGraphRoot/DEPARTMENT"
use="COMPANYID"/>
<xsl:template match="/root/das:DataGraphRoot">
<html>
<body>
@@ -35,10 +35,10 @@
<tr>
<td>
- <xsl:value-of
select="@ID"/>
+ <xsl:value-of
select="ID"/>
</td>
<td>
- <xsl:value-of
select="@NAME"/>
+ <xsl:value-of
select="NAME"/>
</td>
<table border="1">
<tr bgcolor="#9acd32">
@@ -46,14 +46,14 @@
<th
align="left">DEPNAME</th>
</tr>
- <xsl:variable
name="tmp" select="@ID"/>
+ <xsl:variable
name="tmp" select="ID"/>
<xsl:for-each
select="key('companyidkey', $tmp)">
<tr>
<td>
- <xsl:value-of
select="@ID"/>
+ <xsl:value-of
select="ID"/>
</td>
<td>
- <xsl:value-of
select="@NAME"/>
+ <xsl:value-of
select="NAME"/>
</td>
</tr>
</xsl:for-each>
@@ -62,4 +62,4 @@
</table>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified:
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl?view=diff&rev=557718&r1=557717&r2=557718
==============================================================================
---
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
(original)
+++
incubator/tuscany/java/das/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
Thu Jul 19 11:18:54 2007
@@ -31,13 +31,13 @@
<xsl:for-each
select="das:DataGraphRoot">
<tr>
<td>
-
<xsl:value-of select="CUSTOMER/@ID"/>
+
<xsl:value-of select="CUSTOMER/ID"/>
</td>
<td>
-
<xsl:value-of select="CUSTOMER/@LASTNAME"/>
+
<xsl:value-of select="CUSTOMER/LASTNAME"/>
</td>
<td>
-
<xsl:value-of select="CUSTOMER/@ADDRESS"/>
+
<xsl:value-of select="CUSTOMER/ADDRESS"/>
</td>
</tr>
</xsl:for-each>
Modified:
incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java?view=diff&rev=557718&r1=557717&r2=557718
==============================================================================
---
incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
(original)
+++
incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
Thu Jul 19 11:18:54 2007
@@ -259,7 +259,8 @@
assertTrue(-1 != commandResultText.indexOf("Do-rite plumbing"));
assertTrue(-1 != commandResultText.indexOf("MegaCorp"));
assertTrue(-1 != commandResultText.indexOf("Advanced Technologies"));
- assertTrue(-1 != commandResultText.indexOf("COMPANYID=\"1\""));
+ assertTrue(-1 != commandResultText.indexOf("COMPANYID"));
+ assertTrue(-1 != commandResultText.indexOf("1"));
collectedAlerts.clear();
System.out.println("SUCCESS!!!");
@@ -328,9 +329,10 @@
assertTrue(-1 != adhocResultText.indexOf("Do-rite plumbing"));
assertTrue(-1 != adhocResultText.indexOf("MegaCorp"));
assertTrue(-1 != adhocResultText.indexOf("Advanced Technologies"));
- assertTrue(-1 != adhocResultText.indexOf("COMPANYID=\"1\""));
+ assertTrue(-1 != adhocResultText.indexOf("COMPANYID"));
+ assertTrue(-1 != adhocResultText.indexOf("1"));
assertTrue(-1 != adhocResultText.indexOf("MyDept"));
- assertTrue(adhocResultText.indexOf("COMPANYID=\"1\"") !=
adhocResultText.lastIndexOf("COMPANYID=\"1\""));
+ assertTrue(adhocResultText.indexOf("COMPANYID") !=
adhocResultText.lastIndexOf("COMPANYID"));
collectedAlerts.clear();
System.out.println("SUCCESS!!!");
@@ -405,8 +407,8 @@
assertTrue(-1 != commandResultText.indexOf("Do-rite plumbing"));
assertTrue(-1 != commandResultText.indexOf("MegaCorp"));
assertTrue(-1 != commandResultText.indexOf("Advanced Technologies"));
- assertTrue(-1 != commandResultText.indexOf("COMPANYID=\"1\""));
- assertTrue(commandResultText.indexOf("COMPANYID=\"1\"") ==
commandResultText.lastIndexOf("COMPANYID=\"1\""));
+ assertTrue(-1 != commandResultText.indexOf("COMPANYID"));
+ assertTrue(-1 != commandResultText.indexOf("1"));
collectedAlerts.clear();
System.out.println("SUCCESS!!!");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
