Return-Path: 
 <derby-commits-return-7964-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 10927 invoked from network); 5 Jul 2007 18:18:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Jul 2007 18:18:47 -0000
Received: (qmail 59962 invoked by uid 500); 5 Jul 2007 18:18:50 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 59938 invoked by uid 500); 5 Jul 2007 18:18:50 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 59927 invoked by uid 99); 5 Jul 2007 18:18:50 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2007 11:18:50 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2007 11:18:47 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id E9B621A981A; Thu,  5 Jul 2007 11:18:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r553592 -
 /db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita
Date: Thu, 05 Jul 2007 18:18:26 -0000
To: derby-commits@db.apache.org
From: scotsmatrix@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070705181826.E9B621A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: scotsmatrix
Date: Thu Jul  5 11:18:26 2007
New Revision: 553592

URL: http://svn.apache.org/viewvc?view=rev&rev=553592
Log:
Derby-2851: Updated example and merged on 10.3 branch. Patch contributed by me

Modified:
    db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita

Modified: db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita?view=diff&rev=553592&r1=553591&r2=553592
==============================================================================
--- db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ db/derby/docs/branches/10.3/src/adminguide/radminnsdatasourcexmp.dita Thu Jul  5 11:18:26 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -23,31 +24,21 @@
 <refbody>
 <section><p>The following example uses <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> to
 access the Network Server:</p></section>
-<example> <codeblock>public static javax.sql.DataSource getDS(String database, String user, String
-password) throws SQLException
-{
-org.apache.derby.jdbc.ClientDataSource ds =
+<example> <codeblock>org.apache.derby.jdbc.ClientDataSource ds =
    new org.apache.derby.jdbc.ClientDataSource();
-
-// DatabaseName can include <ph conref="../conrefs.dita#prod/productshortname"></ph> URL Attributes
-ds.setDatabaseName(<i>database</i>);
-
-if (user != null)
-   ds.setUser(<i>user</i>);
-if (password != null)
-   ds.setPassword(<i>password</i>);
+ds.setDatabaseName(<i>"mydb</i>);
+ds.setCreateDatabase("create");  
+ds.setUser("user");  
+ds.setPassword("mypass"); 
 
 // The host on which Network Server is running
 ds.setServerName("localhost");
 
-// port on which Network Server is listening
+// The port on which Network Server is listening
 ds.setPortNumber(1527);
 
-return ds;
-}
+Connection conn = ds.getConnection(); 
+
 </codeblock></example>
-<section><p>The program then can connect: <codeblock>javax.sql.DataSource ds = getDS("mydb;create=true", null, null);
-// Note:  user and password are required on connection
-Connection conn = ds.getConnection("usr2", "pass2");</codeblock></p></section>
 </refbody>
 </reference>