Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1153] trunk/applications/jason-team
|
From: <jom...@us...> - 2008-03-16 16:29:59
|
Revision: 1153
http://jason.svn.sourceforge.net/jason/?rev=1153&view=rev
Author: jomifred
Date: 2008-03-16 09:29:57 -0700 (Sun, 16 Mar 2008)
Log Message:
-----------
update jason team run script
Modified Paths:
--------------
trunk/applications/jason-team/run.sh
trunk/applications/jason-team/src/java/arch/ACAgent.java
trunk/applications/jason-team/src/java/arch/ACProxy.java
Modified: trunk/applications/jason-team/run.sh
===================================================================
--- trunk/applications/jason-team/run.sh 2008-03-16 14:29:35 UTC (rev 1152)
+++ trunk/applications/jason-team/run.sh 2008-03-16 16:29:57 UTC (rev 1153)
@@ -1,5 +1,5 @@
#!/bin/sh
-java -cp lib/jason.jar:lib/search.jar:. \
+java -cp ../../lib/jason.jar:lib/search.jar:bin/classes \
jason.infra.centralised.RunCentralisedMAS \
- Local-JasonTeam.mas2j
+ AC-Local-JasonTeam.mas2j
Modified: trunk/applications/jason-team/src/java/arch/ACAgent.java
===================================================================
--- trunk/applications/jason-team/src/java/arch/ACAgent.java 2008-03-16 14:29:35 UTC (rev 1152)
+++ trunk/applications/jason-team/src/java/arch/ACAgent.java 2008-03-16 16:29:57 UTC (rev 1153)
@@ -7,6 +7,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.SocketException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -100,14 +101,8 @@
auth.setAttribute("password",password);
root.appendChild(auth);
this.sendDocument(doc);
- //transformerfactory.newTransformer().transform(new DOMSource(doc),new StreamResult(outputstream));
- //outputstream.write(0);
} catch (ParserConfigurationException e) {
logger.log(Level.SEVERE, "unable to create new document for authentication.", e);
- //} catch (TransformerConfigurationException e) {
- // logger.log(Level.SEVERE,"unable to configure transformer", e);
- //} catch (TransformerException e) {
- // logger.log(Level.SEVERE,"unable to transform document", e);
}
}
@@ -116,7 +111,8 @@
Document doc = receiveDocument();
Element root = doc.getDocumentElement();
if (root==null) return false;
- if (!root.getAttribute("type").equalsIgnoreCase("auth-response")) return false;
+ if (!root.getAttribute("type").equalsIgnoreCase("auth-response"))
+ return false;
NodeList nl = root.getChildNodes();
Element authresult = null;
@@ -127,19 +123,12 @@
break;
}
}
- if (!authresult.getAttribute("result").equalsIgnoreCase("ok")) return false;
- } catch (SAXException e) {
+ if (authresult.getAttribute("result").equalsIgnoreCase("ok"))
+ return true;
+ } catch (Exception e) {
e.printStackTrace();
- return false;
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- return false;
- } catch (SocketClosedException e) {
- e.printStackTrace();
- return false;
}
-
- return true;
+ return false;
}
public boolean doAuthentication(String username, String password) throws IOException {
@@ -160,9 +149,19 @@
return buffer.toByteArray();
}
- public Document receiveDocument() throws SAXException, IOException, ParserConfigurationException, SocketClosedException {
- byte[] raw = receivePacket();
- Document doc = documentbuilderfactory.newDocumentBuilder().parse(new ByteArrayInputStream(raw));
+ public Document receiveDocument() throws SAXException { // , IOException, ParserConfigurationException, SocketClosedException {
+ try {
+ byte[] raw = receivePacket();
+ Document doc = documentbuilderfactory.newDocumentBuilder().parse(new ByteArrayInputStream(raw));
+ return doc;
+ } catch (SocketClosedException e) {
+ logger.log(Level.SEVERE, "Socket was closed:"+e);
+ connected = false;
+ } catch (SocketException e) {
+ logger.log(Level.SEVERE, "Socket exception:"+e);
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "ACAgent receiveDocument exception", e);
+ }
/*
try {
if (logger.isLoggable(Level.FINE)) {
@@ -172,7 +171,7 @@
}
} catch (Exception e) {}
*/
- return doc;
+ return null;
}
protected boolean connect() {
@@ -190,7 +189,7 @@
logger.log(Level.SEVERE, "authentication failed");
}
} catch (Exception e) {
- logger.log(Level.SEVERE, "Exception", e);
+ logger.log(Level.SEVERE, "Connection exception "+e);
}
return connected;
}
@@ -199,15 +198,6 @@
return connected;
}
- /*
- protected void reconnect() throws Exception {
- if (socket != null) {
- socket.close();
- }
- connect();
- }
- */
-
public boolean processMessage(Element el_message) {
String type = el_message.getAttribute("type");
if (type.equals("request-action") || type.equals("sim-start") || type.equals("sim-end")) {
Modified: trunk/applications/jason-team/src/java/arch/ACProxy.java
===================================================================
--- trunk/applications/jason-team/src/java/arch/ACProxy.java 2008-03-16 14:29:35 UTC (rev 1152)
+++ trunk/applications/jason-team/src/java/arch/ACProxy.java 2008-03-16 16:29:57 UTC (rev 1153)
@@ -5,6 +5,7 @@
import jason.asSyntax.Structure;
import jason.environment.grid.Location;
+import java.net.SocketException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -68,29 +69,26 @@
try {
if (isConnected()) {
Document doc = receiveDocument();
- Element el_root = doc.getDocumentElement();
-
- if (el_root != null) {
- if (el_root.getNodeName().equals("message")) {
- processMessage(el_root);
+ if (doc != null) {
+ Element el_root = doc.getDocumentElement();
+
+ if (el_root != null) {
+ if (el_root.getNodeName().equals("message")) {
+ processMessage(el_root);
+ } else {
+ logger.log(Level.SEVERE,"unknown document received");
+ }
} else {
- logger.log(Level.SEVERE,"unknown document received");
+ logger.log(Level.SEVERE, "no document element found");
}
- } else {
- logger.log(Level.SEVERE, "no document element found");
}
} else {
// wait auto-reconnect
logger.info("waiting reconnection...");
try { Thread.sleep(2000); } catch (InterruptedException e1) {}
}
- /*} catch (SocketClosedException e) {
- logger.log(Level.SEVERE, "Socket was closed:"+e);
- connected = false;
- } catch (SocketException e) {
- logger.log(Level.SEVERE, "Socket exception:"+e); */
} catch (Exception e) {
- logger.log(Level.SEVERE, "Exception", e);
+ logger.log(Level.SEVERE, "ACProxy run exception", e);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
