Skip to content

Commit e9da1ef

Browse files
msultzabergermsultzaberger
committed
SSP-3293 Final commits
1 parent 3239bc9 commit e9da1ef

File tree

4 files changed

+225
-0
lines changed

4 files changed

+225
-0
lines changed

‎etc/portal/uPortal.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ cas.ticketValidationFilter.service=${portal.protocol}://${portal.server}${portal
6868
org.apereo.portal.security.provider.cas.CasAssertionSecurityContextFactory.enabled=true
6969
#org.apereo.portal.security.provider.cas.CasAssertionSecurityContextFactory.credentialToken=ticket
7070

71+
## Some CAS servers, like the CAS server bundled with uPortal-start can not handle encoded service URLs.
72+
## By default, the following value is set to true
73+
## See https://groups.google.com/a/apereo.org/d/msg/uportal-user/44Uw1YP8_Mg/hLaTlEVZFAAJ
74+
## for the discussion regarding this property
75+
#
76+
cas.ticketValidationFilter.encodeServiceUrl=false
77+
7178
##
7279
## LDAP
7380
##

‎gradle/tasks/tomcat.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
shared "org.apache.portals.pluto:pluto-container-driver-api:${plutoVersion}"
1616
shared "org.apache.portals.pluto:pluto-taglib:${plutoVersion}"
1717
shared "org.apereo.service.persondir:person-directory-api:${personDirectoryVersion}"
18+
//Remove this for uPortal 5.8.1
1819
shared "org.jasig.portal:uPortal-api-platform:${uPortalVersion}"
1920
shared "${portletApiDependency}"
2021
}

‎overlays/uPortal/out/production/resources/properties/contextOverrides/overridesContext.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to Apereo under one or more contributor license
5+
agreements. See the NOTICE file distributed with this work
6+
for additional information regarding copyright ownership.
7+
Apereo licenses this file to you under the Apache License,
8+
Version 2.0 (the "License"); you may not use this file
9+
except in compliance with the License. You may obtain a
10+
copy of the License at the following location:
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xmlns="http://www.springframework.org/schema/beans"
24+
xsi:schemaLocation="
25+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
26+
27+
</beans>

