Skip to content

Commit

Permalink
remove unnecessary agets from Release version
Browse files Browse the repository at this point in the history
  • Loading branch information
Jupeti10 committed Aug 15, 2016
1 parent 3e3d09d commit 96dc98d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 40 deletions.
48 changes: 10 additions & 38 deletions O-MI Node/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -125,51 +125,23 @@ agent-system {
# Agents to be started on startup,
# their code should be compiled to jar file and found in 'deploy/' directory
internal-agents {
"BAgent" = {
class = "agents.BasicAgent"
config = {
path = "Objects/BAgent/sensor"
interval = 60 seconds
}
}
"RAgent" = {
class = "agents.ResponsibleAgent"
config = {
path = "Objects/RAgent/sensor"
interval = 60 seconds
}
owns = [ "Objects/RAgent/sensor" ]
}
"Broken" = {
class = "agents.BrokenAgent"
config = {
path = "Objects/Broken/sensor"
interval = 60 seconds
}
owns = [ "Objects/Broken/sensorOwned" ]
}
#ODF agent generates random values in a structure defined in the xml file
"SmartHouse" = {
class = "agents.ODFAgent"
config = {
file = "./configs/SmartHouse.xml"
interval = 60 seconds
}
}
"K1Agent" = {
class = "agents.ODFAgent"
config = {
file = "./configs/otaniemi3d-data.xml"
interval = 60 seconds
}
}
"ExternalAgentListener" = {
class = "agents.ExternalAgentListener"
config = {
timeout = 10 seconds
port = 8181
interface = "localhost"
}
}
# This agent opens TCP to listen to O-DF messages and writes the data to server
# "ExternalAgentListener" = {
# class = "agents.ExternalAgentListener"
# config = {
# timeout = 10 seconds
# port = 8181
# interface = "localhost"
# }
# }
}

# Time how long an actor has to at least run before trying
Expand Down
4 changes: 2 additions & 2 deletions O-MI Node/src/main/scala/http/OmiService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class OmiServiceImpl(reqHandler: RequestHandler, val subscriptionManager: ActorR
// Early initializer needed (-- still doesn't seem to work)
override val log = LoggerFactory.getLogger(classOf[OmiService])
} with OmiService {

registerApi(new AuthAPIService())
//example auth API service code in java directory of the project
//registerApi(new AuthAPIService())

//Used for O-MI subscriptions
val requestHandler = reqHandler
Expand Down

0 comments on commit 96dc98d

Please sign in to comment.