Merge branch 'master' into esta-ld-integration

Author: alegrm

.gitignore

@@ -1,7 +1,6 @@
 #Framework configuration files
-/src/main/webapp/WEB-INF/web.xml
 /src/main/resources/framework-configuration.ttl
-/src/main/resources/framework-components-local.ttl
+/src/main/resources/framework-components.ttl
 
 #Mac
 .DS_Store

src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+  version="2.4">
+
+  <display-name>GeoKnow Generator</display-name>
+  
+  <!-- File Upload parameters -->
+  <context-param>
+    <description>Location to store uploaded file</description>
+    <param-name>file-upload</param-name>
+    <param-value>uploads</param-value>
+  </context-param>
+  <context-param>
+    <description>Maximum file size to be uploaded 1024 * 1024 * 5</description>
+    <param-name>max-file-size</param-name>
+    <param-value>524288000</param-value>
+  </context-param>
+  <context-param>
+    <description>Maximum size that will be stored in memory 20 * 1024</description>
+    <param-name>max-mem-size</param-name>
+    <param-value>2048000</param-value>
+  </context-param>
+  <context-param>
+    <description>Location to save data that is larger than maxMemSize</description>
+    <param-name>temp-data</param-name>
+    <param-value>uploads/tmp</param-value>
+  </context-param>
+
+  <servlet>
+    <servlet-name>ImportRDF</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.ImportRDF</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ImportRDF</servlet-name>
+    <url-pattern>/ImportRDF</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UploadServlet</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.UploadServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UploadServlet</servlet-name>
+    <url-pattern>/UploadServlet</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ImportRDFString</servlet-name>
+    <url-pattern>/ImportRDFString</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>ImportRDFString</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.ImportRDFString</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AuthenticationServlet</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.AuthenticationServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AuthenticationServlet</servlet-name>
+    <url-pattern>/AuthenticationServlet</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>VirtuosoProxy</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.VirtuosoProxy</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>VirtuosoProxy</servlet-name>
+    <url-pattern>/VirtuosoProxy</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UserManagerServlet</servlet-name>
+    <servlet-class>eu.geoknow.generator.servlets.UserManagerServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UserManagerServlet</servlet-name>
+    <url-pattern>/UserManagerServlet</url-pattern>
+  </servlet-mapping>
+
+
+  <!-- Jersey rest services scanning -->
+  <!-- TODO: All servlet mapping will be replaced by this once we change all Servlets 
+    to Javax web services 
+  <servlet>
+    <servlet-name>rest</servlet-name>
+    <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+    <load-on-startup>1</load-on-startup>
+    <init-param>
+      <param-name>jersey.config.server.provider.packages</param-name>
+      <param-value>eu.geoknow.generator.rest</param-value>
+    </init-param>
+    <init-param>
+      <param-name>jersey.config.server.provider.scanning.recursive</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+      <param-value>true</param-value>
+     </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>rest</servlet-name>
+    <url-pattern>/rest/*</url-pattern>
+  </servlet-mapping>-->
+
+  <mime-mapping>
+    <extension>n3</extension>
+    <mime-type>text/n3</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>ttl</extension>
+    <mime-type>text/turtle</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>rdf</extension>
+    <mime-type>application/rdf+xml</mime-type>
+  </mime-mapping>
+
+</web-app>