‎overlays/uPortal/src/main/resources/logback.xml‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
<!--
2+
Licensed to Apereo under one or more contributor license
3+
agreements. See the NOTICE file distributed with this work
4+
for additional information regarding copyright ownership.
5+
Apereo licenses this file to you under the Apache License,
6+
Version 2.0 (the "License"); you may not use this file
7+
except in compliance with the License. You may obtain a
8+
copy of the License at the following location:
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
Unless required by applicable law or agreed to in writing,
11+
software distributed under the License is distributed on an
12+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
13+
KIND, either express or implied. See the License for the
14+
specific language governing permissions and limitations
15+
under the License.
16+
-->
17+
<!-- For assistance related to logback-translator or configuration -->
18+
<!-- files in general, please contact the logback user mailing list -->
19+
<!-- at http://www.qos.ch/mailman/listinfo/logback-user -->
20+
<!-- -->
21+
<!-- For professional support please see -->
22+
<!-- http://www.qos.ch/shop/products/professionalSupport -->
23+
<!-- -->
24+
<configuration scan="true" scanPeriod="30 seconds">
25+
<contextName>uPortal</contextName>
26+
27+
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
28+
<resetJUL>true</resetJUL>
29+
</contextListener>
30+
31+
<jmxConfigurator />
32+
33+
<appender name="PORTAL" class="ch.qos.logback.core.rolling.RollingFileAppender">
34+
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
35+
<!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
36+
<!--for further documentation-->
37+
<File>${catalina.base}/logs/portal/portal.log</File>
38+
<encoder>
39+
<pattern>%-5level [%thread] %logger{36} %d{ISO8601} - %msg%n</pattern>
40+
</encoder>
41+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
42+
<fileNamePattern>${catalina.base}/logs/portal/portal.log.%d{yyyy-MM-dd}</fileNamePattern>
43+
</rollingPolicy>
44+
</appender>
45+
46+
<appender name="EVENT" class="ch.qos.logback.core.rolling.RollingFileAppender">
47+
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
48+
<!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
49+
<!--for further documentation-->
50+
<File>${catalina.base}/logs/portal/portal-events.log</File>
51+
<encoder>
52+
<pattern>%-5level [%thread] %logger{36} %d{ISO8601} - %msg%n</pattern>
53+
</encoder>
54+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
55+
<fileNamePattern>${catalina.base}/logs/portal/portal-events.log.%d{yyyy-MM-dd}</fileNamePattern>
56+
</rollingPolicy>
57+
</appender>
58+
59+
<appender name="TINCAN" class="ch.qos.logback.core.rolling.RollingFileAppender">
60+
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
61+
<!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
62+
<!--for further documentation-->
63+
<File>${catalina.base}/logs/portal/portal-tincan-events.log</File>
64+
<encoder>
65+
<pattern>%-5level [%thread] %logger{36} %d{ISO8601} - %msg%n</pattern>
66+
</encoder>
67+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
68+
<fileNamePattern>${catalina.base}/logs/portal/portal-tincan-events.log.%d{yyyy-MM-dd}</fileNamePattern>
69+
</rollingPolicy>
70+
</appender>
71+
72+
<appender name="SWAPPER" class="ch.qos.logback.core.rolling.RollingFileAppender">
73+
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
74+
<!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
75+
<!--for further documentation-->
76+
<File>${catalina.base}/logs/audit/portal.audit.log</File>
77+
<encoder>
78+
<pattern>%-5level [%thread] %logger{36} %d{ISO8601} - %msg%n</pattern>
79+
</encoder>
80+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
81+
<fileNamePattern>${catalina.base}/logs/audit/portal.audit.log.%d{yyyy-MM-dd}</fileNamePattern>
82+
</rollingPolicy>
83+
</appender>
84+
85+
<appender name="JG" class="ch.qos.logback.core.rolling.RollingFileAppender">
86+
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
87+
<!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
88+
<!--for further documentation-->
89+
<File>${catalina.base}/logs/jgroups/portal.jgroups.log</File>
90+
<encoder>
91+
<pattern>%-5level [%thread] %logger{36} %d{ISO8601} - %msg%n</pattern>
92+
</encoder>
93+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
94+
<fileNamePattern>${catalina.base}/logs/jgroups/portal.jgroups.log.%d{yyyy-MM-dd}</fileNamePattern>
95+
</rollingPolicy>
96+
</appender>
97+
98+
<root level="INFO">
99+
<appender-ref ref="PORTAL"/>
100+
</root>
101+
102+
<logger name="org.apereo.services" additivity="false" level="DEBUG">
103+
<appender-ref ref="PORTAL"/>
104+
</logger>
105+
106+
<!-- Log use of the identity and attribute swapper -->
107+
<logger name="org.apereo.portal.portlets.swapper" additivity="false" level="INFO">
108+
<appender-ref ref="SWAPPER"/>
109+
</logger>
110+
111+
<!-- Portal Event aggregation -->
112+
<logger name="org.apereo.portal.events" additivity="false" level="INFO">
113+
<appender-ref ref="EVENT"/>
114+
</logger>
115+
116+
<!-- Portal Tin Can Events -->
117+
<logger name="org.apereo.portal.events.tincan.providers.LogEventTinCanAPIProvider" additivity="false" level="DEBUG">
118+
<appender-ref ref="TINCAN"/>
119+
</logger>
120+
121+
<!-- Debug CAS Clearpass
122+
<logger name="org.apereo.portal.security.provider.cas" additivity="false" level="TRACE">
123+
<appender-ref ref="PORTAL"/>
124+
</logger>
125+
<logger name="org.jasig.cas.client" additivity="false" level="TRACE">
126+
<appender-ref ref="PORTAL"/>
127+
</logger>
128+
<logger name="org.apereo.portal.portlet.container.services" additivity="false" level="DEBUG">
129+
<appender-ref ref="PORTAL"/>
130+
</logger>
131+
-->
132+
133+
<!-- Uncomment to monitor jGroups clustering
134+
<logger name="net.sf.ehcache.distribution" additivity="false" level="TRACE">
135+
<appender-ref ref="JG"/>
136+
</logger>
137+
<logger name="org.jgroups" additivity="false" level="DEBUG">
138+
<appender-ref ref="JG"/>
139+
</logger>
140+
-->
141+
142+
<!-- Log all TX, SQL and SQL Parameters
143+
<logger name="org.springframework.orm.jpa.JpaTransactionManager" additivity="false" level="DEBUG">
144+
<appender-ref ref="PORTAL"/>
145+
</logger>
146+
<logger name="org.hibernate.SQL" additivity="false" level="DEBUG">
147+
<appender-ref ref="PORTAL"/>
148+
</logger>
149+
<logger name="org.hibernate.type" additivity="false" level="TRACE">
150+
<appender-ref ref="PORTAL"/>
151+
</logger>
152+
-->
153+
154+
<!-- Portlet Event handling logging
155+
<logger name="org.apereo.portal.portlet.rendering.PortletEventCoordinatationService" additivity="false" level="DEBUG">
156+
<appender-ref ref="PORTAL"/>
157+
</logger>
158+
-->
159+
160+
<!-- Uncomment to see the XML at various stages in the rendering pipeline
161+
<logger name="org.apereo.portal.rendering.LoggingStAXComponent" additivity="false" level="DEBUG">
162+
<appender-ref ref="PORTAL"/>
163+
</logger>
164+
-->
165+
166+
<!-- Uncomment to see fragment activation errors
167+
<logger name="org.apereo.portal.layout.dlm.FragmentActivator" additivity="false" level="DEBUG">
168+
<appender-ref ref="PORTAL"/>
169+
</logger>
170+
-->
171+
172+
<!-- Uncomment to monitor portlet-spec caching behavior
173+
<logger name="org.apereo.portal.portlet.rendering.PortletRendererImpl" additivity="false" level="DEBUG">
174+
<appender-ref ref="PORTAL"/>
175+
</logger>
176+
<logger name="org.apereo.portal.portlet.container.cache" additivity="false" level="DEBUG">
177+
<appender-ref ref="PORTAL"/>
178+
</logger>
179+
-->
180+
181+
<!-- Hide some useful Hibernate performance statistics that clutter the logs in dev. Enable this to review
182+
DB connection, flush, and cache times, # of objects flushed, etc. -->
183+
<logger name="org.hibernate.engine.internal.StatisticalLoggingSessionEventListener" additivity="false" level="WARN"/>
184+
185+
<!-- Hide some bad Hibernate log messages -->
186+
<logger name="org.hibernate.cfg.annotations.reflection.JPAOverriddenAnnotationReader" additivity="false" level="ERROR"/>
187+
<logger name="org.hibernate.ejb.metamodel.MetadataContext" additivity="false" level="FATAL"/>
188+
<logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" additivity="false" level="FATAL"/>
189+
190+
</configuration>

0 commit comments

Comments
 (0)