Changeset 7 for src

Timestamp:

11/28/19 14:41:17 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

src/main

Files:

• java/geniusweb/runserver/PartyConnectionFactory.java (modified) (6 diffs)
• java/geniusweb/runserver/RunningNegotiationsRepo.java (modified) (3 diffs)
• java/geniusweb/runserver/WebSocketProtToPartyConn.java (added)
• webapp/newsession.xhtml (modified) (4 diffs)
• webapp/newtournament.xhtml (modified) (3 diffs)

src/main/java/geniusweb/runserver/PartyConnectionFactory.java

@@ -12 +12 @@
 import java.util.logging.Level;
 
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.references.PartyRef;
 import geniusweb.references.Reference;
@@ -23 +23 @@
  * following the partiesserver protocols.
  */
-class PartyConnectionFactory implements ConnectionWithPartyFactory {
+class PartyConnectionFactory implements ProtocolToPartyConnFactory {
         private final Reporter log;
 
@@ -35 +35 @@
 
         @Override
-        public PartyConnection connect(Reference reference)
+        public WebSocketProtToPartyConn connect(Reference reference)
                         throws IOException, NoResourcesNowException {
                 try {
-                        return new PartyConnection(reference, log).init();
+                        return new WebSocketProtToPartyConn(reference, log).init();
                 } catch (IOException e) {
                         Date date = getWaitingTime(e);
@@ -60 +60 @@
 
         @Override
-        public List<ConnectionWithParty> connect(List<Reference> references)
+        public List<ProtocolToPartyConn> connect(List<Reference> references)
                         throws IOException, NoResourcesNowException {
                 /*
@@ -70 +70 @@
                  */
                 log.log(Level.INFO, "attempting to connect " + references);
-                List<ConnectionWithParty> connections = new LinkedList<>();
+                List<ProtocolToPartyConn> connections = new LinkedList<>();
                 try {
                         for (Reference partyref : references) {
-                                ConnectionWithParty conn = null;
+                                ProtocolToPartyConn conn = null;
                                 while (conn == null) {
                                         try {
@@ -87 +87 @@
                 } catch (IOException | NoResourcesNowException e) {
                         // free all already created connections
-                        for (ConnectionWithParty conn : connections) {
+                        for (ProtocolToPartyConn conn : connections) {
                                 conn.close();
                         }

src/main/java/geniusweb/runserver/RunningNegotiationsRepo.java

@@ -55 +55 @@
                 }
                 negotiations.put(entity.getID(), entity);
-                notifyChange(entity.getID());
+                notifyListeners(entity.getID());
                 log.log(Level.FINEST, "started " + entity.getID());
         }
@@ -62 +62 @@
         public void remove(String id) {
                 negotiations.remove(id);
-                notifyChange(id);
+                notifyListeners(id);
                 log.log(Level.FINEST, "stopped negotiation " + id);
         }
@@ -73 +73 @@
                 }
                 negotiations.put(entity.getID(), entity);
-                notifyChange(entity.getID());
+                notifyListeners(entity.getID());
                 log.log(Level.FINEST, "replaced " + entity.getID());
 

src/main/webapp/newsession.xhtml

@@ -27 +27 @@
         <br /> Domain/Profile Server:
         <input type="url" name="url" id="profilesserverurl"
-                value="localhost:8080/profilesserver-1.0.0"
+                value="localhost:8080/profilesserver-1.1.0"
                 pattern=".*:[0-9]+/profilesserver" size="30"
                 onchange="connectDomain()"> </input>
@@ -41 +41 @@
                 <br /> <b>Participants</b> <br /> Parties Server: <input type="url"
                         name="url" id="partiesserverurl"
-                        value="localhost:8080/partiesserver-1.0.0"
+                        value="localhost:8080/partiesserver-1.1.0"
                         pattern=".*:[0-9]+/partiesserver" size="30"
                         onchange="connectParties()"> </input> <br /> <br /> <b>Edit
@@ -220 +220 @@
          refresh table: copy all parties elements in there.
          Typically parties is something like
-         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.0.0",
+         [{"uri":"http:130.161.180.1:8080/partiesserver/run/randomparty-1.1.0",
                  "capabilities":{"protocols":["SAOP"]},
                  "description":"places random bids until it can accept an offer with utility >0.6",
-                 "id":"randomparty-1.0.0",
+                 "id":"randomparty-1.1.0",
                  "partyClass":"geniusweb.exampleparties.randomparty.RandomParty"},
                                  ...]
@@ -396 +396 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.0.0"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.0.0"
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.1.0"
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.1.0"
                 connectDomain();
                 connectParties();

src/main/webapp/newtournament.xhtml

@@ -43 +43 @@
         <div id="box" class="box">
                 <br /> Domain/Profile Server: <input type="url" name="url"
-                        id="profilesserverurl" value="localhost:8080/profilesserver-1.0.0"
+                        id="profilesserverurl" value="localhost:8080/profilesserver-1.1.0"
                         pattern=".*:[0-9]+/profilesserver" size="30"
                         onchange="connectDomain()"> </input> <br /> Domain: <select
@@ -69 +69 @@
         <div id="box" class="box">
                 <br /> Parties Server: <input type="url" name="url"
-                        id="partiesserverurl" value="localhost:8080/partiesserver-1.0.0"
+                        id="partiesserverurl" value="localhost:8080/partiesserver-1.1.0"
                         pattern=".*:[0-9]+/partiesserver" size="30"
                         onchange="connectParties()"> </input> <br /> <br />
@@ -390 +390 @@
         */
         function init() {
-                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.0.0"
-                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.0.0"
+                document.getElementById("partiesserverurl").value =window.location.hostname+":8080/partiesserver-1.1.0"
+                document.getElementById("profilesserverurl").value =window.location.hostname+":8080/profilesserver-1.1.0"