Changeset 2709

Timestamp:

02/17/05 15:45:23 (8 years ago)

Author:

hauma

Message:

Proof of concept for a JavaParty RMI server (ticket:224)

• Moved the example to a separate package. This requires little adjustments to access modifiers in some jp.lang classes.

Location:

trunk/jp

Files:

• build.xml (modified) (6 diffs)
• src/jp/example (added)
• src/jp/example/rmiserver (added)
• src/jp/example/rmiserver/PartyClient.java (moved) (moved from trunk/jp/src/jp/lang/PartyClient.java) (1 diff)
• src/jp/example/rmiserver/PartyConfig.java (moved) (moved from trunk/jp/src/jp/lang/PartyConfig.java) (2 diffs)
• src/jp/example/rmiserver/PartyServer.java (moved) (moved from trunk/jp/src/jp/lang/PartyServer.java) (2 diffs)
• src/jp/example/rmiserver/PartyServer_intf.java (moved) (moved from trunk/jp/src/jp/lang/PartyServer_intf.java) (1 diff)
• src/jp/example/rmiserver/PartyWorker.java (moved) (moved from trunk/jp/src/jp/lang/PartyWorker.java) (1 diff)
• src/jp/lang/ConfigJP.java (modified) (1 diff)
• src/jp/lang/Configuration.java (modified) (1 diff)

trunk/jp/build.xml

@@ -274 +274 @@
         <exclude name="jp/lang/RemoteThread.java" />
         <exclude name="jp/lang/RuntimeExplorer.java" />
-
-        <exclude name="jp/lang/Party*.java" />
      </jpc>
 
@@ -286 +284 @@
         <include name="jp/lang/JavaParty.java" />
         <include name="jp/lang/RMICompatibility.java" />
-
-        <include name="jp/lang/PartyConfig.java" />
      </javac>
 
@@ -295 +291 @@
         <include name="jp/lang/RemoteThread.java" />
         <include name="jp/lang/RuntimeExplorer.java" />
-
-        <include name="jp/lang/PartyWorker.java" />
      </jpc>
+  </target>
+
+  <target name="jp-example" depends="jp-env">
+     <jpc destdir="${classes}" debug="on" generatedJPPath="${jpgen}">
+        <classpath refid="cp" />
+        <src path="${javasrc}" />
+        <include name="jp/example/rmiserver/PartyConfig.java" />
+        <include name="jp/example/rmiserver/PartyWorker.java" />
+     </jpc>
 
      <javac destdir="${classes}" debug="on">
@@ -303 +306 @@
         <src path="${javasrc}" />
 
-        <include name="jp/lang/PartyClient.java" />
-        <include name="jp/lang/PartyServer.java" />
+        <include name="jp/example/rmiserver/PartyClient.java" />
+        <include name="jp/example/rmiserver/PartyServer.java" />
      </javac>
 
@@ -310 +313 @@
         <classpath refid="cp" />
 
-        <include name="jp/lang/PartyServer.class" />
-      </rmic>
+        <include name="jp/example/rmiserver/PartyServer.class" />
+     </rmic>
   </target>
 
@@ -338 +341 @@
   </target>
 
-  <target name="jp-jar" depends="jp-env, jp-tools, jp-sync">
+  <target name="jp-jar" depends="jp-env, jp-example, jp-tools, jp-sync">
       <jar jarfile="${build}/jp.jar">
            <fileset dir="${classes}" 
-                    includes="jp/**"/>
+                    includes="jp/lang/**"/>
       </jar>
   </target>

trunk/jp/src/jp/example/rmiserver/PartyClient.java

@@ -1 @@
-package jp.lang;
+/* ***************************************************************************
+ * JavaParty
+ *
+ * Copyright (C) 1996-2005 The JavaParty Team, University of Karlsruhe
+ *
+ * Permission is hereby granted to modify and use this software for research
+ * and teaching purposes. Modification for commercial purposes requires
+ * prior written permission by the author.
+ *
+ * The software, or modifications thereof, may be redistributed only
+ * if this copyright notice stays attached.
+ *****************************************************************************/
+
+package jp.example.rmiserver;
 
 import java.rmi.registry.Registry;
 import java.rmi.registry.LocateRegistry;
