Thread: [Jason-developers] SF.net SVN: jason:[1913] trunk (Page 12)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1913
          http://sourceforge.net/p/jason/svn/1913
Author:   jomifred
Date:     2016-05-12 13:42:16 +0000 (Thu, 12 May 2016)
Log Message:
-----------
add jason script (to run .mas2j files)
remove jacamo as a infra for .mas2j (.jcm should be used for jacamo appls)

Modified Paths:
--------------
    trunk/bin/mas2j.sh
    trunk/release-notes.txt
    trunk/src/jason/infra/jade/JadeAgArch.java
    trunk/src/jason/mas2j/MAS2JProject.java
    trunk/src/jason/util/Config.java
    trunk/src/test/MAS2JParserTest.java

Added Paths:
-----------
    trunk/bin/jason
    trunk/src/jason/runtime/RunJasonProject.java

Removed Paths:
-------------
    trunk/lib/c4jason.jar
    trunk/lib/cartago.jar
    trunk/lib/jacamo.jar
    trunk/lib/moise.jar
    trunk/lib/npl.jar

Added: trunk/bin/jason
===================================================================

--- trunk/bin/jason	                        (rev 0)
+++ trunk/bin/jason	2016-05-12 13:42:16 UTC (rev 1913)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+if [ -z JASON_HOME ] ; then
+    CURDIR=`pwd`
+    JASON_HOME=`dirname $0`
+    cd "$JASON_HOME/.."
+    JASON_HOME=`pwd`
+    cd $CURDIR
+fi
+
+echo Jason home is $JASON_HOME
+
+if [ -z $JDK_HOME ] ; then
+    if [ -n $JAVA_HOME ] ; then
+	    JDK_HOME=$JAVA_HOME
+    fi
+fi
+
+if [ -z $JDK_HOME ] ; then
+	if [ $OS == Darwin ] ; then
+		JDK_HOME=/usr
+	fi
+fi
+
+# check JDK_HOME
+if [ ! -f $JDK_HOME/bin/javac ] ; then
+   echo JDK_HOME is not properly set!
+fi
+
+export PATH="$JDK_HOME/bin":$PATH
+
+JASON_JAR=`find $JASON_HOME/lib -name jason-2*.jar`
+JACAMO_JAR=`find $JASON_HOME/lib -name jacamo*.jar`
+
+java -cp $JASON_JAR:$JACAMO_JAR jason.runtime.RunJasonProject $1


Property changes on: trunk/bin/jason
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/bin/mas2j.sh
===================================================================
--- trunk/bin/mas2j.sh	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/bin/mas2j.sh	2016-05-12 13:42:16 UTC (rev 1913)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# this script creates the Ant script (build.xml) 
-# to run a Jason project  
+# this script creates the Ant script (build.xml)
+# to run a Jason project
 #
 
 if [ ! -f $1 ]
@@ -10,16 +10,20 @@
     exit
 fi
 
+if [ -z JASON_HOME ] ; then
+    CURDIR=`pwd`
+    JASON_HOME=`dirname $0`
+    cd "$JASON_HOME/.."
+    JASON_HOME=`pwd`
+    cd $CURDIR
+fi
 
-CURDIR=`pwd`
+JASON_JAR=`find $JASON_HOME/lib  -name jason-2*.jar`
+JACAMO_JAR=`find $JASON_HOME/lib -name jacamo*.jar`
 
-JASONDIR=`dirname $0`/..
-cd $JASONDIR
-JASONDIR=`pwd`
+java -cp $JASON_JAR:$JACAMO_JAR jason.mas2j.parser.mas2j $1 $2
 
-cd $CURDIR
+# bin/classes:$JASON_HOME/lib/jason.jar:$JASON_HOME/lib/jade.jar:$JASON_HOME/lib/c4jason.jar:$JASON_HOME/lib/cartago.jar:$JASON_HOME/lib/jacamo.jar:$CLASSPATH:. \
+#  jason.mas2j.parser.mas2j $1 $2
 
-java -classpath bin/classes:$JASONDIR/lib/jason.jar:$JASONDIR/lib/jade.jar:$JASONDIR/lib/c4jason.jar:$JASONDIR/lib/cartago.jar:$JASONDIR/lib/jacamo.jar:$CLASSPATH:. \
-  jason.mas2j.parser.mas2j $1 $2
-
 #chmod u+x *.sh

Deleted: trunk/lib/c4jason.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/cartago.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jacamo.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/moise.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/npl.jar
===================================================================
(Binary files differ)

Modified: trunk/release-notes.txt
===================================================================
--- trunk/release-notes.txt	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/release-notes.txt	2016-05-12 13:42:16 UTC (rev 1913)
@@ -32,7 +32,9 @@
 Changes in the API:
 - AgArch act method has just one parameter
 - Java 1.7 is used 
+- JaCaMo is not an available infrastructure anymore, it has its own support to run MAS (the .jcm files)
 
