Author: angelo.vandersijpt at luminis.eu
Date: Thu Nov 11 14:20:56 2010
New Revision: 404
Log:
AMDATU-132 Replaced the org.apache.felix.http.bundle with separate .jetty and
.whiteboard bundles, so we don't need to rely on system properties anymore.
Also, updated the configuration.
Added:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.apache.felix.http.cfg
Removed:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.ops4j.pax.web.cfg
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseServiceImpl.java
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Added:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.apache.felix.http.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.apache.felix.http.cfg
Thu Nov 11 14:20:56 2010
@@ -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=${server.hostname}
+org.osgi.service.http.port=${server.port}
+org.osgi.service.http.port.secure=${server.port.secure}
+org.apache.felix.http.debug=true
+org.apache.felix.log.storeDebug=true
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseServiceImpl.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseServiceImpl.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/CourseServiceImpl.java
Thu Nov 11 14:20:56 2010
@@ -95,7 +95,8 @@
public String getOntologyBaseUrl() throws IOException {
// Build the base URL for the ontologies
- Configuration config =
m_configAdmin.getConfiguration("org.ops4j.pax.web");
+ // TODO why does this bundle steal configuration?
+ Configuration config =
m_configAdmin.getConfiguration("org.apache.felix.http");
String hostname =
config.getProperties().get("org.osgi.service.http.hostname").toString();
String portnr =
config.getProperties().get("org.osgi.service.http.port").toString();
return "http://"; + hostname + ":" + portnr;
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Nov 11 14:20:56 2010
@@ -477,10 +477,16 @@
<!-- Use Felix as HTTP service implementation -->
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bundle</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<version>${org.apache.felix.http.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>${org.apache.felix.http.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Swissbox is used to resolve classloading issues in Jasper -->
<dependency>
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 Thu Nov 11
14:20:56 2010
@@ -76,7 +76,7 @@
# 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.bundle-${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.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-${org.apache.felix.http.version}.jar
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-core/org.amdatu.core.cassandra.application-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra.listener-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra.persistencemanager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar
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-core/org.amdatu.core.cassandra.useradminstore-${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.opensocial.shindig-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.profile-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.login.service-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.jsp-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.login.gadget-${platform.version}.jar
felix.auto.start.20=reference:file:amdatu-examples/org.amdatu.example.friendsgadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.coursegadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.courseservice-${platform.version}.jar
@@ -102,14 +102,4 @@
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
-
-# 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=${server.hostname}
-org.osgi.service.http.port=${server.port}
-org.osgi.service.http.port.secure=${server.port.secure}
-org.apache.felix.http.jettyEnabled=true
-org.apache.felix.http.debug=true
-org.apache.felix.log.storeDebug=true
-org.apache.felix.http.whiteboardEnabled=true
\ No newline at end of file
+felix.fileinstall.start.level=30
\ No newline at end of file
