db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r168976 [1/5] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Fri, 06 May 2005 22:46:34 GMT
Author: jta
Date: Fri May  6 15:46:20 2005
New Revision: 168976

URL: http://svn.apache.org/viewcvs?rev=168976&view=rev
Log:
Committing patch for DERBY-261

Added:
    incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita   (with props)
    incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita   (with props)
    incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita   (with props)
    incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita   (with props)
Modified:
    incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
    incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
    incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
    incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
    incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
    incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita
    incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
    incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
    incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
    incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita
    incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
    incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
    incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita
    incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita
    incubator/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfig815357.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigalteringthestartnetworkserverscr.dita
    incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlog800206.dita
    incubator/derby/docs/trunk/src/adminguide/tadminlogfile.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovclirun.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita
    incubator/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita
    incubator/derby/docs/trunk/src/adminguide/tadminspace43.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts15366.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts23987.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts30811.dita
    incubator/derby/docs/trunk/src/devguide/cdevconcepts65864.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure30032.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure37241.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure862382.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure864642.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure864692.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure865880.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure866716.dita
    incubator/derby/docs/trunk/src/devguide/cdevcsecure96815.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy18639.dita
    incubator/derby/docs/trunk/src/devguide/cdevdeploy30736.dita
    incubator/derby/docs/trunk/src/devguide/cdevdgpref29520.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp13018.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
    incubator/derby/docs/trunk/src/devguide/cdevdvlp40724.dita
    incubator/derby/docs/trunk/src/devguide/cdevresman19524.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial27988.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial28907.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial29620.dita
    incubator/derby/docs/trunk/src/devguide/cdevspecial45786.dita
    incubator/derby/docs/trunk/src/devguide/devconrefs.dita
    incubator/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
    incubator/derby/docs/trunk/src/devguide/rdevcopyright.dita
    incubator/derby/docs/trunk/src/devguide/rdevcsecure557.dita
    incubator/derby/docs/trunk/src/devguide/rdevtrademderby.dita
    incubator/derby/docs/trunk/src/devguide/tdevconcepts41704.dita
    incubator/derby/docs/trunk/src/devguide/tdevdeploy26887.dita
    incubator/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
    incubator/derby/docs/trunk/src/getstart/cgs22227.dita
    incubator/derby/docs/trunk/src/getstart/cgs28881.dita
    incubator/derby/docs/trunk/src/getstart/cgs80725.dita
    incubator/derby/docs/trunk/src/getstart/cgschoos.dita
    incubator/derby/docs/trunk/src/getstart/cgsdocs14707.dita
    incubator/derby/docs/trunk/src/getstart/cgsinsta.dita
    incubator/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
    incubator/derby/docs/trunk/src/getstart/cgsintdo.dita
    incubator/derby/docs/trunk/src/getstart/cgsintro.dita
    incubator/derby/docs/trunk/src/getstart/cgsintsr.dita
    incubator/derby/docs/trunk/src/getstart/cgslib19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsmanuallysetting.dita
    incubator/derby/docs/trunk/src/getstart/cgsnsexample.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck13780.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck19524.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck35643.dita
    incubator/derby/docs/trunk/src/getstart/cgsquck70629.dita
    incubator/derby/docs/trunk/src/getstart/cgsstartprogrammingwiththeexamples.dita
    incubator/derby/docs/trunk/src/getstart/cgsusingsysinfo.dita
    incubator/derby/docs/trunk/src/getstart/cgsusingtoolsutils.dita
    incubator/derby/docs/trunk/src/getstart/gsconrefs.dita
    incubator/derby/docs/trunk/src/getstart/rgscopyright.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs10012.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs17307.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs18277.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs37966.dita
    incubator/derby/docs/trunk/src/getstart/rgsdocs99397.dita
    incubator/derby/docs/trunk/src/getstart/rgslib27507.dita
    incubator/derby/docs/trunk/src/getstart/rgslib46043.dita
    incubator/derby/docs/trunk/src/getstart/rgslib56653.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck30197.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck35368.dita
    incubator/derby/docs/trunk/src/getstart/rgsquck67441.dita
    incubator/derby/docs/trunk/src/getstart/rgstrademderby.dita
    incubator/derby/docs/trunk/src/getstart/tgs26250.dita
    incubator/derby/docs/trunk/src/getstart/tgs36360.dita
    incubator/derby/docs/trunk/src/getstart/tgsrunningij.dita
    incubator/derby/docs/trunk/src/getstart/tgssetupjavaenvir.dita
    incubator/derby/docs/trunk/src/ref/crefjavgcasyn.dita
    incubator/derby/docs/trunk/src/ref/crefjavsaverel.dita
    incubator/derby/docs/trunk/src/ref/crefjdbc25142.dita
    incubator/derby/docs/trunk/src/ref/crefmpref23223.dita
    incubator/derby/docs/trunk/src/ref/crefsqlbuiltinsystemfunctions.dita
    incubator/derby/docs/trunk/src/ref/crefsqlbuiltinsystemprocedures.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj28138.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj34834.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj39374.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj41507.dita
    incubator/derby/docs/trunk/src/ref/crefsqlj80721.dita
    incubator/derby/docs/trunk/src/ref/crefsqljrenamestatements.dita
    incubator/derby/docs/trunk/src/ref/refconrefs.dita
    incubator/derby/docs/trunk/src/ref/rrefaltercolumndef.dita
    incubator/derby/docs/trunk/src/ref/rrefapi1003363.dita
    incubator/derby/docs/trunk/src/ref/rrefapi10613.dita
    incubator/derby/docs/trunk/src/ref/rrefapi33761.dita
    incubator/derby/docs/trunk/src/ref/rrefattrib16471.dita
    incubator/derby/docs/trunk/src/ref/rrefattrib34183.dita
    incubator/derby/docs/trunk/src/ref/rrefattrib42100.dita
    incubator/derby/docs/trunk/src/ref/rrefbackupdbproc.dita
    incubator/derby/docs/trunk/src/ref/rrefblob.dita
    incubator/derby/docs/trunk/src/ref/rrefcasenullif.dita
    incubator/derby/docs/trunk/src/ref/rrefclob.dita
    incubator/derby/docs/trunk/src/ref/rrefconstraintname.dita
    incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita
    incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita
    incubator/derby/docs/trunk/src/ref/rrefcrprofunctionparameter.dita
    incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita
    incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita
    incubator/derby/docs/trunk/src/ref/rrefcrproprocedureparameter.dita
    incubator/derby/docs/trunk/src/ref/rrefcursorname.dita
    incubator/derby/docs/trunk/src/ref/rrefdatefunc.dita
    incubator/derby/docs/trunk/src/ref/rrefdropfunctionstatement.dita
    incubator/derby/docs/trunk/src/ref/rrefdropprocedurestatement.dita
    incubator/derby/docs/trunk/src/ref/rrefdttlimits.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept13113.dita
    incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita
    incubator/derby/docs/trunk/src/ref/rrefexportproc.dita
    incubator/derby/docs/trunk/src/ref/rrefexportselectionproc.dita
    incubator/derby/docs/trunk/src/ref/rreffreezedbproc.dita
    incubator/derby/docs/trunk/src/ref/rrefgetdbpropfunc.dita
    incubator/derby/docs/trunk/src/ref/rrefgpc1.dita
    incubator/derby/docs/trunk/src/ref/rrefidentityvallocal.dita
    incubator/derby/docs/trunk/src/ref/rrefimportproc.dita
    incubator/derby/docs/trunk/src/ref/rrefindexname.dita
    incubator/derby/docs/trunk/src/ref/rrefjavciro.dita
    incubator/derby/docs/trunk/src/ref/rrefjavcsro.dita
    incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc16643.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc23502.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc30469.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc52637.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc59162.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc66688.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc71949.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc75719.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc77156.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc80004.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc87220.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbc99392.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbcdatabasemetadata30.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbcjavasqlconnection30.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbcjavasqlpreparedstatement30.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita
    incubator/derby/docs/trunk/src/ref/rrefjdbcjavasqlstatement30.dita
    incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita
    incubator/derby/docs/trunk/src/ref/rrefjta1003392.dita
    incubator/derby/docs/trunk/src/ref/rrefjta1003415.dita
    incubator/derby/docs/trunk/src/ref/rrefjta16677.dita
    incubator/derby/docs/trunk/src/ref/rrefjta18596.dita
    incubator/derby/docs/trunk/src/ref/rrefjta51021.dita
    incubator/derby/docs/trunk/src/ref/rreflimits.dita
    incubator/derby/docs/trunk/src/ref/rrefmonthfunc.dita
    incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita
    incubator/derby/docs/trunk/src/ref/rrefnumericlimits.dita
    incubator/derby/docs/trunk/src/ref/rrefpgc1.dita
    incubator/derby/docs/trunk/src/ref/rrefrauthid.dita
    incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita
    incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita
    incubator/derby/docs/trunk/src/ref/rrefschemaname.dita
    incubator/derby/docs/trunk/src/ref/rrefsecondfunc.dita
    incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita
    incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs12085.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs13420.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs22441.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs23241.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs24045.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs24269.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs26665.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs28114.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs33768.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs33921.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs39391.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabs40972.dita
    incubator/derby/docs/trunk/src/ref/rrefsistabslilanguageitemsysstatistics.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj1055824.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj1080962.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj11277.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj13083.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj15147.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj16762.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj18922.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj20204.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj21571.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj24513.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj25228.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj27767.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj29930.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj30118.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj30540.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31580.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31648.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj31783.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32268.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32613.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32654.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj32693.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33520.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33602.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj33772.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj34177.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj35034.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj35981.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj37836.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj37860.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj38716.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj38831.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj40899.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj41180.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj41207.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj41360.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42002.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42049.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj42324.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj57522.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj58560.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj61998.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj66113.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj73147.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj75638.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj76354.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj87167.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj89752.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj91438.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj93082.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj97870.dita
    incubator/derby/docs/trunk/src/ref/rrefsqlj98067.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljcurrentdate.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljcurrenttimestamp.dita
    incubator/derby/docs/trunk/src/ref/rrefsqljmod.dita
    incubator/derby/docs/trunk/src/ref/rrefstringlimits.dita
    incubator/derby/docs/trunk/src/ref/rrefsyscsruntimestatsfunc.dita
    incubator/derby/docs/trunk/src/ref/rreftablename.dita
    incubator/derby/docs/trunk/src/ref/rreftemptabledatatype.dita
    incubator/derby/docs/trunk/src/ref/rreftemptableoncommit.dita
    incubator/derby/docs/trunk/src/ref/rreftimefunc.dita
    incubator/derby/docs/trunk/src/ref/rreftimestampfunc.dita
    incubator/derby/docs/trunk/src/ref/rreftrademderby.dita
    incubator/derby/docs/trunk/src/ref/rreftriggername.dita
    incubator/derby/docs/trunk/src/ref/rrefunfreezedbproc.dita
    incubator/derby/docs/trunk/src/ref/rrefviewname.dita
    incubator/derby/docs/trunk/src/ref/rrefyearfunc.dita
    incubator/derby/docs/trunk/src/tools/ctoolsijtools16011.dita
    incubator/derby/docs/trunk/src/tools/ctoolsimportidentitycol.dita
    incubator/derby/docs/trunk/src/tools/ctoolsusingdblook.dita
    incubator/derby/docs/trunk/src/tools/rtools1003161.dita
    incubator/derby/docs/trunk/src/tools/rtoolscopyright.dita
    incubator/derby/docs/trunk/src/tools/rtoolsdblookexamples.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijcomref34110.dita
    incubator/derby/docs/trunk/src/tools/rtoolsijtools16879.dita
    incubator/derby/docs/trunk/src/tools/rtoolstrademderby.dita
    incubator/derby/docs/trunk/src/tools/toolsconrefs.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij11815.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij30600.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij97656.dita
    incubator/derby/docs/trunk/src/tools/ttoolsij98878.dita
    incubator/derby/docs/trunk/src/tools/ttoolsjarload1002986.dita
    incubator/derby/docs/trunk/src/tools/ttoolsjarload1003059.dita
    incubator/derby/docs/trunk/src/tools/ttoolsjarload1003120.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth1002853.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth32379.dita
    incubator/derby/docs/trunk/src/tuning/ctundepth853133.dita
    incubator/derby/docs/trunk/src/tuning/ctunpropref1002477.dita
    incubator/derby/docs/trunk/src/tuning/rtuncopyright.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper13766.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper25581.dita
    incubator/derby/docs/trunk/src/tuning/rtunproper27355.dita
    incubator/derby/docs/trunk/src/tuning/rtunsearchauthpw.dita
    incubator/derby/docs/trunk/src/tuning/rtuntrademderby.dita
    incubator/derby/docs/trunk/src/tuning/rtuntransform866214.dita
    incubator/derby/docs/trunk/src/tuning/ttundepth33391.dita
    incubator/derby/docs/trunk/src/tuning/ttundepth34375.dita
    incubator/derby/docs/trunk/src/tuning/tunconrefs.dita

