Author: angelo.vandersijpt at luminis.eu
Date: Tue Dec 21 15:36:47 2010
New Revision: 523
Log:
Removed startlevels & fileinstall from release build.
Modified:
trunk/amdatu-release/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 Tue Dec 21 15:36:47 2010
@@ -315,12 +315,6 @@
</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/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-minimal.properties (original)
+++ trunk/src/main/resources/conf/amdatu-minimal.properties Tue Dec 21
15:36:47 2010
@@ -77,37 +77,37 @@
# 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-${org.osgi.version}.jar \
-
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.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.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 \
-
reference:file:amdatu-core/org.amdatu.core.config.templates-0.1.0-SNAPSHOT.jar \
-
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.1.0-SNAPSHOT.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-${org.osgi.version}.jar \
+
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.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 \
+
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 \
+
reference:file:amdatu-core/org.amdatu.core.config.templates-0.1.0-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.1.0-SNAPSHOT.jar
# Sets the initial start level of the framework upon startup.
-org.osgi.framework.startlevel.beginning=30
+#org.osgi.framework.startlevel.beginning=1
# Sets the start level of newly installed bundles.
-felix.startlevel.bundle=30
+#felix.startlevel.bundle=1
# Felix installs a stream and content handler factories by default,
# uncomment the following line to not install them.
@@ -117,14 +117,5 @@
# 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/amdatu-web.properties
==============================================================================
--- trunk/src/main/resources/conf/amdatu-web.properties (original)
+++ trunk/src/main/resources/conf/amdatu-web.properties Tue Dec 21 15:36:47 2010
@@ -77,41 +77,41 @@
# 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-${org.osgi.version}.jar \
-
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.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.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 \
-
reference:file:amdatu-core/org.amdatu.core.config.templates-0.1.0-SNAPSHOT.jar \
-
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.1.0-SNAPSHOT.jar
-felix.auto.start.3=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-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-${org.osgi.version}.jar \
+
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.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 \
+
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 \
+
reference:file:amdatu-core/org.amdatu.core.config.templates-0.1.0-SNAPSHOT.jar \
+
reference:file:amdatu-core/org.amdatu.core.useradminstore-fs-0.1.0-SNAPSHOT.jar
\
+
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
# Sets the initial start level of the framework upon startup.
-org.osgi.framework.startlevel.beginning=30
+#org.osgi.framework.startlevel.beginning=1
# Sets the start level of newly installed bundles.
-felix.startlevel.bundle=30
+#felix.startlevel.bundle=1
# Felix installs a stream and content handler factories by default,
# uncomment the following line to not install them.
@@ -121,14 +121,5 @@
# 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 Dec 21
15:36:47 2010
@@ -79,7 +79,6 @@
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 \
@@ -95,8 +94,8 @@
reference:file:amdatu-system/org.apache.felix.http.whiteboard-${org.apache.felix.http.version}.jar
\
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
-felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.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
\
@@ -106,8 +105,8 @@
reference:file:amdatu-core/org.amdatu.core.tenant-${platform.version}.jar \
reference:file:amdatu-core/org.amdatu.core.config.templates-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-${platform.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.web.rest.wink-${platform.version}.jar
-felix.auto.start.10=reference:file:amdatu-application/org.amdatu.authorization.login.gadget-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.web.rest.wink-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.authorization.login.gadget-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.authorization.login.service-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.authorization.useradmin.gadget-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.authorization.useradmin.rest-${platform.version}.jar
\
@@ -124,17 +123,17 @@
reference:file:amdatu-application/org.amdatu.opensocial.profile-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.opensocial.shindig-${platform.version}.jar
\
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${platform.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
-felix.auto.start.20=reference:file:amdatu-examples/org.amdatu.example.friends.gadget-${platform.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
\
+
reference:file:amdatu-examples/org.amdatu.example.friends.gadget-${platform.version}.jar
\
reference:file:amdatu-examples/org.amdatu.example.course.gadget-${platform.version}.jar
\
reference:file:amdatu-examples/org.amdatu.example.course.service-${platform.version}.jar
\
reference:file:amdatu-examples/org.amdatu.example.oauth-${platform.version}.jar
# Sets the initial start level of the framework upon startup.
-org.osgi.framework.startlevel.beginning=30
+#org.osgi.framework.startlevel.beginning=1
# Sets the start level of newly installed bundles.
-felix.startlevel.bundle=30
+#felix.startlevel.bundle=1
# Felix installs a stream and content handler factories by default,
# uncomment the following line to not install them.
@@ -144,14 +143,5 @@
# 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.directory.name}
-felix.fileinstall.debug=1
-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
-
#Config of config admin
felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
\ No newline at end of file
