Author: ivol37 at gmail.com
Date: Mon Jan 24 16:07:32 2011
New Revision: 703
Log:
[AMDATU-262] Restored fileinstall and disabled config-filebased bundle in the
release. Config files are still physically located ni src/main/resources/conf
of the config-filebased, but deployed to /deploy by the release project.
Fileinstall works two-way with Felix web console; config updates in felix web
console are also written to config files in /deploy.
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-web/rest-wink/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/amdatu-minimal.properties
trunk/src/main/resources/conf/amdatu-web.properties
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Jan 24 16:07:32 2011
@@ -336,6 +336,12 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${org.apache.felix.file.install.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
<version>${org.apache.felix.http.version}</version>
<scope>compile</scope>
Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Mon Jan 24
16:07:32 2011
@@ -52,6 +52,9 @@
<include>org.amdatu.core:*</include>
<include>org.amdatu.core.*:*</include>
</includes>
+ <excludes>
+ <exclude>org.amdatu.core.config:filebased</exclude>
+ </excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
@@ -107,6 +110,11 @@
<include>readme.txt</include>
</includes>
</fileSet>
+ <fileSet>
+
<directory>../amdatu-core/config-filebased/src/main/resources/conf</directory>
+ <outputDirectory>${deploy.directory.name}</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
</fileSets>
</component>
\ No newline at end of file
Modified: trunk/amdatu-web/rest-wink/pom.xml
==============================================================================
--- trunk/amdatu-web/rest-wink/pom.xml (original)
+++ trunk/amdatu-web/rest-wink/pom.xml Mon Jan 24 16:07:32 2011
@@ -12,7 +12,7 @@
<packaging>bundle</packaging>
<name>Amdatu Web - Apache Wink Application</name>
<description>Embeds the Apache Wink libraries and provides the necessary
services to publish REST services from OSGi services</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
@@ -31,7 +31,7 @@
<artifactId>slf4j-api</artifactId>
<version>1.5.11</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
<artifactId>jaxrs</artifactId>
@@ -48,17 +48,17 @@
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20080701</version>
- <scope>compile</scope>
+ <scope>compile</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -75,11 +75,11 @@
!org.apache.http.*,
!org.springframework.*,
*
- </Import-Package>
+ </Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
- </build>
-
+ </build>
+
</project>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Jan 24 16:07:32 2011
@@ -86,7 +86,7 @@
<org.osgi.version>4.2.0</org.osgi.version>
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
-
<org.apache.felix.file.install.version>3.0.0</org.apache.felix.file.install.version>
+
<org.apache.felix.file.install.version>3.1.4</org.apache.felix.file.install.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
<org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
<pax.swissbox.version>1.3.0</pax.swissbox.version>
Modified: trunk/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-minimal.properties (original)
+++ trunk/src/main/resources/conf/amdatu-minimal.properties Mon Jan 24
16:07:32 2011
@@ -79,7 +79,7 @@
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.fileinstall-${org.apache.felix.file.install.version}.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 \
@@ -96,7 +96,6 @@
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 \
-
reference:file:amdatu-core/org.amdatu.core.config.filebased-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.loghandler-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.tenant-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.tenantstore-fs-0.1.0-SNAPSHOT.jar \
@@ -117,5 +116,14 @@
# 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
\ No newline at end of file
+# Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
+
+# Config of file install
+felix.fileinstall.poll=3000
+felix.fileinstall.dir=${deploy.directory.name}
+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
Modified: trunk/src/main/resources/conf/amdatu-web.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-web.properties (original)
+++ trunk/src/main/resources/conf/amdatu-web.properties Mon Jan 24 16:07:32 2011
@@ -79,7 +79,7 @@
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.fileinstall-${org.apache.felix.file.install.version}.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 \
@@ -96,7 +96,6 @@
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 \
-
reference:file:amdatu-core/org.amdatu.core.config.filebased-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.loghandler-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.tenant-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-core/org.amdatu.core.tenantstore-fs-0.1.0-SNAPSHOT.jar \
@@ -105,7 +104,7 @@
reference:file:amdatu-application/org.amdatu.web.httpcontext-0.1.0-SNAPSHOT.jar
\
reference:file:amdatu-application/org.amdatu.web.jsp-0.1.0-SNAPSHOT.jar \
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-0.1.0-SNAPSHOT.jar \
-
reference:file:amdatu-application/org.amdatu.web.rest.wink-0.1.0-SNAPSHOT.jar
+
reference:file:amdatu-application/org.amdatu.web.rest.wink-0.1.0-SNAPSHOT.jar
# Sets the initial start level of the framework upon startup.
#org.osgi.framework.startlevel.beginning=1
@@ -121,5 +120,14 @@
# 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
\ No newline at end of file
+# Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
+
+# Config of file install
+felix.fileinstall.poll=3000
+felix.fileinstall.dir=${deploy.directory.name}
+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
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 Mon Jan 24
16:07:32 2011
@@ -79,6 +79,7 @@
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-${org.apache.felix.file.install.version}.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 \
@@ -95,7 +96,6 @@
reference:file:amdatu-system/pax-swissbox-core-${pax.swissbox.version}.jar \
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar \
-
reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.cassandra.application-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.cassandra.listener-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.cassandra.persistencemanager-${platform.version}.jar
\
@@ -146,5 +146,14 @@
# 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
\ No newline at end of file
+# Config of config admin
+felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
+
+# Config of file install
+felix.fileinstall.poll=3000
+felix.fileinstall.dir=${deploy.directory.name}
+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
