[java-identity-provider COMMIT] in /branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3: start.d...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May 25 09:45:29 2016
New Revision: 8255

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8255&view=rev
Log:
IDP-983 Jetty-9.3 encorporate comments from Scott

https://issues.shibboleth.net/jira/browse/IDP-983

merge of r8250

Modified:
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml

Modified: branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini?rev=8255&r1=8254&r2=8255&view=diff
==============================================================================
--- branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini	(original)
+++ branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini	Wed May 25 09:45:29 2016
@@ -45,10 +45,6 @@
 ## idp.xml
 jetty.war.path=../webapp
 
-# Path to JAAS config
-# No longer used TOM????
-# jetty.jaas.path=conf/authn/jaas.config
-
 #Path to statically served.  This is relative to ${jetty.base} directory
 ## static.xml
 #jetty.static.data.path=../static

Modified: branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml?rev=8255&r1=8254&r2=8255&view=diff
==============================================================================
--- branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml	(original)
+++ branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml	Wed May 25 09:45:29 2016
@@ -11,29 +11,4 @@
   <Set name="copyWebDir">false</Set>
   <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=375504 -->
   <Set name="copyWebInf">true</Set>
-<!-- 
-  <Call name="setAttribute">
-    <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg>
-    <Arg>none</Arg>
-  </Call>
-  <Call name="setAttribute">
-    <Arg>org.eclipse.jetty.webapp.basetempdir</Arg>
-    <Arg><Property name="jetty.base" />/tmp</Arg>
-  </Call>
-
-  <Call class="java.lang.System" name="setProperty">
-    <Arg>java.security.auth.login.config</Arg>
-    <Arg><Property name="jetty.jaas.path" /></Arg>
-  </Call>
-  <Set name="securityHandler">
-    <New class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-     <Set name="loginService">
-       <New class="org.eclipse.jetty.jaas.JAASLoginService">
-         <Set name="name">Web Login Service</Set>
-         <Set name="loginModuleName">ShibUserPassAuth</Set>
-       </New>
-     </Set>
-    </New>
-  </Set>
-  -->q
 </Configure>