X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fservlet-sample%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fsample%2Fcadi%2Fjetty%2FJettyServletServer.java;h=4800e133adfad30061726e07395cd4787f74cac8;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=165acffba4a00f218b1e32c243c9ae493b6fa631;hpb=bdce7667a6e272e2fa32e298d957a0d9090c5bc9;p=aaf%2Fauthz.git

diff --git a/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
index 165acffb..4800e133 100644
--- a/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
+++ b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@ 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;
@@ -54,12 +54,12 @@ public abstract class JettyServletServer implements Servlet {
         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) {
@@ -74,26 +74,26 @@ public abstract class JettyServletServer implements Servlet {
             SslContextFactory scf = new SslContextFactory();
             scf.setSslContext(securityInfo.getSSLContext());
             scf.setWantClientAuth(true);
-            ServerConnector sslConnector = new ServerConnector(server,scf); 
+            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 
+        // 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
@@ -104,7 +104,7 @@ public abstract class JettyServletServer implements Servlet {
         // Startup the Server
         server.setStopAtShutdown(true);
         server.start();
-   
+
         access.log(Level.INFO,"TestServlet is running at " + protocol + "://"+hostname+':'+port+context);
         return server;
     }