Author: ivol
Date: Tue Oct 19 11:08:12 2010
New Revision: 188
Log:
[AMDATU-66] Fixed proper startup of mimetype by adding the felix declarative
services jar
Modified:
trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified:
trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java
==============================================================================
---
trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java
(original)
+++
trunk/platform-bundles/httpcontext/src/main/java/org/amdatu/platform/httpcontext/service/HttpContextImpl.java
Tue Oct 19 11:08:12 2010
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -35,8 +33,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.http.HttpService;
import org.osgi.service.log.LogService;
@@ -69,7 +65,6 @@
private volatile MimeTypeService m_mimeTypeService;
private volatile BundleContext m_bundleContext;
private volatile LogService m_logService;
- private volatile ConfigurationAdmin m_configurationAdmin;
private volatile WebContainer m_webContainer;
// Instance variables
@@ -111,23 +106,12 @@
+ "')");
}
+ /**
+ * @see org.osgi.service.http.HttpContext#getMimeType(String)
+ */
public String getMimeType(String name) {
// Use the Apache Sling mimetype resource to return the proper
mimetype of this resource
- // FIXME: for some reason the MimeTypeService is not started when the
bundle is deployed
- // No errors, no log and no trace of any service registered by this
bundle
- if (m_mimeTypeService != null) {
- return m_mimeTypeService.getMimeType(name);
- } else {
- // FIXME: this is a temporary fix
- if (name.endsWith(".css")) {
- return "text/css";
- }
- if (name.endsWith(".js")) {
- return "application/javascript";
- }
- }
-
- return null;
+ return m_mimeTypeService.getMimeType(name);
}
/**
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Oct 19 11:08:12 2010
@@ -148,6 +148,7 @@
<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.scr.version>1.6.0</org.apache.felix.scr.version>
<pax-web.version>0.7.1</pax-web.version>
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
@@ -259,6 +260,13 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>${org.apache.felix.scr.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Event admin service -->
<dependency>
<groupId>org.apache.felix</groupId>
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 Oct 19
11:08:12 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:system-bundles/org.apache.felix.configadmin-1.2.4.jar
reference:file:system-bundles/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.eventadmin-1.2.2.jar
reference:file:system-bundles/org.apache.felix.fileinstall-3.0.0.jar
reference:file:system-bundles/org.apache.felix.log-1.0.0.jar
reference:file:system-bundles/org.apache.felix.main-2.0.5.jar
reference:file:system-bundles/org.apache.felix.metatype-1.0.4.jar
reference:file:system-bundles/org.apache.felix.shell.tui-1.4.1.jar
reference:file:system-bundles/org.apache.felix.shell-1.4.2.jar
reference:file:system-bundles/org.apache.felix.webconsole-3.1.0.jar
reference:file:system-bundles/org.apache.sling.commons.mime-2.1.4.jar
reference:file:system-bundles/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:system-bundles/org.osgi.compendium-1.0.0.jar
reference:file:system-bundles/org.osgi.core-1.0.0.jar
reference:file:system-bundles/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:system-bundles/pax-web-jetty-bundle-0.7.1.jar
reference:file:system-bundles/pax-web-jsp-0.7.1.jar
+felix.auto.start.1=reference:file:system-bundles/org.apache.felix.configadmin-1.2.4.jar
reference:file:system-bundles/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:system-bundles/org.apache.felix.eventadmin-1.2.2.jar
reference:file:system-bundles/org.apache.felix.fileinstall-3.0.0.jar
reference:file:system-bundles/org.apache.felix.log-1.0.0.jar
reference:file:system-bundles/org.apache.felix.main-2.0.5.jar
reference:file:system-bundles/org.apache.felix.metatype-1.0.4.jar
reference:file:system-bundles/org.apache.felix.shell.tui-1.4.1.jar
reference:file:system-bundles/org.apache.felix.shell-1.4.2.jar
reference:file:system-bundles/org.apache.felix.webconsole-3.1.0.jar
reference:file:system-bundles/org.apache.sling.commons.mime-2.1.4.jar
reference:file:system-bundles/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:system-bundles/org.osgi.compendium-1.0.0.jar
reference:file:system-bundles/org.osgi.core-1.0.0.jar
reference:file:system-bundles/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:system-bundles/pax-web-jetty-bundle-0.7.1.jar
reference:file:system-bundles/pax-web-jsp-0.7.1.jar
reference:file:system-bundles/org.apache.felix.scr-1.6.0.jar
felix.auto.start.2=reference:file:platform-bundles/org.amdatu.platform.filebased-configuration-0.0.5-SNAPSHOT.jar
felix.auto.start.5=reference:file:platform-bundles/org.amdatu.platform.shindig-application-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.httpcontext-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.sesame-application-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-0.0.5-SNAPSHOT.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-0.0.5-SNAPSHOT.jar
felix.auto.start.10=reference:file:application-bundles/org.amdatu.application.dashboard-0.0.5-SNAPSHOT.jar
reference:file:application-bundles/org.amdatu.application.gadgetmanagement-0.0.5-SNAPSHOT.jar
