You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jo...@apache.org on 2005/07/28 02:33:15 UTC
cvs commit: xml-xalan/java/samples/extensions/sql/basic-connection dbinfo.xml dbtest.xsl DumpSQL.xsl dbtest-cinfo.xsl
johng 2005/07/27 17:33:15
Modified: java/samples/extensions/sql/basic-connection dbinfo.xml
dbtest.xsl DumpSQL.xsl dbtest-cinfo.xsl
Log:
PR:XalanJ-2172
Obtained from:
Submitted by: John Gentilin
Reviewed by: Yas Talwar
CVS: ----------------------------------------------------------------------
CVS: Change Example file to utilize the Apache Derby DBMS
Revision Changes Path
1.5 +3 -18 xml-xalan/java/samples/extensions/sql/basic-connection/dbinfo.xml
Index: dbinfo.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/basic-connection/dbinfo.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbinfo.xml 27 May 2003 15:44:14 -0000 1.4
+++ dbinfo.xml 28 Jul 2005 00:33:15 -0000 1.5
@@ -2,25 +2,10 @@
<description>This file contains information required to make a connection to the DBMS</description>
<DBINFO>
- <dbdriver>com.lutris.instantdb.jdbc.idbDriver</dbdriver>
- <dburl>jdbc:idb:../../instantdb/sample.prp</dburl>
+ <dbdriver>org.apache.derby.jdbc.EmbeddedDriver</dbdriver>
+ <dburl>jdbc:derby:sampleDB</dburl>
<user />
<password/>
</DBINFO>
- <!-- an example setting for using DB2, sample is the database name
- <DBINFO>
- <dbdriver>COM.ibm.db2.jdbc.app.DB2Driver</dbdriver>
- <dburl>jdbc:db2:sample</dburl>
- <user />
- <password/>
- </DBINFO>
--->
- <!-- an example setting for using mySQL, sample is the database name
- <DBINFO>
- <dbdriver>com.mysql.jdbc.Driver</dbdriver>
- <dburl>jdbc:mySQL://localhost/sample</dburl>
- <user />
- <password/>
- </DBINFO>
--->
+
</dbtest>
1.8 +7 -12 xml-xalan/java/samples/extensions/sql/basic-connection/dbtest.xsl
Index: dbtest.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/basic-connection/dbtest.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dbtest.xsl 27 May 2003 15:44:14 -0000 1.7
+++ dbtest.xsl 28 Jul 2005 00:33:15 -0000 1.8
@@ -12,23 +12,18 @@
<xsl:output method="html" indent="yes"/>
-<!-- parameter setting to connect to DB2
-<xsl:param name="driver" select="'COM.ibm.db2.jdbc.app.DB2Driver'"/>
-<xsl:param name="datasource" select="'jdbc:db2:sample'"/>
--->
+<!-- parameter setting to connect to Database -->
-<!-- parameter setting to connect to MySQL -->
+<xsl:param name="driver" select="'org.apache.derby.jdbc.EmbeddedDriver'"/>
-<xsl:param name="driver" select="'com.mysql.jdbc.Driver'"/>
+<xsl:param name="datasource" select="'jdbc:derby:sampleDB'"/>
-<xsl:param name="datasource" select="'jdbc:mySQL://localhost/sample'"/>
+<xsl:param name="query" select="'SELECT * FROM import1'"/>
-<xsl:param name="query" select="'SELECT * FROM sample'"/>
+<xsl:param name="username" select="''"/>
-<xsl:param name="username" select="'***'"/>
-
-<xsl:param name="passwd" select="'***'"/>
+<xsl:param name="passwd" select="''"/>
<xsl:template match="/">
@@ -96,7 +91,7 @@
</TR>
- <xsl:apply-templates select="$table/sql/row-set/row"/>
+ <xsl:apply-templates select="$table/sql/row-set"/>
</TABLE>
1.3 +19 -19 xml-xalan/java/samples/extensions/sql/basic-connection/DumpSQL.xsl
Index: DumpSQL.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/basic-connection/DumpSQL.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DumpSQL.xsl 25 Jan 2002 19:41:31 -0000 1.2
+++ DumpSQL.xsl 28 Jul 2005 00:33:15 -0000 1.3
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:sql="org.apache.xalan.lib.sql.XConnection"
- extension-element-prefixes="sql">
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="driver" select="'com.lutris.instantdb.jdbc.idbDriver'"/>
-<xsl:param name="datasource" select="'jdbc:idb:../../instantdb/sample.prp'"/>
-<xsl:param name="query" select="'SELECT * FROM import1'"/>
-
-<xsl:template match="/">
- <xsl:variable name="db" select="sql:new($driver, $datasource)"/>
- <xsl:variable name="table" select='sql:query($db, $query)'/>
- <xsl:copy-of select="$table" />
- <xsl:value-of select="sql:close($db)"/>
-</xsl:template>
-
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:sql="org.apache.xalan.lib.sql.XConnection"
+ extension-element-prefixes="sql">
+
+<xsl:output method="html" indent="yes"/>
+
+<xsl:param name="driver" select="'org.apache.derby.jdbc.EmbeddedDriver'"/>
+<xsl:param name="datasource" select="'jdbc:derby:sampleDB'"/>
+<xsl:param name="query" select="'SELECT * FROM import1'"/>
+
+<xsl:template match="/">
+ <xsl:variable name="db" select="sql:new($driver, $datasource)"/>
+ <xsl:variable name="table" select='sql:query($db, $query)'/>
+ <xsl:copy-of select="$table" />
+ <xsl:value-of select="sql:close($db)"/>
+</xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
1.4 +64 -60 xml-xalan/java/samples/extensions/sql/basic-connection/dbtest-cinfo.xsl
Index: dbtest-cinfo.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/samples/extensions/sql/basic-connection/dbtest-cinfo.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dbtest-cinfo.xsl 24 Aug 2001 04:44:15 -0000 1.3
+++ dbtest-cinfo.xsl 28 Jul 2005 00:33:15 -0000 1.4
@@ -1,61 +1,65 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:sql="org.apache.xalan.lib.sql.XConnection"
- extension-element-prefixes="sql">
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="cinfo" select="//DBINFO"/>
-<xsl:param name="query" select="'SELECT * FROM import1'"/>
-
-<xsl:template match="/">
- <xsl:variable name="db" select="sql:new()"/>
-
- <!-- Connect to the database with minimal error detection -->
- <xsl:if test="not(sql:connect($db, $cinfo))" >
- <xsl:message>Error Connecting to the Database</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
-
- <HTML>
- <HEAD>
- <TITLE>List of products</TITLE>
- </HEAD>
- <BODY>
- <TABLE border="1">
- <xsl:variable name="table" select='sql:query($db, $query)'/>
-
- <!--
- Let's include Error Checking, the error is actually stored
- in the connection since $table will be either data or null
- -->
-
- <xsl:if test="not($table)" >
- <xsl:message>Error in Query</xsl:message>
- <xsl:copy-of select="sql:getError($db)/ext-error" />
- </xsl:if>
-
-
- <TR>
- <xsl:for-each select="$table/sql/metadaata/column-header">
- <TH><xsl:value-of select="@column-label"/></TH>
- </xsl:for-each>
- </TR>
- <xsl:apply-templates select="$table/sql/row-set/row"/>
- </TABLE>
- </BODY>
- </HTML>
- <xsl:value-of select="sql:close($db)"/>
-</xsl:template>
-
-<xsl:template match="row">
- <TR><xsl:apply-templates select="col"/></TR>
-</xsl:template>
-
-<xsl:template match="col">
- <TD><xsl:value-of select="text()"/></TD>
-</xsl:template>
-
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:sql="org.apache.xalan.lib.sql.XConnection"
+ extension-element-prefixes="sql">
+
+<xsl:output method="html" indent="yes"/>
+
+<xsl:param name="cinfo" select="//DBINFO"/>
+<xsl:param name="query" select="'SELECT * FROM import1'"/>
+
+<xsl:template match="/">
+ <xsl:variable name="db" select="sql:new()"/>
+
+
+ <!-- Connect to the database with minimal error detection -->
+ <xsl:if test="not(sql:connect($db, $cinfo))" >
+ <xsl:message>Error Connecting to the Database</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+ <CINFO>
+ <xsl:copy-of select="//DBINFO"/>
+ </CINFO>
+
+ <HTML>
+ <HEAD>
+ <TITLE>List of products</TITLE>
+ </HEAD>
+ <BODY>
+ <TABLE border="1">
+ <xsl:variable name="table" select='sql:query($db, $query)'/>
+
+ <!--
+ Let's include Error Checking, the error is actually stored
+ in the connection since $table will be either data or null
+ -->
+
+ <xsl:if test="not($table)" >
+ <xsl:message>Error in Query</xsl:message>
+ <xsl:copy-of select="sql:getError($db)/ext-error" />
+ </xsl:if>
+
+
+ <TR>
+ <xsl:for-each select="$table/sql/metadaata/column-header">
+ <TH><xsl:value-of select="@column-label"/></TH>
+ </xsl:for-each>
+ </TR>
+ <xsl:apply-templates select="$table/sql/row-set"/>
+ </TABLE>
+ </BODY>
+ </HTML>
+ <xsl:value-of select="sql:close($db)"/>
+</xsl:template>
+
+<xsl:template match="row">
+ <TR><xsl:apply-templates select="col"/></TR>
+</xsl:template>
+
+<xsl:template match="col">
+ <TD><xsl:value-of select="text()"/></TD>
+</xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org