Project

General

Profile

« Previous | Next » 

Revision 60020

adding beta branch #6194

View differences:

modules/dnet-login/branches/beta/src/main/webapp/WEB-INF/applicationContext.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2

  
3
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
       xmlns:context="http://www.springframework.org/schema/context"
5
       xmlns:security="http://www.springframework.org/schema/security"
6
       xmlns="http://www.springframework.org/schema/beans"
7
       xsi:schemaLocation="
8
       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
9
       http://www.springframework.org/schema/beans
10
       http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
11
	   http://www.springframework.org/schema/context
12
		   http://www.springframework.org/schema/context/spring-context-4.2.xsd">
13

  
14
    <import resource="classpath*:/eu/dnetlib/openaire/user/login/springContext-userLoginCore.xml" />
15

  
16

  
17
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
18
        <property name="order" value="2" />
19
        <property name="ignoreUnresolvablePlaceholders" value="true" />
20
        <property name="properties">
21
            <bean class="eu.dnetlib.conf.WebappContextProperyFactory">
22
                <property name="propertyFetcher">
23
                    <bean class="eu.dnetlib.conf.PropertyFetcher" />
24
                </property>
25
            </bean>
26
        </property>
27
        <property name="locations">
28
            <list>
29
                <value>classpath*:/eu/**/applicationContext*.properties</value>
30
                <value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
31
                <value>classpath*:/eu/**/springContext-userLoginCore.properties</value>
32
                <value>classpath*:/uoa-override.properties</value>
33
                <value>classpath*:/dnet-override.properties</value>
34
            </list>
35
        </property>
36
    </bean>
37

  
38
</beans>
modules/dnet-login/branches/beta/src/main/webapp/WEB-INF/log4j.properties
1
log4j.rootLogger = INFO, R
2

  
3
log4j.logger.eu.dnetlib = INFO
4
log4j.logger.org.mitre.openid = INFO
5
log4j.logger.org.springframework = INFO, S
6

  
7
log4j.additivity.org.springframework = false
8

  
9
log4j.appender.R=org.apache.log4j.RollingFileAppender
10
#log4j.appender.R.File=/var/log/dnet/monitor-dashboard-login/monitor-dashboard-login.log
11
#log4j.appender.R.File=/var/log/dnet/connect-dashboard-login/connect-dashboard-login.log
12
log4j.appender.R.File=/var/log/dnet/connect-login/connect-login.log
13
#log4j.appender.R.File=/var/log/dnet/monitor-login/monitor-login.log
14
#log4j.appender.R.File=/var/log/dnet/explore-login/explore-login.log
15
#log4j.appender.R.File=/var/log/dnet/connect-user-management/connect-user-management.log
16
#log4j.appender.R.File=/var/log/dnet/admin-user-management/admin-user-management.log
17
log4j.appender.R.MaxFileSize=10MB
18
log4j.appender.R.MaxBackupIndex=10
19
log4j.appender.R.layout=org.apache.log4j.PatternLayout
20
log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
21

  
22
log4j.appender.S=org.apache.log4j.RollingFileAppender
23
#log4j.appender.S.File=/var/log/dnet/monitor-dashboard-login/monitor-dashboard-login-spring.log
24
#log4j.appender.S.File=/var/log/dnet/connect-dashboard-login/connect-dashboard-login-spring.log
25
log4j.appender.S.File=/var/log/dnet/connect-login/connect-login-spring.log
26
#log4j.appender.S.File=/var/log/dnet/monitor-login/monitor-login-spring.log
27
#log4j.appender.S.File=/var/log/dnet/explore-login/explore-login-spring.log
28
#log4j.appender.S.File=/var/log/dnet/connect-user-management/connect-user-management-spring.log
29
#log4j.appender.S.File=/var/log/dnet/admin-user-management/admin-user-management-spring.log
30
log4j.appender.S.MaxFileSize=10MB
31
log4j.appender.S.MaxBackupIndex=10
32
log4j.appender.S.layout=org.apache.log4j.PatternLayout
33
log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
modules/dnet-login/branches/beta/src/main/webapp/WEB-INF/web.xml
1
<!DOCTYPE web-app PUBLIC
2
        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
3
        "http://java.sun.com/dtd/web-app_2_3.dtd" >
4

  
5
<web-app>
6
  <display-name>Dnet Login</display-name>
7
  <context-param>
8
    <param-name>contextConfigLocation</param-name>
9
    <param-value>
10
      /WEB-INF/applicationContext.xml
11
    </param-value>
12
  </context-param>
13
  <context-param>
14
    <param-name>log4jConfigLocation</param-name>
15
    <param-value>/WEB-INF/log4j.properties</param-value>
16
  </context-param>
17

  
18
  <listener>
19
    <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
20
  </listener>
21

  
22
  <listener>
23
    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
24
  </listener>
25

  
26
  <filter>
27
    <filter-name>springSessionRepositoryFilter</filter-name>
28
    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
29
  </filter>
30
  <filter-mapping>
31
    <filter-name>springSessionRepositoryFilter</filter-name>
32
    <url-pattern>/*</url-pattern>
33
    <dispatcher>REQUEST</dispatcher>
34
    <dispatcher>ERROR</dispatcher>
35
  </filter-mapping>
36

  
37
  <filter>
38
    <filter-name>springSecurityFilterChain</filter-name>
39
    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
40
  </filter>
41

  
42
  <filter-mapping>
43
    <filter-name>springSecurityFilterChain</filter-name>
44
    <url-pattern>/*</url-pattern>
45
  </filter-mapping>
46

  
47
</web-app>
modules/dnet-login/branches/beta/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  <parent>
4
    <groupId>eu.dnetlib</groupId>
5
    <artifactId>dnet45-container-parent</artifactId>
6
    <version>1.0.0-SNAPSHOT</version>
7
  </parent>
8
  <modelVersion>4.0.0</modelVersion>
9
  <groupId>eu.dnetlib</groupId>
10
  <artifactId>dnet-login</artifactId>
11
  <packaging>war</packaging>
12
  <version>1.0-SNAPSHOT</version>
13
  <name>dnet-login</name>
14
  <dependencies>
15

  
16
    <dependency>
17
      <groupId>eu.dnetlib</groupId>
18
      <artifactId>uoa-login-core</artifactId>
19
      <version>[1.0.0-SNAPSHOT, 2.0.0)</version>
20
    </dependency>
21

  
22
    <dependency>
23
      <groupId>javax.servlet</groupId>
24
      <artifactId>javax.servlet-api</artifactId>
25
      <version>3.0.1</version>
26
    </dependency>
27

  
28
    <dependency>
29
      <groupId>junit</groupId>
30
      <artifactId>junit</artifactId>
31
      <version>3.8.1</version>
32
      <scope>test</scope>
33
    </dependency>
34

  
35
  </dependencies>
36
  <build>
37
    <finalName>dnet-login</finalName>
38
  </build>
39
</project>

Also available in: Unified diff