Merge commit 'danatcaret/master'

* commit 'danatcaret/master':
  Path fixes to bring up cachemanagerservice and the slightly mysterious
  Added explicit dependency on commons-pool. commons-dbcp seems to have

slingtests/osgikernel/bundles/db/pom.xml

@@ -55,7 +55,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeArtifactIds>commons-dbcp,geronimo-transaction,geronimo-j2ee-connector_1.5_spec</includeArtifactIds>
+              <includeArtifactIds>commons-dbcp,commons-pool,geronimo-transaction,geronimo-j2ee-connector_1.5_spec</includeArtifactIds>
               <excludeTransitive>false</excludeTransitive>
               <outputDirectory> ${project.build.outputDirectory} </outputDirectory>
             </configuration>
@@ -117,6 +117,12 @@
       <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.4</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-transaction</artifactId>

slingtests/osgikernel/bundles/uxloader/src/main/java/org/sakaiproject/kernel2/uxloader/FileServlet.java

@@ -48,7 +48,7 @@ public class FileServlet extends HttpServlet {
    */
 
   private static final long serialVersionUID = -1304876073995688329L;
-  private static final String MIME_TYPES = "mimetypes.properties";
+  private static final String MIME_TYPES = "org/sakaiproject/kernel2/uxloader/mimetypes.properties";
   public static final String BASE_FILE = "base-location";
   public static final String WELCOME_FILE = "welcome-file";
   public static final String MAX_CACHE_SIZE = "max-cache-file";