Author: [email protected] Date: Tue Dec 13 10:20:06 2011 New Revision: 1843
Log: AMDATU-476 MT ConfigurationAdmin MUST use managed datadir / Fileinstall should as well Modified: trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties Modified: trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties ============================================================================== --- trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties (original) +++ trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties Tue Dec 13 10:20:06 2011 @@ -1,33 +1,35 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # -# Framework config properties. +# Copyright (c) 2010, 2011 The Amdatu Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # -# To override the packages the framework exports by default from the -# class path, set this variable. -#org.osgi.framework.system.packages= - -# To append packages to the default set of exported system packages, -# set this value. -# Unfortunately, Cassandra uses a cliffc lib which contains a class 'org.cliffc.high_scale_lib.NonBlockingHashMap' -# This class imports the com.sun package and so it must be exposed here. -org.osgi.framework.system.packages.extra=sun.misc,com.sun.management,org.w3c.dom.traversal +# +# Amdatu Platform core configuration properties for the Apache Felix +# OSGi container. +# +# In general there should be as little as possible generic configuration +# in this file. Avoid any project specific settings as they will may +# conflict with other modules and may even fail in a managed cloud +# deployment. As a rule off thumb: +# +# 1) Configuration must be done through ConfigurationAdmin in the +# correct (tenant) configuration space. +# 2) Specific classloading settings, both bootdelegation and framework +# packages, should be avoided at all cost. +# +# In short.. do not touch this file unless you know what you are doing. +# # The following property makes specified packages from the class path # available to all bundles. You should avoid using this property. @@ -38,79 +40,51 @@ # is enabled by default, uncomment the following line to disable it. #felix.bootdelegation.implicit=false +# To override the packages the framework exports by default from the +# class path, set this variable. +#org.osgi.framework.system.packages= + +# To append packages to the default set of exported system packages, +# set this value. +org.osgi.framework.system.packages.extra= \ + sun.misc, \ + com.sun.management, \ + org.w3c.dom.traversal + # The following property explicitly specifies the location of the bundle # cache, which defaults to "felix-cache" in the current working directory. # If this value is not absolute, then the felix.cache.rootdir controls # how the absolute location is calculated. (See next property) -org.osgi.framework.storage=felix-deploy +#org.osgi.framework.storage=felix-cache # The following property is used to convert a relative bundle cache # location into an absolute one by specifying the root to prepend to # the relative cache path. The default for this property is the # current working directory. -felix.cache.rootdir=work/cache - -# The following property controls whether the bundle cache is flushed -# the first time the framework is initialized. Possible values are -# "none" and "onFirstInit"; the default is "none". -#org.osgi.framework.storage.clean=onFirstInit - -# The following property determines which actions are performed when -# processing the auto-deploy directory. It is a comma-delimited list of -# the following values: 'install', 'start', 'update', and 'uninstall'. -# An undefined or blank value is equivalent to disabling auto-deploy -# processing. -#felix.auto.deploy.action=install,start,update,uninstall - -# The following property specifies the directory to use as the bundle -# auto-deploy directory; the default is 'bundle' in the working directory. -#felix.auto.deploy.dir=lib - -# The following property is a space-delimited list of bundle URLs -# to install when the framework starts. The ending numerical component -# is the target start level. Any number of these properties may be -# specified for different start levels. -#felix.auto.install.5= +felix.cache.rootdir=work # The following property is a space-delimited list of bundle URLs # to install and start when the framework starts. The ending numerical # component is the target start level. Any number of these properties # may be specified for different start levels. felix.auto.start.1= \ - reference:file:lib/org.osgi.compendium-${org.osgi.version}.jar \ - reference:file:lib/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar \ - reference:file:lib/org.apache.felix.dependencymanager.shell-${org.apache.felix.dependencymanager.version}.jar \ - reference:file:lib/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar \ - reference:file:lib/org.apache.felix.log-${org.apache.felix.log.version}.jar \ - reference:file:lib/org.apache.felix.metatype-${org.apache.felix.metatype.version}.jar \ - reference:file:lib/org.apache.felix.shell.tui-${org.apache.felix.shell.tui.version}.jar \ - reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar \ - reference:file:lib/org.apache.felix.webconsole-${org.apache.felix.webconsole.version}.jar \ - reference:file:lib/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar \ - reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar - -# Sets the initial start level of the framework upon startup. -#org.osgi.framework.startlevel.beginning=1 - -# Sets the start level of newly installed bundles. -#felix.startlevel.bundle=1 - -# Felix installs a stream and content handler factories by default, -# uncomment the following line to not install them. -#felix.service.urlhandlers=false - -# The launcher registers a shutdown hook to cleanly stop the framework -# by default, uncomment the following line to disable it. -#felix.shutdown.hook=false - -# Config of config admin -felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin + reference:file:lib/org.osgi.compendium-${org.osgi.version}.jar \ + reference:file:lib/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar \ + reference:file:lib/org.apache.felix.dependencymanager.shell-${org.apache.felix.dependencymanager.version}.jar \ + reference:file:lib/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar \ + reference:file:lib/org.apache.felix.log-${org.apache.felix.log.version}.jar \ + reference:file:lib/org.apache.felix.metatype-${org.apache.felix.metatype.version}.jar \ + reference:file:lib/org.apache.felix.shell.tui-${org.apache.felix.shell.tui.version}.jar \ + reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar \ + reference:file:lib/org.apache.felix.webconsole-${org.apache.felix.webconsole.version}.jar \ + reference:file:lib/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar \ + reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar -# Config of file install +# Configuration for file install in a local development scenario. It +# should not be deployed and enabled in a real world deployment. felix.fileinstall.poll=3000 felix.fileinstall.dir=deploy felix.fileinstall.debug=1 felix.fileinstall.bundles.new.start=true felix.fileinstall.filter=.* -felix.fileinstall.tmpdir=work/fileinstall felix.fileinstall.disableConfigSave=true \ No newline at end of file _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