+
 
 /** The client-tier application. */

trunk/jp/src/jp/example/rmiserver/PartyConfig.java

@@ -2 +2 @@
  * JavaParty
  *
- * Copyright (C) 1996-2002 The JavaParty Team, University of Karlsruhe
+ * Copyright (C) 1996-2005 The JavaParty Team, University of Karlsruhe
  *
  * Permission is hereby granted to modify and use this software for research
@@ -11 +11 @@
  * if this copyright notice stays attached.
  *****************************************************************************/
-/*
- * $Revision: 1.7 $
- * $Date: 2002/05/24 19:19:07 $
- */
 
-package jp.lang;
+package jp.example.rmiserver;
+
+import jp.lang.ConfigJP;
+
 
 /**

trunk/jp/src/jp/example/rmiserver/PartyServer.java

@@ -1 @@
-package jp.lang;
+/* ***************************************************************************
+ * JavaParty
+ *
+ * Copyright (C) 1996-2005 The JavaParty Team, University of Karlsruhe
+ *
+ * Permission is hereby granted to modify and use this software for research
+ * and teaching purposes. Modification for commercial purposes requires
+ * prior written permission by the author.
+ *
+ * The software, or modifications thereof, may be redistributed only
+ * if this copyright notice stays attached.
+ *****************************************************************************/
+
+package jp.example.rmiserver;
 
 import jp.lang.ApplicationContext;
@@ -6 +19 @@
 import jp.lang.RuntimeEnvironment;
 import jp.lang.RuntimeManager;
-
-import jp.lang.PartyConfig;
 
 

trunk/jp/src/jp/example/rmiserver/PartyServer_intf.java

@@ -1 @@
-package jp.lang;
+/* ***************************************************************************
+ * JavaParty
+ *
+ * Copyright (C) 1996-2005 The JavaParty Team, University of Karlsruhe
+ *
+ * Permission is hereby granted to modify and use this software for research
+ * and teaching purposes. Modification for commercial purposes requires
+ * prior written permission by the author.
+ *
+ * The software, or modifications thereof, may be redistributed only
+ * if this copyright notice stays attached.
+ *****************************************************************************/
+
+package jp.example.rmiserver;
 
 

trunk/jp/src/jp/example/rmiserver/PartyWorker.java

@@ -1 @@
-package jp.lang;
+/* ***************************************************************************
+ * JavaParty
+ *
+ * Copyright (C) 1996-2005 The JavaParty Team, University of Karlsruhe
+ *
+ * Permission is hereby granted to modify and use this software for research
+ * and teaching purposes. Modification for commercial purposes requires
+ * prior written permission by the author.
+ *
+ * The software, or modifications thereof, may be redistributed only
+ * if this copyright notice stays attached.
+ *****************************************************************************/
+
+package jp.example.rmiserver;
 
 import jp.lang.ConfigJP;

trunk/jp/src/jp/lang/ConfigJP.java

@@ -25 +25 @@
 public abstract class ConfigJP extends ConfigBase implements Constants {
     // default values
-    String  host     = null;
-    int     port     = -1;
-    String  code     = null;
+    public String  host     = null;
+    public int     port     = -1;
+    public String  code     = null;
 
-    int     timeout  = 10;
+    public int     timeout  = 10;
 
-    boolean verbose  = false;
-    boolean debug    = false;
+    public boolean verbose  = false;
+    public boolean debug    = false;
 
     public String argumentDescription() {

trunk/jp/src/jp/lang/Configuration.java

@@ -360 +360 @@
     }
 
-    protected RuntimeManager getRuntimeManager(int timeout) throws ConfigurationException {
+    public RuntimeManager getRuntimeManager(int timeout) throws ConfigurationException {
         if (debug) System.err.println("lookup runtime manager at " + this);