fixed merge conflict when bringing in @ThomasMaxwell repo

Author: doutriaux1

.gitignore

@@ -1,6 +1,8 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*.log
+.idea
 
 # C extensions
 *.so
@@ -52,3 +54,4 @@ docs/_build/
 
 # PyBuilder
 target/
+*~

README.txt

@@ -0,0 +1,57 @@
+  WPCDAS:  Web Processing Climate Data Analysis Services
+
+WPS API leveraging UVCDAT for server-side climate data analytics with clients for web, python, etc.
+The inital version of the WPS server was based on code developed by Charles Doutriaux, LLNL.
+
+Package installation:
+
+  >> sudo mkdir /usr/local/web
+  >> sudo chown <username> /usr/local/web
+  >> cd /usr/local/web
+  >> git checkout [email protected]:ThomasMaxwell/CDS-WPS-AaaS.git WPCDAS
+  >> chmod -R a+rX WPCDAS
+  >> chmod -R a+w WPCDAS/server/logs
+  >> cd WPCDAS
+  >> tar xzf sample_data.tar.gz
+
+WPS Server Requirements:
+
+    UVCDAT:  http://uvcdat.llnl.gov/
+
+    Once UVCDAT is installed the following packages should be installed using UVCDAT's python:
+
+    lxml:    http://lxml.de/
+    Django:  https://www.djangoproject.com/
+    django-corsheaders:  https://github.com/OttoYiu/django-cors-headers
+
+
+Client Requirements:
+
+     The web client is executed using an HTTP server such as Apache or CherryPy.
+     For Apache, edit the /usr/local/apache2/conf/httpd.conf file:
+       Set Listen to 8001
+       Set DocumentRoot to "/usr/local/web/WPCDAS/clients/web/htdocs"
+
+Service Initialization:
+
+  Setup the UVCDAT environment:
+
+  >> source .../install/bin/setup_runtime.sh
+
+  Start the WPS service with the command:
+
+  >> cd /usr/local/web/WPCDAS/server; python manage.py runserver
+
+  Start the apache server with the command:
+
+  >> sudo /usr/local/apache2/bin/apachectl -k start
+
+Testing:
+
+  WPS service test URLs can be found at: http://localhost:8001/
+
+Web Client:
+
+     A test plot can be accessed at http://localhost:8001/cdas/.
+     Clicking on the map initiates a WPS call which retrieves a timeseries at the chosen location and then plots it.
+

clients/.DS_Store

@@ -0,0 +1 @@
+TBD

clients/cpp/README.txt

@@ -0,0 +1 @@
+TBD

clients/python/README.txt

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CreateV</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+</projectDescription>

clients/web/.DS_Store

@@ -0,0 +1,38 @@
+var CDS = {
+	title: "NCCS Climate Data Services",
+	location: "NASA Goddard Space Flight Center",
+	url: "https://cds.nccs.nasa.gov/"
+};
+
+CDS.wps = {
+	title: "Web Processing Service Utilities",
+	
+	execute: function( args ) {
+		var inputs = this.to_html_inputs( args.inputs ); 
+		console.log( 'inputs: ' + inputs );
+		var request = OpenLayers.Request.GET( {
+     		url: args.url,
+        	params: {
+	           service: "WPS",
+	           version: "1.0.0",
+	           request: "Execute",
+	           rawDataOutput: "result",
+	           identifier: args.process,
+	           datainputs: inputs
+	        },
+	        success: args.success
+    	} );
+    	console.log( request );
+    },
+    
+    to_html_inputs: function( object ) {
+    	var result = "[";
+    	for (var property in object) {
+    		if (object.hasOwnProperty(property)) {
+				result = result.concat( property, "=", object[property], ";" );
+    		}
+		}
+		result.concat( "]" );
+		return result;
+    }	
+};