[java-idp-jetty-base] 03/04: IDP-1110 - Formatting
Tom Zeller
tzeller at dragonacea.biz
Thu Apr 26 10:46:49 EDT 2018
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch 9.4
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=6a46ec85110c43e61c57e0f70ba63f5e3ffc5516
commit 6a46ec85110c43e61c57e0f70ba63f5e3ffc5516
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Apr 26 09:40:51 2018 -0500
IDP-1110 - Formatting
https://issues.shibboleth.net/jira/browse/IDP-1110
---
.../resources/jetty-base/etc/idp-backchannel.xml | 14 ++++-----
.../jetty-base/etc/jetty-logback-access.xml | 1 -
.../resources/jetty-base/etc/jetty-ssl-context.xml | 2 +-
.../jetty-base/modules/idp-backchannel.mod | 4 +--
.../jetty-base/resources/logback-access.xml | 3 +-
.../resources/jetty-base/resources/logback.xml | 33 ++++++++++------------
src/main/resources/jetty-base/webapps/idp.xml | 1 -
src/main/resources/jetty-base/webapps/static.xml | 1 -
8 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/src/main/resources/jetty-base/etc/idp-backchannel.xml
index 7da42fb..70c8514 100644
--- a/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ b/src/main/resources/jetty-base/etc/idp-backchannel.xml
@@ -1,9 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- ============================================================= -->
+ <!-- ============================================================= -->
<!-- TLS context factory with optional client auth -->
<!-- and no container trust (delegate to application) -->
<!-- for backchannel (SOAP) communication to IdP -->
@@ -24,8 +22,8 @@
</Set>
<Set name="IncludeCipherSuites">
<Array type="String">
- <Item>TLS_ECDHE.*</Item>
- <Item>TLS_RSA.*</Item>
+ <Item>TLS_ECDHE.*</Item>
+ <Item>TLS_RSA.*</Item>
</Array>
</Set>
<Set name="ExcludeCipherSuites">
@@ -38,7 +36,7 @@
</Array>
</Set>
</New>
-
+
<New id="shibHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer">
@@ -49,7 +47,7 @@
</Arg>
</Call>
</New>
-
+
<!-- ============================================================= -->
<!-- IdP SOAP protocol connector -->
<!-- ============================================================= -->
@@ -83,5 +81,5 @@
</New>
</Arg>
</Call>
-
+
</Configure>
diff --git a/src/main/resources/jetty-base/etc/jetty-logback-access.xml b/src/main/resources/jetty-base/etc/jetty-logback-access.xml
index b2cf4b2..2e0008f 100644
--- a/src/main/resources/jetty-base/etc/jetty-logback-access.xml
+++ b/src/main/resources/jetty-base/etc/jetty-logback-access.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
<!-- =============================================================== -->
<!-- Configure the Logback Request Log -->
<!-- =============================================================== -->
diff --git a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
index 8406e12..0cf53f1 100644
--- a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
+++ b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
@@ -35,5 +35,5 @@
<Item>.*DSS.*</Item>
</Array>
</Set>
- </New>
+ </New>
</Configure>
\ No newline at end of file
diff --git a/src/main/resources/jetty-base/modules/idp-backchannel.mod b/src/main/resources/jetty-base/modules/idp-backchannel.mod
index 7cfce50..fbd2301 100644
--- a/src/main/resources/jetty-base/modules/idp-backchannel.mod
+++ b/src/main/resources/jetty-base/modules/idp-backchannel.mod
@@ -1,8 +1,8 @@
[description]
Shibboleth IdP Back-Channel
-
+
[depend]
idp
-
+
[xml]
etc/idp-backchannel.xml
diff --git a/src/main/resources/jetty-base/resources/logback-access.xml b/src/main/resources/jetty-base/resources/logback-access.xml
index aed30ce..8f17f33 100644
--- a/src/main/resources/jetty-base/resources/logback-access.xml
+++ b/src/main/resources/jetty-base/resources/logback-access.xml
@@ -1,5 +1,5 @@
<configuration>
- <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+ <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${jetty.base}/logs/access.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -9,6 +9,5 @@
<pattern>combined</pattern>
</encoder>
</appender>
-
<appender-ref ref="FILE" />
</configuration>
diff --git a/src/main/resources/jetty-base/resources/logback.xml b/src/main/resources/jetty-base/resources/logback.xml
index 67e7112..8b9ea93 100644
--- a/src/main/resources/jetty-base/resources/logback.xml
+++ b/src/main/resources/jetty-base/resources/logback.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true">
- <appender name="jetty" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>${jetty.base}/logs/jetty.log</File>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${jetty.base}/logs/jetty-%d{yyyy-MM-dd}.log.gz</FileNamePattern>
- </rollingPolicy>
-
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <charset>UTF-8</charset>
- <Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n</Pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="jetty" />
- </root>
- <logger name="org.springframework" level="OFF" />
- <logger name="ch.qos.logback" level="WARN" />
+ <appender name="jetty" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <File>${jetty.base}/logs/jetty.log</File>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <FileNamePattern>${jetty.base}/logs/jetty-%d{yyyy-MM-dd}.log.gz</FileNamePattern>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <charset>UTF-8</charset>
+ <Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n</Pattern>
+ </encoder>
+ </appender>
+ <root level="INFO">
+ <appender-ref ref="jetty" />
+ </root>
+ <logger name="org.springframework" level="OFF" />
+ <logger name="ch.qos.logback" level="WARN" />
</configuration>
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 6dd338f..a998c5e 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
<!-- =============================================================== -->
<!-- Configure the Shibboleth IdP webapp -->
<!-- =============================================================== -->
diff --git a/src/main/resources/jetty-base/webapps/static.xml b/src/main/resources/jetty-base/webapps/static.xml
index 7497b9e..b6ab738 100644
--- a/src/main/resources/jetty-base/webapps/static.xml
+++ b/src/main/resources/jetty-base/webapps/static.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
<!-- =============================================================== -->
<!-- Configure static content delivery -->
<!-- =============================================================== -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list