+
 New Tutorial on BDI (see doc/index.html)
 
 ---------------------------

Modified: trunk/src/jason/infra/jade/JadeAgArch.java
===================================================================
--- trunk/src/jason/infra/jade/JadeAgArch.java	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/src/jason/infra/jade/JadeAgArch.java	2016-05-12 13:42:16 UTC (rev 1913)
@@ -1,5 +1,13 @@
 package jason.infra.jade;
 
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.logging.Level;
+
+import org.w3c.dom.Document;
+
 import jade.core.AID;
 import jade.core.behaviours.Behaviour;
 import jade.core.behaviours.CyclicBehaviour;
@@ -18,17 +26,7 @@
 import jason.mas2j.MAS2JProject;
 import jason.mas2j.parser.ParseException;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.logging.Level;
 
-import org.w3c.dom.Document;
-
-import c4jason.CartagoEnvironment;
-
-
 /**
  * Implementation of the Jade Architecture to run Jason agents
  * 
@@ -168,7 +166,7 @@
     public static boolean isCartagoJadeCase(MAS2JProject project) {
         return 
             project.getEnvClass() != null && 
-            project.getEnvClass().getClassName().equals(CartagoEnvironment.class.getName()) && 
+            project.getEnvClass().getClassName().equals("c4jason.CartagoEnvironment") && 
             project.isJade();
     }
     
@@ -176,9 +174,10 @@
     public static synchronized void startCartagoNode(String[] args) {
         if (!cartagoStarted) {
             System.out.print("Starting cartago node....");
-            CartagoEnvironment env = new CartagoEnvironment();
-            env.init(args);
-            System.out.println("ok.");
+            //CartagoEnvironment env = new CartagoEnvironment();
+            //env.init(args);
+            //System.out.println("ok.");
+            System.out.println("**** not implemented!!!! ****");
         }
         cartagoStarted = true;
     }

Modified: trunk/src/jason/mas2j/MAS2JProject.java
===================================================================
--- trunk/src/jason/mas2j/MAS2JProject.java	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/src/jason/mas2j/MAS2JProject.java	2016-05-12 13:42:16 UTC (rev 1913)
@@ -305,7 +305,7 @@
                 String facClass = Config.get().getInfrastructureFactoryClass(infrastructure.getClassName());
                 infraFac = (InfrastructureFactory)Class.forName(facClass).newInstance();
             } catch (Exception e) { 
-                throw new JasonException("The project's infrastructure ('"+infrastructure.getClassName()+"') is unknown! \n"+e);
+                throw new JasonException("The project's infrastructure ('"+infrastructure.getClassName()+"') is not well configured! \n"+e);
             }
         }
         return infraFac;

Added: trunk/src/jason/runtime/RunJasonProject.java
===================================================================
--- trunk/src/jason/runtime/RunJasonProject.java	                        (rev 0)
+++ trunk/src/jason/runtime/RunJasonProject.java	2016-05-12 13:42:16 UTC (rev 1913)
@@ -0,0 +1,68 @@
+package jason.runtime;
+
+import java.io.File;
+
+import jason.infra.MASLauncherInfraTier;
+import jason.mas2j.MAS2JProject;
+import jason.mas2j.parser.mas2j;
+import jason.util.Config;
+
+/**
+ * Run a Jason mas2j project
+ * 
+ * parameters: 
+ *    /Jason mas2j Project File/
+ * 
+ * @author jomi
+ *
+ */
+public class RunJasonProject {
+    
+    static MASLauncherInfraTier launcher;
+    
+    // Run the parser
+    public static void main (String args[]) {
+
+      String name;
+      mas2j parser;
+      MAS2JProject project = new MAS2JProject();
+      
+      if (args.length == 0) {
+          System.out.println("usage must be:");
+          System.out.println("      java "+RunJasonProject.class.getName()+" <MAS2j Project File>");
+          return;
+      } else {
+          name = args[0];
+          System.err.println("reading from file " + name + " ..." );
+          try {
+              parser = new mas2j(new java.io.FileInputStream(name));
+          } catch(java.io.FileNotFoundException e){
+              System.err.println("file \"" + name + "\" not found.");
+              return;
+          }
+      }
+      
+      // parsing
+      try {
+          File file = new File(name);
+          //File directory = file.getAbsoluteFile().getParentFile();
+          project = parser.mas();
+          Config.get().fix();
+          project.setProjectFile(file);
+          System.out.println("file "+name+" parsed successfully!\n");
+          
+          launcher = project.getInfrastructureFactory().createMASLauncher();
+          launcher.setProject(project);
+          launcher.writeScripts(false, false);
+          
+          new Thread(launcher, "MAS-Launcher").start();
+      } catch(Exception e){
+          System.err.println("parsing errors found... \n" + e);
+      }
+    }
+    
+    public MASLauncherInfraTier getLauncher() {
+        return launcher;
+    }
+
+}

