svn commit: r1417135 - /airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java

[la...@apache.org]

Author: lahiru
Date: Tue Dec  4 19:34:56 2012
New Revision: 1417135

URL: http://svn.apache.org/viewvc?rev=1417135&view=rev
Log:
adding rest service in to embedded tomcat instance.

Modified:
    airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java

Modified: airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java?rev=1417135&r1=1417134&r2=1417135&view=diff
==============================================================================
--- airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java (original)
+++ airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java Tue Dec  4 19:34:56 2012
@@ -24,6 +24,9 @@ import org.apache.airavata.common.utils.
 import org.apache.catalina.Wrapper;
 import java.io.File;
 import org.apache.catalina.Host;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.deploy.FilterMap;
 import org.apache.catalina.startup.Tomcat;
 
 public class ServerMain {
@@ -55,9 +58,25 @@ public class ServerMain {
                 File.separator + "bin" + File.separator + "axis2.xml");
         axis2Servlet.setLoadOnStartup(1);
 
-//        Wrapper registryServlet = tomcat.addServlet("/registry", "Airavata Web Application", "com.sun.jersey.spi.container.servlet.ServletContainer");
-//        registryServlet.addInitParameter("com.sun.jersey.config.property.packages","org.apache.airavata.services.registry.rest;org.codehaus.jackson.jaxrs");
-//        registryServlet.setLoadOnStartup(1);
+        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/registry", System.getenv("AIRAVATA_HOME"));
+        Wrapper registryServlet = tomcat.addServlet("/registry", "Airavata Web Application", "com.sun.jersey.spi.container.servlet.ServletContainer");
+        registryServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.registry.rest;org.codehaus.jackson.jaxrs");
+        registryServlet.setLoadOnStartup(1);
+
+        FilterDef filter1definition = new FilterDef();
+        filter1definition.setFilterName("AuthenticationFilter");
+        filter1definition.setFilterClass("org.apache.airavata.services.registry.rest.security.HttpAuthenticatorFilter");
+        filter1definition.addInitParameter("authenticatorConfigurations","authenticators.xml");
+        context.addFilterDef(filter1definition);
+
+        FilterMap filter1mapping = new FilterMap();
+        filter1mapping.setFilterName("AuthenticationFilter");
+        filter1mapping.addURLPattern("/user-store/*");
+        filter1mapping.addURLPattern("/api/*");
+        context.addFilterMap(filter1mapping);
+        registryServlet.addMapping("/api/*");
+        context.addApplicationListener("org.apache.airavata.rest.mappings.utils.RegistryListener");
+
         tomcat.start();
     }