Author: marrs
Date: Fri Nov 8 12:12:48 2013
New Revision: 1539994
URL: http://svn.apache.org/r1539994
Log:
Some fixes to the configuration parameters.
Modified:
ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
ace/trunk/run-server-allinone/server-allinone.bndrun
ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
ace/trunk/run-server/server.bndrun
Modified: ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg Fri Nov 8
12:12:48 2013
@@ -1 +1 @@
-showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.server.port}/obr
\ No newline at end of file
+showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.obr.port}/obr
\ No newline at end of file
Modified: ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg Fri Nov
8 12:12:48 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.server.port}/obr/
+authentication.baseURL = http://localhost:${org.apache.ace.obr.port}/obr/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified: ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg Fri Nov 8
12:12:48 2013
@@ -7,7 +7,7 @@ ui.authentication.user.password = ff
# ACE MS settings
ace.host = http://localhost:${org.apache.ace.server.port}/
# OBR settings
-obr.url = http://localhost:${org.apache.ace.server.port}/obr/
+obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
obr.xml = repository.xml
# Session timeout
session.timeout = 300
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg Fri
Nov 8 12:12:48 2013
@@ -1 +1 @@
-showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.server.port}/obr
\ No newline at end of file
+showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.obr.port}/obr
\ No newline at end of file
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
Fri Nov 8 12:12:48 2013
@@ -1,4 +1,4 @@
org.apache.ace.server.servlet.endpoint=/agent
# OBR settings
-obr.url = http://localhost:${org.apache.ace.server.port}/obr/
+obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
authentication.enabled = false
Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Fri Nov 8 12:12:48
2013
@@ -70,6 +70,7 @@
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server.port=8080,\
+ org.apache.ace.obr.port=8080,\
org.osgi.service.http.port=8080,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
Modified: ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg Fri
Nov 8 12:12:48 2013
@@ -1,4 +1,4 @@
org.apache.ace.server.servlet.endpoint=/agent
# OBR settings
-obr.url = http://localhost:${org.apache.ace.server.port}/obr/
+obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
authentication.enabled = false
Modified: ace/trunk/run-server/server.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1539994&r1=1539993&r2=1539994&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Fri Nov 8 12:12:48 2013
@@ -43,6 +43,7 @@
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server.port=8080,\
+ org.apache.ace.obr.port=8082,\
org.osgi.service.http.port=8080,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
