You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/04/25 21:30:47 UTC
svn commit: r164631 [1/3] - in
/incubator/derby/code/branches/10.0/java/demo: ./ nserverdemo/ simple/
Author: fuzzylogic
Date: Mon Apr 25 12:30:44 2005
New Revision: 164631
URL: http://svn.apache.org/viewcvs?rev=164631&view=rev
Log:
Derby-233: Merge revisions 164629 and 164630 to 10.0 branch
-This line, and those below, will be ignored--
MM java/demo/csfull.css
MM java/demo/readme.html
MM java/demo/demo.html
MM java/demo/simple/derby.properties
MM java/demo/simple/SimpleApp.java
MM java/demo/simple/example.html
MM java/demo/nserverdemo/readme.html
MM java/demo/nserverdemo/NsSample.java
MM java/demo/nserverdemo/SimpleNetworkClientSample.java
MM java/demo/nserverdemo/simpleserversample.html
MM java/demo/nserverdemo/NsSampleClientThread.java
MM java/demo/nserverdemo/nserverdemo.html
MM java/demo/nserverdemo/SimpleNetworkServerSample.java
MM java/demo/nserverdemo/NetworkServerUtil.java
MM java/demo/navbar.html
MM java/demo/build.xml
Modified:
incubator/derby/code/branches/10.0/java/demo/build.xml (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/csfull.css (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/demo.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/navbar.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSampleClientThread.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkClientSample.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/SimpleNetworkServerSample.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/nserverdemo.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/readme.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/nserverdemo/simpleserversample.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/readme.html (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/simple/SimpleApp.java (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/simple/derby.properties (contents, props changed)
incubator/derby/code/branches/10.0/java/demo/simple/example.html (contents, props changed)
Modified: incubator/derby/code/branches/10.0/java/demo/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/build.xml?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/build.xml (original)
+++ incubator/derby/code/branches/10.0/java/demo/build.xml Mon Apr 25 12:30:44 2005
@@ -1,76 +1,76 @@
-<?xml version="1.0"?>
-
-<project default="demo" basedir="../..">
-
-<!-- Set Properties -->
- <!-- User settings -->
- <property file="${user.home}/ant.properties"/>
- <!-- Set property lib dir -->
- <property name="properties.dir" value="${ant.home}/properties"/>
- <!-- Significant dirs -->
- <property file="${properties.dir}/dirs.properties"/>
- <!-- Compiler settings -->
- <property file="${properties.dir}/${build.compiler}.properties"/>
- <!-- Compile-time classpath properties files -->
- <property file="${properties.dir}/extrapath.properties"/>
- <property file="${properties.dir}/compilepath.properties"/>
-
-<!-- Targets -->
- <target name="demo" depends="compile"/>
-
- <target name="compile">
- <javac
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="nserverdemo"
- destdir="${out.dir}"
- includes="Simple*">
- <classpath>
- <pathelement path="${java14compile.classpath}"/>
- <pathelement location="${jcc}"/>
- </classpath>
- </javac>
- <javac
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="."
- destdir="${out.dir}"
- includes="nserverdemo/**"
- excludes="nserverdemo/Simple*">
- <classpath>
- <pathelement path="${java14compile.classpath}"/>
- <pathelement location="${jcc}"/>
- </classpath>
- </javac>
- <javac
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.demo.src.dir}/simple"
- destdir="${out.dir}">
- <classpath>
- <pathelement location="${javasrc.dir};${jcc};${jta1_2}"/>
- <pathelement path="${java13compile.classpath};${jcc};${jta1_2}"/>
- </classpath>
- </javac>
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+
+<project default="demo" basedir="../..">
+
+<!-- Set Properties -->
+ <!-- User settings -->
+ <property file="${user.home}/ant.properties"/>
+ <!-- Set property lib dir -->
+ <property name="properties.dir" value="${ant.home}/properties"/>
+ <!-- Significant dirs -->
+ <property file="${properties.dir}/dirs.properties"/>
+ <!-- Compiler settings -->
+ <property file="${properties.dir}/${build.compiler}.properties"/>
+ <!-- Compile-time classpath properties files -->
+ <property file="${properties.dir}/extrapath.properties"/>
+ <property file="${properties.dir}/compilepath.properties"/>
+
+<!-- Targets -->
+ <target name="demo" depends="compile"/>
+
+ <target name="compile">
+ <javac
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="${debug}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="nserverdemo"
+ destdir="${out.dir}"
+ includes="Simple*">
+ <classpath>
+ <pathelement path="${java14compile.classpath}"/>
+ <pathelement location="${jcc}"/>
+ </classpath>
+ </javac>
+ <javac
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="${debug}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="."
+ destdir="${out.dir}"
+ includes="nserverdemo/**"
+ excludes="nserverdemo/Simple*">
+ <classpath>
+ <pathelement path="${java14compile.classpath}"/>
+ <pathelement location="${jcc}"/>
+ </classpath>
+ </javac>
+ <javac
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="${debug}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="${derby.demo.src.dir}/simple"
+ destdir="${out.dir}">
+ <classpath>
+ <pathelement location="${javasrc.dir};${jcc};${jta1_2}"/>
+ <pathelement path="${java13compile.classpath};${jcc};${jta1_2}"/>
+ </classpath>
+ </javac>
+ </target>
+
+</project>
+
Propchange: incubator/derby/code/branches/10.0/java/demo/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/derby/code/branches/10.0/java/demo/csfull.css
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/csfull.css?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/csfull.css (original)
+++ incubator/derby/code/branches/10.0/java/demo/csfull.css Mon Apr 25 12:30:44 2005
@@ -1,751 +1,751 @@
-BODY {
- font-size : 12pt;
- font-family : "Times New Roman";
- background-color : White;
-}
-
-A:LINK {
- color : #3300FF;
- background-color : transparent;
-}
-
-A:HOVER {
- color : Fuchsia;
- text-decoration : underline;
- background-color : transparent;
-}
-
-
-A:VISITED {
- color : #330099;
- background-color : transparent;
-}
-
-A:ACTIVE {
- color : Purple;
- text-decoration : none;
- background-color : transparent;
-}
-
-A.TOC:LINK {
- color : #3300FF;
- text-decoration : none;
- background-color : transparent;
-}
-
-A.TOC:HOVER {
- color : Fuchsia;
- font-weight : bold;
- background-color : transparent;
-}
-
-
-A.TOC:VISITED {
- color : #330099;
- text-decoration : none;
- background-color : transparent;
-}
-
-A.TOC:ACTIVE {
- color : Purple;
- text-decoration : none;
- background-color : transparent;
-}
-
-.BadFormatting{
- background-color : transparent;
- font-size : 24pt;
- color : Red;
-}
-
-.CommandLine{
- background-color : transparent;
- color : Black;
- font-weight : bold;
- font-family : monospace;
- font-size : 9pt;
-}
-
-
-.Output {
- color : Gray;
- background-color : transparent;
- font-family : monospace;
- font-size : 10pt;
-}
-
-.OutputVeryWide {
- color : Gray;
- background-color : transparent;
- font-size :8pt;
-}
-
-.SmallFile {
- background-color : #B0C4DE;
-}
-
-.Thin{
- font-size : 2pt;
- margin-top: 3px;
- margin-bottom :3px;
-}
-
-ADDRESS {
- font-size : 10pt;
-}
-
-ADDRESS.Footer {
- font-size : 10pt;
- font-style : normal;
-}
-
-
-
-Caption.TableTitle {
- background-color : transparent;
- font-style : normal;
- text-align : center;
- font-weight : bold;
-}
-
-DL.Index {
- font-size : 9pt;
-}
-
-DL.Glossary {
- font-size : 10pt;
- margin-left : 0;
- background-color : transparent;
-}
-
-DT.GlossaryTerm {
- background-color : transparent;
- font-style : normal;
- font-weight : bold;
- margin-top : 22px;
-}
-
-DD.GlossaryDefinition {
- background-color : transparent;
-}
-
-H1 {
- color : #004080;
- background-color : transparent;
- margin-top : 0px;
- font-size : 24pt;
-}
-H1.ExtraSpace {
- color : #004080;
- background-color : transparent;
- margin-top : 48px;
- font-size : 20pt;
-}
-
-H1.BookTitle {
- color : White;
- background-color : #D3D3D3;
- margin-top : 0px;
- padding-bottom : 28px;
- padding-left : 8px;
- padding-right : 8px;
- padding-top : 28px;
- font-size : 28pt;
- margin-bottom : 34px;
- border : 2px solid Silver;
-}
-
-H1.Title {
- color : Black;
- background-color : transparent;
- margin-top : 0px;
- margin-bottom : 28px;
-}
-
-H1.PartTitle {
- color : Black;
- background-color : #D3D3D3;
- margin-top : 0px;
- padding-bottom : 8px;
- padding-left : 8px;
- padding-right : 8px;
- padding-top : 8px;
- font-size : 28pt;
- border : 2px solid Silver;
-}
-
-H2 {
- color : #0000ff;
- background-color : transparent;
- margin-top : 40px;
- font-size : 18pt;
-}
-
-H2.ManPage{
- color : #0000ff;
- background-color : transparent;
- margin-top : 0px;
-}
-
-H3 {
- color : #0000A0;
- background-color : transparent;
- margin-top : 40px;
- font-size : 14pt;
-}
-
-H3.BoxHead {
- margin-top : 1px;
- margin-bottom : 6px;
- color : Black;
- background-color : transparent;
-}
-
-H3.GroupTitlesIX {
- margin-top : 12px;
- color : Black;
- margin-bottom : 2px;
- background-color : transparent;
-}
-H3.GroupTitlesIXGlobal {
- margin-top : 0px;
- color : Black;
- margin-bottom : 2px;
- background-color : transparent;
-}
-
-H3.ManPageSubHead {
- background-color : transparent;
- color : #33532F;
- margin-top : 32px;
-}
-
-H3.Heading4 {
- color : #33532F;
- background-color : transparent;
- margin-top : 32px;
-}
-
-H3.TaskHead{
- color : #0000A0;
- background-color : White;
- padding-bottom : 4px;
- padding-left : 10px;
- padding-right : 10px;
- padding-top : 10px;
- margin-bottom : 10px;
- margin-left : 0px;
- margin-right : 10px;
- margin-top : 20px;
- font-weight : bold;
- font-size : 16pt;
-}
-
-H3.TOC {
- background-color : transparent;
- font-size : 14pt;
- margin-bottom : 1px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 14px;
- font-weight : bold;
- padding-bottom : 6px;
- padding-left : 6px;
- padding-right : 6px;
- padding-top : 6px;
-}
-
-H3.TOCPartTitle {
- background-color : #D3D3D3;
- margin-bottom : 12px;
- font-weight : bold;
- color : Black;
- padding-bottom : 8px;
- padding-left : 12px;
- padding-right : 12px;
- padding-top : 12px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 24px;
- width : 4in;
- font-size : 18pt;
- border : 1px solid White;
-}
-
-H4.SyntaxSubHead {
- background-color : White;
-}
-
-H5 {
- color : #8000FF;
- background-color : transparent;
-}
-
-H5.SyntaxSubhead {
- color : #538055;
- background-color : transparent;
- margin-left : 2em;
-}
-
-
-
-LI{
- margin-top : 12px;
-}
-
-LI .CellBodyBulleted{
- margin-top : 1px;
-}
-
-LI .SubList{
- margin-top : 4px;
- list-style-type : square;
- background-color : transparent;
-}
-
-LI.BulletEmphasis {
- font-style : normal;
- margin-top : 12px;
- background-color : transparent;
-}
-
-OL {
- background-color : transparent;
-}
-
-P {
- text-align : left;
- font-style : normal;
- background-color : transparent;
-}
-
-P.BodyRelative {
- margin-top : 6px;
- margin-bottom : 6px;
- background-color : transparent;
-}
-
-P.BugNumber {
- margin-top : -10px;
- margin-bottom :-10px;
- background-color : transparent;
- color : Black;
- font-size : 9pt;
-}
-
-
-P.CellBody {
- font-size : 10pt;
- margin-top : 3px;
- margin-bottom : 3px;
-}
-
-P.CellBodySmall {
- font-size : 9pt;
- margin-top : 3px;
- margin-bottom : 3px;
-}
-
-P.CellBodyCommandLine {
- font-size :9pt;
- font-family : monospace;
-}
-
-P.CellBodyJava {
- font-size : 9pt;
- font-family : monospace;
-}
-
-P.CellBodySQLExample {
- font-size : 9pt;
- margin-top : 2px;
- color : #000066;
- font-family : monospace;
- background-color : transparent;
-}
-
-P.CellBodySQLSyntax {
- color : #538055;
- font-family : monospace;
- font-size : 9pt;
- margin-top : 2px;
- background-color : transparent;
-}
-
-P.CellBodyIndented {
- font-size : 10pt;
- margin-left : 1em;
- margin-top : 3px;
- margin-bottom : 3px;
-}
-
-P.CellHeading {
- font-size : 10pt;
- font-weight : bold;
- text-align : center;
-}
-
-P.CopyrightInfo {
- font-size : 9pt;
- margin-top : 6px;
- margin-left : 12px;
- margin-right: 12px;
- margin-bottom : 0px;
- padding-bottom : 1px;
- padding-left : 1px;
- padding-right : 1px;
- padding-top : 1px;
- background-color : transparent;
-}
-
-P.FigureCaption {
- background-color : transparent;
- font-style : italic;
-}
-
-P.IJ {
- background-color : White;
- color : #7a7d7d;
-}
-P.IndexKey {
- background-color : #D3D3D3;
- font-size : 10pt;
- padding-bottom : 6px;
- padding-left : 6px;
- padding-right : 6px;
- padding-top : 6px;
- text-align : center;
- width : 350px;
- font-weight : bold;
- border : 2px solid #D3D3D3;
-}
-
-P.Java {
- color : #004080;
- background-color : Purple;
- font-size : 30pt;
- font-family : monospace;
-}
-
-P.JavaRelative{
- color : #004080;
- margin-top : 2px;
- margin-bottom : 2px;
- background-color : transparent;
- font-size : 10pt;
- font-family : monospace;
-}
-
-P.Indented {
- margin : 1em;
-}
-
-P.NavBar {
- font-size : 9pt;
- margin-top:6px;
- margin-bottom :6px;
- padding-top : 2px;
- padding-right : 2px;
- padding-left : 2px;
- padding-bottom : 2px;
- background-color : transparent;
-}
-
-P.NavBar1 {
- font-size : 9pt;
- margin-top: 1px;
- margin-bottom : 8px;
- padding-top : 2px;
- padding-right : 2px;
- padding-left : 2px;
- padding-bottom : 2px;
-}
-
-P.NavBar2 {
- font-size :9pt;
- margin-top : 8px;
- margin-bottom : 8px;
- margin-left : 2em;
- padding-top : 2px;
- padding-right : 2px;
- padding-left : 2px;
- padding-bottom : 2px;
-}
-
-P.NavBar3 {
- font-size : 9pt;
- margin-top : 8px;
- margin-bottom : 1px;
- margin-left : 4em;
- padding-top : 2px;
- padding-right : 2px;
- padding-left : 2px;
- padding-bottom : 2px;
-}
-P.NavBarIndentHang {
- font-size : 9pt;
- margin-top:6px;
- margin-bottom :6px;
- padding-top : 2px;
- padding-right : 2px;
- padding-left : 2px;
- padding-bottom : 2px;
- background-color : transparent;
- text-indent : -2em;
- margin-left : 2em;
-}
-
-
-P.NavBarVersion {
- font-size : 9pt;
- margin-top: 3px;
- margin-bottom :3px;
-}
-
-P.PageCounter {
- font-size : 9pt;
- text-align : right;
- background-color : #D3D3D3;
- border : 2px;
- padding-bottom : 4px;
- padding-left : 4px;
- padding-right : 4px;
- padding-top : 4px;
-}
-
-P.PartNum {
- background-color : Silver;
- padding-bottom : 8px;
- padding-left : 8px;
- padding-right : 8px;
- padding-top : 8px;
- color : White;
- font-weight : bold;
- font-size : 18pt;
- margin-bottom : 0px;
-}
-
-P.OutputRelative {
- margin-top :3px;
- font-family : monospace;
- color : Gray;
- font-size : 10pt;
- margin-bottom : 2px;
- background-color : transparent;
-}
-
-P.Special {
- background-color : #FFFAFA;
- padding : 6px 6px 6px 6px;
- border : 4px solid White;
- color : Maroon;
-}
-
-P.SQLSyntax {
- color : #538055;
- margin-left : 2em;
- background-color : White;
- font-family : monospace;
- font-size : 10pt;
-}
-
-P.SQLExample {
- color : #000066;
- margin-left : 2em;
- background-color : transparent;
- font-family : monospace;
- font-size : 10pt;
-}
-
-P.TOC1 {
- margin-top : 4px;
- margin-bottom : 4px;
- margin-left : 3em;
- font-weight : bold;
- background-color : transparent;
-}
-
-P.TOC2 {
- margin-left : 5em;
- margin-top : 4px;
- margin-bottom : 4px;
-}
-
-P.TOCTaskHead {
- margin-left : 5em;
- margin-top : 6px;
- margin-bottom : 6px;
- background-color : White;
-}
-
-P.TOC3 {
- margin-top : 4px;
- margin-bottom : 4px;
- margin-left : 7em;
-}
-
-P.TOC4 {
- margin-top : 4px;
- margin-bottom : 4px;
- margin-left : 9em;
-}
-
-P.TutorialQuiz {
- font-style : normal;
- background-color : transparent;
- margin-bottom : 0px;
- margin-top : 0px;
-}
-
-PRE {
- font-size : 10pt;
- background-color : White;
- font-family : monospace;
-
-}
-
-PRE.Java {
- color : #004080;
- background-color : transparent;
- font-family : monospace;
-}
-
-PRE.JavaSmall{
- color : #004080;
- background-color : transparent;
- margin-left : 2em;
- font-family : monospace;
-}
-
-PRE.ECIJ {
- color : #7a7d7d;
- font-size : 9pt;
- background-color : transparent;
- font-family : monospace;
-
-}
-
-TABLE.Sample {
- background-color : #FAF0E6;
-}
-
-TD.BoxTable {
- background-color : Silver;
- padding : 10px;
-}
-
-UL {
- background-color : transparent;
-}
-UL.Normal {
- background-color : transparent;
-}
-
-
-UL.CellBodyBulleted {
- font-size : 10pt;
- margin-top : 3px;
- margin-bottom : 3px;
- background-color : transparent;
-}
-
-UL.ChapterTOC {
- background-color : Silver;
- border : medium Black;
- padding-bottom : 10px;
- padding-left : 10px;
- padding-right : 10px;
- padding-top : 10px;
- margin-bottom : 10px;
- margin-left : 10px;
- margin-right : 10px;
- margin-top : 10px;
- list-style-type : none;
-}
-
-UL.SubList {
- background-color : transparent;
-}
-EM {
- font-style : italic;
-}
-
-EM.Biblio {
- color : Black;
- background-color : transparent;
-}
-
-EM.FileName {
- background-color : transparent;
-}
-
-EM.NoLink {
- color : Gray;
- font-style : normal;
- background-color : transparent;
-}
-
-EM.URL {
- background-color : White;
-}
-
-EM.JavaItem {
- background-color : White;
-}
-
-EM.DatabaseObject {
- background-color : White;
-}
-
-EM.MenuItem {
- font-style : normal;
- font-weight : bold;
-}
-
-EM.Button {
- font-style : normal;
- font-weight : bold;
-}
-
-EM.QuizItem {
- font-style : normal;
-}
-
-EM.UserVariable {
- background-color : transparent;
-}
-
-STRONG.ijUI {
- background-color : transparent;
- color : #004080;
- font-family : monospace;
-}
-
-STRONG.ChapterNum {
- background-color : transparent;
- color : Gray;
-}
-
-STRONG.Comment {
- font-weight : normal;
- color : #A4A9C1;
- background-color : transparent;
-}
-
-STRONG.GlossaryTerm{
- font-weight : bold;
- color : Black;
- background-color : transparent;
-}
-
-STRONG.Special {
- font-weight : bold;
- font-style : normal;
-}
-
-STRONG.PartNum {
- color : #3300FF;
- font-size : small;
- background-color : transparent;
-}
-
+BODY {
+ font-size : 12pt;
+ font-family : "Times New Roman";
+ background-color : White;
+}
+
+A:LINK {
+ color : #3300FF;
+ background-color : transparent;
+}
+
+A:HOVER {
+ color : Fuchsia;
+ text-decoration : underline;
+ background-color : transparent;
+}
+
+
+A:VISITED {
+ color : #330099;
+ background-color : transparent;
+}
+
+A:ACTIVE {
+ color : Purple;
+ text-decoration : none;
+ background-color : transparent;
+}
+
+A.TOC:LINK {
+ color : #3300FF;
+ text-decoration : none;
+ background-color : transparent;
+}
+
+A.TOC:HOVER {
+ color : Fuchsia;
+ font-weight : bold;
+ background-color : transparent;
+}
+
+
+A.TOC:VISITED {
+ color : #330099;
+ text-decoration : none;
+ background-color : transparent;
+}
+
+A.TOC:ACTIVE {
+ color : Purple;
+ text-decoration : none;
+ background-color : transparent;
+}
+
+.BadFormatting{
+ background-color : transparent;
+ font-size : 24pt;
+ color : Red;
+}
+
+.CommandLine{
+ background-color : transparent;
+ color : Black;
+ font-weight : bold;
+ font-family : monospace;
+ font-size : 9pt;
+}
+
+
+.Output {
+ color : Gray;
+ background-color : transparent;
+ font-family : monospace;
+ font-size : 10pt;
+}
+
+.OutputVeryWide {
+ color : Gray;
+ background-color : transparent;
+ font-size :8pt;
+}
+
+.SmallFile {
+ background-color : #B0C4DE;
+}
+
+.Thin{
+ font-size : 2pt;
+ margin-top: 3px;
+ margin-bottom :3px;
+}
+
+ADDRESS {
+ font-size : 10pt;
+}
+
+ADDRESS.Footer {
+ font-size : 10pt;
+ font-style : normal;
+}
+
+
+
+Caption.TableTitle {
+ background-color : transparent;
+ font-style : normal;
+ text-align : center;
+ font-weight : bold;
+}
+
+DL.Index {
+ font-size : 9pt;
+}
+
+DL.Glossary {
+ font-size : 10pt;
+ margin-left : 0;
+ background-color : transparent;
+}
+
+DT.GlossaryTerm {
+ background-color : transparent;
+ font-style : normal;
+ font-weight : bold;
+ margin-top : 22px;
+}
+
+DD.GlossaryDefinition {
+ background-color : transparent;
+}
+
+H1 {
+ color : #004080;
+ background-color : transparent;
+ margin-top : 0px;
+ font-size : 24pt;
+}
+H1.ExtraSpace {
+ color : #004080;
+ background-color : transparent;
+ margin-top : 48px;
+ font-size : 20pt;
+}
+
+H1.BookTitle {
+ color : White;
+ background-color : #D3D3D3;
+ margin-top : 0px;
+ padding-bottom : 28px;
+ padding-left : 8px;
+ padding-right : 8px;
+ padding-top : 28px;
+ font-size : 28pt;
+ margin-bottom : 34px;
+ border : 2px solid Silver;
+}
+
+H1.Title {
+ color : Black;
+ background-color : transparent;
+ margin-top : 0px;
+ margin-bottom : 28px;
+}
+
+H1.PartTitle {
+ color : Black;
+ background-color : #D3D3D3;
+ margin-top : 0px;
+ padding-bottom : 8px;
+ padding-left : 8px;
+ padding-right : 8px;
+ padding-top : 8px;
+ font-size : 28pt;
+ border : 2px solid Silver;
+}
+
+H2 {
+ color : #0000ff;
+ background-color : transparent;
+ margin-top : 40px;
+ font-size : 18pt;
+}
+
+H2.ManPage{
+ color : #0000ff;
+ background-color : transparent;
+ margin-top : 0px;
+}
+
+H3 {
+ color : #0000A0;
+ background-color : transparent;
+ margin-top : 40px;
+ font-size : 14pt;
+}
+
+H3.BoxHead {
+ margin-top : 1px;
+ margin-bottom : 6px;
+ color : Black;
+ background-color : transparent;
+}
+
+H3.GroupTitlesIX {
+ margin-top : 12px;
+ color : Black;
+ margin-bottom : 2px;
+ background-color : transparent;
+}
+H3.GroupTitlesIXGlobal {
+ margin-top : 0px;
+ color : Black;
+ margin-bottom : 2px;
+ background-color : transparent;
+}
+
+H3.ManPageSubHead {
+ background-color : transparent;
+ color : #33532F;
+ margin-top : 32px;
+}
+
+H3.Heading4 {
+ color : #33532F;
+ background-color : transparent;
+ margin-top : 32px;
+}
+
+H3.TaskHead{
+ color : #0000A0;
+ background-color : White;
+ padding-bottom : 4px;
+ padding-left : 10px;
+ padding-right : 10px;
+ padding-top : 10px;
+ margin-bottom : 10px;
+ margin-left : 0px;
+ margin-right : 10px;
+ margin-top : 20px;
+ font-weight : bold;
+ font-size : 16pt;
+}
+
+H3.TOC {
+ background-color : transparent;
+ font-size : 14pt;
+ margin-bottom : 1px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 14px;
+ font-weight : bold;
+ padding-bottom : 6px;
+ padding-left : 6px;
+ padding-right : 6px;
+ padding-top : 6px;
+}
+
+H3.TOCPartTitle {
+ background-color : #D3D3D3;
+ margin-bottom : 12px;
+ font-weight : bold;
+ color : Black;
+ padding-bottom : 8px;
+ padding-left : 12px;
+ padding-right : 12px;
+ padding-top : 12px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 24px;
+ width : 4in;
+ font-size : 18pt;
+ border : 1px solid White;
+}
+
+H4.SyntaxSubHead {
+ background-color : White;
+}
+
+H5 {
+ color : #8000FF;
+ background-color : transparent;
+}
+
+H5.SyntaxSubhead {
+ color : #538055;
+ background-color : transparent;
+ margin-left : 2em;
+}
+
+
+
+LI{
+ margin-top : 12px;
+}
+
+LI .CellBodyBulleted{
+ margin-top : 1px;
+}
+
+LI .SubList{
+ margin-top : 4px;
+ list-style-type : square;
+ background-color : transparent;
+}
+
+LI.BulletEmphasis {
+ font-style : normal;
+ margin-top : 12px;
+ background-color : transparent;
+}
+
+OL {
+ background-color : transparent;
+}
+
+P {
+ text-align : left;
+ font-style : normal;
+ background-color : transparent;
+}
+
+P.BodyRelative {
+ margin-top : 6px;
+ margin-bottom : 6px;
+ background-color : transparent;
+}
+
+P.BugNumber {
+ margin-top : -10px;
+ margin-bottom :-10px;
+ background-color : transparent;
+ color : Black;
+ font-size : 9pt;
+}
+
+
+P.CellBody {
+ font-size : 10pt;
+ margin-top : 3px;
+ margin-bottom : 3px;
+}
+
+P.CellBodySmall {
+ font-size : 9pt;
+ margin-top : 3px;
+ margin-bottom : 3px;
+}
+
+P.CellBodyCommandLine {
+ font-size :9pt;
+ font-family : monospace;
+}
+
+P.CellBodyJava {
+ font-size : 9pt;
+ font-family : monospace;
+}
+
+P.CellBodySQLExample {
+ font-size : 9pt;
+ margin-top : 2px;
+ color : #000066;
+ font-family : monospace;
+ background-color : transparent;
+}
+
+P.CellBodySQLSyntax {
+ color : #538055;
+ font-family : monospace;
+ font-size : 9pt;
+ margin-top : 2px;
+ background-color : transparent;
+}
+
+P.CellBodyIndented {
+ font-size : 10pt;
+ margin-left : 1em;
+ margin-top : 3px;
+ margin-bottom : 3px;
+}
+
+P.CellHeading {
+ font-size : 10pt;
+ font-weight : bold;
+ text-align : center;
+}
+
+P.CopyrightInfo {
+ font-size : 9pt;
+ margin-top : 6px;
+ margin-left : 12px;
+ margin-right: 12px;
+ margin-bottom : 0px;
+ padding-bottom : 1px;
+ padding-left : 1px;
+ padding-right : 1px;
+ padding-top : 1px;
+ background-color : transparent;
+}
+
+P.FigureCaption {
+ background-color : transparent;
+ font-style : italic;
+}
+
+P.IJ {
+ background-color : White;
+ color : #7a7d7d;
+}
+P.IndexKey {
+ background-color : #D3D3D3;
+ font-size : 10pt;
+ padding-bottom : 6px;
+ padding-left : 6px;
+ padding-right : 6px;
+ padding-top : 6px;
+ text-align : center;
+ width : 350px;
+ font-weight : bold;
+ border : 2px solid #D3D3D3;
+}
+
+P.Java {
+ color : #004080;
+ background-color : Purple;
+ font-size : 30pt;
+ font-family : monospace;
+}
+
+P.JavaRelative{
+ color : #004080;
+ margin-top : 2px;
+ margin-bottom : 2px;
+ background-color : transparent;
+ font-size : 10pt;
+ font-family : monospace;
+}
+
+P.Indented {
+ margin : 1em;
+}
+
+P.NavBar {
+ font-size : 9pt;
+ margin-top:6px;
+ margin-bottom :6px;
+ padding-top : 2px;
+ padding-right : 2px;
+ padding-left : 2px;
+ padding-bottom : 2px;
+ background-color : transparent;
+}
+
+P.NavBar1 {
+ font-size : 9pt;
+ margin-top: 1px;
+ margin-bottom : 8px;
+ padding-top : 2px;
+ padding-right : 2px;
+ padding-left : 2px;
+ padding-bottom : 2px;
+}
+
+P.NavBar2 {
+ font-size :9pt;
+ margin-top : 8px;
+ margin-bottom : 8px;
+ margin-left : 2em;
+ padding-top : 2px;
+ padding-right : 2px;
+ padding-left : 2px;
+ padding-bottom : 2px;
+}
+
+P.NavBar3 {
+ font-size : 9pt;
+ margin-top : 8px;
+ margin-bottom : 1px;
+ margin-left : 4em;
+ padding-top : 2px;
+ padding-right : 2px;
+ padding-left : 2px;
+ padding-bottom : 2px;
+}
+P.NavBarIndentHang {
+ font-size : 9pt;
+ margin-top:6px;
+ margin-bottom :6px;
+ padding-top : 2px;
+ padding-right : 2px;
+ padding-left : 2px;
+ padding-bottom : 2px;
+ background-color : transparent;
+ text-indent : -2em;
+ margin-left : 2em;
+}
+
+
+P.NavBarVersion {
+ font-size : 9pt;
+ margin-top: 3px;
+ margin-bottom :3px;
+}
+
+P.PageCounter {
+ font-size : 9pt;
+ text-align : right;
+ background-color : #D3D3D3;
+ border : 2px;
+ padding-bottom : 4px;
+ padding-left : 4px;
+ padding-right : 4px;
+ padding-top : 4px;
+}
+
+P.PartNum {
+ background-color : Silver;
+ padding-bottom : 8px;
+ padding-left : 8px;
+ padding-right : 8px;
+ padding-top : 8px;
+ color : White;
+ font-weight : bold;
+ font-size : 18pt;
+ margin-bottom : 0px;
+}
+
+P.OutputRelative {
+ margin-top :3px;
+ font-family : monospace;
+ color : Gray;
+ font-size : 10pt;
+ margin-bottom : 2px;
+ background-color : transparent;
+}
+
+P.Special {
+ background-color : #FFFAFA;
+ padding : 6px 6px 6px 6px;
+ border : 4px solid White;
+ color : Maroon;
+}
+
+P.SQLSyntax {
+ color : #538055;
+ margin-left : 2em;
+ background-color : White;
+ font-family : monospace;
+ font-size : 10pt;
+}
+
+P.SQLExample {
+ color : #000066;
+ margin-left : 2em;
+ background-color : transparent;
+ font-family : monospace;
+ font-size : 10pt;
+}
+
+P.TOC1 {
+ margin-top : 4px;
+ margin-bottom : 4px;
+ margin-left : 3em;
+ font-weight : bold;
+ background-color : transparent;
+}
+
+P.TOC2 {
+ margin-left : 5em;
+ margin-top : 4px;
+ margin-bottom : 4px;
+}
+
+P.TOCTaskHead {
+ margin-left : 5em;
+ margin-top : 6px;
+ margin-bottom : 6px;
+ background-color : White;
+}
+
+P.TOC3 {
+ margin-top : 4px;
+ margin-bottom : 4px;
+ margin-left : 7em;
+}
+
+P.TOC4 {
+ margin-top : 4px;
+ margin-bottom : 4px;
+ margin-left : 9em;
+}
+
+P.TutorialQuiz {
+ font-style : normal;
+ background-color : transparent;
+ margin-bottom : 0px;
+ margin-top : 0px;
+}
+
+PRE {
+ font-size : 10pt;
+ background-color : White;
+ font-family : monospace;
+
+}
+
+PRE.Java {
+ color : #004080;
+ background-color : transparent;
+ font-family : monospace;
+}
+
+PRE.JavaSmall{
+ color : #004080;
+ background-color : transparent;
+ margin-left : 2em;
+ font-family : monospace;
+}
+
+PRE.ECIJ {
+ color : #7a7d7d;
+ font-size : 9pt;
+ background-color : transparent;
+ font-family : monospace;
+
+}
+
+TABLE.Sample {
+ background-color : #FAF0E6;
+}
+
+TD.BoxTable {
+ background-color : Silver;
+ padding : 10px;
+}
+
+UL {
+ background-color : transparent;
+}
+UL.Normal {
+ background-color : transparent;
+}
+
+
+UL.CellBodyBulleted {
+ font-size : 10pt;
+ margin-top : 3px;
+ margin-bottom : 3px;
+ background-color : transparent;
+}
+
+UL.ChapterTOC {
+ background-color : Silver;
+ border : medium Black;
+ padding-bottom : 10px;
+ padding-left : 10px;
+ padding-right : 10px;
+ padding-top : 10px;
+ margin-bottom : 10px;
+ margin-left : 10px;
+ margin-right : 10px;
+ margin-top : 10px;
+ list-style-type : none;
+}
+
+UL.SubList {
+ background-color : transparent;
+}
+EM {
+ font-style : italic;
+}
+
+EM.Biblio {
+ color : Black;
+ background-color : transparent;
+}
+
+EM.FileName {
+ background-color : transparent;
+}
+
+EM.NoLink {
+ color : Gray;
+ font-style : normal;
+ background-color : transparent;
+}
+
+EM.URL {
+ background-color : White;
+}
+
+EM.JavaItem {
+ background-color : White;
+}
+
+EM.DatabaseObject {
+ background-color : White;
+}
+
+EM.MenuItem {
+ font-style : normal;
+ font-weight : bold;
+}
+
+EM.Button {
+ font-style : normal;
+ font-weight : bold;
+}
+
+EM.QuizItem {
+ font-style : normal;
+}
+
+EM.UserVariable {
+ background-color : transparent;
+}
+
+STRONG.ijUI {
+ background-color : transparent;
+ color : #004080;
+ font-family : monospace;
+}
+
+STRONG.ChapterNum {
+ background-color : transparent;
+ color : Gray;
+}
+
+STRONG.Comment {
+ font-weight : normal;
+ color : #A4A9C1;
+ background-color : transparent;
+}
+
+STRONG.GlossaryTerm{
+ font-weight : bold;
+ color : Black;
+ background-color : transparent;
+}
+
+STRONG.Special {
+ font-weight : bold;
+ font-style : normal;
+}
+
+STRONG.PartNum {
+ color : #3300FF;
+ font-size : small;
+ background-color : transparent;
+}
+
Propchange: incubator/derby/code/branches/10.0/java/demo/csfull.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/derby/code/branches/10.0/java/demo/demo.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/demo.html?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/demo.html (original)
+++ incubator/derby/code/branches/10.0/java/demo/demo.html Mon Apr 25 12:30:44 2005
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Example Programs</TITLE>
-<link rel="stylesheet" type="text/css" href="../csfull.css" title="sample">
-</HEAD>
-<BODY>
-
-<H1>Example IBM Cloudscape Programs</H1>
-<p>This directory contains example programs. For a complete description, see <A href="../../doc/pdf/getstart.pdf">Getting Started with IBM Cloudscape</A> and the <A href="../../doc/pdf/server.pdf">IBM Cloudscape Server and Administration Guide</A>.</p>
-<UL>
- <LI><A href="simple/example.html">Simple</A>
- <p class="BodyRelative">A very simple JDBC application that boots the driver,
- creates a database, and loads some data.</p></LI>
-</LI>
-<LI><A href="nserverdemo/readme.html">Network Server Sample Programs</A>
- <p class="BodyRelative">Two examples are provided to demonstrate how to obtain an <em class="Emphasis">embedded connection</em> and <em class="Emphasis">client connections</em> using the Network Server to connect to the same database. An embedded connection is a connection to a database that is booted in the same JVM as the application. Client applications that require a database connection across the network use the network server protocol (DRDA) to connect to the Network Server. This type of connection is referred to as a client connection.</p></LI></LI>
-
-</UL>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<TITLE>Example Programs</TITLE>
+<link rel="stylesheet" type="text/css" href="../csfull.css" title="sample">
+</HEAD>
+<BODY>
+
+<H1>Example Apache Derby Programs</H1>
+<p>This directory contains example programs. For a complete description, see <A href="http://incubator.apache.org/derby/docs/getstart/">Getting Started with Apache Derby</A> and the <A href="http://incubator.apache.org/derby/docs/adminguide/">Apache Derby Server and Administration Guide</A>.</p>
+<UL>
+ <LI><A href="simple/example.html">Simple</A>
+ <p class="BodyRelative">A very simple JDBC application that boots the driver,
+ creates a database, and loads some data.</p></LI>
+</LI>
+<LI><A href="nserverdemo/readme.html">Network Server Sample Programs</A>
+ <p class="BodyRelative">Two examples are provided to demonstrate how to obtain an <em class="Emphasis">embedded connection</em> and <em class="Emphasis">client connections</em> using the Network Server to connect to the same database. An embedded connection is a connection to a database that is booted in the same JVM as the application. Client applications that require a database connection across the network use the network server protocol (DRDA) to connect to the Network Server. This type of connection is referred to as a client connection.</p></LI></LI>
+
+</UL>
+
+</BODY>
+</HTML>
Propchange: incubator/derby/code/branches/10.0/java/demo/demo.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/derby/code/branches/10.0/java/demo/navbar.html
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/navbar.html?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/navbar.html (original)
+++ incubator/derby/code/branches/10.0/java/demo/navbar.html Mon Apr 25 12:30:44 2005
@@ -1,17 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Example Programs</TITLE>
-<link rel="stylesheet" type="text/css" href="../csfull.css" title="sample">
-</HEAD>
-<BODY class="SmallFile">
-
-<p class="NavBar"><a href="demo.html" target="mainPage">Demo home</a></li></p>
-<p class="NavBar1"><a href="simple/example.html" target="mainPage">Simple</a></p>
-<p class="NavBar1"><a href="nserverdemo/readme.html" target="mainPage">Network Server Sample Programs</a></p>
-<p class="NavBar"><a href="../../index.html" target="_top">Documentation Home</a></p>
-<p class="NavBar"><a href="../../releasenotes.html" target="_top">Release Notes</a></p>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<TITLE>Example Programs</TITLE>
+<link rel="stylesheet" type="text/css" href="../csfull.css" title="sample">
+</HEAD>
+<BODY class="SmallFile">
+
+<p class="NavBar"><a href="demo.html" target="mainPage">Demo home</a></li></p>
+<p class="NavBar1"><a href="simple/example.html" target="mainPage">Simple</a></p>
+<p class="NavBar1"><a href="nserverdemo/readme.html" target="mainPage">Network Server Sample Programs</a></p>
+<p class="NavBar"><a href="http://incubator.apache.org/derby/manuals/index.html" target="_top">Documentation Home</a></p>
+
+</BODY>
+</HTML>
Propchange: incubator/derby/code/branches/10.0/java/demo/navbar.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java (original)
+++ incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java Mon Apr 25 12:30:44 2005
@@ -1,103 +1,111 @@
-/*
- * (C) Copyright IBM Corp. 2003, 2004.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- */
-
-package nserverdemo;
-
-import java.util.Properties;
-import java.sql.SQLException;
-import java.sql.DriverManager;
-import java.io.IOException;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-
-import org.apache.derby.drda.NetworkServerControl; //derby network server
-import java.io.FileOutputStream;
-
-/**
- * Class for starting the Derby NetworkServer on a separate Thread.
- * This class provides methods to start, and shutdown the server
- *
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
- */
-
-public class NetworkServerUtil {
-
- private int portNum;
- private NetworkServerControl serverControl;
- private PrintWriter pw;
-
- public NetworkServerUtil(int port, PrintWriter pw) {
-
- this.portNum = port;
- this.pw = pw;
- try {
- serverControl = new
- NetworkServerControl(InetAddress.getByName("localhost"), port);
- pw.println("Derby Network Server created");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * trace utility of server
- */
- public void trace(boolean onoff) {
- try {
- serverControl.trace(onoff);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- /**
- * Try to test for a connection
- * Throws exception if unable to get a connection
- */
- public void testForConnection()
- throws Exception {
- serverControl.ping();
- }
-
-
- /**
- * Shutdown the NetworkServer
- */
- public void shutdown() {
- try {
- serverControl.shutdown();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- /**
- * Start Derby Network server
- *
- */
- public void start() {
- try {
- serverControl.start(pw);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
-}
-
-
-
+/*
+
+ Derby - Class nserverdemo.NetworkServerUtil
+
+ Copyright 2003, 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.
+
+ */
+
+package nserverdemo;
+
+import java.util.Properties;
+import java.sql.SQLException;
+import java.sql.DriverManager;
+import java.io.IOException;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+
+import org.apache.derby.drda.NetworkServerControl; //derby network server
+import java.io.FileOutputStream;
+
+/**
+ * Class for starting the Derby NetworkServer on a separate Thread.
+ * This class provides methods to start, and shutdown the server
+ */
+
+public class NetworkServerUtil {
+
+ private int portNum;
+ private NetworkServerControl serverControl;
+ private PrintWriter pw;
+
+ public NetworkServerUtil(int port, PrintWriter pw) {
+
+ this.portNum = port;
+ this.pw = pw;
+ try {
+ serverControl = new
+ NetworkServerControl(InetAddress.getByName("localhost"), port);
+ pw.println("Derby Network Server created");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * trace utility of server
+ */
+ public void trace(boolean onoff) {
+ try {
+ serverControl.trace(onoff);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * Try to test for a connection
+ * Throws exception if unable to get a connection
+ */
+ public void testForConnection()
+ throws Exception {
+ serverControl.ping();
+ }
+
+
+ /**
+ * Shutdown the NetworkServer
+ */
+ public void shutdown() {
+ try {
+ serverControl.shutdown();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * Start Derby Network server
+ *
+ */
+ public void start() {
+ try {
+ serverControl.start(pw);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+}
+
+
+
Propchange: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NetworkServerUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java?rev=164631&r1=164630&r2=164631&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java (original)
+++ incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java Mon Apr 25 12:30:44 2005
@@ -1,208 +1,216 @@
-/*
- * (C) Copyright IBM Corp. 2003.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- */
-package nserverdemo;
-
-
-import java.util.Properties;
-import java.sql.SQLException;
-import java.sql.DriverManager;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.io.PrintWriter;
-
-
-/**
-
- The Network Server sample demo program is a
- simple JDBC application that interacts with the Derby Network Server.
- The program:
-
- 1. starts the Derby Network Server
- 2. loads the IBM DB2 JDBC Universal driver
- 3. creates the database if not already created
- 4. checks to see if the schema is already created, and if not,
- 5. creates the schema which includes the table SAMPLETBL and corresponding indexes.
- 6. connects to the database
- 7. loads the schema by inserting data
- 8. starts client threads to perform database related operations
- 9. has each of the clients perform DML operations (select, insert, delete, update) using JDBC calls,
- i) one client opens an embedded connection to perform database operations
- You can open an embedded connection in the same JVM that starts the Derby Network
- Server.
- ii) one client opens a client connection to the Derby Network Server to perform database operations.
- 10.waits for the client threads to finish the tasks
- 11.shuts down the Derby Network Server at the end of the demo
-
- <P>
- Usage: java nserverdemo.NsSample
- <P>
- Please note, a file derby.log is created in the directory you run this program.
- This file contains the logging of connections made with the derby network server
-
- <P>
- <I>IBM Corp. reserves the right to change, rename, or
- remove this interface at any time.</I>
-
- */
-
-public class NsSample {
-
- public static final String DB2_JDBC_UNIVERSAL_DRIVER = new String("com.ibm.db2.jcc.DB2Driver");
- public static int NUM_ROWS = 50; /* Number of rows to load initially */
- public static int ITERATIONS = 10; //Each client does these many iterations
- public static int NUM_CLIENT_THREADS = 2;
-
-
- // network server control specific
- private static int NETWORKSERVER_PORT=1621;
-
- // Derby database connection URL for embedded environment
- public static final String CS_EMBED_DBURL="jdbc:derby:NSSampledb;";
-
- // To connect to Derby Network Server
- // This URL describes the target database for type 4 connectivity
- // Notice that the properties may be established via the URL syntax
- private static final String CS_NS_DBURL= "jdbc:derby:net://localhost:"+NETWORKSERVER_PORT+"/NSSampledb;create=true;retrieveMessagesFromServerOnGetMessage=true;deferPrepares=true;";
-
- public static void main(String[] args) throws Exception {
-
- NetworkServerUtil nwServer;
-
- // DB2Connection provides additional functionality than java.sql.Connection
- // One can use either depending on the requirements
- Connection conn = null;
-
- PrintWriter pw = null;
-
- try {
- pw = new PrintWriter(System.out,true); // to print messages
-
- /* Start - In order to start the network server do the following
- In case you want to start the server as a script or another program
- comment out the next block of code (i.e. until the comment line 'End - network server started')
- Also, comment out the 'Shutdown Derby Network Server' line of code at the bottom
- In case you decide to comment out the starting of the network server, make sure that the
- client thread is not making an embedded connection but instead making only a client connection.
- Also note, the server logs messages to the file derby.log in the
- directory you run this program
- */
-
- {
- nwServer = new NetworkServerUtil(NETWORKSERVER_PORT,pw);
- nwServer.start();
-
- boolean knowIfServerUp = false; //do we know if server is ready to accept connections
- int numTimes = 5;
-
- // Test to see if server is ready for connections, for 15 seconds.
- while(!knowIfServerUp && (numTimes >0)) {
- try {
- // testing for connection to see if the network server is up and running
- // if server is not ready yet, this method will throw an exception
- numTimes--;
- nwServer.testForConnection();
- knowIfServerUp = true;
- }
- catch(Exception e) {
- System.out.println("[NsSample] Unable to obtain a connection to network server, trying again after 3000 ms.");
- Thread.currentThread().sleep(3000);
- }
- }
- if(!knowIfServerUp) {
- pw.println("[NsSample] Exiting, since unable to connect to Derby Network Server.");
- pw.println("[NsSample] Please try to increase the amount of time to keep trying to connect to the Server.");
- System.exit(1);
- }
-
- pw.println("[NsSample] Derby Network Server started.");
- }
- /*End - network server started*/
-
- pw.println("[NsSample] Sample Derby Network Server program demo starting. ");
- pw.println("Please wait .....................");
-
- // Load the JCC Driver
- try {
- Class.forName(DB2_JDBC_UNIVERSAL_DRIVER).newInstance();
- } catch (Exception e) {
- pw.println("[NsSample] Unable to load JCC driver. Following exception was thrown");
- e.printStackTrace();
- System.exit(1); //critical error, so exit
- }
-
-
- // See Derby documentation for description of properties that may be set
- // in the context of the network server.
- Properties properties = new java.util.Properties();
-
- // The user and password properties are a must, required by JCC
- properties.setProperty("user","cloud");
- properties.setProperty("password","scape");
-
- // Get database connection using the JCC client via DriverManager api
- try {
-
- conn = (Connection) DriverManager.getConnection(CS_NS_DBURL, properties);
- } catch(Exception e) {
- pw.println("[NsSample] Connection request unsuccessful, exception thrown was: ");
- pw.println("[NsSample] Please check if all the jar files are in the classpath and the dbUrl is set correctly.");
- e.printStackTrace();
- System.exit(1); //critical error, so exit
- }
-
- NsSampleWork.checkAndCreateSchema(conn,pw); // Check and create the necessary schema if not already created
- NsSampleWork.loadSchema(conn,NUM_ROWS,pw); // Insert rows into the table
- conn.close();
-
- // Start client threads to perform database related sql operations
- NsSampleClientThread clientThreads[] = new NsSampleClientThread[NUM_CLIENT_THREADS];
-
-
- /* Only the JVM that starts the Derby Network Server can obtain an embedded connection
- Please pay attention to the database URL
- Also, you need not load the org.apache.derby.jdbc.EmbeddedDriver since it is already loaded when
- the network server starts up.
- 1. Derby embedded database url - jdbc:derby:databasename
- */
- clientThreads[0] = new NsSampleClientThread(1,CS_EMBED_DBURL,properties,pw);
- clientThreads[0].start();
-
-
- /*
- 2. The below client threads obtain a client connection to Derby Network Server
- One can also get a client connection from another JVM
- Please be aware of the database URL for obtaining a client connection
- */
- for (int i=1; i<NUM_CLIENT_THREADS; i++) {
- clientThreads[i] = new NsSampleClientThread(i+1,CS_NS_DBURL,properties,pw);
- clientThreads[i].start();
-
- }
-
- // Wait for the client threads to complete all the work
- for (int i = 0; i < NUM_CLIENT_THREADS; i++)
- clientThreads[i].join();
-
- // Shutdown Derby network server
- pw.println("[NsSample] Shutting down network server.");
- nwServer.shutdown();
- pw.println("[NsSample] End of Network server demo.");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- finally
- {
- if(pw != null) pw.close();
- }
- }
-}
+/*
+
+ Derby - Class nserverdemo.NsSample
+
+ Copyright 2003, 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.
+
+ */
+
+package nserverdemo;
+
+
+import java.util.Properties;
+import java.sql.SQLException;
+import java.sql.DriverManager;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.io.PrintWriter;
+
+
+/**
+
+ The Network Server sample demo program is a
+ simple JDBC application that interacts with the Derby Network Server.
+ The program:
+
+ 1. starts the Derby Network Server
+ 2. loads the IBM DB2 JDBC Universal driver
+ 3. creates the database if not already created
+ 4. checks to see if the schema is already created, and if not,
+ 5. creates the schema which includes the table SAMPLETBL and corresponding indexes.
+ 6. connects to the database
+ 7. loads the schema by inserting data
+ 8. starts client threads to perform database related operations
+ 9. has each of the clients perform DML operations (select, insert, delete, update) using JDBC calls,
+ i) one client opens an embedded connection to perform database operations
+ You can open an embedded connection in the same JVM that starts the Derby Network
+ Server.
+ ii) one client opens a client connection to the Derby Network Server to perform database operations.
+ 10.waits for the client threads to finish the tasks
+ 11.shuts down the Derby Network Server at the end of the demo
+
+ <P>
+ Usage: java nserverdemo.NsSample
+ <P>
+ Please note, a file derby.log is created in the directory you run this program.
+ This file contains the logging of connections made with the derby network server
+ */
+
+public class NsSample {
+
+ public static final String DB2_JDBC_UNIVERSAL_DRIVER = new String("com.ibm.db2.jcc.DB2Driver");
+ public static int NUM_ROWS = 50; /* Number of rows to load initially */
+ public static int ITERATIONS = 10; //Each client does these many iterations
+ public static int NUM_CLIENT_THREADS = 2;
+
+
+ // network server control specific
+ private static int NETWORKSERVER_PORT=1621;
+
+ // Derby database connection URL for embedded environment
+ public static final String CS_EMBED_DBURL="jdbc:derby:NSSampledb;";
+
+ // To connect to Derby Network Server
+ // This URL describes the target database for type 4 connectivity
+ // Notice that the properties may be established via the URL syntax
+ private static final String CS_NS_DBURL= "jdbc:derby:net://localhost:"+NETWORKSERVER_PORT+"/NSSampledb;create=true;retrieveMessagesFromServerOnGetMessage=true;deferPrepares=true;";
+
+ public static void main(String[] args) throws Exception {
+
+ NetworkServerUtil nwServer;
+
+ // DB2Connection provides additional functionality than java.sql.Connection
+ // One can use either depending on the requirements
+ Connection conn = null;
+
+ PrintWriter pw = null;
+
+ try {
+ pw = new PrintWriter(System.out,true); // to print messages
+
+ /* Start - In order to start the network server do the following
+ In case you want to start the server as a script or another program
+ comment out the next block of code (i.e. until the comment line 'End - network server started')
+ Also, comment out the 'Shutdown Derby Network Server' line of code at the bottom
+ In case you decide to comment out the starting of the network server, make sure that the
+ client thread is not making an embedded connection but instead making only a client connection.
+ Also note, the server logs messages to the file derby.log in the
+ directory you run this program
+ */
+
+ {
+ nwServer = new NetworkServerUtil(NETWORKSERVER_PORT,pw);
+ nwServer.start();
+
+ boolean knowIfServerUp = false; //do we know if server is ready to accept connections
+ int numTimes = 5;
+
+ // Test to see if server is ready for connections, for 15 seconds.
+ while(!knowIfServerUp && (numTimes >0)) {
+ try {
+ // testing for connection to see if the network server is up and running
+ // if server is not ready yet, this method will throw an exception
+ numTimes--;
+ nwServer.testForConnection();
+ knowIfServerUp = true;
+ }
+ catch(Exception e) {
+ System.out.println("[NsSample] Unable to obtain a connection to network server, trying again after 3000 ms.");
+ Thread.currentThread().sleep(3000);
+ }
+ }
+ if(!knowIfServerUp) {
+ pw.println("[NsSample] Exiting, since unable to connect to Derby Network Server.");
+ pw.println("[NsSample] Please try to increase the amount of time to keep trying to connect to the Server.");
+ System.exit(1);
+ }
+
+ pw.println("[NsSample] Derby Network Server started.");
+ }
+ /*End - network server started*/
+
+ pw.println("[NsSample] Sample Derby Network Server program demo starting. ");
+ pw.println("Please wait .....................");
+
+ // Load the JCC Driver
+ try {
+ Class.forName(DB2_JDBC_UNIVERSAL_DRIVER).newInstance();
+ } catch (Exception e) {
+ pw.println("[NsSample] Unable to load JCC driver. Following exception was thrown");
+ e.printStackTrace();
+ System.exit(1); //critical error, so exit
+ }
+
+
+ // See Derby documentation for description of properties that may be set
+ // in the context of the network server.
+ Properties properties = new java.util.Properties();
+
+ // The user and password properties are a must, required by JCC
+ properties.setProperty("user","cloud");
+ properties.setProperty("password","scape");
+
+ // Get database connection using the JCC client via DriverManager api
+ try {
+
+ conn = (Connection) DriverManager.getConnection(CS_NS_DBURL, properties);
+ } catch(Exception e) {
+ pw.println("[NsSample] Connection request unsuccessful, exception thrown was: ");
+ pw.println("[NsSample] Please check if all the jar files are in the classpath and the dbUrl is set correctly.");
+ e.printStackTrace();
+ System.exit(1); //critical error, so exit
+ }
+
+ NsSampleWork.checkAndCreateSchema(conn,pw); // Check and create the necessary schema if not already created
+ NsSampleWork.loadSchema(conn,NUM_ROWS,pw); // Insert rows into the table
+ conn.close();
+
+ // Start client threads to perform database related sql operations
+ NsSampleClientThread clientThreads[] = new NsSampleClientThread[NUM_CLIENT_THREADS];
+
+
+ /* Only the JVM that starts the Derby Network Server can obtain an embedded connection
+ Please pay attention to the database URL
+ Also, you need not load the org.apache.derby.jdbc.EmbeddedDriver since it is already loaded when
+ the network server starts up.
+ 1. Derby embedded database url - jdbc:derby:databasename
+ */
+ clientThreads[0] = new NsSampleClientThread(1,CS_EMBED_DBURL,properties,pw);
+ clientThreads[0].start();
+
+
+ /*
+ 2. The below client threads obtain a client connection to Derby Network Server
+ One can also get a client connection from another JVM
+ Please be aware of the database URL for obtaining a client connection
+ */
+ for (int i=1; i<NUM_CLIENT_THREADS; i++) {
+ clientThreads[i] = new NsSampleClientThread(i+1,CS_NS_DBURL,properties,pw);
+ clientThreads[i].start();
+
+ }
+
+ // Wait for the client threads to complete all the work
+ for (int i = 0; i < NUM_CLIENT_THREADS; i++)
+ clientThreads[i].join();
+
+ // Shutdown Derby network server
+ pw.println("[NsSample] Shutting down network server.");
+ nwServer.shutdown();
+ pw.println("[NsSample] End of Network server demo.");
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally
+ {
+ if(pw != null) pw.close();
+ }
+ }
+}
Propchange: incubator/derby/code/branches/10.0/java/demo/nserverdemo/NsSample.java
------------------------------------------------------------------------------
svn:eol-style = native