From 083f3a1ce29b957bc0e795a2fb252717037209f3 Mon Sep 17 00:00:00 2001 From: Gregor Riegler Date: Mon, 10 Jun 2013 21:31:02 +0200 Subject: [PATCH] [XVSM]runXVSM --- runXVSM-group.sh | 2 ++ runXVSM-spaces.sh | 4 +++ runXVSM.sh | 15 +++++++++ .../tuwien/sbc/valesriegler/common/Util.java | 32 ++++++------------- src/main/resources/logback.xml | 2 +- 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100755 runXVSM-group.sh create mode 100644 runXVSM-spaces.sh create mode 100755 runXVSM.sh diff --git a/runXVSM-group.sh b/runXVSM-group.sh new file mode 100755 index 0000000..fc2c3c5 --- /dev/null +++ b/runXVSM-group.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.group.GroupAgent" -Dexec.args="XVSM" & diff --git a/runXVSM-spaces.sh b/runXVSM-spaces.sh new file mode 100644 index 0000000..b7e6dc4 --- /dev/null +++ b/runXVSM-spaces.sh @@ -0,0 +1,4 @@ +#!/bin/bash +mvn exec:java -Dexec.mainClass="org.mozartspaces.core.Server" -Dexec.args=9876 & +mvn exec:java -Dexec.mainClass="org.mozartspaces.core.Server" -Dexec.args=9875 & +mvn exec:java -Dexec.mainClass="org.mozartspaces.core.Server" -Dexec.args=9874 & \ No newline at end of file diff --git a/runXVSM.sh b/runXVSM.sh new file mode 100755 index 0000000..2916ed5 --- /dev/null +++ b/runXVSM.sh @@ -0,0 +1,15 @@ +#!/bin/bash +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.cook.Cook" -Dexec.args="1 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.cook.Cook" -Dexec.args="2 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.cook.Cook" -Dexec.args="1 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.cook.Cook" -Dexec.args="2 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.waiter.Waiter" -Dexec.args="1 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.waiter.Waiter" -Dexec.args="2 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.waiter.Waiter" -Dexec.args="1 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.waiter.Waiter" -Dexec.args="2 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.driver.Driver" -Dexec.args="1 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.driver.Driver" -Dexec.args="2 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.driver.Driver" -Dexec.args="1 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.xvsm.driver.Driver" -Dexec.args="2 9874" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.pizzeria.PizzeriaAgent" -Dexec.args="XVSM 9875" & +mvn exec:java -Dexec.mainClass="at.ac.tuwien.sbc.valesriegler.pizzeria.PizzeriaAgent" -Dexec.args="XVSM 9874" & diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java index 68634e3..4f200e8 100644 --- a/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java +++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java @@ -1,34 +1,22 @@ package at.ac.tuwien.sbc.valesriegler.common; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; - -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.ScrollPaneConstants; -import javax.swing.border.TitledBorder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import at.ac.tuwien.sbc.valesriegler.group.gui.GroupCreationDetailsRequest; import at.ac.tuwien.sbc.valesriegler.types.Order; import at.ac.tuwien.sbc.valesriegler.types.PizzaOrder; import at.ac.tuwien.sbc.valesriegler.types.PizzaType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.swing.*; +import javax.swing.border.TitledBorder; +import java.awt.*; +import java.net.URI; +import java.util.*; +import java.util.List; public abstract class Util { private static final Logger log = LoggerFactory.getLogger(Util.class); - public static boolean useJMS = true; + public static boolean useJMS = false; public static final String TABLE_ASSIGNED = "tables"; public static final String ASSIGN_TABLE = "assignTable"; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 21d6cda..184b6a9 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -12,7 +12,7 @@ - + -- 2.43.0