Merge branch 'develop'

bioinformatics-ua · Nov 30, 2015 · 984a1b9 · 984a1b9
2 parents efbbea6 + 6236e37
commit 984a1b9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,14 +10,6 @@
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
-    <repositories>
-		<repository>
-			<id>maven2-repository.java.net</id>
-			<name>Java.net Repository for Maven</name>
-			<url>http://download.java.net/maven/2/</url>
-			<layout>default</layout>
-		</repository>
-	</repositories>
     <dependencies>
         <dependency>
             <groupId>commons-validator</groupId>
@@ -45,11 +37,6 @@
             <artifactId>jetty-server</artifactId>
             <version>9.0.3.v20130506</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>9.0.3.v20130506</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
@@ -58,38 +45,44 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>2.18</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet-core</artifactId>
-            <version>2.18</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-jetty-http</artifactId>
             <version>2.7</version>
         </dependency>
         <dependency>
-    		<groupId>org.glassfish.jersey.media</groupId>
-    		<artifactId>jersey-media-multipart</artifactId>
-    		<version>2.17</version>
-		</dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.glassfish.jersey.media</groupId>-->
-            <!--<artifactId>jersey-media-moxy</artifactId>-->
-            <!--<version>2.7</version>-->
-        <!--</dependency>-->
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+            <version>2.17</version>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-moxy</artifactId>
+            <version>2.7</version>
+        </dependency>-->
         <dependency>
             <groupId>com.owlike</groupId>
             <artifactId>genson</artifactId>
             <version>1.3</version>
         </dependency>
         <dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
-		</dependency>
+            <groupId>org.glassfish.jersey.bundles</groupId>
+            <artifactId>jaxrs-ri</artifactId>
+            <version>2.22.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <type>jar</type>
+        </dependency>
 
     </dependencies>
     <build>
@@ -111,7 +104,6 @@
                         </manifest>
                     </archive>
                 </configuration>
-
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>

diff --git a/src/main/java/pt/ua/scaleus/server/JettyServer.java b/src/main/java/pt/ua/scaleus/server/JettyServer.java
@@ -62,7 +62,7 @@ public static void main(String[] args) {
         } catch (ParseException ex) {
             log.error("CommandLine parse error", ex);
         }
-
+        
         Server server = new Server(port);
 
         // setup the web pages/scripts app
@@ -76,6 +76,7 @@ public static void main(String[] args) {
         //API init parameters
         Map<String, String> apiInit = new HashMap<>();
         apiInit.put("jersey.config.server.provider.classnames", RESTService.class.getCanonicalName()+";org.glassfish.jersey.media.multipart.MultiPartFeature");
+        // for request filtering add also: ;org.glassfish.jersey.filter.LoggingFilter
         //Test init parameters
         //Map<String, String> testInit = new HashMap<>();
         //testInit.put("jersey.config.server.provider.classnames", TestService.class.getCanonicalName());

diff --git a/src/main/resources/webapp/WEB-INF/index.html b/src/main/resources/webapp/WEB-INF/index.html
@@ -128,6 +128,8 @@
                                         class="fa fa-edit fa-fw"></i> Data Preview</a> <!-- /.nav-second-level --></li>
                             <li><a href="#fileupload"><i
                                         class="fa fa-upload fa-fw"></i> File Upload</a> <!-- /.nav-second-level --></li>
+                            <li><a href="https://github.com/bioinformatics-ua/scaleus"><i
+                                        class="fa fa-book fa-fw"></i> Documentation</a> <!-- /.nav-second-level --></li>
                         </ul>
                     </div>
                     <!-- /.sidebar-collapse -->