Merge branch 'development'

usc-isi-i2 · Sep 30, 2016 · 2148d9e · 2148d9e
2 parents 3f2354d + b7e04ff
commit 2148d9e
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 36 deletions.
diff --git a/karma-app/README.md b/karma-app/README.md
@@ -2,24 +2,31 @@ Karma-app
 =========
 Karma desktop app for linux, windows and mac using which you can easily launch Karma.
 
-![](http://i.imgur.com/LtQcfmi.png)
+![](https://github.com/usc-isi-i2/Web-Karma/wiki/images/karma-app.png)
 
 ##Installation
-Download [karma app](https://github.com/usc-isi-i2/Web-Karma/releases) for your operating system. Then, install [java](https://www.java.com/en/download/help/download_options.xml) if you don't already have it. Installation of the right version of java is important. For instance, if you are running a 64bit windows, you have to download 64bit java for windows.
-###Linux
-Run `./Karma` on terminal.
-###Mac
-Navigate to the folder and open `Karma.app`
-###Windows
-First [set JRE_HOME](https://confluence.atlassian.com/doc/setting-the-java_home-variable-in-windows-8895.html) environmment variable. Then, navigate to the folder and open `Karma.exe`
+*  Install [java](https://www.java.com/en/download/help/download_options.xml) if not already installed: Java version 1.7 or higher. Installation of the right version of java is important. For instance, if you are running a 64bit windows, you have to download 64bit java for windows.
+
+* Download [karma app](https://github.com/usc-isi-i2/Web-Karma/releases) for your operating system. Unzip into a local folder
+
+* Depending on the OS, do the following:
+  ###Linux
+  Navigate to the folder and run `./Karma` on terminal.
+
+  ###Mac
+  Navigate to the folder, copy `Karma.app` to your Applications Folder and then open `Karma.app` from your Applications folder
+
+  ###Windows
+  * [Set JRE_HOME](https://confluence.atlassian.com/doc/setting-the-java_home-variable-in-windows-8895.html) environmment variable. 
+  * Navigate to the folder and open `Karma.exe`
 
 ##Usage
 Once Karma app is opened, it automatically starts the server and launches on a web browser (It can take sometime the first time). In order to open a new instance on the browser, you can either click on "Open New Window" on the app or open `localhost:8080` on a new window in the browser.
 
 ##Configuration
 You can set maximum heap size for karma on the main window. Once you change it, you need to __restart karma__.
 
-![](http://i.imgur.com/zMUotto.png)
+![](https://github.com/usc-isi-i2/Web-Karma/wiki/images/karma-app-heap.png)
 
 
 ##Building the app from code.

diff --git a/karma-app/build b/karma-app/build
@@ -12,7 +12,7 @@
 ########################################
 
 CURRENT=`pwd`
-rm -rf target
+rm -rf ./target
 mkdir target
 
 cd ..

diff --git a/karma-app/desktop/src/app.js b/karma-app/desktop/src/app.js
@@ -16,7 +16,6 @@ var app = remote.app;
 var appDir = jetpack.cwd(app.getAppPath());
 
 var appName = appDir.read('package.json', 'json').name;
-var appVersion= appDir.read('package.json', 'json').version;
 
 var colors = {
   INFO: "#eee",
@@ -26,7 +25,7 @@ var colors = {
 };
 
 document.addEventListener('DOMContentLoaded', function () {
-  document.getElementById('greet').innerHTML = appName + " v" + appVersion;
+  document.getElementById('greet').innerHTML = appName;
 
   // create log file if it doesnt already exist and close the file descriptor rightaway
   fs.closeSync(fs.openSync(karma.tomcat.logFile, 'w'));

diff --git a/karma-commands/commands-common/pom.xml b/karma-commands/commands-common/pom.xml
@@ -20,9 +20,10 @@
 	    </dependency>
 
 	    <dependency>
-		    <groupId>commons-httpclient</groupId>
-		    <artifactId>commons-httpclient</artifactId>
-	    </dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpclient</artifactId>
+		    <version>4.5.2</version>
+		</dependency>
 
 	    <dependency>
 		    <groupId>javax.servlet</groupId>

diff --git a/karma-common/pom.xml b/karma-common/pom.xml
@@ -128,12 +128,9 @@
 	</dependency>
 
 	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>commons-httpclient</groupId>
-		<artifactId>commons-httpclient</artifactId>
+	    <groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpclient</artifactId>
+	    <version>4.5.2</version>
 	</dependency>
 
 	<dependency>

diff --git a/karma-jsonld/pom.xml b/karma-jsonld/pom.xml
@@ -11,7 +11,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <httpclient.version>4.2.5</httpclient.version>
         <jackson.version>2.3.3</jackson.version>
         <junit.version>4.12</junit.version>
         <slf4j.version>1.7.9</slf4j.version>
@@ -89,7 +88,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-osgi</artifactId>
-            <version>${httpclient.version}</version>
+            <version>4.5.2</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
@@ -100,7 +99,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-osgi</artifactId>
-            <version>${httpclient.version}</version>
+            <version>4.4.5</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/karma-web-services/web-services-publish-es/pom.xml b/karma-web-services/web-services-publish-es/pom.xml
@@ -74,7 +74,7 @@
 		<dependency>
 		  <groupId>org.apache.httpcomponents</groupId>
 		  <artifactId>httpclient</artifactId>
-		  <version>4.3.6</version>
+		  <version>4.5.2</version>
 		</dependency>
 
 		<dependency>

diff --git a/...eb-services-rdf/src/test/java/edu/isi/karma/web/services/rdf/TestRDFGeneratorServlet.java b/...eb-services-rdf/src/test/java/edu/isi/karma/web/services/rdf/TestRDFGeneratorServlet.java
@@ -89,7 +89,7 @@ public void testR2RMLJSON() {
 		assert(idx != -1);
 
 		String[] lines = response.split("(\r\n|\n)");
-		assertEquals(438, lines.length);
+		assertEquals(564, lines.length);
 	}
 
 	@Test

diff --git a/karma-web/src/main/webapp/version.jsp b/karma-web/src/main/webapp/version.jsp
@@ -1 +1 @@
-v2.048
+v2.049
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
 	  <jdom.version>1.1.2</jdom.version>
 
 	  <gson.version>2.2.2</gson.version>
-	  <httpcomponents.version>4.2.4</httpcomponents.version>
+	  <httpcomponents.version>4.5.2</httpcomponents.version>
 	  <guava.version>13.0.1</guava.version>
 	  <spring.version>3.2.4.RELEASE</spring.version>
 
@@ -237,7 +237,7 @@
     <dependency>
     	<groupId>commons-fileupload</groupId>
     	<artifactId>commons-fileupload</artifactId>
-    	<version>1.2.2</version>
+    	<version>1.3.2</version>
     </dependency>
     <dependency>
     	<groupId>commons-io</groupId>
@@ -254,12 +254,7 @@
 		<artifactId>commons-cli</artifactId>
 		<version>1.2</version>
 	</dependency>
-	  <dependency>
-		  <groupId>commons-httpclient</groupId>
-		  <artifactId>commons-httpclient</artifactId>
-		  <version>3.1</version>
-	  </dependency>
-
+
     <dependency>
     	<groupId>org.antlr</groupId>
     	<artifactId>antlr</artifactId>
@@ -323,7 +318,7 @@
         <dependency>
         	<groupId>org.apache.httpcomponents</groupId>
         	<artifactId>httpcore</artifactId>
-        	<version>${httpcomponents.version}</version>
+        	<version>4.4.5</version>
         </dependency>
         <dependency>
         	<groupId>org.apache.httpcomponents</groupId>