You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ow...@apache.org on 2013/10/25 22:19:13 UTC
svn commit: r1535851 - in /cxf/fediz/trunk/services/idp: pom.xml
src/main/resources/log4j.properties src/main/resources/logging.properties
src/main/webapp/WEB-INF/security-config.xml
Author: owulff
Date: Fri Oct 25 20:19:13 2013
New Revision: 1535851
URL: http://svn.apache.org/r1535851
Log:
Fix metadata issue after login in idp and library cleanup
Removed:
cxf/fediz/trunk/services/idp/src/main/resources/logging.properties
Modified:
cxf/fediz/trunk/services/idp/pom.xml
cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties
cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml
Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1535851&r1=1535850&r2=1535851&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Fri Oct 25 20:19:13 2013
@@ -30,6 +30,21 @@
<packaging>war</packaging>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.1.4.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.1.4.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.1.4.RELEASE</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<properties>
@@ -81,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
Modified: cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties?rev=1535851&r1=1535850&r2=1535851&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/log4j.properties Fri Oct 25 20:19:13 2013
@@ -1,17 +1,17 @@
# Set root category priority to INFO and its only appender to CONSOLE.
#log4j.rootCategory=FATAL, CONSOLE
-log4j.rootCategory=DEBUG, CONSOLE
+log4j.rootCategory=INFO, CONSOLE, LOGFILE
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Threshold=INFO
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
# LOGFILE is set to be a File appender using a PatternLayout.
log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=target/wss4j.log
-log4j.appender.LOGFILE.Append=false
+log4j.appender.LOGFILE.File=${catalina.base}/logs/idp.log
+log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.Threshold=DEBUG
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml?rev=1535851&r1=1535850&r2=1535851&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml Fri Oct 25 20:19:13 2013
@@ -30,12 +30,12 @@
<context:component-scan base-package="org.apache.cxf.fediz.service.idp"/>
<!-- DIABLE in production as it might log confidential information about the user -->
- <security:debug />
+ <!-- <security:debug /> -->
- <!-- Configure Spring Security -->
+ <!-- Configure Spring Security -->
<security:http auto-config="false" use-expressions="true">
<security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
- <security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous()" />
+ <security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
<!-- MUST be http-basic thus systests run fine -->
<security:http-basic />