Author: marrs
Date: Mon Oct 29 14:47:29 2012
New Revision: 1403331
URL: http://svn.apache.org/viewvc?rev=1403331&view=rev
Log:
ACE-297 Refactored all configuration to use a variable for the port. Added
configuration data for the port to the .bndrun files. The default is still
8080, but I tested setting it to 8888 and everything seems to work just fine.
Modified:
ace/trunk/run-server/conf/org.apache.ace.activation.matcher.cfg
ace/trunk/run-server/conf/org.apache.ace.client.automation.cfg
ace/trunk/run-server/conf/org.apache.ace.client.rest.cfg
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/obr.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.discovery.property.cfg
ace/trunk/run-server/conf/org.apache.ace.distribution.servlet.cfg
ace/trunk/run-server/conf/org.apache.ace.server.activation.impl.cfg
ace/trunk/run-server/conf/org.apache.ace.webui.vaadin.cfg
ace/trunk/run-server/server.bndrun
ace/trunk/run-target/target.bndrun
Modified: ace/trunk/run-server/conf/org.apache.ace.activation.matcher.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.activation.matcher.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.activation.matcher.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.activation.matcher.cfg Mon Oct 29
14:47:29 2012
@@ -1,3 +1,3 @@
activationRepository = activation
customerName = apache
-repositoryURL = http://localhost:8080/repository
+repositoryURL = http://localhost:${org.apache.ace.server.port}/repository
Modified: ace/trunk/run-server/conf/org.apache.ace.client.automation.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.client.automation.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.client.automation.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.client.automation.cfg Mon Oct 29
14:47:29 2012
@@ -6,5 +6,5 @@ targetRepository = target
deploymentRepository = deployment
storeRepository = shop
customerName = apache
-hostName = http://localhost:8080
+hostName = http://localhost:${org.apache.ace.server.port}
endpoint = /repository
\ No newline at end of file
Modified: ace/trunk/run-server/conf/org.apache.ace.client.rest.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.client.rest.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.client.rest.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.client.rest.cfg Mon Oct 29
14:47:29 2012
@@ -1,6 +1,6 @@
org.apache.ace.server.servlet.endpoint=/client
-repository.url=http://localhost:8080/repository
-obr.url=http://localhost:8080/obr/
+repository.url=http://localhost:${org.apache.ace.server.port}/repository
+obr.url=http://localhost:${org.apache.ace.server.port}/obr/
user.name=d
authentication.enabled=false
customer.name=apache
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=1403331&r1=1403330&r2=1403331&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
Mon Oct 29 14:47:29 2012
@@ -1,3 +1,3 @@
-repositoryLocation = http://localhost:8080/repository
+repositoryLocation = http://localhost:${org.apache.ace.server.port}/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=1403331&r1=1403330&r2=1403331&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 Mon
Oct 29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/auditlog/
+authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/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=1403331&r1=1403330&r2=1403331&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 Mon
Oct 29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/client/
+authentication.baseURL = http://localhost:${org.apache.ace.server.port}/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=1403331&r1=1403330&r2=1403331&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
Mon Oct 29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/deployment/
+authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/deployment/
authentication.type = none
#authentication.user.name = d
#authentication.user.password = f
Modified: ace/trunk/run-server/conf/org.apache.ace.connectionfactory/obr.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.connectionfactory/obr.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.connectionfactory/obr.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.connectionfactory/obr.cfg Mon Oct
29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/obr/
+authentication.baseURL = http://localhost:${org.apache.ace.server.port}/obr/
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=1403331&r1=1403330&r2=1403331&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
Mon Oct 29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/replication/
+authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/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=1403331&r1=1403330&r2=1403331&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
Mon Oct 29 14:47:29 2012
@@ -1,4 +1,4 @@
-authentication.baseURL = http://localhost:8080/repository/
+authentication.baseURL =
http://localhost:${org.apache.ace.server.port}/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=1403331&r1=1403330&r2=1403331&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
Mon Oct 29 14:47:29 2012
@@ -1,3 +1,3 @@
-url = http://localhost:8080/repository
+url = http://localhost:${org.apache.ace.server.port}/repository
name = deployment
customer = apache
Modified: ace/trunk/run-server/conf/org.apache.ace.discovery.property.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.discovery.property.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.discovery.property.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.discovery.property.cfg Mon Oct 29
14:47:29 2012
@@ -1 +1 @@
-serverURL = http://localhost:8080
\ No newline at end of file
+serverURL = http://localhost:${org.apache.ace.server.port}
\ No newline at end of file
Modified: ace/trunk/run-server/conf/org.apache.ace.distribution.servlet.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.distribution.servlet.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.distribution.servlet.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.distribution.servlet.cfg Mon Oct
29 14:47:29 2012
@@ -1,5 +1,5 @@
targetRepository = target
storeRepository = shop
customerName = apache
-hostName = http://localhost:8080/repository
+hostName = http://localhost:${org.apache.ace.server.port}/repository
org.apache.ace.server.servlet.endpoint = /distribution
Modified: ace/trunk/run-server/conf/org.apache.ace.server.activation.impl.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.server.activation.impl.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.server.activation.impl.cfg
(original)
+++ ace/trunk/run-server/conf/org.apache.ace.server.activation.impl.cfg Mon Oct
29 14:47:29 2012
@@ -6,9 +6,9 @@ targetRepository = target
deploymentRepository = deployment
storeRepository = shop
customerName = apache
-hostName = http://localhost:8080
+hostName = http://localhost:${org.apache.ace.server.port}
endpoint = /repository
-obrUrl = http://localhost:8080/obr/
+obrUrl =
http://localhost:${org.apache.ace.server.port}/obr/
activationInfoRepository = activationinfo
activationInfoTimeout = 604800000
checkoutInterval = 5000
Modified: ace/trunk/run-server/conf/org.apache.ace.webui.vaadin.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.webui.vaadin.cfg?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.webui.vaadin.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.webui.vaadin.cfg Mon Oct 29
14:47:29 2012
@@ -2,9 +2,9 @@
org.apache.ace.server.servlet.endpoint = /ace
# Vaadin UI settings
ui.authentication.enabled = true
-#ui.authentication.user.name = d
-#ui.authentication.user.password = f
+ui.authentication.user.name = dd
+ui.authentication.user.password = ff
# ACE MS settings
-ace.host = http://localhost:8080/
+ace.host = http://localhost:${org.apache.ace.server.port}/
# OBR settings
-obr.url = http://localhost:8080/obr/
+obr.url = http://localhost:${org.apache.ace.server.port}/obr/
Modified: ace/trunk/run-server/server.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Mon Oct 29 14:47:29 2012
@@ -56,10 +56,13 @@
org.apache.ace.deployment.verifier;version=latest,\
org.apache.ace.client.repository.helper.base;version=latest,\
org.apache.ace.authenticationprocessor.basicauth;version=latest,\
- org.apache.ace.nodelauncher.ui;version=latest
+ org.apache.ace.nodelauncher.ui;version=latest,\
+ org.apache.felix.useradmin.shell;version=latest
-runrepos: Workspace,\
Local Repository,\
Release
-runproperties: org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
+ org.apache.ace.server.port=8080,\
+ org.osgi.service.http.port=8080,\
org.apache.felix.log.maxSize=1000
\ No newline at end of file
Modified: ace/trunk/run-target/target.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-target/target.bndrun?rev=1403331&r1=1403330&r2=1403331&view=diff
==============================================================================
--- ace/trunk/run-target/target.bndrun (original)
+++ ace/trunk/run-target/target.bndrun Mon Oct 29 14:47:29 2012
@@ -4,4 +4,7 @@
org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
org.apache.ace.managementagent;version=latest,\
org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)'
--runvm: -Dlog=true
+-runvm: -Dlog=true -Didentification=target-1 -Ddiscovery=http://localhost:8080
+-runproperties: org.apache.felix.log.storeDebug=true,\
+ org.apache.felix.eventadmin.Timeout=0,\
+ org.apache.felix.log.maxSize=1000
