Add local bootstrap/jquery libraries

Resolves: https://www.pivotaltracker.com/story/show/71840448
fcrepo · May 27, 2014 · 0973828 · 0973828
1 parent 9afee37
commit 0973828
Show file tree

Hide file tree

Showing 8 changed files with 397 additions and 10 deletions.
diff --git a/fcrepo-http-api/src/main/resources/views/common-head.vsl b/fcrepo-http-api/src/main/resources/views/common-head.vsl
@@ -1,10 +1,10 @@
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
+<script src="$uriInfo.baseUriBuilder.build()../static/js/jquery-1.9.1.min.js" ></script>
 
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
-<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+<script src="$uriInfo.baseUriBuilder.build()../static/js/bootstrap-3.0.0.min.js"></script>
+<link href="$uriInfo.baseUriBuilder.build()../static/css/bootstrap-3.0.0.min.css" rel="stylesheet">
 <script type="text/javascript">
    #include("views/common.js")
 </script>
 <style type="text/css">
    #include("views/common.css")
-</style>
+</style>
diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -146,6 +146,12 @@
       <artifactId>junit</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.4.01</version>
+    </dependency>
+
     <!-- test gear -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -155,6 +161,77 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-leveldb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.sourceforge.htmlunit</groupId>
+      <artifactId>htmlunit</artifactId>
+      <scope>test</scope>
+      <version>2.13</version>
+
+      <exclusions>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-http</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge.htmlunit</groupId>
+      <artifactId>htmlunit-core-js</artifactId>
+      <scope>test</scope>
+      <version>2.13</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-cache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.fcrepo</groupId>
+      <artifactId>fcrepo-http-commons</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+    <!-- This dependency is for compile-time: it keeps this module independent
+      of any given choice of JAX-RS implementation. It must be _after_ the test
+      gear. Otherwise it will get loaded during test phase, but because this is
+      just an API, the tests will not be able to execute. -->
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>6.0</version>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
   <build>
     <resources>

diff --git a/fcrepo-webapp/src/main/webapp/index.html b/fcrepo-webapp/src/main/webapp/index.html
@@ -2,10 +2,10 @@
 <head>
   <title>Fedora Commons Repository 4.0</title>
   <link rel="icon" type="image/x-icon" href="favicon.ico"/>
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
+  <script src="static/js/jquery-1.9.1.min.js" ></script>
 
-  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
-  <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet" />
+  <script src="static/js/bootstrap-3.0.0.min.js"></script>
+  <link href="static/css/bootstrap-3.0.0.min.css" rel="stylesheet" />
     <style >
         .thumbnail {
             background: transparent; border: none; margin-bottom: 1.5em
@@ -43,4 +43,4 @@
     </div>
 </nav>
 </body>
-</html>
+</html>
diff --git a/fcrepo-webapp/src/main/webapp/static/css/bootstrap-3.0.0.min.css b/fcrepo-webapp/src/main/webapp/static/css/bootstrap-3.0.0.min.css
diff --git a/fcrepo-webapp/src/main/webapp/static/js/bootstrap-3.0.0.min.js b/fcrepo-webapp/src/main/webapp/static/js/bootstrap-3.0.0.min.js
diff --git a/fcrepo-webapp/src/main/webapp/static/js/jquery-1.9.1.min.js b/fcrepo-webapp/src/main/webapp/static/js/jquery-1.9.1.min.js