Modified: incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminadvtops.dita Fri May  6 15:46:20 2005
@@ -20,13 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This chapter discusses the following advanced topics for users of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server: </p>
-<ul>
-<li><xref href="cadminnetservsecurity.dita#cadminnetservsecurity"/></li>
-<li><xref href="tadminnetservrun.dita#tadminnetservrun"/></li>
-<li><xref href="tadminconfiguringthenetworkserver.dita#tadminconfiguringthenetworkserver"/></li>
-<li><xref href="tadminlogfile.dita#tadminlogfile"/></li>
-<li><xref href="tadmintracefacility.dita#tadmintracefacility"/></li>
-</ul>
+<p>This section discusses several advanced topics for users of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps49914.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,32 +16,31 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cadminapps49914" xml:lang="en-us">
 <title>User authentication</title>
 <prolog><metadata>
 <keywords><indexterm>User authentication<indexterm>and Network Server</indexterm></indexterm>
 <indexterm>Network Server<indexterm>user authentication and</indexterm></indexterm>
-<indexterm>com.ibm.db2.jcc.DB2BaseDataSource. CLEAR_TEXT_ PASSWORD_SECURITY</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientDataSource. CLEAR_TEXT_ PASSWORD_SECURITY</indexterm>
 <indexterm>Security properties<indexterm>supported by Network Server</indexterm></indexterm>
 <indexterm>Network Server<indexterm>supported security properties</indexterm></indexterm>
