use new jacamo

Author: jomifred

build.gradle

@@ -29,7 +29,8 @@ repositories {
 }
 
 dependencies {
-    compile 'org.jacamo:jacamo:0.8-SNAPSHOT'
+    compile group: 'org.jacamo' , name: 'jacamo'   , version: '0.8-SNAPSHOT'  , changing: true , transitive: true
+
     compile 'javax.xml.bind:jaxb-api:+'
 	compile 'com.sun.xml.bind:jaxb-core:+'
     compile 'com.sun.xml.bind:jaxb-impl:+'

src/java/jacamo/web/JCMRest.java

@@ -27,9 +27,12 @@
 import org.glassfish.jersey.server.ResourceConfig;
 
 import jacamo.infra.JaCaMoLauncher;
+import jacamo.infra.JaCaMoRuntimeServices;
 import jacamo.platform.DefaultPlatformImpl;
+import jason.asSemantics.Agent;
 import jason.mas2j.AgentParameters;
 import jason.mas2j.ClassParameters;
+import jason.runtime.Settings;
 
 
 public class JCMRest extends DefaultPlatformImpl {
@@ -60,6 +63,8 @@ static public String getZKHost() {
 
     @Override
     public void init(String[] args) throws Exception {
+        
+        // adds RestAgArch in the configuration of all agents in the project
         List<AgentParameters> lags = new ArrayList<>();
         for (AgentParameters ap: project.getAgents()) {
             if (ap.getNbInstances() > 0) {
@@ -110,6 +115,18 @@ public void init(String[] args) throws Exception {
             }
         }
 
+        // replace createAgent service (to add RestAgArch)
+        ((JaCaMoLauncher)JaCaMoLauncher.getRunner()).setRuntimeServives(new JaCaMoRuntimeServices(JaCaMoLauncher.getRunner()) {
+            @Override
+            public String createAgent(String agName, String agSource, String agClass, List<String> archClasses, ClassParameters bbPars, Settings stts, Agent father) throws Exception {
+                if (archClasses == null)
+                    archClasses = new ArrayList<>();
+                if (!archClasses.contains(RestAgArch.class.getName()))
+                    archClasses.add(RestAgArch.class.getName());
+                return super.createAgent(agName, agSource, agClass, archClasses, bbPars, stts, father);
+            }
+        });
+        
         this.runner = (JaCaMoLauncher)JaCaMoLauncher.getRunner();
     }
 

src/java/jacamo/web/RestAgArch.java

@@ -71,7 +71,7 @@ public void stop() {
 
     RuntimeServices singRTS = null;
 
-    // place DSF services based on ZK
+    // place DF services based on ZK
     @Override
     public RuntimeServices getRuntimeServices() {
         if (singRTS == null) {
@@ -95,9 +95,8 @@ public void dfSubscribe(String agName, String service, String type) {
                     }
                     @Override
                     public String createAgent(String agName, String agSource, String agClass, List<String> archClasses, ClassParameters bbPars, Settings stts, Agent father) throws Exception {
-                        String r = super.createAgent(agName, agSource, agClass, archClasses, bbPars, stts, father);
-                        archClasses.add(RestAgArch.class.getName());
-                        return r;
+                        // delegate the to RTS defined in JaCaMo Launcher
+                        return masRunner.getRuntimeServices().createAgent(agName, agSource, agClass, archClasses, bbPars, stts, father);
                     }
                 };
             } else {

src/java/jacamo/web/RestImpl.java

@@ -11,6 +11,7 @@
 import java.util.logging.LogRecord;
 import java.util.logging.StreamHandler;
 
+import javax.inject.Singleton;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -22,14 +23,13 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
+import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.w3c.dom.Document;
 
 import jacamo.infra.JaCaMoLauncher;
-import jacamo.platform.DefaultPlatformImpl;
 import jason.ReceiverNotFoundException;
 import jason.asSemantics.Agent;
 import jason.asSemantics.IntendedMeans;
@@ -47,8 +47,14 @@
 import jason.util.asl2html;
 
 
+@Singleton
 @Path("/")
-public class RestImpl extends DefaultPlatformImpl {
+public class RestImpl extends AbstractBinder {
+
+    @Override
+    protected void configure() {
+        bind(new RestImpl()).to(RestImpl.class);
+    }
 
     // HTML interface
 
@@ -120,10 +126,10 @@ public String getNewAgentForm() {
     @Produces(MediaType.TEXT_HTML)
     public String createNewAgent(@FormParam("name") String agName) {
         try {
-            List<String> archs = new ArrayList<>();
-            archs.add(RestAgArch.class.getName());
-            String name = JaCaMoLauncher.getRunner().getRuntimeServices().createAgent(agName, null, null, archs, null, null, null);
+            String name = JaCaMoLauncher.getRunner().getRuntimeServices().createAgent(agName, null, null, null, null, null, null);
             JaCaMoLauncher.getRunner().getRuntimeServices().startAgent(name);
+            // set some source for the agent
+            JaCaMoLauncher.getRunner().getAg(name).getTS().getAg().setASLSrc("no-inicial.asl");
             return "<head><meta http-equiv=\"refresh\" content=\"2; URL='/agents/"+name+"/all'\" /></head>ok for "+name;
         } catch (Exception e) {
             e.printStackTrace();