Author: jawi
Date: Thu Dec 5 14:41:25 2013
New Revision: 1548154
URL: http://svn.apache.org/r1548154
Log:
ACE-441 - update run scripts for other hosts than localhost
- introduced combined properties for host + port where needed,
splitting out the main server, the OBR, the client and the
relay to separate properties.
Modified:
ace/trunk/run-client/client.bndrun
ace/trunk/run-client/conf/org.apache.ace.client.repository.cfg
ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg
ace/trunk/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/client.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/obr.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
ace/trunk/run-client/conf/org.apache.ace.discovery.property.cfg
ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
ace/trunk/run-obr/obr.bndrun
ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
ace/trunk/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
ace/trunk/run-relay/conf/org.apache.ace.discovery.property.cfg
ace/trunk/run-relay/relay.bndrun
ace/trunk/run-server-allinone/conf/org.apache.ace.client.automation.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
ace/trunk/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
ace/trunk/run-server-allinone/server-allinone.bndrun
ace/trunk/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/client.cfg
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
ace/trunk/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
ace/trunk/run-server/server.bndrun
ace/trunk/run-target/target.bndrun
Modified: ace/trunk/run-client/client.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Thu Dec 5 14:41:25 2013
@@ -54,9 +54,8 @@
Release
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
- org.apache.ace.server.port=8080,\
- org.apache.ace.client.port=8081,\
- org.apache.ace.obr.port=8082,\
+ org.apache.ace.server=localhost:8080,\
+ org.apache.ace.obr=localhost:8082,\
org.osgi.service.http.port=8081,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
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=1548154&r1=1548153&r2=1548154&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 Thu Dec 5
14:41:25 2013
@@ -1 +1 @@
-showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.obr.port}/obr
\ No newline at end of file
+showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://${org.apache.ace.obr}/obr
\ No newline at end of file
Modified: ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg Thu Dec 5
14:41:25 2013
@@ -1,5 +1,5 @@
org.apache.ace.server.servlet.endpoint=/client
-repository.url=http://localhost:${org.apache.ace.server.port}/repository
+repository.url=http://${org.apache.ace.server}/repository
user.name=d
authentication.enabled=false
customer.name=apache
Modified:
ace/trunk/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
(original)
+++
ace/trunk/run-client/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-repositoryLocation = http://localhost:${org.apache.ace.server.port}/repository
+repositoryLocation = http://${org.apache.ace.server}/repository
repositoryCustomer = apache
repositoryName = user
Modified:
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/auditlog.cfg Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/auditlog/
+authentication.baseURL = http://${org.apache.ace.server}/auditlog/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified: ace/trunk/run-client/conf/org.apache.ace.connectionfactory/client.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/client.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/client.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/client.cfg Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.server.port}/client/
+authentication.baseURL = http://${org.apache.ace.server}/client/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/deployment.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/deployment/
+authentication.baseURL = http://${org.apache.ace.server}/deployment/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
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=1548154&r1=1548153&r2=1548154&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 Thu Dec
5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.obr.port}/obr/
+authentication.baseURL = http://${org.apache.ace.obr}/obr/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/replication.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/replication.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/replication/
+authentication.baseURL = http://${org.apache.ace.server}/replication/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.connectionfactory/repository.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
(original)
+++ ace/trunk/run-client/conf/org.apache.ace.connectionfactory/repository.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/repository/
+authentication.baseURL = http://${org.apache.ace.server}/repository/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified: ace/trunk/run-client/conf/org.apache.ace.discovery.property.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.discovery.property.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.discovery.property.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.discovery.property.cfg Thu Dec 5
14:41:25 2013
@@ -1 +1 @@
-serverURL = http://localhost:${org.apache.ace.server.port}
\ No newline at end of file
+serverURL = http://${org.apache.ace.server}
\ No newline at end of file
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=1548154&r1=1548153&r2=1548154&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 Thu Dec 5
14:41:25 2013
@@ -5,9 +5,9 @@ ui.authentication.enabled = true
ui.authentication.user.name = dd
ui.authentication.user.password = ff
# ACE MS settings
-ace.host = http://localhost:${org.apache.ace.server.port}/
+ace.host = http://${org.apache.ace.server}/
# OBR settings
-obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
+obr.url = http://${org.apache.ace.obr}/obr/
obr.xml = repository.xml
# Session timeout
session.timeout = 300
Modified: ace/trunk/run-obr/obr.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Thu Dec 5 14:41:25 2013
@@ -23,7 +23,6 @@
Release
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
- org.apache.ace.obr.port=8082,\
org.osgi.service.http.port=8082,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
Modified: ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg
(original)
+++ ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/auditlog.cfg Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.relay.port}/auditlog/
+authentication.baseURL = http://${org.apache.ace.relay}/auditlog/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
(original)
+++ ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/deployment.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.relay.port}/deployment/
+authentication.baseURL = http://${org.apache.ace.relay}/deployment/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
(original)
+++ ace/trunk/run-relay/conf/org.apache.ace.connectionfactory/repository.cfg
Thu Dec 5 14:41:25 2013
@@ -1,5 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.relay.port}/repository/
+authentication.baseURL = http://${org.apache.ace.relay}/repository/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
-
Modified:
ace/trunk/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
(original)
+++
ace/trunk/run-relay/conf/org.apache.ace.deployment.provider.repositorybased.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-url = http://localhost:${org.apache.ace.relay.port}/repository
+url = http://${org.apache.ace.relay}/repository
name = deployment
customer = apache
Modified: ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
(original)
+++ ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg Thu
Dec 5 14:41:25 2013
@@ -2,4 +2,4 @@ org.apache.ace.server.servlet.endpoint=/
# no authentication is used...
authentication.enabled = false
# OBR settings
-obr.url = http://localhost:${org.apache.ace.server.port}/obr/
+obr.url = http://${org.apache.ace.obr}/obr/
Modified: ace/trunk/run-relay/conf/org.apache.ace.discovery.property.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.discovery.property.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.discovery.property.cfg (original)
+++ ace/trunk/run-relay/conf/org.apache.ace.discovery.property.cfg Thu Dec 5
14:41:25 2013
@@ -1,2 +1,2 @@
# This is the *master* server URL to contact in order to relay to...
-serverURL = http://localhost:${org.apache.ace.server.port}
\ No newline at end of file
+serverURL = http://${org.apache.ace.server}
\ No newline at end of file
Modified: ace/trunk/run-relay/relay.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-relay/relay.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-relay/relay.bndrun (original)
+++ ace/trunk/run-relay/relay.bndrun Thu Dec 5 14:41:25 2013
@@ -42,8 +42,9 @@
Release
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
- org.apache.ace.server.port=8080,\
- org.apache.ace.relay.port=8282,\
+ org.apache.ace.server=localhost:8080,\
+ org.apache.ace.obr=localhost:8080,\
+ org.apache.ace.relay=localhost:8282,\
org.osgi.service.http.port=8282,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.client.automation.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.client.automation.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.client.automation.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.client.automation.cfg Thu
Dec 5 14:41:25 2013
@@ -6,5 +6,5 @@ targetRepository = target
deploymentRepository = deployment
storeRepository = shop
customerName = apache
-hostName = http://localhost:${org.apache.ace.server.port}
+hostName = http://${org.apache.ace.server}
endpoint = /repository
\ No newline at end of file
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=1548154&r1=1548153&r2=1548154&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 Thu
Dec 5 14:41:25 2013
@@ -1 +1 @@
-showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://localhost:${org.apache.ace.obr.port}/obr
\ No newline at end of file
+showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://${org.apache.ace.obr}/obr
\ No newline at end of file
Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg Thu Dec
5 14:41:25 2013
@@ -1,5 +1,5 @@
org.apache.ace.server.servlet.endpoint=/client
-repository.url=http://localhost:${org.apache.ace.server.port}/repository
+repository.url=http://${org.apache.ace.server}/repository
user.name=d
authentication.enabled=false
customer.name=apache
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-repositoryLocation = http://localhost:${org.apache.ace.server.port}/repository
+repositoryLocation = http://${org.apache.ace.server}/repository
repositoryCustomer = apache
repositoryName = user
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/auditlog.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/auditlog/
+authentication.baseURL = http://${org.apache.ace.server}/auditlog/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/client.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.server.port}/client/
+authentication.baseURL = http://${org.apache.ace.server}/client/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/deployment.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/deployment/
+authentication.baseURL = http://${org.apache.ace.server}/deployment/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/obr.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.server.port}/obr/
+authentication.baseURL = http://${org.apache.ace.server}/obr/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/replication.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/replication/
+authentication.baseURL = http://${org.apache.ace.server}/replication/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.connectionfactory/repository.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/repository/
+authentication.baseURL = http://${org.apache.ace.server}/repository/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.provider.repositorybased.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-url = http://localhost:${org.apache.ace.server.port}/repository
+url = http://${org.apache.ace.server}/repository
name = deployment
customer = apache
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=1548154&r1=1548153&r2=1548154&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
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
org.apache.ace.server.servlet.endpoint=/agent
# OBR settings
-obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
+obr.url = http://${org.apache.ace.obr}/obr/
authentication.enabled = false
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.discovery.property.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.discovery.property.cfg
Thu Dec 5 14:41:25 2013
@@ -1 +1 @@
-serverURL = http://localhost:${org.apache.ace.server.port}
\ No newline at end of file
+serverURL = http://${org.apache.ace.server}
\ No newline at end of file
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
(original)
+++
ace/trunk/run-server-allinone/conf/org.apache.ace.nodelauncher.amazon.cfg.example
Thu Dec 5 14:41:25 2013
@@ -4,7 +4,7 @@
#
# Configure your server here
-server=http://localhost:${org.apache.ace.server.port}
+server=http://${org.apache.ace.server}
# Note that AMIs are specific to an Amazon availability zone
amiId=ami-6a31041e
Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg Thu Dec
5 14:41:25 2013
@@ -5,9 +5,9 @@ ui.authentication.enabled = true
ui.authentication.user.name = dd
ui.authentication.user.password = ff
# ACE MS settings
-ace.host = http://localhost:${org.apache.ace.server.port}/
+ace.host = http://${org.apache.ace.server}/
# OBR settings
-obr.url = http://localhost:${org.apache.ace.server.port}/obr/
+obr.url = http://${org.apache.ace.obr}/obr/
obr.xml = repository.xml
# Session timeout
session.timeout = 300
Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Thu Dec 5 14:41:25
2013
@@ -69,8 +69,8 @@
Library Repository
-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.apache.ace.server=localhost:8080,\
+ org.apache.ace.obr=localhost: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.configurator.useradmin.task.UpdateUserAdminTask.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
(original)
+++
ace/trunk/run-server/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-repositoryLocation = http://localhost:${org.apache.ace.server.port}/repository
+repositoryLocation = http://${org.apache.ace.server}/repository
repositoryCustomer = apache
repositoryName = user
Modified:
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/auditlog.cfg Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/auditlog/
+authentication.baseURL = http://${org.apache.ace.server}/auditlog/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified: ace/trunk/run-server/conf/org.apache.ace.connectionfactory/client.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/client.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/client.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/client.cfg Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:${org.apache.ace.server.port}/client/
+authentication.baseURL = http://${org.apache.ace.server}/client/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/deployment.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/deployment/
+authentication.baseURL = http://${org.apache.ace.server}/deployment/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/replication.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/replication.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/replication/
+authentication.baseURL = http://${org.apache.ace.server}/replication/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/repository.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/repository.cfg
Thu Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
-authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/repository/
+authentication.baseURL = http://${org.apache.ace.server}/repository/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified:
ace/trunk/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
---
ace/trunk/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
(original)
+++
ace/trunk/run-server/conf/org.apache.ace.deployment.provider.repositorybased.cfg
Thu Dec 5 14:41:25 2013
@@ -1,3 +1,3 @@
-url = http://localhost:${org.apache.ace.server.port}/repository
+url = http://${org.apache.ace.server}/repository
name = deployment
customer = apache
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=1548154&r1=1548153&r2=1548154&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 Thu
Dec 5 14:41:25 2013
@@ -1,4 +1,4 @@
org.apache.ace.server.servlet.endpoint=/agent
# OBR settings
-obr.url = http://localhost:${org.apache.ace.obr.port}/obr/
+obr.url = http://${org.apache.ace.obr}/obr/
authentication.enabled = false
Modified: ace/trunk/run-server/server.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Thu Dec 5 14:41:25 2013
@@ -42,8 +42,8 @@
Release
-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.apache.ace.server=localhost:8080,\
+ org.apache.ace.obr=localhost:8082,\
org.osgi.service.http.port=8080,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
Modified: ace/trunk/run-target/target.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-target/target.bndrun?rev=1548154&r1=1548153&r2=1548154&view=diff
==============================================================================
--- ace/trunk/run-target/target.bndrun (original)
+++ ace/trunk/run-target/target.bndrun Thu Dec 5 14:41:25 2013
@@ -11,8 +11,9 @@
org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.felix.log.maxSize=1000,\
- agent.logging.level=DEBUG,\
+ agent.logging.level=INFO,\
agent.identification.agentid=target-1,\
agent.discovery.serverurls=http://localhost:8080,\
- agent.controller.syncinterval=30,\
- agent.controller.syncdelay=1
\ No newline at end of file
+ agent.controller.syncinterval=10,\
+ agent.controller.streaming=true,\
+ agent.controller.syncdelay=5