-<indexterm>com.ibm.db2.jcc.DB2BaseDataSource. USER_ONLY_SECURITY</indexterm>
-<indexterm>com.ibm.db2.jcc.DB2BaseDataSource. ENCRYPTED_USER_AND_ PASSWORD_SECURITY</indexterm>
-</keywords>
+<indexterm>org.apache.derby.jdbc.ClientDataSource. USER_ONLY_SECURITY</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientDataSource. ENCRYPTED_USER_AND_
+PASSWORD_SECURITY</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>As when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in embedded mode, you can enable or disable server-side
-user authentication when using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. However, the default
-security mechanism (<codeph>CLEAR_TEXT_PASSWORD</codeph>) requires that you
-supply both the user name and password.</p>
-<p>In addition to the default user name and password security mechanism, <i>com.ibm.db2.jcc.DB2BaseDataSource.CLEAR_TEXT_PASSWORD_SECURITY, </i> <ph conref="adminconrefs.dita#prod/productshortname"></ph>
-Network Server supports the following security properties:</p>
+<p>As when running <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
+embedded mode, you can enable or disable server-side user authentication when
+using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Server. However, the default security mechanism (<codeph>CLEAR_TEXT_PASSWORD</codeph>)
+requires that you supply both the user name and password.</p>
+<p>In addition to the default user name and password security mechanism, <i>org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY, </i
+> <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server
+supports the following security properties:</p>
 <ul>
-<li><i>UserID  (</i><codeph><i>com.ibm.db2.jcc.DB2BaseDataSource.USER_ONLY_SECURITY)</i></codeph> 
+<li><i>UserID  (</i><codeph><i>org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY)</i></codeph> 
  <p>When using this mechanism, only the user property needs to be specified.</p></li>