Modified: trunk/src/jason/util/Config.java
===================================================================
--- trunk/src/jason/util/Config.java	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/src/jason/util/Config.java	2016-05-12 13:42:16 UTC (rev 1913)
@@ -59,7 +59,7 @@
     /** path to jade.jar */
     public static final String JADE_JAR      = "jadeJar";
     public static final String MOISE_JAR     = "moiseJar";
-    public static final String JACAMO_JAR    = "jacamoJar";
+    //public static final String JACAMO_JAR    = "jacamoJar";
     
     /** runtime jade arguments (the same used in jade.Boot) */
     public static final String JADE_ARGS     = "jadeArgs";
@@ -82,7 +82,7 @@
     public static final String SHOW_ANNOTS   = "showAnnots";
     
     
-    public static final String jacamoHomeProp = "JaCaMoHome";
+    //public static final String jacamoHomeProp = "JaCaMoHome";
 
     public static final String SHORT_UNNAMED_VARS = "shortUnnamedVars";
     public static final String START_WEB_MI       = "startWebMindInspector";
@@ -273,7 +273,7 @@
         tryToFixJarFileConf(JASON_JAR,  "jason",  700000);
         tryToFixJarFileConf(JADE_JAR,   "jade",  2000000);
         tryToFixJarFileConf(MOISE_JAR,  "moise",  300000);
-        tryToFixJarFileConf(JACAMO_JAR, "jacamo",   5000);
+        //tryToFixJarFileConf(JACAMO_JAR, "jacamo",   5000);
         tryToFixJarFileConf(JASON_JAR,  "jason",  700000); // in case jacamo is found
         
         // fix java home
@@ -391,7 +391,7 @@
         // Default infrastructures
         put("infrastructure.Centralised", CentralisedFactory.class.getName());
         put("infrastructure.Jade", JadeFactory.class.getName());
-        put("infrastructure.JaCaMo", "jacamo.infra.JaCaMoInfrastructureFactory");
+        //put("infrastructure.JaCaMo", "jacamo.infra.JaCaMoInfrastructureFactory");
 
     }
 
@@ -437,7 +437,7 @@
         } catch (Exception e) {
             System.err.println("Error getting user infrastructures.");          
         }
-        return new String[] {"Centralised","Jade","JaCaMo"};
+        return new String[] {"Centralised","Jade" }; //,"JaCaMo"};
     }
     
     public String getInfrastructureFactoryClass(String infraId) {
@@ -521,6 +521,7 @@
                 }
             } catch (Exception e) {}
 
+            /*
             try {
                 // try jacamo jar
                 File jacamojardir= new File(getProperty(JACAMO_JAR)).getAbsoluteFile().getCanonicalFile().getParentFile();
@@ -531,7 +532,8 @@
                     return;
                 }
             } catch (Exception e) {}
-
+            */
+            
             // try current dir
             jarFile = findJarInDirectory(new File("."), jarFilePrefix);
             if (checkJar(jarFile, minSize)) {

Modified: trunk/src/test/MAS2JParserTest.java
===================================================================
--- trunk/src/test/MAS2JParserTest.java	2016-05-09 10:19:38 UTC (rev 1912)
+++ trunk/src/test/MAS2JParserTest.java	2016-05-12 13:42:16 UTC (rev 1913)
@@ -8,6 +8,7 @@
 import jason.mas2j.MAS2JProject;
 import jason.mas2j.parser.ParseException;
 import jason.mas2j.parser.mas2j;
+import jason.util.Config;
 
 import java.io.StringReader;
 import java.util.Map;
@@ -22,7 +23,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         StringBuffer source = new StringBuffer("MAS auctionCent { \n");
-        source.append("infrastructure: Centralised \n");
+        source.append("infrastructure: JaCaMo \n");
         source.append("environment: myEnv at \"x.edu\" \n");
         source.append("executionControl: myController ");
         source.append("agents: ag1 [events=discard,intBels=newFocus,osfile=\"a/x.xml\"]; ag2 /home/agTest.asl agentClass mypkg.MyAgent #2; ag3 at \"x.edu\"; auctionner agentArchClass AuctionnerGUI;");
@@ -61,7 +62,12 @@
             
             assertEquals(project.getDirectiveClasses().size(),2);
             assertEquals(project.getDirectiveClasses().get("md2").toString(), "mypkg.LogDirective");
+            assertEquals("JaCaMo", project.getInfrastructure().getClassName());
             
+            String facClass = Config.get().getInfrastructureFactoryClass(project.getInfrastructure().getClassName());
+            assertEquals("jacamo.infra.JaCaMoInfrastructureFactory", facClass);
+
+            //System.out.println(project.getInfrastructureFactory());
         } catch (Exception e) {
             System.err.println("Error:"+e);
             e.printStackTrace();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Jason-developers] SF.net SVN: jason:[1913] trunk (Page 12)

jason-developers