X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fservlet-sample%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fsample%2Fcadi%2Fjetty%2FJettyServletServer.java;h=165acffba4a00f218b1e32c243c9ae493b6fa631;hb=7e966914050e66219689001ff4ab601a49eef0ac;hp=2d1fc0977c79b9f6b836a5fb9a141d411b674336;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git

diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java b/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
index 2d1fc097..165acffb 100644
--- a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
+++ b/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
@@ -43,70 +43,70 @@ import org.onap.aaf.cadi.config.SecurityInfo;
 import org.onap.aaf.cadi.filter.CadiFilter;
 
 public abstract class JettyServletServer implements Servlet {
-	
-	public static Server run(PropAccess access, String context, Class<? extends Servlet> servletCls, int port, String ...args) throws Exception {
-		// Defaults:
-		int blockingQueueSize = 10;
+    
+    public static Server run(PropAccess access, String context, Class<? extends Servlet> servletCls, int port, String ...args) throws Exception {
+        // Defaults:
+        int blockingQueueSize = 10;
         int corePoolSize = 10;
         int maxPoolSize = 10;
         int keepAliveTime  = 3000;
-		String hostname = access.getProperty(Config.HOSTNAME, null);
-		if(hostname==null) {
-			hostname = Inet4Address.getLocalHost().getHostName();
-		}
+        String hostname = access.getProperty(Config.HOSTNAME, null);
+        if (hostname==null) {
+            hostname = Inet4Address.getLocalHost().getHostName();
+        }
         
         // Add your own Properties to override defaults
 
         ArrayBlockingQueue<Runnable> queue = new ArrayBlockingQueue<Runnable>(blockingQueueSize);
         QueuedThreadPool pool = new QueuedThreadPool(maxPoolSize,corePoolSize,keepAliveTime,queue);
-		Server server = new Server(pool);			
+        Server server = new Server(pool);            
 
-		String protocol;
-		if(access.getProperty(Config.CADI_KEYSTORE_PASSWORD,null)==null) {
-			ServerConnector conn = new ServerConnector(server);
-			conn.setHost(hostname);
-			conn.setPort(port);
-			server.addConnector(conn);
-			protocol = "http";
-		} else {
-			// Setup Security
-			SecurityInfo securityInfo = new SecurityInfo(access);
-			SslContextFactory scf = new SslContextFactory();
-			scf.setSslContext(securityInfo.getSSLContext());
-			scf.setWantClientAuth(true);
-			ServerConnector sslConnector = new ServerConnector(server,scf); 
-	        sslConnector.setHost(hostname);
-	        sslConnector.setPort(port);
-	        server.addConnector(sslConnector);
-			protocol = "https";
-		}
+        String protocol;
+        if (access.getProperty(Config.CADI_KEYSTORE_PASSWORD,null)==null) {
+            ServerConnector conn = new ServerConnector(server);
+            conn.setHost(hostname);
+            conn.setPort(port);
+            server.addConnector(conn);
+            protocol = "http";
+        } else {
+            // Setup Security
+            SecurityInfo securityInfo = new SecurityInfo(access);
+            SslContextFactory scf = new SslContextFactory();
+            scf.setSslContext(securityInfo.getSSLContext());
+            scf.setWantClientAuth(true);
+            ServerConnector sslConnector = new ServerConnector(server,scf); 
+            sslConnector.setHost(hostname);
+            sslConnector.setPort(port);
+            server.addConnector(sslConnector);
+            protocol = "https";
+        }
         
         // Setup Sample Servlet
         CadiFilter cf = new CadiFilter(true,access);
-		FilterHolder cfh = new FilterHolder(cf);
-		
-		ServletHandler shand = new ServletHandler();
-		shand.addFilterWithMapping(cfh, "/*", FilterMapping.ALL);
-		// To use normal Servlets, just add the class here... Actually, bug in Jetty... need to add with ServletHolder
-		ServletHolder sh = new ServletHolder();
-		sh.setServlet(servletCls.newInstance());
-		shand.addServletWithMapping(sh,"/*");
-		
-		// To use JASPI Authorization Style to protect the servlet, wrap the Servlet
-		// with the "MiniJSAPIWrap class, as shown here.  Then add "@RolesAllowed" on your 
-		// servlet (see sample).  Use Pipe delimited Permissions, not AAF Roles in the line
-		// shand.addServletWithMapping(new MiniJASPIWrap(MyServlet.class),"/*");
-		// call initialize after start
-		ContextHandler ch = new ServletContextHandler();
-		ch.setContextPath(context);
-		ch.setHandler(shand);
-		server.setHandler(ch);
-		// Startup the Server
+        FilterHolder cfh = new FilterHolder(cf);
+        
+        ServletHandler shand = new ServletHandler();
+        shand.addFilterWithMapping(cfh, "/*", FilterMapping.ALL);
+        // To use normal Servlets, just add the class here... Actually, bug in Jetty... need to add with ServletHolder
+        ServletHolder sh = new ServletHolder();
+        sh.setServlet(servletCls.newInstance());
+        shand.addServletWithMapping(sh,"/*");
+        
+        // To use JASPI Authorization Style to protect the servlet, wrap the Servlet
+        // with the "MiniJSAPIWrap class, as shown here.  Then add "@RolesAllowed" on your 
+        // servlet (see sample).  Use Pipe delimited Permissions, not AAF Roles in the line
+        // shand.addServletWithMapping(new MiniJASPIWrap(MyServlet.class),"/*");
+        // call initialize after start
+        ContextHandler ch = new ServletContextHandler();
+        ch.setContextPath(context);
+        ch.setHandler(shand);
+        server.setHandler(ch);
+        // Startup the Server
         server.setStopAtShutdown(true);
         server.start();
    
         access.log(Level.INFO,"TestServlet is running at " + protocol + "://"+hostname+':'+port+context);
         return server;
-	}
+    }
 
 }