-<li><i>Encrypted UserID and encrypted password  (com.ibm.db2.jcc.DB2BaseDataSource.ENCRYPTED_USER
+<li><i>Encrypted UserID and encrypted password  (org.apache.derby.jdbc.ClientDataSource.ENCRYPTED_USER
 AND_PASSWORD_SECURITY)</i>   <p>When using this mechanism, both password and
 user are encrypted.</p></li>
 </ul>
@@ -52,4 +53,4 @@
 the connection.</p>
 </conbody>
 </concept>
-<?Pub *0000002367?>
+<?Pub *0000003197?>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps59125.dita Fri May  6 15:46:20 2005
@@ -21,15 +21,5 @@
 </prolog>
 <conbody>
 <p>You must make certain changes to Java applications that currently run against <ph conref="adminconrefs.dita#prod/productshortname"></ph> in
-embedded mode so that they work with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. The following
-topics discuss these changes:</p>
-<ul>
-<li><i><xref href="cadminappsthenetworkserverandjvms.dita#cadminappsthenetworkserverandjvms"/></i></li>
-<li><i><xref href="tadminappschangingyourclasspath.dita#tadminappschangingyourclasspath"/></i></li>
-<li><i><xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"/></i></li>
-<li><i><xref href="cadminapps810777.dita#cadminapps810777"/></i></li>
-<li><i><xref href="cadminappsusingthederbytoolswiththene.dita#cadminappsusingthederbytoolswiththene"/></i>  </li>
-<li><i><xref href="cadminapps.dita#cadminapps"/></i></li>
-<li><i><xref href="tadminappssettingportnumbers.dita#tadminappssettingportnumbers"/></i></li>
-</ul>
+embedded mode so that they work with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server. The topics in this section discuss these changes.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,48 +16,47 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
- "../dtd/concept.dtd">
 <concept id="cadminapps810777" xml:lang="en-us">
 <title>Accessing the Network Server by using the DB2 Universal Driver</title>
 <prolog></prolog>
 <conbody>
-<p>When connecting to the Network Server, your application needs to load a
-driver and connection URL specific to the Network Server. In addition, you
-specify a user name and password. If you have not set up authentication, you
-can use any value for the user name and password. The driver you need to access
-the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock></p>
+<p>You can use the DB2 Universal Driver instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client driver when connecting to the Network Server. Your application needs
+to load the driver and connection URL specific to the Network Server. In addition,
+you specify a user name and password. If you have not set up authentication,
+you can use any value for the user name and password. The driver you use 
+to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock></p>
 <p>The URL that is needed to access the Network Server is:</p>
 <codeblock>jdbc:derby:net://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
 &lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
 [:&lt;Universal Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
-<p>The syntax for connection to the Network Server differs slightly from the
-syntax used to connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> running in embedded mode. After the database
-name and attributes you can include attributes for the DB2 JDBC Driver. You
-must include a semicolon after the last Universal Driver attribute.</p>
+<p>After the database name and attributes you can include attributes for the
+DB2 JDBC Driver. You must include a semicolon after the last Universal Driver
+attribute.</p>
 <ul>
 <li><i>server</i>   <p>The name of the machine where the server is running.
 It can be the name of the machine (for example, <i>buffy</i>) or the address,
-for example, <i>158.58.62.225</i>.</p> <note>Unless the Network Server was
+for example, <i>158.58.62.225</i>.</p><note>Unless the Network Server was
 started with the <codeph>-h</codeph> option or the <i>derby.drda.host</i> property
 set, this value should be <codeph>localhost</codeph>.</note></li>
 <li><i>port</i>   <p>The port the server is listening to. The default is 1527.</p></li>
 <li><i>database name</i>   <p>The name of the database you are connecting
 to. The database name can be at most 18 characters long. You must use double
-quotes (") to include path information in the database name.
-Alternately, you can specify path information by setting the property <i>derby.system.home</i> in
+quotes (") to include path information in the database name. Alternately,
+you can specify path information by setting the property <i>derby.system.home</i> in
 either the <codeph><i>derby.properties</i></codeph> file or in the Java environment
 when starting the Network Server. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
 more information about defining the system home.</p></li>
-<li><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph> URL attribute=value</i>   <p>Optional database connection URL
-attributes supported by <ph conref="adminconrefs.dita#prod/productshortname"></ph>. See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
+<li><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph> URL attribute=value</i> 
+ <p>Optional database connection URL attributes supported by <ph conref="adminconrefs.dita#prod/productshortname"></ph>.
+See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for
 more information.</p></li>
 <li><i>Universal Driver Attribute=value</i>   <p>Optional database connection
-URL attributes supported by the DB2 Universal JDBC Driver.</p> <p>The DB2
-JDBC Universal Driver requires that you set the Universal Driver user and
-password attributes to non-null values.</p> <p>Here's a list of the DB2 Universal
-JDBC Driver attributes available to you when running the Network Server:</p> <ul>
+URL attributes supported by the DB2 Universal JDBC Driver.</p><p>The DB2 JDBC
+Universal Driver requires that you set the Universal Driver user and password
+attributes to non-null values.</p><p>Here is a list of the DB2
+Universal JDBC Driver attributes available to you when running the Network
+Server:</p><ul>
 <li><i>user </i>   <p>User name (required by the Universal JDBC Driver).</p></li>
 <li><i>password</i>   <p>User password (required by the Universal JDBC Driver).</p></li>
 <li><i>portNumber</i>   <p>The TCP/IP port number where the Network Server
@@ -78,4 +79,4 @@
 Server is compatible with the DB2 JDBC Universal Driver release 1.2 and higher.</p></section>
 </conbody>
 </concept>
-<?Pub *0000004355?>
+<?Pub *0000005153?>

Added: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=168976&view=auto
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita (added)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita Fri May  6 15:46:20 2005
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cadminappsclient" xml:lang="en-us">
+<title>Accessing the Network Server by using the Network Client driver</title>
+<prolog></prolog>
+<conbody>
+<p>When connecting to the Network Server, your application needs to load a
+driver and connection URL specific to the Network Server. In addition, you
+specify a user name and password. If you have not set up authentication, you
+can use any value for the user name and password. The driver you need to access
+the Network Server is: <codeblock>org.apache.derby.jdbc.ClientDriver</codeblock></p>
+<p>The URL that is needed to access the Network Server is:</p>
+<codeblock>jdbc:derby://&lt;<i>server</i>&gt;[:&lt;<i>port</i>&gt;]/
+&lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph> URL attribute&gt;=&lt;value&gt; [;...]]
+[:&lt;Client Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
+<p>The syntax for connection to the Network Server differs slightly from the
+syntax used to connect to <ph conref="adminconrefs.dita#prod/productshortname"></ph> running
+in embedded mode. After the database name and attributes you can include attributes
+for the Network Client driver. You must include a semicolon after the last
+Network Client attribute.</p>
+<table><title>Standard JDBC DataSource properties</title>
+<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
+colname="col3"/><colspec colname="COLSPEC0" colwidth="1*"/><colspec colname="col4"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Property</entry>
+<entry colname="col2">Type</entry>
+<entry colname="col3">Description</entry>
+<entry colname="COLSPEC0">URL attribute</entry>
+<entry colname="col4">Notes</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><i>databaseName</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The name of the database. This property is required.</entry>
+<entry colname="COLSPEC0"></entry>
+<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+</row>
+<row>
+<entry colname="col1"><i>dataSourceName</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The data source name.</entry>
+<entry colname="COLSPEC0"></entry>
+<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+</row>
+<row>
+<entry colname="col1"><i>description</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">A description of the data source.</entry>
+<entry colname="COLSPEC0"></entry>
+<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+</row>
+<row>
+<entry colname="col1"><i>user</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The user's account name.</entry>
+<entry colname="COLSPEC0">user</entry>
+<entry colname="col4">Default is APP. The property is also available using
+EmbeddedDataSource.</entry>
+</row>
+<row>
+<entry colname="col1"><i>password</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The user's database password.</entry>
+<entry colname="COLSPEC0">password</entry>
+<entry colname="col4">The property is also available using EmbeddedDataSource.</entry>
+</row>
+<row>
+<entry colname="col1"><i>serverName</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The host name or TCP/IP address where the server is
+listening for requests.</entry>
+<entry colname="COLSPEC0"></entry>
+<entry colname="col4">Default is "localhost".</entry>
+</row>
+<row>
+<entry colname="col1"><i>portNumber</i></entry>
+<entry colname="col2">Integer</entry>
+<entry colname="col3">The port number where the server is listening for requests.</entry>
+<entry colname="COLSPEC0"></entry>
+<entry colname="col4">Default is "1527".</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<table><title>Client-specific DataSource properties</title>
+<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
+colname="col3"/><colspec colname="COLSPEC1" colwidth="1*"/><colspec colname="col4"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Property</entry>
+<entry colname="col2">Type</entry>
+<entry colname="col3">Description</entry>
+<entry colname="COLSPEC1">URL attribute</entry>
+<entry colname="col4">Notes</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><i>traceFile</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The filename for tracing output. Setting this property
+turns on tracing. See <xref href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
+<entry colname="COLSPEC1"><i>traceFile</i></entry>
+<entry colname="col4"></entry>
+</row>
+<row>
+<entry colname="col1"><i>traceDirectory</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="col3">The directory for the tracing output. Each connection
+will output to a separate file. Setting this property turns on tracing. See <xref
+href="cadminappsclienttracing.dita#cadminappsclienttracing"></xref>.</entry>
+<entry colname="COLSPEC1"><i>traceDirectory</i></entry>
+<entry colname="col4"></entry>
+</row>
+<row>
+<entry colname="col1"><i>traceLevel</i></entry>
+<entry colname="col2">Integer</entry>
+<entry colname="col3">The level of client tracing if <i>traceFile</i> or <i>traceDirectory</i> are
+set.</entry>
+<entry colname="COLSPEC1"><i>traceLevel</i></entry>
+<entry colname="col4">The default is TRACE_ALL.</entry>
+</row>
+<row>
+<entry colname="col1"><i>traceFileAppend</i></entry>
+<entry colname="col2">Boolean</entry>
+<entry colname="col3">Value is true if tracing output should append to the
+existing trace file.</entry>
+<entry colname="COLSPEC1"><i>traceFileAppend</i></entry>
+<entry colname="col4">The default is false.</entry>
+</row>
+<row>
+<entry colname="col1"><i>securityMechanism</i></entry>
+<entry colname="col2">Integer</entry>
+<entry colname="col3">The security mechanism. See <xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity"></xref>.</entry>
+<entry colname="COLSPEC1"><i>securityMechanism</i></entry>
+<entry colname="col4">The default is USER_ONLY_SECURITY.</entry>
+</row>
+<row>
+<entry colname="col1"><i>retrieveMessageText</i></entry>
+<entry colname="col2">Boolean</entry>
+<entry colname="col3">Retrieve message text from the server. A stored procedure
+is called to retrieve the message text with each <i>SQLException</i> and may
+start a new unit of work. Set to false if you do not want the performance
+impact or when starting new units of work.</entry>
+<entry colname="COLSPEC1"><i>retrieveMessageText</i></entry>
+<entry colname="col4">The default is true.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<table><title>Server-Specific DataSource properties</title>
+<tgroup cols="5"><colspec colname="col1"/><colspec colname="col2"/><colspec
+colname="COLSPEC2" colwidth="1*"/><colspec colname="col3"/><colspec colname="COLSPEC3"
+colwidth="1*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Property</entry>
+<entry colname="col2">Type</entry>
+<entry colname="COLSPEC2">Description</entry>
+<entry colname="col3">URL attributes</entry>
+<entry colname="COLSPEC3">Notes</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1"><i>connectionAttributes</i></entry>
+<entry colname="col2">String</entry>
+<entry colname="COLSPEC2">Set to the list of <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
+connection attributes separated by semicolons. See the <ph conref="adminconrefs.dita#pub/citref"></ph>.</entry>
+<entry colname="col3">Various. See the <ph conref="adminconrefs.dita#pub/citref"></ph>.</entry>
+<entry colname="COLSPEC3">The property is also available using EmbeddedDataSource.
+See the <ph conref="adminconrefs.dita#pub/citref"></ph> for more information
+on the various connection attributes.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<p>Note that <i>setAttributesAsPassword</i> , which is available for the embedded
+DataSource, is not available for the client DataSource.</p>
+</conbody>
+</concept>
+<?Pub *0000008695?>

Propchange: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=168976&view=auto
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (added)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Fri May  6 15:46:20 2005
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "..\dtd\reference.dtd">
+<?Pub Inc?>
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="cadminappsclientsecurity" xml:lang="en-us">
+<title>Network Client security</title>
+<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client allows you to select a security mechanism by specifying a value for
+the <codeph>securityMechanism</codeph> property.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Network Client security</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><p>You can set the <codeph>securityMechanism</codeph> property
+in one of the following ways:<ul>
+<li>When using the <codeph>DriverManager</codeph> interface, set <codeph>securityMechanism</codeph> in
+a <codeph>java.util.Properties</codeph> object before you invoke the form
+of the <codeph>getConnection</codeph> method which includes the <codeph>java.util.Properties</codeph> parameter.</li>
+<li>When using the <codeph>DataSource</codeph> interface and creating and
+deploying your own DataSource objects, invoke the <codeph>DataSource.setSecurityMechanism</codeph> method
+after you create a DataSource object.</li>
+</ul><xref href="cadminappsclientsecurity.dita#cadminappsclientsecurity/radminappsclientsecuritytable"></xref> lists
+the security mechanisms that the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client supports, and the corresponding property value to specify to obtain
+this <codeph>securityMechanism</codeph>. The default security mechanism is
+the userid only if no password is set. If the password is set, the default
+security mechanism is both the userid and password. The default user is APP
+if no other is specified.<table id="radminappsclientsecuritytable"><title>Security
+mechanisms supported by the Derby Network Client</title>
+<tgroup cols="3"><colspec colname="col1"/><colspec colname="col2"/><colspec
+colname="col3"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Security and mechanism</entry>
+<entry colname="col2"><codeph>securityMechanism</codeph> property value</entry>
+<entry colname="col3">Comments</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Userid and password</entry>
+<entry colname="col2">ClientDataSource. CLEAR_TEXT_PASSWORD_SECURITY (0x03)</entry>
+<entry colname="col3">Default if password is set</entry>
+</row>
+<row>
+<entry colname="col1">Userid only</entry>
+<entry colname="col2">ClientDataSource. USER_ONLY_SECURITY (0x04)</entry>
+<entry colname="col3">Default if password is not set</entry>
+</row>
+<row>
+<entry colname="col1">Encrypted userid and encrypted password</entry>
+<entry colname="col2">ClientDataSource. ENCRYPTED_USER_AND_ PASSWORD_SECURITY
+(0x09)</entry>
+<entry colname="col3">Encryption requires a JCE implementation that supports
+the Diffie-Helman algorithm with a prime of 32 bytes.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></p></section>
+</refbody>
+</reference>
+<?Pub *0000003662?>

Propchange: incubator/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=168976&view=auto
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (added)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Fri May  6 15:46:20 2005
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "..\dtd\reference.dtd">
+<?Pub Inc?>
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="cadminappsclienttracing" xml:lang="en-us">
+<title>Network Client tracing</title>
+<shortdesc>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client provides a tracing facility to collect JDBC trace information and view
+protocol flows.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>Network Client tracing</indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><p>There are various ways to obtain trace output. However, the easiest
+way to turn on tracing is to use the <codeph>traceFile</codeph> attribute
+on the URL in <codeph>ij</codeph>. The example below shows all tracing going
+to the file <codeph>trace.out</codeph> from an <codeph>ij</codeph> session.<codeblock>ij>connect 'jdbc:derby://localhost:1527/mydb;
+create=true;traceFile=trace.out;user=user1;password=secret4me';</codeblock></p></section>
+<section><title>ClientDataSource tracing</title><p>You can use one of three
+methods to collect tracing data while obtaining connections from the ClientDataSource:<ul>
+<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of ClientDataSource
+and set the <codeph>PrintWriter</codeph> to a non-null value.</li>
+<li>Use the <codeph>setTraceFile(String filename)</codeph> method of ClientDataSource.</li>
+<li>Use the <codeph>setTraceDirectory(String dirname)</codeph> method of ClientDataSource
+to trace each connection flow in its own file for programs that have multiple
+connections.</li>
+</ul></p></section>
+<section><title>DriverManager tracing</title><p>Use one of the following two
+options to enable and collect tracing information while obtaining connections
+using the DriverManager:<ul>
+<li>Use the <codeph>setLogWriter(java.io.PrintWriter)</codeph> method of DriverManager
+and set the <codeph>PrintWriter</codeph> to a non null-value.</li>
+<li>Use the <codeph>traceFile</codeph> or <codeph>traceDirectory</codeph> URL
+attributes to set these properties prior to creating the connection with the <codeph>DriverManager.getConnection()</codeph> method.</li>
+</ul></p></section>
+<section><title>Changing the default trace level</title><p>The trace level
+defaults to <codeph>ClientDataSource.TRACE_ALL</codeph>. The tracing can be
+changed by calling the <codeph>setTraceLevel(int level)</codeph> method or
+setting the <codeph>traceLevel</codeph> URL attribute:<codeblock>String url = "jdbc:derby://myhost.mydomain.com:1528/mydb" +
+ ";traceFile=/u/user1/trace.out" +
+ ";traceLevel=" +
+ org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS;
+DriverManager.getConnection(url,"user1","secret4me");</codeblock><table><title>Available
+tracing levels and values</title>
+<tgroup cols="2"><colspec colname="col1"/><colspec colname="col2"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Trace level</entry>
+<entry colname="col2">Value</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_NONE</entry>
+<entry colname="col2">0x0</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_CONNECTION_CALLS</entry>
+<entry colname="col2">0x1</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_STATEMENT_CALLS</entry>
+<entry colname="col2">0x2</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_RESULT_SET_CALLS</entry>
+<entry colname="col2">0x3</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_DRIVER_CONFIGURATION</entry>
+<entry colname="col2">0x10</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_CONNECTS</entry>
+<entry colname="col2">0x20</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS</entry>
+<entry colname="col2">0x40</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_RESULT_SET_META_DATA</entry>
+<entry colname="col2">0x80</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_PARAMETER_META_DATA</entry>
+<entry colname="col2">0x100</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_DIAGNOSTICS</entry>
+<entry colname="col2">0x200</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_XA_CALLS</entry>
+<entry colname="col2">0x800</entry>
+</row>
+<row>
+<entry colname="col1">org.apache.derby.jdbc.ClientDataSource.TRACE_ALL</entry>
+<entry colname="col2">0xFFFFFFFF;</entry>
+</row>
+</tbody>
+</tgroup>
+</table>To specify more than one trace, use one of the following techniques:<ul>
+<li>Use bitwise OR ( | ) operators with two or more trace values. For example,
+to trace PROTOCOL flows and connection calls, specify this value for traceLevel:<codeblock>TRACE_PROTOCOL_FLOWS | TRACE_CONNECTION_CALLS</codeblock
+></li>
+<li>Use a bitwise complement ( ~ ) operator with a trace value to specify
+all except a certain trace. For example, to trace everything except PROTOCOL
+flows, specify this value for traceLevel:<codeblock>~TRACE_PROTOCOL_FLOWS</codeblock></li>
+</ul></p></section>
+</refbody>
+</reference>
+<?Pub *0000005958?>

Propchange: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Fri May  6 15:46:20 2005
@@ -20,30 +20,26 @@
 -->
 
 <concept id="cadminappsxawthdriver" xml:lang="en-us">
-<title>Using XA with the DB2 Universal JDBC Driver</title>
+<title>Using XA with the Network Client driver</title>
 <prolog><metadata>
-<keywords><indexterm>XA<indexterm>Using with the DB2 Universal JDBC Driver</indexterm></indexterm>
+<keywords><indexterm>XA<indexterm>Using with the Network Client driver</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <section><p>You can access XA support for the Network Server by using the
-DB2 Universal JDBC Driver's XA DataSource interface (<codeph>com.ibm.db2.jcc.DB2XADataSource</codeph>).</p></section>
+Network Client driver's XA DataSource interface (<codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>).</p></section>
 <example><p>The following example illustrates how to obtain an XA connection
-with the DB2 Universal JDBC Driver:</p><codeblock>XAConnection xaConnection = null;
+with the Network Client driver:</p><codeblock>XAConnection xaConnection = null;
 Connection conn = null;
 
-	String driver = "com.ibm.db2.jcc.DB2DataSource";
-	DB2XADataSource ds = new DB2XADataSource();
+	String driver = "org.apache.derby.jdbc.ClientDataSource";
+	ClientXADataSource ds = new ClientXADataSource();
 
 		ds.setDatabaseName (dbname + ";create=true");
 
-ds.setRetrieveMessagesFromServerOnGetMessage(true);
-
 ds.setServerName("localhost");
 
 ds.setPortNumber(1527);
-
-ds.setDriverType(4); //Network Server requires JDBC type 4 driver
 
 Class.forName(driver);
 

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Fri May  6 15:46:20 2005
@@ -20,13 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This chapter explains how to manage the Network Server.</p>
-<ul>
-<li><xref href="cadminconfigoverview.dita#cadminconfigoverview"/></li>
-<li><xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"/></li>
-<li><xref href="tadmincbdjhhfd.dita#tadmincbdjhhfd"/></li>
-<li><xref href="tadminconfigverifyingstartup.dita#tadminconfigverifyingstartup"/></li>
-<li><xref href="tadminconfigshuttingdownthenetworkserver.dita#tadminconfigshuttingdownthenetworkserver"/></li>
-<li><xref href="tadminconfigsysteminformation.dita#tadminconfigsysteminformation"/></li>
-</ul>
+<p>This section explains how to manage the Network Server.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminconsist01.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,26 +16,21 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cadminconsist01">
+<concept id="cadminconsist01" xml:lang="en-us">
 <title>Checking database consistency</title>
+<shortdesc><ph conref="adminconrefs.dita#prod/productshortname"></ph> is a
+robust product that contains many safeguards to ensure that the database remains
+consistent.</shortdesc>
 <prolog><metadata>
-<keywords>
-<indexterm>Consistency<indexterm>checking database</indexterm></indexterm>
+<keywords><indexterm>Consistency<indexterm>checking database</indexterm></indexterm>
 </keywords>
-</metadata>
-</prolog>
+</metadata></prolog>
 <conbody>
-<p><ph conref="adminconrefs.dita#prod/productshortname"></ph> is a robust product that contains many safeguards to ensure
-that the database remains consistent.</p>
 <p>If, however, you have experienced hardware or operating system failure
 and you want to verify that the database is still consistent, <ph conref="adminconrefs.dita#prod/productshortname"></ph> provides
 a way to do this. Check consistency only if there are indications that such
 a check is needed, because a consistency check can take a long time on a large
 database.</p>
-<ul>
-<li><xref href="radminconsist30301.dita#radminconsist30301"/></li>
-<li><xref href="radminconsist38781.dita#radminconsist38781"/></li>
-<li><xref href="radminconsist24642.dita#radminconsist24642"/></li>
-</ul>
-</conbody></concept>
+</conbody>
+</concept>
+<?Pub *0000001650?>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Fri May  6 15:46:20 2005
@@ -30,6 +30,6 @@
 of deadlock when it does occur.</p>
 <p>To diagnose locking problems, constantly monitor locking traffic by logging
 all deadlocks (using the <i>derby.locks.monitor</i> property).</p>
-</conbody><?Pub Caret1?>
+</conbody>
 </concept>
 <?Pub *0000000928?>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,12 +16,13 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-<!DOCTYPE concept PUBLIC "-//IBM//DTD DITA Concept//EN" "../dtd/concept.dtd">
-<concept xml:lang="en-us" id="cadminnsdatasources">
+<concept id="cadminnsdatasources" xml:lang="en-us">
 <title>Accessing the Network Server by using a DataSource</title>
-<prolog>
-</prolog>
+<prolog></prolog>
 <conbody>
-<p>The DB2 Universal Driver DataSources <codeph>com.ibm.db2.jcc.DB2SimpleDataSource</codeph> and <codeph>com.ibm.db2.jcc.DB2ConnectionPoolDataSource</codeph> are supported
-with Network Server. See the DB2 Universal Driver Documentation for details.</p>
-</conbody></concept>
+<p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
+Client driver DataSources <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph
+> are supported with Network Server.</p>
+</conbody>
+</concept>
+<?Pub *0000001272?>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov11108.dita Fri May  6 15:46:20 2005
@@ -20,9 +20,5 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This chapter contains the following sections:</p>
-<ul>
-<li><xref href="cadminov17524.dita#cadminov17524"/></li>
-<li><xref href="cadminov38650.dita#cadminov38650"/></li>
-</ul>
+<p>This section discusses the use of <ph conref="adminconrefs.dita#prod/productshortname"></ph> in a server environment.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov38650.dita Fri May  6 15:46:20 2005
@@ -24,6 +24,4 @@
 and tuning. Before reading this guide, you should first learn the basic <ph conref="adminconrefs.dita#prod/productshortname"></ph> product
 by reading the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>. Also, because multi-user environments typically
 have performance and tuning issues, you should read <cite><ph conref="adminconrefs.dita#pub/cittuning"></ph></cite>. </p>
-<p>For additional information about the IBM DB2 JDBC Universal Driver, refer
-to the DB2 UDB documentation.</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminov825266.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 within a single system or over a network. The Network Server receives and
 replies to queries from clients using standard Distributed Relational Database
 Architecture (DRDA) protocol. Databases are accessed through the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server using the IBM JDBC driver, the DB2 JDBC Universal Driver.</p>
+Server using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Client driver.</p>
 <p>The Network Server is a solution for multiple JVMs connecting to the database,
 unlike the embedded scenario where one JVM is all that runs as part of the
 system. When <ph conref="adminconrefs.dita#prod/productshortname"></ph> is embedded in a single-JVM application, the embedded
@@ -40,8 +40,7 @@
 </ul></p>
 <p>On the client side:
 <ul>
-<li><filepath>db2jcc.jar</filepath></li>
-<li><filepath>db2jcc_license_c.jar</filepath></li>
+<li><filepath>derbyclient.jar</filepath></li>
 </ul></p>
 <p>There are several ways to manage the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server:</p>
 <ul>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Fri May  6 15:46:20 2005
@@ -29,7 +29,7 @@
 program that interacts with the <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server from another JVM.
 The program performs the following tasks.
 <ul>
-<li>Loads the DB2 Universal JDBC Driver</li>
+<li>Loads the Network Client driver</li>
 <li>Obtains a client connection using the DriverManager</li>
 <li>Obtains a client connection using a DataSource</li>
 <li>Tests the database connections by executing a sample query</li>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminovnsdemo.dita Fri May  6 15:46:20 2005
@@ -24,7 +24,7 @@
 <ul>
 <li>Starts the Network Server. </li>
 <li>Checks that the Network Server is running.</li>
-<li>Loads the DB2 JDBC Universal driver. </li>
+<li>Loads the Network Client driver. </li>
 <li>Creates the <i>NsSampledb</i> database if not already
 created. </li>
 <li>Checks to see if the schema is already created, and if not, creates the

Modified: incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminpartone.dita Fri May  6 15:46:20 2005
@@ -20,13 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide is divided into the following sections:
-<ul>
-<li><xref href="cadminov11108.dita#cadminov11108"/></li>
-<li><xref href="cadminapps59125.dita#cadminapps59125"/></li>
-<li><xref href="cadminconfig86869.dita#cadminconfig86869"/></li>
-<li><xref href="cadminservlet98430.dita#cadminservlet98430"/></li>
-<li><xref href="cadminadvtops.dita#cadminadvtops"/></li>
-<li><xref href="radminsampleprograms.dita#radminsampleprograms"/></li>
-</ul></p>
+<p>This part of the guide is divided into sections discussing the Network Server.
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminparttwo.dita Fri May  6 15:46:20 2005
@@ -20,12 +20,6 @@
 <prolog>
 </prolog>
 <conbody>
-<p>This part of the guide is divided into the following sections:
-<ul>
-<li><xref href="cadminconsist01.dita#cadminconsist01"/></li>
-<li><xref href="cadminhubbkup98797.dita#cadminhubbkup98797"/></li>
-<li><xref href="cadminlog98.dita#cadminlog98"/></li>
-<li><xref href="cadminlockvti42553.dita#cadminlockvti42553"/></li>
-<li><xref href="cadminspace21579.dita#cadminspace21579"/></li>
-</ul></p>
+<p>This part of the guide is divided into several administrative tasks.
+</p>
 </conbody></concept>

Modified: incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/cadminspace21579.dita Fri May  6 15:46:20 2005
@@ -30,6 +30,6 @@
 automatically return the page to the operating system until the table or index
 is dropped, even if the space is no longer needed. However, <ph conref="adminconrefs.dita#prod/productshortname"></ph> does
 provide a way to reclaim unused space in tables and associated indexes.</p>
-</conbody><?Pub Caret1?>
+</conbody>
 </concept>
 <?Pub *0000001084?>

Modified: incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE map PUBLIC "-//IBM//DTD DITA Map//EN"
  "../dtd/map.dtd">
 <!-- 
@@ -83,10 +82,18 @@
 </topicref>
 </topicref>
 </topicref>
+<topicref href="cadminappsclient.dita" navtitle="Accessing the Network Server by using the Network Client driver">
+<topicref href="cadminappsclientsecurity.dita" navtitle="Network Client security">
+</topicref>
+<topicref href="cadminappsclienttracing.dita" navtitle="Network Client tracing">
+</topicref>
+<topicref href="radminappsclientxmp.dita" navtitle="Network Client driver examples">
+</topicref>
 <topicref href="cadminapps810777.dita" navtitle="Accessing the Network Server by using the DB2 Universal Driver">
 <topicref href="radminapps810699.dita" navtitle="DB2 Universal Driver examples"
 toc="no"></topicref>
 </topicref>
+</topicref>
 <topicref href="cadminnsdatasources.dita" navtitle="Accessing the Network Server by using a DataSource">
 <topicref href="radminnsdatasourcexmp.dita" navtitle="DataSource access example"
 toc="no"></topicref>
@@ -245,7 +252,6 @@
 <topicref href="tadminspace43.dita" navtitle="Reclaiming unused space"></topicref>
 </topicref>
 </topicref>
-<topicref href="radmintrademderby.dita" navtitle="Trademarks">
-</topicref>
+<topicref href="radmintrademderby.dita" navtitle="Trademarks"></topicref>
 </map>
-<?Pub *0000012936?>
+<?Pub *0000013347?>

Modified: incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminapps810699.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -19,24 +18,24 @@
 -->
 <reference id="radminapps810699" xml:lang="en-us">
 <title>DB2 Universal Driver examples</title>
-<refbody><?Pub Caret1?>
-<section><title>Example 1</title> <p>The following example connects to the
+<refbody>
+<section><title>Example 1</title><p>The following example connects to the
 default server name <i>localhost</i> on the default port, <i>1527</i>, and
 to the database <i>sample</i>. It specifies the URL attributes <i>user, password,</i> and <i>retrieveMessagesFromServerOnGetMessage</i>.
-You must set the Universal Driver Attributes user name and password.</p> <codeblock>jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see;
+You must set the Universal Driver Attributes user name and password.</p><codeblock>jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see;
 retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
-<section><title>Example 2</title> <p>The following example specifies both <ph
+<section><title>Example 2</title><p>The following example specifies both <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> and Universal Driver
 Attributes:  <codeblock>jdbc:derby:net://localhost:1527/sample;create=true:user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></p></section>
-<section><title>Example 3</title> <p>This example connects to the default
-server name <i>localhost</i> on the default port, <i>1527</i>, and includes
-the path in the database name portion of the URL. The database name must be
-delimited by double quotes and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph> attributes
-on the URL.</p> <codeblock>jdbc:derby:net://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
+<section><title>Example 3</title><p>This example connects to the default server
+name <i>localhost</i> on the default port, <i>1527</i>, and includes the path
+in the database name portion of the URL. The database name must be delimited
+by double quotes and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph> attributes
+on the URL.</p><codeblock>jdbc:derby:net://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
-<section><title>Example 4</title> <p>The following is a sample program fragment
-that connects to the Network Server using the Universal Driver:</p> <codeblock>String databaseURL = "jdbc:derby:net://localhost:1527/sample";
+<section><title>Example 4</title><p>The following is a sample program fragment
+that connects to the Network Server using the Universal Driver:</p><codeblock>String databaseURL = "jdbc:derby:net://localhost:1527/sample";
 <b>// Load IBM JDBC Universal Driver class</b>
 Class.forName("com.ibm.db2.jcc.DB2Driver");
 <b>// Set user and password properties</b>
@@ -48,4 +47,4 @@
 Connection conn = DriverManager.getConnection(databaseURL, properties); </codeblock></section>
 </refbody>
 </reference>
-<?Pub *0000002982?>
+<?Pub *0000002974?>

Modified: incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminapps811974.dita Fri May  6 15:46:20 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,11 +16,8 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="radminapps811974" xml:lang="en-us">
-<title>Error messages</title>
+<title>Network Server error messages</title>
 <prolog><metadata>
 <keywords><indexterm>Network Server<indexterm>error messages and</indexterm></indexterm>
 <indexterm>Error messages<indexterm>and the Network Server</indexterm></indexterm>
@@ -37,14 +36,8 @@
 <section><p>Using the <ph conref="adminconrefs.dita#prod/productshortname"></ph> embedded
 driver, you would see the following two SQL exceptions: : <codeblock>ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI'. 
 </codeblock> <codeblock>ERROR 22003: The resulting value is outside the range for the data type INTEGER.</codeblock></p></section>
-<section><p>This is because the Universal Driver reports only one SQLException
+<section><p>This is because the Network Client driver reports only one SQLException
 or one <i>SQLWarning </i>per statement.</p></section>
-<section><p>By default, the Universal Driver will not return message text.
-Use the <codeph>retrieveMessagesFromServerOnGetMessage</codeph> attribute
-to see message text. For example, if <codeph>retrieveMessagesFromServerOnGetMessage=false</codeph>: <codeblock>ij&gt; select * from akdfj;
-ERROR 42X05: DB2 SQL error: SQLCODE: -1, SQLSTATE: 42X05, SQLERRMC: AKDFJ 42X05</codeblock>If <codeph>retrieveMessagesFromServerOnGetMessage=true</codeph
->: <codeblock>ij&gt; select * from akdfj;
-ERROR 42X05: Table 'AKDFJ' does not exist.</codeblock></p></section>
 </refbody>
 </reference>
-<?Pub *0000002284?>
+<?Pub *0000002392?>

Added: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=168976&view=auto
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (added)
+++ incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Fri May  6 15:46:20 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed under the Apache License, Version 2.0 (the "License");  
+you may not use this file except in compliance with the License.  
+You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<reference id="radminappsclientxmp" xml:lang="en-us">
+<title>Network Client driver examples</title>
+<refbody>
+<section><title>Example 1</title><p>The following example connects to the
+default server name <i>localhost</i> on the default port, <i>1527</i>, and
+to the database <i>sample</i>. It specifies the <i>user</i> and <i>password</i> URL
+attributes. You must set these attributes before attempting to connect to
+the server.</p><codeblock>jdbc:derby://localhost:1527/sample:user=judy;password=no12see;</codeblock></section>
+<section><title>Example 2</title><p>The following example specifies both <ph
+conref="adminconrefs.dita#prod/productshortname"></ph> and Network Client
+driver attributes:  <codeblock>jdbc:derby://localhost:1527/sample;create=true:user=judy;
+password=no12see;</codeblock></p></section>
+<section><title>Example 3</title><p>This example connects to the default server
+name <i>localhost</i> on the default port, <i>1527</i>, and includes the path
+in the database name portion of the URL. The database name must be delimited
+by double quotes and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph> attributes
+on the URL.</p><codeblock>jdbc:derby://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
+password=no12see;</codeblock></section>
+<section><title>Example 4</title><p>The following is a sample program fragment
+that connects to the Network Server using the Network Client driver:</p><codeblock>String databaseURL = "jdbc:derby://localhost:1527/sample";
+<b>// Load Derby Network Client driver class</b>
+Class.forName("org.apache.derby.jdbc.ClientDriver");
+<b>// Set user and password properties</b>
+Properties properties = new Properties();
+properties.put("user", "APP");
+properties.put("password", "APP");
+<b>// Get a connection</b>
+Connection conn = DriverManager.getConnection(databaseURL, properties); </codeblock></section>
+</refbody>
+</reference>
+<?Pub *0000002748?>

Propchange: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -33,19 +32,19 @@
 	(InetAddress.getByName("localhost"),1527);
 server.start(null);</codeblock></example>
 <section><p>The program that starts Network Server can access the database
-with either the embedded driver or the IBM JDBC Universal Driver. The server
-framework's attempt to boot the local JDBC driver is ignored because it has
-already been booted within the application's JVM. The server framework simply
-accesses the instance of <ph conref="adminconrefs.dita#prod/productshortname"></ph> already
+with either the embedded driver or the Network Client driver.
+The server framework's attempt to boot the local JDBC driver is ignored because
+it has already been booted within the application's JVM. The server framework
+simply accesses the instance of <ph conref="adminconrefs.dita#prod/productshortname"></ph> already
 booted. There is no conflict between the application and the server framework.</p></section>
-<section><p>The remote client can then connect via the client driver: </p></section>
-<section><p> <codeblock>String nsURL="jdbc:derby:net://localhost:1527/
-sample:retrieveMessagesFromServerOnGetMessage=true;";  
+<section><p>The remote client can then connect via the <ph conref="adminconrefs.dita#prod/productshortname"></ph> client
+driver: </p></section>
+<section><p> <codeblock>String nsURL="jdbc:derby://localhost:1527/sample";  
 java.util.Properties props = new java.util.Properties();
 props.put("user","usr");
 props.put("password","pwd");
 
-Class.forName("com.ibm.db2.jcc.DB2Driver").newInstance();
+Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance();
 Connection conn = DriverManager.getConnection(nsURL, props);
 
 /*interact with <ph conref="adminconrefs.dita#prod/productshortname"></ph>*/
@@ -55,4 +54,4 @@
 "SELECT * FROM HotelBookings");</codeblock></p></section>
 </refbody>
 </reference>
-<?Pub *0000002853?>
+<?Pub *0000002867?>

Modified: incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Fri May  6 15:46:20 2005
@@ -20,12 +20,12 @@
 <prolog>
 </prolog>
 <refbody>
-<section><p>The following example uses <codeph>com.ibm.db2.jcc.DB2SimpleDataSource</codeph> to
+<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
 {
-com.ibm.db2.jcc.DB2SimpleDataSource ds = new com.ibm.db2.jcc.DB2SimpleDataSource();
+org.apache.derby.jdbc.ClientDataSource ds = new org.apache.derby.jdbc.ClientDataSource();
 
 // DatabaseName can include <ph conref="adminconrefs.dita#prod/productshortname"></ph> URL Attributes
 ds.setDatabaseName(database);
@@ -40,9 +40,6 @@
 
 // port on which Network Server is listening
 ds.setPortNumber(1527);
-
-// Driver type must be 4 to access Network Server
-ds.setDriverType(4);
 
 return ds;
 }

Modified: incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/radminsampleprograms.dita Fri May  6 15:46:20 2005
@@ -24,10 +24,6 @@
 </metadata>
 </prolog>
 <refbody>
-<section><p>This section describes the following <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server sample
-programs for Network Server users: </p></section><section>
-<ul>
-<li><xref href="radminovnssample.dita#radminovnssample"/></li>
-<li><xref href="cadminovntsrvsample.dita#cadminovntsrvsample"/></li>
-</ul></section>
+<section><p>This section describes several <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network Server sample
+programs for Network Server users.</p></section>
 </refbody></reference>

Modified: incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita?rev=168976&r1=168975&r2=168976&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita (original)
+++ incubator/derby/docs/trunk/src/adminguide/tadminapps811302.dita Fri May  6 15:46:20 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
  "../dtd/task.dtd">
 <?Pub Inc?>
@@ -19,16 +18,15 @@
 limitations under the License.
 -->
 <task id="tadminapps811302" xml:lang="en-us">
-<title>Using the Derby ij
-tool with the Network Server</title>
+<title>Using the Derby ij tool with the Network Server</title>
 <prolog><metadata>
 <keywords><indexterm>ij<indexterm>using with Network Server</indexterm></indexterm>
 <indexterm>Network Server<indexterm>ij and</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context> To use ij with the Universal Driver, do the following:</context>
+<context> To use ij with the Network Client driver:</context>
 <steps>
-<step><cmd>Specify the driver</cmd><stepxmp><codeph>com.ibm.db2.jcc.DB2Driver</codeph>.
+<step><cmd>Specify the driver</cmd><stepxmp><codeph>org.apache.derby.jdbc.ClientDriver</codeph>.
 You can do this in any of the following ways:</stepxmp>
 <substeps>
 <substep><cmd>Use a Script</cmd><stepxmp><ul>
@@ -37,18 +35,17 @@
 <li>Script: ij.bat (Windows)</li>
 <li>Script: ij.ksh (Unix)</li>
 </ul></stepxmp></substep>
-<substep><cmd>Run ij from the command line</cmd><stepxmp><codeblock>java -Dij.driver='com.ibm.db2.jcc.DB2Driver' org.apache.derby.tools.ij </codeblock
+<substep><cmd>Run ij from the command line</cmd><stepxmp><codeblock>java -Dij.driver='org.apache.derby.jdbc.ClientDriver' org.apache.derby.tools.ij </codeblock
 ></stepxmp></substep>
-<substep><cmd>Use the DRIVER command</cmd><stepxmp><codeblock>ij&gt; DRIVER 'com.ibm.db2.jcc.DB2Driver'; </codeblock></stepxmp>
+<substep><cmd>Use the DRIVER command</cmd><stepxmp><codeblock>ij&gt; DRIVER 'org.apache.derby.jdbc.ClientDriver'; </codeblock></stepxmp>
 </substep>
 </substeps>
 </step>
-<step><cmd>Connect by specifying the URL:</cmd><info><note type="remember">The
-Universal Driver requires a user name and password. </note></info><stepxmp><codeblock>ij&gt; CONNECT 'jdbc:derby:net://localhost:1527/sample'
-	USER 'judy' PASSWORD 'no12see';</codeblock><?Pub Caret1?></stepxmp></step>
+<step><cmd>Connect by specifying the URL:</cmd><stepxmp><codeblock>ij&gt; CONNECT 'jdbc:derby://localhost:1527/sample'
+	USER 'judy' PASSWORD 'no12see';</codeblock></stepxmp></step>
 </steps>
-<postreq>See <xref href="cadminapps810777.dita#cadminapps810777"></xref> for
+<postreq>See <xref href="radminappsclientxmp.dita#radminappsclientxmp"></xref> for
 additional URL examples.</postreq>
 </taskbody>
 </task>
-<?Pub *0000002466?>
+<?Pub *0000002330?>



Mime
View raw message