Fix up config typos and loggin configs
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 24 Aug 2010 14:10:07 +0000 (14:10 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 24 Aug 2010 14:10:07 +0000 (14:10 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2946 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/logging.xml
src/installer/resources/conf-tmpl/service.xml
src/main/assembly/src.xml [deleted file]
src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 414741d..9efa4e8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/bin.xml</descriptor>
-                        <descriptor>src/main/assembly/src.xml</descriptor>
                     </descriptors>
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
index 5edcf20..7f29da1 100644 (file)
@@ -5,41 +5,41 @@
                      xsi:schemaLocation="urn:mace:shibboleth:2.0:idp:profile-handler classpath:/schema/shibboleth-2.0-idp-profile-handler.xsd">
 
     <!-- Error Handler -->
-    <ph:ErrorHandler xsi:type="JSPErrorHandler" jspPagePath="/error.jsp" />
+    <ph:ErrorHandler xsi:type="ph:JSPErrorHandler" jspPagePath="/error.jsp" />
 
     <!-- Profile Handlers -->
     <!-- 
         All profile handlers defined below are accessed via the Servlet path "/profile" so if your profile 
         handler's request path is "/Status" then the full path is "<servletContextName>/profile/Status"
      -->
-    <ph:ProfileHandler xsi:type="Status">
+    <ph:ProfileHandler xsi:type="ph:Status">
         <ph:RequestPath>/Status</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAMLMetadata" metadataFile="$IDP_HOME$/metadata/idp-metadata.xml">
+    <ph:ProfileHandler xsi:type="ph:SAMLMetadata" metadataFile="$IDP_HOME$/metadata/idp-metadata.xml">
         <ph:RequestPath>/Metadata/SAML</ph:RequestPath>
     </ph:ProfileHandler>    
 
-    <ph:ProfileHandler xsi:type="ShibbolethSSO"
+    <ph:ProfileHandler xsi:type="ph:ShibbolethSSO"
                     inboundBinding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:1.0:profiles:browser-post 
                                                 urn:oasis:names:tc:SAML:1.0:profiles:artifact-01">
         <ph:RequestPath>/Shibboleth/SSO</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAML1AttributeQuery" 
+    <ph:ProfileHandler xsi:type="ph:SAML1AttributeQuery" 
                     inboundBinding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding">
         <ph:RequestPath>/SAML1/SOAP/AttributeQuery</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAML1ArtifactResolution" 
+    <ph:ProfileHandler xsi:type="ph:SAML1ArtifactResolution" 
                     inboundBinding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding">
         <ph:RequestPath>/SAML1/SOAP/ArtifactResolution</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAML2SSO" 
+    <ph:ProfileHandler xsi:type="ph:SAML2SSO" 
                     inboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign
                                                 urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST 
@@ -47,7 +47,7 @@
         <ph:RequestPath>/SAML2/POST/SSO</ph:RequestPath>
     </ph:ProfileHandler>
 
-    <ph:ProfileHandler xsi:type="SAML2SSO" 
+    <ph:ProfileHandler xsi:type="ph:SAML2SSO" 
                     inboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign
                                                 urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST 
@@ -55,7 +55,7 @@
         <ph:RequestPath>/SAML2/POST-SimpleSign/SSO</ph:RequestPath>
     </ph:ProfileHandler>
 
-    <ph:ProfileHandler xsi:type="SAML2SSO" 
+    <ph:ProfileHandler xsi:type="ph:SAML2SSO" 
                     inboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign
                                                 urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST 
         <ph:RequestPath>/SAML2/Redirect/SSO</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAML2AttributeQuery"
+    <ph:ProfileHandler xsi:type="ph:SAML2AttributeQuery"
                     inboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:2.0:bindings:SOAP">
         <ph:RequestPath>/SAML2/SOAP/AttributeQuery</ph:RequestPath>
     </ph:ProfileHandler>
     
-    <ph:ProfileHandler xsi:type="SAML2ArtifactResolution" 
+    <ph:ProfileHandler xsi:type="ph:SAML2ArtifactResolution" 
                     inboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                     outboundBindingEnumeration="urn:oasis:names:tc:SAML:2.0:bindings:SOAP">
         <ph:RequestPath>/SAML2/SOAP/ArtifactResolution</ph:RequestPath>
     </ph:ProfileHandler>
     
     <!-- Login Handlers -->
-    <ph:LoginHandler xsi:type="RemoteUser">
+    <ph:LoginHandler xsi:type="ph:RemoteUser">
         <ph:AuthenticationMethod>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</ph:AuthenticationMethod>
     </ph:LoginHandler>
     
     <!--  Username/password login handler -->
     <!-- 
-    <ph:LoginHandler xsi:type="UsernamePassword" 
+    <ph:LoginHandler xsi:type="ph:UsernamePassword" 
                   jaasConfigurationLocation="file://$IDP_HOME$/conf/login.config">
         <ph:AuthenticationMethod>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</ph:AuthenticationMethod>
     </ph:LoginHandler>
@@ -92,7 +92,7 @@
         Removal of this login handler will disable SSO support, that is it will require the user to authenticate 
         on every request.
     -->
-    <ph:LoginHandler xsi:type="PreviousSession">
+    <ph:LoginHandler xsi:type="ph:PreviousSession">
         <ph:AuthenticationMethod>urn:oasis:names:tc:SAML:2.0:ac:classes:PreviousSession</ph:AuthenticationMethod>
     </ph:LoginHandler>
 
index 445eb35..9799fc9 100644 (file)
@@ -30,7 +30,6 @@
      -->
     <appender name="IDP_ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>$IDP_HOME$/logs/idp-access.log</File>
-        <ImmediateFlush>true</ImmediateFlush>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>$IDP_HOME$/logs/idp-access-%d{yyyy-MM-dd}.log</FileNamePattern>
@@ -44,7 +43,6 @@
 
     <appender name="IDP_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>$IDP_HOME$/logs/idp-audit.log</File>
-        <ImmediateFlush>true</ImmediateFlush>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>$IDP_HOME$/logs/idp-audit-%d{yyyy-MM-dd}.log</FileNamePattern>
 
     <appender name="IDP_PROCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>$IDP_HOME$/logs/idp-process.log</File>
-        <!-- Uncomment this if application is terminating in such as way that the last few log messages are not written to disk -->
-        <!--
-        <ImmediateFlush>true</ImmediateFlush>
-        -->
         
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>$IDP_HOME$/logs/idp-process-%d{yyyy-MM-dd}.log</FileNamePattern>
index 8733739..9d8bfb9 100644 (file)
@@ -59,5 +59,5 @@
                          shibboleth.SAML1AttributeAuthority shibboleth.SAML2AttributeAuthority 
                          shibboleth.RelyingPartyConfigurationManager shibboleth.HandlerManager
                          shibboleth.StorageService"
-             xsi:type="ServletContextAttributeExporter" />
+             xsi:type="srv:ServletContextAttributeExporter" />
 </srv:Services>
\ No newline at end of file
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
deleted file mode 100644 (file)
index 999ffd1..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- Source distribution -->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <excludes>
-                <exclude>org.apache.xerces:*</exclude>
-                <exclude>org.apache.xalan:*</exclude>
-                <exclude>org.apache.ant:*</exclude>
-                <exclude>ant-contrib:*</exclude>
-                <exclude>edu.internet2.middleware:ant-extensions:*</exclude>
-            </excludes>
-            <includes>
-                <include>*:jar:*</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>src/installer/lib</outputDirectory>
-            <includes>
-                <include>org.apache.ant:*</include>
-                <include>ant-contrib:*</include>
-                <include>edu.internet2.middleware:ant-extensions:*</include>
-                <include>org.bouncycastle:*</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/endorsed</outputDirectory>
-            <includes>
-                <include>org.apache.xerces:*</include>
-                <include>org.apache.xalan:*</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-    
-    <fileSets>
-        <fileSet>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/bin/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Documentation -->
-        <fileSet>
-            <directory>doc/</directory>
-            <outputDirectory>/doc</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>/doc/api</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/style</directory>
-            <outputDirectory>/doc/style</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/unitTest</directory>
-            <outputDirectory>/doc/unitTest</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/xref</directory>
-            <outputDirectory>/doc/src-xref</outputDirectory>
-        </fileSet>
-    </fileSets>
-    
-</assembly>
\ No newline at end of file
index bc61e5e..63b1d78 100644 (file)
@@ -3,15 +3,15 @@
 <!-- Basic configuration used until the IdP can load the real configuration -->
 <configuration>
 
-  <appender name="STDOUT"
-    class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </layout>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <charset>UTF-8</charset>
+        <pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <root>
-    <level value="warn" />
+  <root level="warn">
     <appender-ref ref="STDOUT" />
   </root>
+  
 </configuration>
\ No newline at end of file