Author: [email protected]
Date: Tue Aug 2 10:01:53 2011
New Revision: 1236
Log:
AMDATU-394 localized platform config to ams release
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.config.templates.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.loghandler.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenant.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenantstore.fs.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.useradminstore.fs.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.felix.http.cfg
Modified:
trunk/amdatu-release-ams/pom.xml
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.activation.matcher.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.client.automation.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.deployment.provider.repositorybased.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.server.activation.impl.cfg
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.webui.vaadin.cfg
Modified: trunk/amdatu-release-ams/pom.xml
==============================================================================
--- trunk/amdatu-release-ams/pom.xml (original)
+++ trunk/amdatu-release-ams/pom.xml Tue Aug 2 10:01:53 2011
@@ -21,6 +21,12 @@
<properties>
<org.amdatu.release.version>0.2.0-SNAPSHOT</org.amdatu.release.version>
<org.apache.ace.version>0.8.1-incubator-SNAPSHOT</org.apache.ace.version>
+
+ <amdatu.http.hostname>localhost</amdatu.http.hostname>
+ <amdatu.http.port>8080</amdatu.http.port>
+ <amdatu.https.port>8045</amdatu.https.port>
+ <amdatu.log.level>INFO</amdatu.log.level>
+
</properties>
<repositories>
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.config.templates.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.config.templates.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,7 @@
+# The work directory in which temporary configuration files are stored
+# Note that this directory becomes a subdirectory of /target/work
+workdir=config-template-manager
+
+# Hostname and port number
+hostname=${amdatu.http.hostname}
+port=${amdatu.http.port}
\ No newline at end of file
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.loghandler.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.loghandler.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,5 @@
+# This settings indicates the loglevels of messages that will be printed
+# to the console. Can be DEBUG, INFO, WARNING or ERROR. For example if "INFO"
+# is defined, only log messages will be printed in the console which have a
+# loglevel of INFO or higher (WARNING or ERROR).
+console.mininum.loglevel=${amdatu.log.level}
\ No newline at end of file
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenant.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenant.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,4 @@
+# Default Tenants
+tenant1.id=Default
+tenant1.name=Default tenant
+tenant1.properties.hostname=${amdatu.http.hostname}
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenantstore.fs.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.tenantstore.fs.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,2 @@
+# Tenantstore FS datadirectory
+datadir=work/tenantstore
\ No newline at end of file
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.useradminstore.fs.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.amdatu.core.useradminstore.fs.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,2 @@
+# PAX UserAdmin FS datadirectory
+datadir=work/useradminstore
\ No newline at end of file
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.activation.matcher.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.activation.matcher.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.activation.matcher.cfg
Tue Aug 2 10:01:53 2011
@@ -1,3 +1,3 @@
activationRepository = activation
customerName = apache
-repositoryURL = http://localhost:8080/repository
+repositoryURL = http://${amdatu.http.hostname}:${amdatu.http.port}/repository
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.client.automation.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.client.automation.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.client.automation.cfg
Tue Aug 2 10:01:53 2011
@@ -6,5 +6,5 @@
deploymentRepository = deployment
storeRepository = shop
customerName = apache
-hostName = http://localhost:8080
+hostName = http://${amdatu.http.hostname}:${amdatu.http.port}
endpoint = /repository
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
Tue Aug 2 10:01:53 2011
@@ -1,3 +1,3 @@
-repositoryLocation = http://localhost:8080/repository
+repositoryLocation =
http://${amdatu.http.hostname}:${amdatu.http.port}/repository
repositoryCustomer = apache
repositoryName = user
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.deployment.provider.repositorybased.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.deployment.provider.repositorybased.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.deployment.provider.repositorybased.cfg
Tue Aug 2 10:01:53 2011
@@ -1,3 +1,3 @@
-url=http://localhost:8080/repository
+url=http://${amdatu.http.hostname}:${amdatu.http.port}/repository
name=deployment
customer=apache
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.server.activation.impl.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.server.activation.impl.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.server.activation.impl.cfg
Tue Aug 2 10:01:53 2011
@@ -6,9 +6,9 @@
deploymentRepository = deployment
storeRepository = shop
customerName = apache
-hostName = http://localhost:8080
+hostName = http://${amdatu.http.hostname}:${amdatu.http.port}
endpoint = /repository
-obrUrl = http://localhost:8080/obr/
+obrUrl =
http://${amdatu.http.hostname}:${amdatu.http.port}/obr/
activationInfoRepository = activationinfo
activationInfoTimeout = 604800000
checkoutInterval = 5000
Modified:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.webui.vaadin.cfg
==============================================================================
---
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.webui.vaadin.cfg
(original)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.ace.webui.vaadin.cfg
Tue Aug 2 10:01:53 2011
@@ -1,3 +1,3 @@
alias=/ace
-aceHost = http://localhost:8080/
-obrUrl = http://localhost:8080/obr/
+aceHost = http://${amdatu.http.hostname}:${amdatu.http.port}/
+obrUrl = http://${amdatu.http.hostname}:${amdatu.http.port}/obr/
Added:
trunk/amdatu-release-ams/src/main/resources/config/org.apache.felix.http.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-release-ams/src/main/resources/config/org.apache.felix.http.cfg
Tue Aug 2 10:01:53 2011
@@ -0,0 +1,7 @@
+# Skype runs on port 80, Oracle db on 8080. Therefore use this 'arbitrary' port
+# Provides properties for the HTTP service (Felix HTTP Bundle or Pax Web)
+org.osgi.service.http.hostname=${amdatu.http.hostname}
+org.osgi.service.http.port=${amdatu.http.port}
+org.osgi.service.http.port.secure=${amdatu.https.port}
+org.apache.felix.http.debug=true
+org.apache.felix.log.storeDebug=true
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
