Author: bdekruijff at gmail.com
Date: Tue Nov 23 22:55:08 2010
New Revision: 436
Log:
AMDATU-130 include fs stores in release and added sample minimal/web profiles
Added:
trunk/src/main/resources/conf/amdatu-minimal.properties
trunk/src/main/resources/conf/amdatu-web.properties
Modified:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.tenantstore-fs.cfg
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.useradminstore-fs.cfg
trunk/amdatu-release/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.tenantstore-fs.cfg
==============================================================================
---
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.tenantstore-fs.cfg
(original)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.tenantstore-fs.cfg
Tue Nov 23 22:55:08 2010
@@ -1,2 +1,2 @@
# Tenantstore FS datadirectory
-datadir=work/tenantstore-fs
\ No newline at end of file
+datadir=work/tenantstore
\ No newline at end of file
Modified:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.useradminstore-fs.cfg
==============================================================================
---
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.useradminstore-fs.cfg
(original)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.useradminstore-fs.cfg
Tue Nov 23 22:55:08 2010
@@ -1,2 +1,2 @@
# PAX UserAdmin FS datadirectory
-datadir=work/useradminstore-fs
\ No newline at end of file
+datadir=work/useradminstore
\ No newline at end of file
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 23 22:55:08 2010
@@ -91,6 +91,20 @@
<scope>runtime</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>tenantstore-fs</artifactId>
+ <version>${platform.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>useradminstore-fs</artifactId>
+ <version>${platform.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
<!-- Example bundles -->
<dependency>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Nov 23 22:55:08 2010
@@ -26,6 +26,7 @@
<!--
Build properties
-->
+ <maven.dollar>$</maven.dollar>
<server.hostname>localhost</server.hostname>
<server.port>3737</server.port>
<server.port.secure>9090</server.port.secure>
Added: trunk/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- (empty file)
+++ trunk/src/main/resources/conf/amdatu-minimal.properties Tue Nov 23
22:55:08 2010
@@ -0,0 +1,130 @@
+# 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.
+#
+
+# 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
+
+# The following property makes specified packages from the class path
+# available to all bundles. You should avoid using this property.
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
+# 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
+
+# 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=amdatu-system
+
+# 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=
+
+# 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:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
\
+
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
\
+
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
+
reference:file:amdatu-system/org.apache.felix.fileinstall-3.0.0.jar \
+
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar \
+
reference:file:amdatu-system/org.apache.felix.main-2.0.5.jar \
+
reference:file:amdatu-system/org.apache.felix.metatype-1.0.4.jar \
+
reference:file:amdatu-system/org.apache.felix.shell.tui-1.4.1.jar \
+
reference:file:amdatu-system/org.apache.felix.shell-1.4.2.jar \
+
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar \
+
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar \
+
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
+
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar \
+
reference:file:amdatu-system/org.osgi.core-1.0.0.jar \
+
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
+
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
+
reference:file:amdatu-system/org.apache.felix.http.whiteboard-2.0.4.jar \
+
reference:file:amdatu-system/pax-swissbox-core-1.3.0.jar \
+
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
+
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar
+felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-0.0.6-SNAPSHOT.jar
\
+
reference:file:amdatu-core/org.amdatu.core.loghandler-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.tenant-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.tenantstore-fs-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.config.templates-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.0.6-SNAPSHOT.jar
+
+# Sets the initial start level of the framework upon startup.
+org.osgi.framework.startlevel.beginning=30
+
+# Sets the start level of newly installed bundles.
+felix.startlevel.bundle=30
+
+# 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 file install
+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/tmp/web/org/apache/felix/fileinstall
+felix.fileinstall.start.level=30
+
+#Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
\ No newline at end of file
Added: trunk/src/main/resources/conf/amdatu-web.properties
==============================================================================
--- (empty file)
+++ trunk/src/main/resources/conf/amdatu-web.properties Tue Nov 23 22:55:08 2010
@@ -0,0 +1,134 @@
+# 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.
+#
+
+# 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
+
+# The following property makes specified packages from the class path
+# available to all bundles. You should avoid using this property.
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
+# 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
+
+# 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=amdatu-system
+
+# 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=
+
+# 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:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
\
+
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
\
+
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
+
reference:file:amdatu-system/org.apache.felix.fileinstall-3.0.0.jar \
+
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar \
+
reference:file:amdatu-system/org.apache.felix.main-2.0.5.jar \
+
reference:file:amdatu-system/org.apache.felix.metatype-1.0.4.jar \
+
reference:file:amdatu-system/org.apache.felix.shell.tui-1.4.1.jar \
+
reference:file:amdatu-system/org.apache.felix.shell-1.4.2.jar \
+
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar \
+
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar \
+
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
+
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar \
+
reference:file:amdatu-system/org.osgi.core-1.0.0.jar \
+
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
+
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
+
reference:file:amdatu-system/org.apache.felix.http.whiteboard-2.0.4.jar \
+
reference:file:amdatu-system/pax-swissbox-core-1.3.0.jar \
+
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
+
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar
+felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-0.0.6-SNAPSHOT.jar
\
+
reference:file:amdatu-core/org.amdatu.core.loghandler-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.tenant-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.tenantstore-fs-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.config.templates-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.0.6-SNAPSHOT.jar
+felix.auto.start.3=reference:file:amdatu-application/org.amdatu.web.httpcontext-0.0.6-SNAPSHOT.jar
\
+
reference:file:amdatu-application/org.amdatu.web.jsp-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-0.0.6-SNAPSHOT.jar \
+
reference:file:amdatu-application/org.amdatu.web.rest.wink-0.0.6-SNAPSHOT.jar
+
+# Sets the initial start level of the framework upon startup.
+org.osgi.framework.startlevel.beginning=30
+
+# Sets the start level of newly installed bundles.
+felix.startlevel.bundle=30
+
+# 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 file install
+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/tmp/web/org/apache/felix/fileinstall
+felix.fileinstall.start.level=30
+
+#Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
\ No newline at end of file
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Tue Nov 23
22:55:08 2010
@@ -142,4 +142,7 @@
felix.fileinstall.bundles.new.start=true
felix.fileinstall.filter=.*
felix.fileinstall.tmpdir=${work.directory.name}/tmp/web/org/apache/felix/fileinstall
-felix.fileinstall.start.level=30
\ No newline at end of file
+felix.fileinstall.start.level=30
+
+#Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
\ No newline at end of file
