diff options
Diffstat (limited to 'java/demo/Freeze')
| -rw-r--r-- | java/demo/Freeze/bench/build.xml | 5 | ||||
| -rw-r--r-- | java/demo/Freeze/casino/Client.java | 16 | ||||
| -rw-r--r-- | java/demo/Freeze/casino/build.xml | 5 | ||||
| -rw-r--r-- | java/demo/Freeze/library/Collocated.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/library/Scanner.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/library/Server.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/library/build.xml | 5 | ||||
| -rw-r--r-- | java/demo/Freeze/phonebook/Collocated.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/phonebook/Scanner.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/phonebook/Server.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/phonebook/build.xml | 9 | ||||
| -rw-r--r-- | java/demo/Freeze/transform/build.xml | 5 |
12 files changed, 42 insertions, 15 deletions
diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml index 420ed9850c5..309f7c9ed9c 100644 --- a/java/demo/Freeze/bench/build.xml +++ b/java/demo/Freeze/bench/build.xml @@ -57,7 +57,10 @@ <mkdir dir="${class.dir}"/> <javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}"> - <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> <javac srcdir="." destdir="${class.dir}" diff --git a/java/demo/Freeze/casino/Client.java b/java/demo/Freeze/casino/Client.java index d5e5965c31f..0f0fd53bf95 100644 --- a/java/demo/Freeze/casino/Client.java +++ b/java/demo/Freeze/casino/Client.java @@ -9,6 +9,14 @@ public class Client extends Ice.Application { + // + // Number of bets placed by each player + // You can (should) increase these values by a factor of 5 or more + // on a fast system + // + static final int betCount1 = 100; + static final int betCount2 = 20; + private void printBalances(Casino.PlayerPrx[] players) { @@ -79,10 +87,10 @@ public class Client extends Ice.Application System.out.println("All chips accounted for? " + (bank.checkAllChips() ? "yes" : "no")); - System.out.print("Create 500 10-chips bets... "); + System.out.print("Create " + betCount1 + " 10-chips bets... "); System.out.flush(); - for(int b = 0; b < 500; ++b) + for(int b = 0; b < betCount1; ++b) { Casino.BetPrx bet = bank.createBet(10, 200 + random.nextInt(4000)); for(int i = 0; i < players.length; ++i) @@ -147,10 +155,10 @@ public class Client extends Ice.Application System.out.println("Live bets: " + bank.getLiveBetCount()); - System.out.print("Create 100 10-chips bets... "); + System.out.print("Create " + betCount2 + " 10-chips bets... "); System.out.flush(); - for(int b = 0; b < 100; ++b) + for(int b = 0; b < betCount2; ++b) { Casino.BetPrx bet = bank.createBet(10, 200 + random.nextInt(4000)); for(int i = 0; i < players.length; ++i) diff --git a/java/demo/Freeze/casino/build.xml b/java/demo/Freeze/casino/build.xml index cec4df18549..c5e1ed1536f 100644 --- a/java/demo/Freeze/casino/build.xml +++ b/java/demo/Freeze/casino/build.xml @@ -39,7 +39,10 @@ </javac> <javac srcdir="." destdir="${class.dir}" excludes="generated/**" debug="${debug}"> - <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> </target> diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java index 7e275e1d229..8629e894d7a 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -64,7 +64,7 @@ class Collocated extends Ice.Application // Create and install a factory and initializer for books. // Ice.ObjectFactory bookFactory = new BookFactory(library); - communicator().addObjectFactory(bookFactory, "::Demo::Book"); + communicator().addObjectFactory(bookFactory, Demo.Book.ice_staticId()); // // Everything ok, let's go. diff --git a/java/demo/Freeze/library/Scanner.java b/java/demo/Freeze/library/Scanner.java index 975eaece2dd..ff61f1289da 100644 --- a/java/demo/Freeze/library/Scanner.java +++ b/java/demo/Freeze/library/Scanner.java @@ -155,7 +155,7 @@ class Scanner return null; } - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(128); if(c == ';' || c == '\n') { diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index 2edfb823034..7af7e3a8a61 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -47,7 +47,7 @@ class Server extends Ice.Application // Create and install a factory for books. // Ice.ObjectFactory bookFactory = new BookFactory(library); - communicator().addObjectFactory(bookFactory, "::Demo::Book"); + communicator().addObjectFactory(bookFactory, Demo.Book.ice_staticId()); // // Everything ok, let's go. diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml index ae9ae29f883..41ec51eeafa 100644 --- a/java/demo/Freeze/library/build.xml +++ b/java/demo/Freeze/library/build.xml @@ -49,7 +49,10 @@ </javac> <javac srcdir="." destdir="${class.dir}" excludes="generated/**" debug="${debug}"> - <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> </target> diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java index 47abe391520..9d1b316ddfd 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -41,7 +41,7 @@ class Collocated extends Ice.Application // Create and install a factory for contacts. // ContactFactory contactFactory = new ContactFactory(); - communicator().addObjectFactory(contactFactory, "::Demo::Contact"); + communicator().addObjectFactory(contactFactory, Demo.Contact.ice_staticId()); // // Create an object adapter diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java index db438f8fe5f..790a672f7b0 100644 --- a/java/demo/Freeze/phonebook/Scanner.java +++ b/java/demo/Freeze/phonebook/Scanner.java @@ -155,7 +155,7 @@ class Scanner return null; } - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(128); if(c == ';' || c == '\n') { diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 3dbf0d0d0d1..692b465da7f 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -24,7 +24,7 @@ class Server extends Ice.Application // Create and install a factory for contacts. // ContactFactory contactFactory = new ContactFactory(); - communicator().addObjectFactory(contactFactory, "::Demo::Contact"); + communicator().addObjectFactory(contactFactory, Demo.Contact.ice_staticId()); // // Create an object adapter diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml index 233435b6cde..c5616897bdd 100644 --- a/java/demo/Freeze/phonebook/build.xml +++ b/java/demo/Freeze/phonebook/build.xml @@ -41,12 +41,19 @@ <mkdir dir="${class.dir}"/> <javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}"> - <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> <javac srcdir="." destdir="${class.dir}" excludes="generated/**" debug="${debug}"> <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> </target> diff --git a/java/demo/Freeze/transform/build.xml b/java/demo/Freeze/transform/build.xml index cf84d604e26..0250da01c04 100644 --- a/java/demo/Freeze/transform/build.xml +++ b/java/demo/Freeze/transform/build.xml @@ -43,7 +43,10 @@ <mkdir dir="${class.dir}"/> <javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}"> - <classpath refid="ice.classpath"/> + <classpath> + <path refid="ice.classpath"/> + <path refid="db.classpath"/> + </classpath> <compilerarg value="${javac.lint}"/> </javac> <javac srcdir="." destdir="${class.dir}" |