[Aglets-commits] aglets/src/com/ibm/aglet/system AgletRuntime.java, 1.7, 1.8 ContextAdapter.java, 1.2, 1.3 Aglets.java, 1.4, 1.5 ContextEvent.java, 1.3, 1.4

[Luca F. <cat...@us...>]

Update of /cvsroot/aglets/aglets/src/com/ibm/aglet/system
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18746/src/com/ibm/aglet/system

Modified Files:
	AgletRuntime.java ContextAdapter.java Aglets.java 
	ContextEvent.java 
Log Message:
Merge of experimental branch.

Index: AgletRuntime.java
===================================================================
RCS file: /cvsroot/aglets/aglets/src/com/ibm/aglet/system/AgletRuntime.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AgletRuntime.java	27 Jul 2009 10:31:42 -0000	1.7
+++ AgletRuntime.java	28 Jul 2009 07:04:54 -0000	1.8
@@ -47,7 +47,7 @@
 public abstract class AgletRuntime {
 
 	final static String runtimePackagePrefix = "aglet.runtime.packagePrefix";
-    static LogCategory logCategory = LogInitializer.getCategory("com.ibm.aglet.system.AgletRuntime");
+	private static AgletsLogger logger = AgletsLogger.getLogger(AgletRuntime.class.getName());
 
 	private boolean _secure = true;
 
@@ -258,13 +258,13 @@
 			if (obj instanceof AgletRuntime) {
 				runtime = (AgletRuntime)obj;
 			} else {
-				logCategory.error("[ \"" + classname + "\" is not Runtime]");
+				logger.error("[ \"" + classname + "\" is not Runtime]");
 			} 
 		} catch (ClassNotFoundException ex) {
-			logCategory.error("[ The class \"" + classname 
+			logger.error("[ The class \"" + classname 
 							   + "\" not found]");
 		} catch (Exception ex) {
-			logCategory.error("[ An instance of \"" + classname 
+			logger.error("[ An instance of \"" + classname 
 							   + "\" cannot be created]");
 		} 
 

Index: Aglets.java
===================================================================
RCS file: /cvsroot/aglets/aglets/src/com/ibm/aglet/system/Aglets.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Aglets.java	27 Jul 2009 10:31:42 -0000	1.4
+++ Aglets.java	28 Jul 2009 07:04:54 -0000	1.5
@@ -33,19 +33,17 @@
  * 
  * <pre>
  * static public void main(String args[]) {
- * Aglets.init();
- * String contextAddress = "atp://server.com:4434";
- * 
- * // create from server's local path
- * AgletProxy p1 = Aglets.createAglet(contextAddress,
- * null,
- * "test.Aglet", null);
- * AgletID id = p1.getAgletID();
- * 
- * // this returns a proxy equivalent to p1.
- * AgletProxy p2 = Aglets.getAgletProxy(contextAddress, id);
- * 
- * p2.sendMessage(new Message("startTrip"));
+ *     String contextAddress = "atp://server.com:4434";
+ *
+ *     // create from server's local path
+ *     AgletProxy p1 = Aglets.createAglet(contextAddress, null,
+ *                                        "test.Aglet", null);
+ *     AgletID id = p1.getAgletID();
+ *
+ *     // this returns a proxy equivalent to p1.
+ *     AgletProxy p2 = Aglets.getAgletProxy(contextAddress, id);
+ *
+ *     p2.sendMessage(new Message("startTrip"));
  * }
  * </pre>
  * 
@@ -83,7 +81,7 @@
 		return AgletRuntime.getAgletRuntime().getAgletProxies(contextAddress);
 	}
 	/**
-	 * Obtains a proxy reference the remote aglet.
+	 * Obtains a proxy reference to the remote aglet.
 	 */
 	static public AgletProxy getAgletProxy(String contextAddress, 
 										   AgletID id) throws IOException {